Parser refactor

src/backend/parser/LocationMacro.js

@@ -0,0 +1,7 @@
+function preprocessGrammar (parserGrammar) {
+    var reg = /^(\w+)_\b/gm;
+    var replacement = '$1\n    : $1_\n        { $$$$ = addloc($$1, @1, ops); }\n    ;\n\n$&';
+    return parserGrammar.replace(reg, replacement);
+}
+
+module.exports = preprocessGrammar;

src/backend/parser/Make.js

@@ -2,6 +2,7 @@ var JisonLex = require('jison-lex');
 var Jison = require('jison');
 var fs = require('fs');
 var path = require('path');
+var preprocessGrammar = require('./LocationMacro.js');
 
 var dest = path.join(path.resolve(process.argv[2]), "src/parser"); // first command-line argument
 
@@ -18,7 +19,8 @@ var lexerGrammar = fs.readFileSync('src/backend/parser/assets/ansic.jisonlex', '
 var lexerSource = JisonLex.generate(lexerGrammar);
 fs.writeFileSync(lexerFilename, lexerSource);
 
-var parserGrammar = fs.readFileSync('src/backend/parser/assets/ansic.jison', 'utf-8');
+var rawParserGrammar = fs.readFileSync('src/backend/parser/assets/ansic.jison', 'utf-8');
+var parserGrammar = preprocessGrammar(rawParserGrammar);
 var parser = new Jison.Parser(parserGrammar);
 parser.lexer = new JisonLex(lexerGrammar);
 var parserSource = addRequireJsParts(parser.generate());
@@ -30,3 +32,9 @@ function addRequireJsParts(source) {
     source = source.replace("require('path')", "dummy");
     return "define(function(require, exports, module) {" + source + "});";
 }
+
+function processLocationMacro (parserGrammar) {
+    var reg = /^(\w+)_\b/gm;
+    var replacement = '$1\n    : $1_\n        { $$$$ = addloc($$1, @1, ops); }\n    ;\n\n$&';
+    return parserGrammar.replace(reg, replacement);
+}

src/backend/parser/MakeHere.js

@@ -2,6 +2,7 @@ var JisonLex = require('jison-lex');
 var Jison = require('jison');
 var fs = require('fs');
 var path = require('path');
+var preprocessGrammar = require('./LocationMacro');
 
 var dest = process.cwd();
 
@@ -12,7 +13,7 @@ var lexerGrammar = fs.readFileSync('assets/ansic.jisonlex', 'utf-8');
 var lexerSource = JisonLex.generate(lexerGrammar);
 fs.writeFileSync(lexerFilename, lexerSource);
 
-var parserGrammar = fs.readFileSync('assets/ansic.jison', 'utf-8');
+var parserGrammar = preprocessGrammar(fs.readFileSync('assets/ansic.jison', 'utf-8'));
 var parser = new Jison.Parser(parserGrammar);
 parser.lexer = new JisonLex(lexerGrammar);
 var parserSource = parser.generate();
@@ -37,3 +38,9 @@ var finalParserSource = parserSource.replace(
     );
 
 fs.writeFileSync(parserFilename, finalParserSource);
+
+function processLocationMacro (parserGrammar) {
+    var reg = /^(\w+)_\b/gm;
+    var replacement = '$1\n    : $1_\n        { $$$$ = addloc($$1, @1, ops); }\n    ;\n\n$&';
+    return parserGrammar.replace(reg, replacement);
+}