Another bug fix for inner class code: when trying to find a field in the surrounding...

[IRC.git] / Robust / src / IR / Tree / LiteralNode.java

diff --git a/Robust/src/IR/Tree/LiteralNode.java b/Robust/src/IR/Tree/LiteralNode.java
index 4f273fde4467a6f4252beee4f2e592ed53979e95..8cb08821beb4c9332c47f7f0d3478b508ccefd8d 100644 (file)
--- a/Robust/src/IR/Tree/LiteralNode.java
+++ b/Robust/src/IR/Tree/LiteralNode.java
@@ -1,76 +1,71 @@
 package IR.Tree;
+import IR.TypeDescriptor;
+import IR.TypeUtil;
+
 
 public class LiteralNode extends ExpressionNode {
-    public final static int INTEGER=1;
-    public final static int FLOAT=2;
-    public final static int BOOLEAN=3;
-    public final static int CHAR=4;
-    public final static int STRING=5;
-    public final static int NULL=6;
+  public final static int INTEGER=1;
+  public final static int FLOAT=2;
+  public final static int BOOLEAN=3;
+  public final static int CHAR=4;
+  public final static int STRING=5;
+  public final static int NULL=6;
 
+  Object value;
+  TypeDescriptor type;
+  String typestr;
 
-    Object value;
-    int type;
-    
-    public LiteralNode(String type, Object o) {
-       this.type=parseType(type);
-       value=o;
-    }
+  public LiteralNode(String type, Object o) {
+    typestr=type;
+    value=o;
+    type=null;
+  }
 
-    private static int parseType(String type) {
-       if (type.equals("integer"))
-           return INTEGER;
-       else if (type.equals("float"))
-           return FLOAT;
-       else if (type.equals("boolean"))
-           return BOOLEAN;
-       else if (type.equals("char"))
-           return CHAR;
-       else if (type.equals("string"))
-           return STRING;
-       else if (type.equals("null"))
-           return NULL;
-       else throw new Error();
-    }
+  public String getTypeString() {
+    return typestr;
+  }
 
-    private String getType() {
-       if (type==INTEGER)
-           return "integer";
-       else if (type==FLOAT)
-           return "float";     
-       else if (type==BOOLEAN)
-           return "boolean";
-       else if (type==CHAR)
-           return "char";
-       else if (type==STRING)
-           return "string";
-       else if (type==NULL)
-           return "null";
-       else throw new Error();
+  public TypeDescriptor getType() {
+    return type;
+  }
 
-    }
+  public void setType(TypeDescriptor td) {
+    type=td;
+  }
+
+  public Object getValue() {
+    return value;
+  }
 
-    public String printNode(int indent) {
-       if (type==NULL)
-           return "null";
-       if (type==STRING) {
-           return '"'+escapeString(value.toString())+'"';
-       }
-       return "/*"+getType()+ "*/"+value.toString();
+  public String printNode(int indent) {
+    if (typestr.equals("null"))
+      return "null";
+    if (typestr.equals("string")) {
+      return '"'+escapeString(value.toString())+'"';
     }
-    private static String escapeString(String st) {
-       String new_st="";
-       for(int i=0;i<st.length();i++) {
-           char x=st.charAt(i);
-           if (x=='\n')
-               new_st+="\\n";
-           else if (x=='"')
-               new_st+="'"+'"'+"'";
-           else new_st+=x;
-       }
-       return new_st;
+    return "/*"+typestr+ "*/"+value.toString();
+  }
+  private static String escapeString(String st) {
+    String new_st="";
+    for(int i=0; i<st.length(); i++) {
+      char x=st.charAt(i);
+      if (x=='\n')
+        new_st+="\\n";
+      else if (x=='"')
+        new_st+="'"+'"'+"'";
+      else new_st+=x;
     }
-    public int kind() {
-       return Kind.LiteralNode;
+    return new_st;
+  }
+  public int kind() {
+    return Kind.LiteralNode;
+  }
+
+  public Long evaluate() {
+    eval = null;
+    if(this.type.isChar() || this.type.isInt()) {
+      eval = Long.parseLong(this.value.toString());
     }
+    return eval;
+  }
 }