edits

diff --git a/src/edu/uci/eecs/codeGenerator/CodeGenerator.java b/src/edu/uci/eecs/codeGenerator/CodeGenerator.java
index 67848e5fb566d32916d01427e77ebe72c006d94c..7f6d1928bae7cdec895d54324cb14a9437973254 100644 (file)
--- a/src/edu/uci/eecs/codeGenerator/CodeGenerator.java
+++ b/src/edu/uci/eecs/codeGenerator/CodeGenerator.java
@@ -318,14 +318,18 @@ public class CodeGenerator {
        }
 
        static public void main(String[] args) {
-//             String[] dirNames = { Environment.REGISTER, Environment.MS_QUEUE,
-//                             Environment.LINUXRWLOCKS, Environment.MCS_LOCK,
-//                             Environment.DEQUE, Environment.TREIBER_STACK };
+//             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();

diff --git a/src/edu/uci/eecs/specExtraction/FunctionHeader.java b/src/edu/uci/eecs/specExtraction/FunctionHeader.java
index a825c4b4f50d34659640477584bc717fb431d3b1..b79d65ba65a0ab34e6bd79a205a14eba2eb4c862 100644 (file)
--- a/src/edu/uci/eecs/specExtraction/FunctionHeader.java
+++ b/src/edu/uci/eecs/specExtraction/FunctionHeader.java
@@ -164,7 +164,7 @@ public class FunctionHeader {
        public String getRenamedCall(String prefix) {
                String res = "";
                if (!isReturnVoid()) {
-                       res = res + "bool " + SpecNaming.RET + " = ";
+                       res = res + returnType + " " + SpecNaming.RET + " = ";
                }
                res = res + prefix + "_" + funcName.fullName + "(";
                if (args.size() >= 1) {