implemented PCLOC annotation.

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

diff --git a/Robust/src/IR/FieldDescriptor.java b/Robust/src/IR/FieldDescriptor.java
index 09e5549375cfea2809c2281d6948f5293bf9047c..d2e50ac5342ece7e94ce0fba821742e65842bce0 100644 (file)
--- a/Robust/src/IR/FieldDescriptor.java
+++ b/Robust/src/IR/FieldDescriptor.java
@@ -19,7 +19,8 @@ public class FieldDescriptor extends Descriptor {
   private boolean isglobal;
   private boolean isenum;
   private int enumvalue;
-  
+  private boolean isEnumClass;
+
   private ClassDescriptor cn;
 
   public FieldDescriptor(Modifiers m, TypeDescriptor t, String identifier, ExpressionNode e, boolean isglobal) {
@@ -32,55 +33,56 @@ public class FieldDescriptor extends Descriptor {
     this.isglobal=isglobal;
     this.isenum = false;
     this.enumvalue = -1;
+    this.isEnumClass = false;
   }
-  
+
   public ClassDescriptor getClassDescriptor() {
     return this.cn;
   }
-  
+
   public void setClassDescriptor(ClassDescriptor cn) {
     this.cn = cn;
   }
 
   public String getSafeSymbol() {
     if (isStatic()) {
-      cn.getSafeSymbol()+safename;
+      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;
   }
@@ -89,10 +91,10 @@ public class FieldDescriptor extends Descriptor {
     return td;
   }
 
-       public void changeSafeSymbol(int id) {
-               safename+=id;
-       }
-       
+  public void changeSafeSymbol(int id) {
+    safename+=id;
+  }
+
   public String toString() {
     if (en==null)
       return modifier.toString()+td.toString()+" "+getSymbol()+";";
@@ -101,10 +103,19 @@ public class FieldDescriptor extends Descriptor {
   }
 
   public String toStringBrief() {
-    return td.toString()+" "+getSymbol();
+    return td.toPrettyString()+" "+getSymbol();
   }
 
   public String toPrettyStringBrief() {
     return td.toPrettyString()+" "+getSymbol();
   }
+  
+  public void setIsEnumClass() {
+    this.isEnumClass = true;
+  }
+
+  public boolean isEnumClass() {
+    return this.isEnumClass;
+  }
+
 }