Permalink
Browse files

reorganize source files and build process

  • Loading branch information...
1 parent d6504ba commit 534a91e012b8156bb2bf180abd03ed7e8e4feee5 @izuzak committed Jan 21, 2013
@@ -1,7 +1,7 @@
var fs = require("fs");
var path = require("path");
-var parser = require("./../lib/friscasm.js");
-var sim = require("./../lib/friscjs.js").FRISC;
+var asm = require("./../lib/index.js").assembler;
+var sim = require("./../lib/index.js").simulator;
var argv = process.argv;
var isVerboseMode = argv.indexOf("-v") > -1;
@@ -170,7 +170,7 @@ function runProgram(frisc_asmsource) {
console.error("");
try {
- var result = parser.parse(frisc_asmsource.toString());
+ var result = asm.parse(frisc_asmsource.toString());
} catch (e) {
console.error("Parsing error on line " + e.line + " column " + e.column + " -- " + e.toString());
return;
View
@@ -4,25 +4,26 @@ module.exports = function(grunt) {
friscasm : {
grammar: "src/friscasm.pegjs",
exportVar: "frisc_asm",
- outputFile: "lib/friscasm.js"
+ outputFile: "src/friscasm.js"
}
},
concat: {
friscasm : {
- src: ['lib/friscasm.js',
+ src: ['src/friscasm.js',
'src/friscasm.export.js'],
- dest: 'lib/friscasm.js'
+ dest: 'src/friscasm.js'
},
browser : {
- src: ['lib/friscasm.js',
- 'lib/friscjs.js'],
+ src: ['src/friscasm.js',
+ 'src/friscsim.js',
+ 'lib/index.js'],
dest: 'lib/friscjs-browser.js'
}
},
lint: {
- all: ['src/src/friscasm.export.js', 'lib/friscjs.js', 'consoleapp/frisc-console.js', 'webapp/scripts/*']
+ all: ['src/friscasm.export.js', 'src/friscsim.js', 'consoleapp/frisc-console.js', 'webapp/scripts/*']
},
min: {
Oops, something went wrong.

0 comments on commit 534a91e

Please sign in to comment.