edits

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

diff --git a/src/edu/uci/eecs/codeGenerator/CodeGenerator.java b/src/edu/uci/eecs/codeGenerator/CodeGenerator.java
index b3f1c619acb7f99bd9afce3a17f4ddd9b86d9ef7..41a5bddfe32eefba8c061e6455fc99f152dc8fd6 100644 (file)
--- a/src/edu/uci/eecs/codeGenerator/CodeGenerator.java
+++ b/src/edu/uci/eecs/codeGenerator/CodeGenerator.java
@@ -13,6 +13,7 @@ import java.util.HashMap;
 import edu.uci.eecs.codeGenerator.CodeAdditions.CodeAddition;
 import edu.uci.eecs.specExtraction.Code;
 import edu.uci.eecs.specExtraction.Construct;
+import edu.uci.eecs.specExtraction.DefineConstruct;
 import edu.uci.eecs.specExtraction.EntryConstruct;
 import edu.uci.eecs.specExtraction.InterfaceConstruct;
 import edu.uci.eecs.specExtraction.OPConstruct;
@@ -102,6 +103,8 @@ public class CodeGenerator {
                        // Extract all the additions
                        ArrayList<OPConstruct> OPList = extractor.OPListMap.get(file);
                        EntryConstruct entry = extractor.entryMap.get(file);
+                       ArrayList<DefineConstruct> defineList = extractor.defineListMap
+                                       .get(file);
                        ArrayList<InterfaceConstruct> interfaceList = extractor.interfaceListMap
                                        .get(file);
                        Code code = null;
@@ -120,6 +123,15 @@ public class CodeGenerator {
                                addition = new CodeAddition(entry.beginLineNum, code);
                                additions.addCodeAddition(addition);
                        }
+                       // For define constructs
+                       if (defineList != null) {
+                               for (DefineConstruct con : defineList) {
+                                       code = CodeGeneratorUtils.Generate4Define(con);
+                                       addition = new CodeAddition(con.endLineNum,
+                                                       code);
+                                       additions.addCodeAddition(addition);
+                               }
+                       }
                        // For interface constructs
                        if (interfaceList != null) {
                                for (InterfaceConstruct con : interfaceList) {
@@ -166,6 +178,14 @@ public class CodeGenerator {
                        additionIdx = 0;
                        curAddition = additions.codeAdditions.get(0);
                }
+               
+               // Include the header for C/C++ files (.c/.cc/.cpp)
+               String name = file.getName();
+               if (name.endsWith(".c") || name.endsWith(".cc") || name.endsWith(".cpp")) {
+                       newCode.addLine(CodeGeneratorUtils.Comment("Add the" + SpecNaming.CDSSpecGeneratedHeader + " header file"));
+                       newCode.addLine(CodeGeneratorUtils.IncludeHeader(SpecNaming.CDSSpecGeneratedHeader));
+                       newCode.addLine("");
+               }
 
                try {
                        br = new BufferedReader(new FileReader(file));
@@ -306,11 +326,18 @@ public class CodeGenerator {
        }
 
        static public void main(String[] args) {
-               String[] dirNames = { Environment.REGISTER, Environment.MS_QUEUE, Environment.LINUXRWLOCKS, Environment.MCS_LOCK };
+//             String[] dirNames = { 
+//                             Environment.REGISTER, 
+//                             Environment.MS_QUEUE,
+//                             Environment.LINUXRWLOCKS,
+//                             Environment.MCS_LOCK,
+//                             Environment.DEQUE, 
+//                             Environment.TREIBER_STACK };
+               String[] dirNames = args;
 
                for (int i = 0; i < dirNames.length; i++) {
                        String dirName = dirNames[i];
-                       System.out.println("/**********   Processing " + dirName
+                       System.out.println("/**********   Generating CDSSpec files for " + dirName
                                        + "    **********/");
                        CodeGenerator generator = new CodeGenerator(dirName);
                        generator.generateCode();