From d26bf39f054434fbcc0e3a894d9e828b069e8831 Mon Sep 17 00:00:00 2001 From: n loewen Date: Sat, 2 Sep 2023 20:34:54 -0700 Subject: [PATCH] assembler - Fix: move 'main' back to end --- src/assembler.js | 47 +++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/src/assembler.js b/src/assembler.js index 5df973b..68b54aa 100755 --- a/src/assembler.js +++ b/src/assembler.js @@ -9,30 +9,6 @@ const DBG = require('./dbg.js'); const CFG = require('./machine.config.js'); -/** MAIN **/ - -// Handle command-line options... -const opts = new Opter(process.argv); -opts.synonymize('-d', '--debug'); -opts.requireOption('-i', 'Input file required (-i prog.asm)'); -opts.requireOptionArgument('-i', 1, 1, 'Input file required (-i prog.asm)'); -opts.requireOptionArgument('-o', 1, 1, 'Missing output file name (-o prog.asm)'); - -const inputFilename = opts.opts.i[0]; -const inputFile_str = fs.readFileSync(inputFilename, 'utf8'); - -let outputFileProvided = opts.contains('-o'); -let returnOnStdout = !outputFileProvided; -let outputFilename = outputFileProvided ? opts.opts.o[0] : null; - -let outputWithMetadata = opts.contains('--debug'); - -// Initialize debugger... -const dbg = returnOnStdout ? new DBG('none') : new DBG('nitpick'); - -// Assemble...! -assemble(inputFile_str, outputFilename, outputWithMetadata); - /** Configure pseudo-ops **/ const ASM_IP_LABEL = '*'; @@ -452,3 +428,26 @@ function assemble(sourceCode, outputFile='out.txt', includeMetadata=false) { } } +/** MAIN **/ + +// Handle command-line options... +const opts = new Opter(process.argv); +opts.synonymize('-d', '--debug'); +opts.requireOption('-i', 'Input file required (-i prog.asm)'); +opts.requireOptionArgument('-i', 1, 1, 'Input file required (-i prog.asm)'); +opts.requireOptionArgument('-o', 1, 1, 'Missing output file name (-o prog.asm)'); + +const inputFilename = opts.opts.i[0]; +const inputFile_str = fs.readFileSync(inputFilename, 'utf8'); + +let outputFileProvided = opts.contains('-o'); +let returnOnStdout = !outputFileProvided; +let outputFilename = outputFileProvided ? opts.opts.o[0] : null; + +let outputWithMetadata = opts.contains('--debug'); + +// Initialize debugger... +const dbg = returnOnStdout ? new DBG('none') : new DBG('nitpick'); + +// Assemble...! +assemble(inputFile_str, outputFilename, outputWithMetadata);