Skip to content

Commit

Permalink
added package files
Browse files Browse the repository at this point in the history
  • Loading branch information
sehugg committed May 26, 2019
1 parent d84e415 commit 5e79821
Show file tree
Hide file tree
Showing 6 changed files with 78 additions and 25 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
*~
node_modules/
14 changes: 14 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
"scripts": {
"build": "tsc"
},
"dependencies": {
},
"dependencies": {},
"devDependencies": {
"@types/node": "^12.0.2",
"typescript": "^3.4.5"
}
}
41 changes: 18 additions & 23 deletions src/asmmain.js
Original file line number Diff line number Diff line change
@@ -1,38 +1,33 @@

var asmmod = require('../../gen/worker/assembler');
var asmmod = require('./assembler');
var fs = require('fs');

var args = process.argv;
if (args.length < 3) {
console.log("Usage: asmmain config.json [file.asm...]");
process.exit(1);
}

// load JSON config
var configFilename = args[2];
var configFile = fs.readFileSync(configFilename, 'utf8');
var configJson = JSON.parse(configFile);

var binout = [];
for (var fi=3; fi<args.length; fi++) {
// assemble file
var asmFilename = args[fi];
var asm = new asmmod.Assembler(configJson);
asm.loadInclude = function(fn) { };
asm.loadModule = function(fn) { };
var asmtext = fs.readFileSync(asmFilename, 'utf8');
var out = asm.assembleFile(asmtext);
if (out.errors && out.errors.length) {
for (var ei=0; ei<out.errors.length; ei++) {
var err = out.errors[ei];
console.log(asmFilename + "(" + err.line + "): " + err.msg);
for (var fi = 3; fi < args.length; fi++) {
// assemble file
var asmFilename = args[fi];
var asm = new asmmod.Assembler(configJson);
asm.loadInclude = function (fn) { };
asm.loadModule = function (fn) { };
var asmtext = fs.readFileSync(asmFilename, 'utf8');
var out = asm.assembleFile(asmtext);
if (out.errors && out.errors.length) {
for (var ei = 0; ei < out.errors.length; ei++) {
var err = out.errors[ei];
console.log(asmFilename + "(" + err.line + "): " + err.msg);
}
process.exit(2);
}
process.exit(2);
}
binout = binout.concat(out.output);
binout = binout.concat(out.output);
}

// print output
for (var i=0; i<binout.length; i++) {
console.log(binout[i].toString(16));
for (var i = 0; i < binout.length; i++) {
console.log(binout[i].toString(16));
}
38 changes: 38 additions & 0 deletions src/asmmain.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@

var asmmod = require('./assembler');
var fs = require('fs');

var args = process.argv;
if (args.length < 3) {
console.log("Usage: asmmain config.json [file.asm...]");
process.exit(1);
}

// load JSON config
var configFilename = args[2];
var configFile = fs.readFileSync(configFilename, 'utf8');
var configJson = JSON.parse(configFile);

var binout = [];
for (var fi=3; fi<args.length; fi++) {
// assemble file
var asmFilename = args[fi];
var asm = new asmmod.Assembler(configJson);
asm.loadInclude = function(fn) { };
asm.loadModule = function(fn) { };
var asmtext = fs.readFileSync(asmFilename, 'utf8');
var out = asm.assembleFile(asmtext);
if (out.errors && out.errors.length) {
for (var ei=0; ei<out.errors.length; ei++) {
var err = out.errors[ei];
console.log(asmFilename + "(" + err.line + "): " + err.msg);
}
process.exit(2);
}
binout = binout.concat(out.output);
}

// print output
for (var i=0; i<binout.length; i++) {
console.log(binout[i].toString(16));
}
5 changes: 5 additions & 0 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
{
"module": "commonjs",
"esModuleInterop": true,
"target": "es6",
"moduleResolution": "node",
"sourceMap": true,
"include": [
"./src/**/*.ts"
]
Expand Down

0 comments on commit 5e79821

Please sign in to comment.