add lots of stuff

[cdsspec-compiler.git] / src / edu / uci / eecs / specCompiler / codeGenerator / CodeGenerator.java

diff --git a/src/edu/uci/eecs/specCompiler/codeGenerator/CodeGenerator.java b/src/edu/uci/eecs/specCompiler/codeGenerator/CodeGenerator.java
index e685bc6c76aa092e60e1e72835ec444129a0e6d5..e78624cc67d3b6f1c2bb644999820caa4f367733 100644 (file)
--- a/src/edu/uci/eecs/specCompiler/codeGenerator/CodeGenerator.java
+++ b/src/edu/uci/eecs/specCompiler/codeGenerator/CodeGenerator.java
@@ -11,8 +11,10 @@ import java.util.Iterator;
 
 import edu.uci.eecs.specCompiler.specExtraction.CPDefineCheckConstruct;
 import edu.uci.eecs.specCompiler.specExtraction.CPDefineConstruct;
+import edu.uci.eecs.specCompiler.specExtraction.ClassEndConstruct;
 import edu.uci.eecs.specCompiler.specExtraction.ConditionalInterface;
 import edu.uci.eecs.specCompiler.specExtraction.Construct;
+import edu.uci.eecs.specCompiler.specExtraction.EntryPointConstruct;
 import edu.uci.eecs.specCompiler.specExtraction.GlobalConstruct;
 import edu.uci.eecs.specCompiler.specExtraction.IDExtractor;
 import edu.uci.eecs.specCompiler.specExtraction.InterfaceConstruct;
