diff --git a/src/args.ts b/src/args.ts index c5f66fc..b91970f 100644 --- a/src/args.ts +++ b/src/args.ts @@ -2,10 +2,12 @@ const argv = require('minimist')(process.argv.slice(2)); export type Args = { devMode: boolean; + debug: boolean; repl: boolean; }; export const args: Args = { repl: argv.repl ?? false, devMode: argv.dev ?? false, + debug: argv.debug ?? false, }; diff --git a/src/index.ts b/src/index.ts index d162465..1496cfc 100644 --- a/src/index.ts +++ b/src/index.ts @@ -31,7 +31,7 @@ const devMode = async (logger: TracingLogger) => { }; export const main = async (args: Args) => { - if (args.devMode) { + if (args.devMode || args.debug) { LOG_LEVELS.push('debug'); } diff --git a/src/repl.ts b/src/repl.ts index a42183a..1da8132 100644 --- a/src/repl.ts +++ b/src/repl.ts @@ -5,7 +5,8 @@ import { peggyParse } from './parser'; import { evaluate } from './interpreter'; // cool asci logo for CPS -const LOGO = ` +const LOGO = `\x1b[33m + simponic's _______ ________ ______ _______ __ / \\ / | / \\ / \\ / | $$$$$$$ |$$$$$$$$/ /$$$$$$ |$$$$$$$ |$$ | @@ -15,11 +16,10 @@ $$$$$$$ |$$$$$/ $$ | __ $$$$$$$/ $$ | $$ | $$ |$$ |_____ $$ \\__/ |$$ | $$ |_____ $$ | $$ |$$ |$$ $$/ $$ | $$ | $$/ $$/ $$$$$$$$/ $$$$$$/ $$/ $$$$$$$$/ - -`; +\x1b[0m`; const HELP = ` - This is the CPS REPL. You can enter CPS programs and see the result of evaluating them. + This is the CPS REPL. You can enter CPS programs and view the result of evaluating them. This REPL supports multi-line input. To end a multi-line input, enter an empty line. Commands: @@ -31,9 +31,9 @@ const HELP = ` this Intermediate Representation. Example: - ~> PRIMOP(+, [INT 1, INT 2], [result], [ + \x1b[34m ~>\x1b[0m\x1b[32m PRIMOP(+, [INT 1, INT 2], [result], [ | APP(LABEL id, [VAR result]) - | ]) + | ])\x1b[0m `; export const doRepl = async ( @@ -42,19 +42,24 @@ export const doRepl = async ( rl = readline.createInterface({ input, output }), ): Promise => { if (prompt === 0) { - logger.info('welcome to recpl (read eval continue print loop) :)' + LOGO); + logger.info( + 'welcome to recpl (read eval continue print loop) ʕ•́ᴥ•̀ʔっ' + LOGO, + ); } const promptString = `[ ${prompt} ] ~> `; - const lines: string[] = [await rl.question(promptString)]; + const coloredPrompt = `\x1b[0m[\x1b[33m ${prompt} \x1b[0m]\x1b[34m ~> \x1b[0m\x1b[32m`; + const lines: string[] = [await rl.question(coloredPrompt)]; while (lines.at(-1)) { const line = lines.at(-1)!; if (lines.length === 1 && line === 'help') { + process.stdout.write('\x1b[0m'); logger.info(HELP); return doRepl(logger, prompt + 1, rl); } if (line === 'exit') { + process.stdout.write('\x1b[0m'); logger.info('Exiting REPL...'); rl.close(); return; @@ -66,12 +71,15 @@ export const doRepl = async ( } const program = lines.slice(0, -1).join('\n'); + process.stdout.write('\x1b[0m'); try { const ast = peggyParse(program); logger.debug('AST: ' + JSON.stringify(ast, null, 2)); const result = await evaluate(ast, logger.createChild('evaluate')); - logger.info('Result: ' + JSON.stringify(result, null, 2) + '\n'); + logger.info( + 'Result: \n\x1b[36m' + JSON.stringify(result, null, 2) + '\x1b[0m\n', + ); } catch (e) { logger.error(e!.toString() + '\n'); }