Merge pull request #39 from AndreasAakesson/master

Revert putting files in bin dir

.gitignore

@@ -1,3 +1,8 @@
 *.tar.gz
-bin/*
 *.pyc
+NaCl.tokens
+NaClLexer.py
+NaClLexer.tokens
+NaClListener.py
+NaClParser.py
+NaClVisitor.py

NaCl.py

@@ -1,10 +1,10 @@
 #! /usr/bin/env python
-import sys
-sys.path.append('bin')
+
 from antlr4 import *
 from NaClLexer import *
 from NaClParser import *
 from NaClVisitor import *
+import sys
 import os
 
 import pystache

README.md

@@ -3,7 +3,7 @@
 1. Install antlr4 exactly like described under Quick start: http://www.antlr.org/
 2. `pip install antlr4-python2-runtime`
 3. `pip install pystache`
-4. Generate python parser / lexer for `NaCl.g4` grammar WITH visitor (NaClVisitor.py): `antlr4 -Dlanguage=Python2 NaCl.g4 -visitor -o bin`
+4. Generate python parser / lexer for `NaCl.g4` grammar WITH visitor (NaClVisitor.py): `antlr4 -Dlanguage=Python2 NaCl.g4 -visitor`
 5. Make transpiler program executable: `chmod u+x NaCl.py`
 6. run with `cat examples/nacl.nacl | ./NaCl.py`
 7. For testing, using the `grun` program (alias really) is nice. This requires that you generate the java lexer / parser

create_bundle.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
+FILES="NaCl.tokens NaClLexer.py NaClLexer.tokens NaClListener.py NaClParser.py NaClVisitor.py"
 TARFILE="nacl_bin.tar.gz"
-tar -zcvf $TARFILE bin
+tar -zcvf $TARFILE $FILES
 echo -e "> Created $TARFILE"
 md5 $TARFILE