@@ -41,18 +43,14 @@ public class CodeGenerator {
 
        private HashMap<File, ArrayList<CodeAddition>> codeAdditions;
 
-       private ArrayList<String> globalContent;
-
        public CodeGenerator(File[] srcFiles) {
                this.srcFiles = srcFiles;
                _extractor = new SpecExtractor();
                _extractor.extract(srcFiles);
-               
+
                this.srcFilesInfo = _extractor.srcFilesInfo;
-               
-               this.globalContent = null;
-               this.codeAdditions = new HashMap<File, ArrayList<CodeAddition>>();
 
+               this.codeAdditions = new HashMap<File, ArrayList<CodeAddition>>();
 
                _semantics = new SemanticsChecker(_extractor);
                try {
@@ -72,32 +70,26 @@ public class CodeGenerator {
        private void globalConstruct2Code(GlobalConstruct construct) {
                ArrayList<String> newCode = CodeVariables.generateGlobalVarDeclaration(
                                _semantics, construct);
-               // Record the global content array to generate the new file
-               globalContent = newCode;
+               // Add it to the codeAdditions
+               if (!codeAdditions.containsKey(construct.file)) {
+                       codeAdditions.put(construct.file, new ArrayList<CodeAddition>());
+               }
+               CodeAddition addition = new CodeAddition(construct.beginLineNum,
+                               newCode);
+               codeAdditions.get(construct.file).add(addition);
+               newCode = CodeVariables.generateStaticVarDefine(_semantics, construct);
+               if (newCode.size() > 0) {
+                       addition = new CodeAddition(_semantics.getClassEndConstruct().beginLineNum, newCode);
+                       codeAdditions.get(construct.file).add(addition);
+               }
        }
 
        // Mainly rename and wrap the interface
        private void interface2Code(InterfaceConstruct construct)
                        throws InterfaceWrongFormatException {
-               int lineNum = construct.beginLineNum;
-               String funcName = "";
-
-               // Rename the interface name
-               
-               // Rename the function declaration
-               
-               // Also rename the function definition if it's separated from the
-               // declaration
-               InterfaceDefineConstruct definition = (InterfaceDefineConstruct) _semantics.interfaceName2DefineConstruct
-                               .get(construct.name);
-               if (definition != null) {
-                       String funcDefintionName = renameInterface(definition);
-                       assert (funcDefintionName.equals(funcName));
-               }
-
-               // Generate new wrapper
                ArrayList<String> newCode = CodeVariables.generateInterfaceWrapper(
                                _semantics, construct);
+               int lineNum = construct.beginLineNum;
                // Add it to the codeAdditions
                CodeAddition addition = new CodeAddition(lineNum, newCode);
                if (!codeAdditions.containsKey(construct.file)) {
@@ -106,37 +98,10 @@ public class CodeGenerator {
                codeAdditions.get(construct.file).add(addition);
        }
 
-       // Returns the function name that has been renamed and replace the old line
-       private String renameInterface(Construct construct)
-                       throws InterfaceWrongFormatException {
-               String funcDecl = "";
-               ArrayList<String> content = srcFilesInfo.get(construct.file).content;
-
-               // Depending on "(" to find the function name, so it doesn't matter if
-               // there's any template
-               int beginIdx = funcDecl.indexOf('(');
-               if (beginIdx == -1) {
-                       throw new InterfaceWrongFormatException(funcDecl
-                                       + "\n has wrong format!");
-               }
-               IDExtractor idExtractor = new IDExtractor(funcDecl, beginIdx);
-               String funcName = idExtractor.getPrevID();
-               int idBeginIdx = idExtractor.getIDBeginIdx(), idEndIdx = idExtractor
-                               .getIDEndIdx(), idLineBeginIdx = idExtractor.lineBeginIdxOfID(), idLineEndIdx = idExtractor
-                               .lineEndIdxOfID();
-               String newLine = funcDecl.substring(idLineBeginIdx, idBeginIdx)
-                               + CodeVariables.SPEC_INTERFACE_WRAPPER + funcName
-                               + funcDecl.substring(idEndIdx + 1, idLineEndIdx + 1);
-
-               int lineNumOfID = idExtractor.lineNumOfID();
-               // Be careful: lineNum - 1 -> index of content array
-               content.set(construct.beginLineNum - 1, newLine);
-               return funcName;
-       }
-
        private void potentialCPDefine2Code(PotentialCPDefineConstruct construct) {
                int lineNum = construct.beginLineNum;
-               ArrayList<String> newCode = new ArrayList<String>();
+               ArrayList<String> newCode = CodeVariables.generatePotentialCPDefine(
+                               _semantics, construct);
 
                CodeAddition addition = new CodeAddition(lineNum, newCode);
                if (!codeAdditions.containsKey(construct.file)) {
@@ -147,7 +112,7 @@ public class CodeGenerator {
 
        private void CPDefine2Code(CPDefineConstruct construct) {
                int lineNum = construct.beginLineNum;
-               ArrayList<String> newCode = new ArrayList<String>();
+               ArrayList<String> newCode = CodeVariables.generateCPDefine(_semantics, construct);
 
                CodeAddition addition = new CodeAddition(lineNum, newCode);
                if (!codeAdditions.containsKey(construct.file)) {
@@ -157,8 +122,20 @@ public class CodeGenerator {
        }
 
        private void CPDefineCheck2Code(CPDefineCheckConstruct construct) {
+               int lineNum = construct.beginLineNum;
+               ArrayList<String> newCode = CodeVariables.generateCPDefineCheck(_semantics, construct);
+
+               CodeAddition addition = new CodeAddition(lineNum, newCode);
+               if (!codeAdditions.containsKey(construct.file)) {
+                       codeAdditions.put(construct.file, new ArrayList<CodeAddition>());
+               }
+               codeAdditions.get(construct.file).add(addition);
+       }
+       
+       private void EntryPoint2Code(EntryPointConstruct construct) {
                int lineNum = construct.beginLineNum;
                ArrayList<String> newCode = new ArrayList<String>();
+               newCode.add(")
 
                CodeAddition addition = new CodeAddition(lineNum, newCode);
                if (!codeAdditions.containsKey(construct.file)) {
@@ -166,6 +143,7 @@ public class CodeGenerator {
                }
                codeAdditions.get(construct.file).add(addition);
        }
+       
 
        public void generateCode() {
                for (int i = 0; i < _semantics.constructs.size(); i++) {