From: Peizhao Ou <peizhaoo@uci.edu>
Date: Mon, 22 Feb 2016 09:33:16 +0000 (-0800)
Subject: edits
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=cdsspec-compiler.git;a=commitdiff_plain;h=19ccd7c10175f9a93b315ef34b9d3168939c87ec

edits
---

diff --git a/src/edu/uci/eecs/codeGenerator/CodeGenerator.java b/src/edu/uci/eecs/codeGenerator/CodeGenerator.java
index 67848e5..7f6d192 100644
--- 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 a825c4b..b79d65b 100644
--- 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) {