From: bdemsky <bdemsky>
Date: Sun, 3 Apr 2011 03:56:14 +0000 (+0000)
Subject: changes for correctness
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0dc73d1cbcf95f2b34b133bb7a0284584526fa6a;p=IRC.git

changes for correctness
---

diff --git a/Robust/src/IR/Flat/BuildCode.java b/Robust/src/IR/Flat/BuildCode.java
index f5e99038..efdcc0b3 100644
--- a/Robust/src/IR/Flat/BuildCode.java
+++ b/Robust/src/IR/Flat/BuildCode.java
@@ -2899,14 +2899,25 @@ public class BuildCode {
       output.println(generateTemp(fm,fcn.getDst())+"=("+fcn.getType().getSafeSymbol()+")"+generateTemp(fm,fcn.getSrc())+";");
   }
 
+  int flncount=0;
+
   protected void generateFlatLiteralNode(FlatMethod fm, FlatLiteralNode fln, PrintWriter output) {
     if (fln.getValue()==null)
       output.println(generateTemp(fm, fln.getDst())+"=0;");
     else if (fln.getType().getSymbol().equals(TypeUtil.StringClass)) {
+      String str=(String)fln.getValue();
+      output.print("short str"+flncount+"[]={");
+      for(int i=0;i<str.length();i++) {
+	if (i!=0)
+	  output.print(", ");
+	output.print(((int)str.charAt(i)));
+      }
+      output.println("};");
+      flncount++;
       if ((GENERATEPRECISEGC) || (this.state.MULTICOREGC)) {
-	output.println(generateTemp(fm, fln.getDst())+"=NewString("+localsprefixaddr+", \""+FlatLiteralNode.escapeString((String)fln.getValue())+"\","+((String)fln.getValue()).length()+");");
+	output.println(generateTemp(fm, fln.getDst())+"=NewStringShort("+localsprefixaddr+", str"+flncount+", "+((String)fln.getValue()).length()+");");
       } else {
-	output.println(generateTemp(fm, fln.getDst())+"=NewString(\""+FlatLiteralNode.escapeString((String)fln.getValue())+"\","+((String)fln.getValue()).length()+");");
+	output.println(generateTemp(fm, fln.getDst())+"=NewStringShort(str"+flncount+" ,"+((String)fln.getValue()).length()+");");
       }
     } else if (fln.getType().isBoolean()) {
       if (((Boolean)fln.getValue()).booleanValue())
@@ -2914,8 +2925,8 @@ public class BuildCode {
       else
 	output.println(generateTemp(fm, fln.getDst())+"=0;");
     } else if (fln.getType().isChar()) {
-      String st=FlatLiteralNode.escapeString(fln.getValue().toString());
-      output.println(generateTemp(fm, fln.getDst())+"='"+st+"';");
+      int val=(int)(((Character)fln.getValue()).charValue());
+      output.println(generateTemp(fm, fln.getDst())+"="+val+";");
     } else if (fln.getType().isLong()) {
       output.println(generateTemp(fm, fln.getDst())+"="+fln.getValue()+"LL;");
     } else