X-Git-Url: http://plrg.eecs.uci.edu/git/?p=cdsspec-compiler.git;a=blobdiff_plain;f=run-javacc.sh;h=ab350be284c50303b7db25f3a2391dcd5e18a97a;hp=a8484bdade8ecc8129e66fe25efe2e2f0ba31856;hb=20f4a8dc41dedff13ccdd90bcf420d0f1f78844c;hpb=3914e7a0a051d03bde44122f970d0549ef1b7dbf

diff --git a/run-javacc.sh b/run-javacc.sh
index a8484bd..ab350be 100755
--- a/run-javacc.sh
+++ b/run-javacc.sh
@@ -6,17 +6,17 @@ fi
 
 JAVACC_PATH=$SPEC_COMPILER_HOME/lib
 
-OUTPUT_PATH=$SPEC_COMPILER_HOME/src/edu/uci/eecs/specCompiler/grammerParser
-mkdir -p $OUTPUT_PATH
+PRE_SCANNER_FILE=$SPEC_COMPILER_HOME/grammer/pre_scanner.jj
+GRAMMER_FILE=$SPEC_COMPILER_HOME/grammer/spec_compiler.jj
 
-GRAMMER_FILE=$SPEC_COMPILER_HOME/grammer/spec-compiler.jj
-
-if [ -z $1 ]; then
-	echo "Using the default grammer file: $GRAMMER_FILE."
-else
-	GRAMMER_FILE=$1
-fi
+PRE_SCANNER_OUTPUT_PATH=$SPEC_COMPILER_HOME/src/edu/uci/eecs/specCompiler/grammerParser/preScanner
+GRAMMER_OUTPUT_PATH=$SPEC_COMPILER_HOME/src/edu/uci/eecs/specCompiler/grammerParser
 
 echo "Deleting the old generated java files."
-rm $OUTPUT_PATH/*.java
-java -cp $JAVACC_PATH/javacc.jar javacc -OUTPUT_DIRECTORY=$OUTPUT_PATH $GRAMMER_FILE
+rm -r $GRAMMER_OUTPUT_PATH/*
+
+mkdir -p $PRE_SCANNER_OUTPUT_PATH
+mkdir -p $GRAMMER_OUTPUT_PATH
+
+java -cp $JAVACC_PATH/javacc.jar javacc -OUTPUT_DIRECTORY=$PRE_SCANNER_OUTPUT_PATH $PRE_SCANNER_FILE
+java -cp $JAVACC_PATH/javacc.jar javacc -OUTPUT_DIRECTORY=$GRAMMER_OUTPUT_PATH $GRAMMER_FILE