From: Peizhao Ou <peizhaoo@uci.edu>
Date: Sat, 15 Mar 2014 00:06:42 +0000 (-0700)
Subject: clean up
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=cdsspec-compiler.git;a=commitdiff_plain;h=d6df0bb6bee6a71ea185b4dffbf52bb7f1fff551

clean up
---

diff --git a/grammer/spec_compiler.jj b/grammer/spec_compiler.jj
index 9950ad8..37749aa 100644
--- 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 3a253c1..db7e7e6 100644
--- 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 580120b..74b48a2 100644
--- 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 232f483..c80ce51 100644
--- 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;
 	}