clean up

diff --git a/grammer/spec_compiler.jj b/grammer/spec_compiler.jj
index 9950ad886f7926bd2712d192ad5fa2ccfa292db9..37749aab497b2b2438959e1c2b9b918ef508234e 100644 (file)
--- a/grammer/spec_compiler.jj
+++ b/grammer/spec_compiler.jj
@@ -610,24 +610,6 @@ String Type() :
        }
 }
 
-void Test() :
-{
-       String str;     
-       FunctionHeader func;
-}
-{
-       /*
-       str = Type()
-       {
-               System.out.println(str);
-       }
-       */
-       func = FuncDecl() 
-       {
-               System.out.println(func);
-       }
-       
-}
 
 String ParameterizedName() :
 {

diff --git a/src/edu/uci/eecs/specCompiler/codeGenerator/CodeVariables.java b/src/edu/uci/eecs/specCompiler/codeGenerator/CodeVariables.java
index 3a253c17386043736e13e1de0ee1e4217eb67bf2..db7e7e68c1c753a4a5841b3dae067a3b799730e0 100644 (file)
--- a/src/edu/uci/eecs/specCompiler/codeGenerator/CodeVariables.java
+++ b/src/edu/uci/eecs/specCompiler/codeGenerator/CodeVariables.java
@@ -5,21 +5,18 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.io.File;
 
-import edu.uci.eecs.specCompiler.grammerParser.ParseException;
-import edu.uci.eecs.specCompiler.grammerParser.SpecParser;
+import edu.uci.eecs.specCompiler.grammerParser.utilParser.UtilParser;
+import edu.uci.eecs.specCompiler.grammerParser.utilParser.ParseException;
 import edu.uci.eecs.specCompiler.specExtraction.CPDefineCheckConstruct;
 import edu.uci.eecs.specCompiler.specExtraction.CPDefineConstruct;
 import edu.uci.eecs.specCompiler.specExtraction.ConditionalInterface;
 import edu.uci.eecs.specCompiler.specExtraction.Construct;
 import edu.uci.eecs.specCompiler.specExtraction.FunctionHeader;
 import edu.uci.eecs.specCompiler.specExtraction.GlobalConstruct;
-import edu.uci.eecs.specCompiler.specExtraction.IDExtractor;
 import edu.uci.eecs.specCompiler.specExtraction.InterfaceConstruct;
 import edu.uci.eecs.specCompiler.specExtraction.InterfaceDefineConstruct;
-import edu.uci.eecs.specCompiler.specExtraction.ParserUtils;
 import edu.uci.eecs.specCompiler.specExtraction.PotentialCPDefineConstruct;
 import edu.uci.eecs.specCompiler.specExtraction.SequentialDefineSubConstruct;
-import edu.uci.eecs.specCompiler.specExtraction.SpecExtractor;
 import edu.uci.eecs.specCompiler.specExtraction.VariableDeclaration;
 
 public class CodeVariables {
@@ -307,9 +304,9 @@ public class CodeVariables {
                }
                headerLine = headerLine.substring(0, headerLine.indexOf(')') + 1);
                try {
-                       FunctionHeader header = SpecParser.parseFuncHeader(headerLine);
+                       FunctionHeader header = UtilParser.parseFuncHeader(headerLine);
                        if (templateLine != null) {
-                               ArrayList<VariableDeclaration> templateArgs = SpecParser
+                               ArrayList<VariableDeclaration> templateArgs = UtilParser
                                                .getTemplateArg(templateLine);
                                header.setTemplateList(templateArgs);
                        }

diff --git a/src/edu/uci/eecs/specCompiler/codeGenerator/SemanticsChecker.java b/src/edu/uci/eecs/specCompiler/codeGenerator/SemanticsChecker.java
index 580120b5bc97b378d7fb58f019bded5b573f82b0..74b48a237fdee48b6aec848736e0bb6ef5416f05 100644 (file)
--- a/src/edu/uci/eecs/specCompiler/codeGenerator/SemanticsChecker.java
+++ b/src/edu/uci/eecs/specCompiler/codeGenerator/SemanticsChecker.java
@@ -6,7 +6,6 @@ import java.util.HashMap;
 import java.util.HashSet;
 
 import edu.uci.eecs.specCompiler.grammerParser.ParseException;
-import edu.uci.eecs.specCompiler.grammerParser.SpecParser;
 import edu.uci.eecs.specCompiler.specExtraction.CPDefineCheckConstruct;
 import edu.uci.eecs.specCompiler.specExtraction.CPDefineConstruct;
 import edu.uci.eecs.specCompiler.specExtraction.ClassBeginConstruct;

diff --git a/src/edu/uci/eecs/specCompiler/specExtraction/ParserUtils.java b/src/edu/uci/eecs/specCompiler/specExtraction/ParserUtils.java
index 232f483c5c353ed3d69540b716a7e49cda2963e9..c80ce51dcfe844b3016b3e5aade8080089b1cc4f 100644 (file)
--- a/src/edu/uci/eecs/specCompiler/specExtraction/ParserUtils.java
+++ b/src/edu/uci/eecs/specCompiler/specExtraction/ParserUtils.java
@@ -7,9 +7,8 @@ import java.io.IOException;
 import java.util.ArrayList;
 
 import edu.uci.eecs.specCompiler.codeGenerator.Environment;
-import edu.uci.eecs.specCompiler.codeGenerator.SemanticsChecker;
-import edu.uci.eecs.specCompiler.grammerParser.ParseException;
-import edu.uci.eecs.specCompiler.grammerParser.SpecParser;
+import edu.uci.eecs.specCompiler.grammerParser.utilParser.ParseException;
+import edu.uci.eecs.specCompiler.grammerParser.utilParser.UtilParser;
 
 public class ParserUtils {
        public static String trimSpace(String line) {
@@ -47,8 +46,9 @@ public class ParserUtils {
 
        public static String getTemplateStr(String templateLine) {
                String templateStr = null;
+               ArrayList<VariableDeclaration> templateArgs;
                try {
-                       ArrayList<VariableDeclaration> templateArgs = SpecParser.getTemplateArg(templateLine);
+                       templateArgs = UtilParser.getTemplateArg(templateLine);
                        templateStr = "<" + templateArgs.get(0).name;
                        for (int i = 1; i < templateArgs.size(); i++) {
                                templateStr = templateStr + ", " + templateArgs.get(i).name;
@@ -57,6 +57,7 @@ public class ParserUtils {
                } catch (ParseException e) {
                        e.printStackTrace();
                }
+               
                return templateStr;
        }