code clean up

[IRC.git] / Robust / src / IR / FieldDescriptor.java

diff --git a/Robust/src/IR/FieldDescriptor.java b/Robust/src/IR/FieldDescriptor.java
index a60a65d3234559efc82c70c87b68711c76385dab..2d5a7d5baa25703a0bd505225cd1851d9fcf07f1 100644 (file)
--- a/Robust/src/IR/FieldDescriptor.java
+++ b/Robust/src/IR/FieldDescriptor.java
@@ -20,6 +20,8 @@ public class FieldDescriptor extends Descriptor {
   private boolean isenum;
   private int enumvalue;
 
+  private ClassDescriptor cn;
+
   public FieldDescriptor(Modifiers m, TypeDescriptor t, String identifier, ExpressionNode e, boolean isglobal) {
     super(identifier);
     this.modifier=m;
@@ -31,35 +33,54 @@ public class FieldDescriptor extends Descriptor {
     this.isenum = false;
     this.enumvalue = -1;
   }
-  
+
+  public ClassDescriptor getClassDescriptor() {
+    return this.cn;
+  }
+
+  public void setClassDescriptor(ClassDescriptor cn) {
+    this.cn = cn;
+  }
+
+  public String getSafeSymbol() {
+    if (isStatic()) {
+      return cn.getSafeSymbol()+safename;
+    } else
+      return safename;
+  }
+
   public boolean isEnum() {
     return this.isenum;
   }
-  
+
   public int enumValue() {
     return this.enumvalue;
   }
-  
+
   public void setAsEnum() {
     this.isenum = true;
   }
-  
+
   public void setEnumValue(int value) {
     this.enumvalue = value;
   }
 
-  public ExpressionNode getExpressionNode(){
-      return en;
+  public ExpressionNode getExpressionNode() {
+    return en;
+  }
+
+  public boolean isFinal() {
+    return modifier.isFinal();
   }
 
   public boolean isStatic() {
     return modifier.isStatic();
   }
-  
+
   public boolean isVolatile() {
     return modifier.isVolatile();
   }
-  
+
   public boolean isGlobal() {
     return isglobal;
   }
@@ -68,6 +89,10 @@ public class FieldDescriptor extends Descriptor {
     return td;
   }
 
+  public void changeSafeSymbol(int id) {
+    safename+=id;
+  }
+
   public String toString() {
     if (en==null)
       return modifier.toString()+td.toString()+" "+getSymbol()+";";
@@ -76,7 +101,7 @@ public class FieldDescriptor extends Descriptor {
   }
 
   public String toStringBrief() {
-    return td.toString()+" "+getSymbol();
+    return td.toPrettyString()+" "+getSymbol();
   }
 
   public String toPrettyStringBrief() {