Merge branch 'python3' into antlr

Author: kasbah

.gitignore

@@ -2,3 +2,6 @@ coverage/
 .nyc_output/
 node_modules/
 test-lib/
+
+js/**/ElectroGrammar*
+python3/**/ElectroGrammar*

Makefile

@@ -2,7 +2,7 @@ ANTLR=antlr4 -Xexact-output-dir
 GRAMMAR=src/ElectroGrammar.g4
 GRAMMAR_FILES=$(wildcard src/*.g4)
 
-all: js
+all: js python3
 
 java: $(GRAMMAR) $(GRAMMAR_FILES)
 	$(ANTLR) $< -o java/
@@ -11,11 +11,12 @@ java: $(GRAMMAR) $(GRAMMAR_FILES)
 clean-java:
 	rm -f java/*
 
+
 python3: $(GRAMMAR) $(GRAMMAR_FILES)
-	$(ANTLR) -Dlanguage=Python3 $< -o python3/
+	$(ANTLR) -Dlanguage=Python3 $< -o python3/electro_grammar/
 
 clean-python3:
-	rm -f python3/*
+	rm -f python3/electro_grammar/ElectroGrammar*
 
 
 js: $(GRAMMAR) $(GRAMMAR_FILES)
@@ -24,6 +25,7 @@ js: $(GRAMMAR) $(GRAMMAR_FILES)
 clean-js:
 	rm -f js/lib/ElectroGrammar*
 
+
 clean: clean-java clean-python3 clean-js
 
 .PHONY: all clean python3 clean-python3 java clean-java clean js clean-js

js/bin/electro-grammar.js

@@ -0,0 +1,4 @@
+var lib = require('../lib/index.js');
+
+var input = process.argv[2];
+console.log(lib.parse(input));

js/lib/index.js

@@ -3,34 +3,33 @@ var {ElectroGrammarParser} = require('./ElectroGrammarParser');
 var {ElectroGrammarListener} = require('./ElectroGrammarListener');
 var antlr4 = require('antlr4');
 
-var KeyPrinter = function() {
+var ElectroGrammarToObjectListener = function() {
   ElectroGrammarListener.call(this);
+  this.obj = {};
   return this;
 };
 
-KeyPrinter.prototype = Object.create(ElectroGrammarListener.prototype);
-KeyPrinter.prototype.constructor = KeyPrinter;
+ElectroGrammarToObjectListener.prototype = Object.create(ElectroGrammarListener.prototype);
+ElectroGrammarToObjectListener.prototype.constructor = ElectroGrammarToObjectListener;
 
-KeyPrinter.prototype.exitCapacitance = function(ctx) {
-  var prefix = ctx
-    .CPREFIX()
-    .getText()
-    .toLowerCase();
-  if (prefix === 'micro') {
-    prefix = 'u';
-  } else {
-    prefix = prefix[0];
-  }
-  var number = Number(ctx.NUMBER().getText());
-  console.log('capacitance', `${number}${prefix}F`);
+ElectroGrammarToObjectListener.prototype.enterCapacitance = function(ctx) {
+	var cprefix_lookup = {'u': 10e-6, 'n': 10e-9, 'p': 10e-12};
+	var number = Number(ctx.NUMBER().getText());
+	var cprefix = cprefix_lookup[ctx.CPREFIX().getText()];
+	this.obj['capacitance'] = number * cprefix;
 };
 
-var input = '100 micro farad \n';
-var chars = new antlr4.InputStream(input);
-var lexer = new ElectroGrammarLexer(chars);
-var tokens = new antlr4.CommonTokenStream(lexer);
-var parser = new ElectroGrammarParser(tokens);
-parser.buildParseTrees = true;
-var tree = parser.capacitance();
-var printer = new KeyPrinter();
-antlr4.tree.ParseTreeWalker.DEFAULT.walk(printer, tree);
+var parse = function(input) {
+	var chars = new antlr4.InputStream(input);
+	var lexer = new ElectroGrammarLexer(chars);
+	var tokens = new antlr4.CommonTokenStream(lexer);
+	var parser = new ElectroGrammarParser(tokens);
+	parser.buildParseTrees = true;
+
+	var tree = parser.electro_grammar();
+	var listener = new ElectroGrammarToObjectListener();
+	var walker = antlr4.tree.ParseTreeWalker.DEFAULT.walk(listener, tree);
+	return listener.obj;
+};
+
+module.exports = {'parse': parse};