some bug fix

diff --git a/Robust/src/IR/Flat/BuildCode.java b/Robust/src/IR/Flat/BuildCode.java
index fee74315f5c2295667efc8078df1bab01f0eea42..a85621aedce350ea056623d08d8d72b2030b350d 100644 (file)
--- a/Robust/src/IR/Flat/BuildCode.java
+++ b/Robust/src/IR/Flat/BuildCode.java
@@ -3271,9 +3271,6 @@ public class BuildCode {
               // its static blocks have been executed
               output.println("#ifdef MGC_STATIC_INIT_CHECK");
               output.println("if(global_defs_p->" + cn.getSafeSymbol()+"static_block_exe_flag == 0) {");
-              if(cn.getNumStaticFields() != 0) {
-                // TODO add static field initialization here
-              }
               if(cn.getNumStaticBlocks() != 0) {
                 MethodDescriptor t_md = (MethodDescriptor)cn.getMethodTable().get("staticblocks");
                 output.println("  "+cn.getSafeSymbol()+t_md.getSafeSymbol()+"_"+t_md.getSafeMethodDescriptor()+"();");
@@ -3286,7 +3283,7 @@ public class BuildCode {
           }
         }
         // redirect to the global_defs_p structure
-        if(ffn.getSrc().getType().isStatic()) {
+        if((ffn.getField().isStatic()) || (ffn.getSrc().getType().isStatic())) {
           // reference to the static field with Class name
           output.println(generateTemp(fm, ffn.getDst(),lb)+"=global_defs_p->"+ ffn.getSrc().getType().getClassDesc().getSafeSymbol()+ffn.getField().getSafeSymbol()+";");
         } else {

diff --git a/Robust/src/IR/Flat/BuildCodeMGC.java b/Robust/src/IR/Flat/BuildCodeMGC.java
index 9ffcc8d14296bf416c7d12bad01e8343e45a7cfb..0784becec9f4d60785e9b1f219c3ec02e23b9b61 100644 (file)
--- a/Robust/src/IR/Flat/BuildCodeMGC.java
+++ b/Robust/src/IR/Flat/BuildCodeMGC.java
@@ -4,30 +4,14 @@ import java.io.FileOutputStream;
 import java.io.PrintWriter;
 import java.util.Hashtable;
 import java.util.Iterator;
-import java.util.Set;
 
-import Analysis.Locality.LocalityBinding;
 import Analysis.Prefetch.*;
 import Analysis.TaskStateAnalysis.SafetyAnalysis;
 import IR.ClassDescriptor;
-import IR.Descriptor;
-import IR.FlagDescriptor;
 import IR.MethodDescriptor;
 import IR.State;
 import IR.SymbolTable;
-import IR.TagVarDescriptor;
-import IR.TaskDescriptor;
-import IR.TypeDescriptor;
 import IR.TypeUtil;
-import IR.VarDescriptor;
-import IR.Tree.DNFFlag;
-import IR.Tree.DNFFlagAtom;
-import IR.Tree.ExpressionNode;
-import IR.Tree.FlagEffect;
-import IR.Tree.FlagEffects;
-import IR.Tree.FlagExpressionNode;
-import IR.Tree.TagEffect;
-import IR.Tree.TagExpressionList;
 
 public class BuildCodeMGC extends BuildCode {
   int coreNum;

diff --git a/Robust/src/IR/Flat/BuildFlat.java b/Robust/src/IR/Flat/BuildFlat.java
index 207dae3cdd2d2acc3182e2a337cda26222734edd..7cbb6100565099c9869a5da1a8df9735e2cfe840 100644 (file)
--- a/Robust/src/IR/Flat/BuildFlat.java
+++ b/Robust/src/IR/Flat/BuildFlat.java
@@ -856,7 +856,14 @@ public class BuildFlat {
       /* Hack - use subtree instead */
       return flattenExpressionNode(nn.getExpression(),out_temp);
     } else if (nn.getField()!=null) {
-      TempDescriptor tmp=getTempforVar(nn.getVar());
+      TempDescriptor tmp= null;
+      if(state.MGC && (nn.getClassDesc() != null)) {
+        // this is a static field
+        tmp = new TempDescriptor(nn.getClassDesc().getSymbol(), nn.getClassType());
+        
+      } else {
+      tmp=getTempforVar(nn.getVar());
+      }
       FlatFieldNode ffn=new FlatFieldNode(nn.getField(), tmp, out_temp);
       return new NodePair(ffn,ffn);
     } else {

diff --git a/Robust/src/IR/SymbolTable.java b/Robust/src/IR/SymbolTable.java
index 6532671f1bdee658db1f34c730cbf4478a8affec..1a1f4fd96f4b22e8c4ddc8ac247fba9a16962864 100644 (file)
--- a/Robust/src/IR/SymbolTable.java
+++ b/Robust/src/IR/SymbolTable.java
@@ -44,6 +44,13 @@ public class SymbolTable {
       hs=parent.getPSet(name);
     else
       hs=new HashSet();
+    if(this.parentIFs != null) {
+      for(int i = 0; i < this.parentIFs.size(); i++) {
+        if(this.parentIFs.elementAt(i).contains(name)) {
+          hs.addAll((HashSet)(this.parentIFs.elementAt(i).getPSet(name)));
+        }
+      }
+    }
     if (table.containsKey(name)) {
       hs.addAll((HashSet)table.get(name));
     }
@@ -64,11 +71,20 @@ public class SymbolTable {
 
   public Descriptor get(String name) {
     Descriptor d = getFromSameScope(name);
-    if (d == null && parent != null) {
-      return parent.get(name);
-    } else {
-      return d;
+    if (d == null){
+      if(parent != null) {
+        d = parent.get(name);
+      }
+      if((d == null) && (this.parentIFs != null)) {
+        for(int i = 0; i < this.parentIFs.size(); i++) {
+          d = this.parentIFs.elementAt(i).get(name);
+          if(d != null) {
+            return d;
+          }
+        }
+      }
     }
+    return d;
   }
 
   public Descriptor getFromSameScope(String name) {
@@ -79,7 +95,7 @@ public class SymbolTable {
       return null;
 
   }
-
+  
   public Enumeration getNames() {
     return table.keys();
   }

diff --git a/Robust/src/IR/Tree/BuildIR.java b/Robust/src/IR/Tree/BuildIR.java
index e29eaa9ebfef401e34928acdfda8a3154e13bca9..7d7121e5390793897b017950173bedc7f2b9b959 100644 (file)
--- a/Robust/src/IR/Tree/BuildIR.java
+++ b/Robust/src/IR/Tree/BuildIR.java
@@ -647,7 +647,7 @@ public class BuildIR {
           // for static field, the initializer should be considered as a 
           // static block
           boolean isfirst = false;
-          MethodDescriptor md = (MethodDescriptor)cn.getMethodTable().get("staticblocks");
+          MethodDescriptor md = (MethodDescriptor)cn.getMethodTable().getFromSameScope("staticblocks");
           if(md == null) {
             // the first static block for this class
             Modifiers m_i=new Modifiers();
@@ -995,12 +995,12 @@ public class BuildIR {
     // Each class maintains one MethodDecscriptor which combines all its 
     // static blocks in their declaration order
     boolean isfirst = false;
-    MethodDescriptor md = (MethodDescriptor)cn.getMethodTable().get("staticblocks");
+    MethodDescriptor md = (MethodDescriptor)cn.getMethodTable().getFromSameScope("staticblocks");
     if(md == null) {
       // the first static block for this class
-      Modifiers m=new Modifiers();
-      m.addModifier(Modifiers.STATIC);
-      md = new MethodDescriptor(m, "staticblocks", false);
+      Modifiers m_i=new Modifiers();
+      m_i.addModifier(Modifiers.STATIC);
+      md = new MethodDescriptor(m_i, "staticblocks", false);
       md.setAsStaticBlock();
       isfirst = true;
     }
@@ -1150,7 +1150,7 @@ public class BuildIR {
       }
     } else if (isNode(pn, "throwstatement")) {
       // TODO Simply return here
-      blockstatements.add(new ReturnNode());
+      //blockstatements.add(new ReturnNode());
     } else if (isNode(pn,"taskexit")) {
       Vector vfe=null;
       if (pn.getChild("flag_effects_list")!=null)
@@ -1192,14 +1192,26 @@ public class BuildIR {
       BlockNode update=parseSingleBlock(pn.getChild("update").getFirstChild());
       ExpressionNode condition=parseExpression(pn.getChild("condition").getFirstChild());
       BlockNode body=parseSingleBlock(pn.getChild("statement").getFirstChild());
+      if(condition == null) {
+        // no condition clause, make a 'true' expression as the condition
+        condition = (ExpressionNode)new LiteralNode("boolean", new Boolean(true));
+      }
       blockstatements.add(new LoopNode(init,condition,update,body));
     } else if (isNode(pn,"whilestatement")) {
       ExpressionNode condition=parseExpression(pn.getChild("condition").getFirstChild());
       BlockNode body=parseSingleBlock(pn.getChild("statement").getFirstChild());
+      if(condition == null) {
+        // no condition clause, make a 'true' expression as the condition
+        condition = (ExpressionNode)new LiteralNode("boolean", new Boolean(true));
+      }
       blockstatements.add(new LoopNode(condition,body,LoopNode.WHILELOOP));
     } else if (isNode(pn,"dowhilestatement")) {
       ExpressionNode condition=parseExpression(pn.getChild("condition").getFirstChild());
       BlockNode body=parseSingleBlock(pn.getChild("statement").getFirstChild());
+      if(condition == null) {
+        // no condition clause, make a 'true' expression as the condition
+        condition = (ExpressionNode)new LiteralNode("boolean", new Boolean(true));
+      }
       blockstatements.add(new LoopNode(condition,body,LoopNode.DOWHILELOOP));
     } else if (isNode(pn,"sese")) {
       ParseNode pnID=pn.getChild("identifier");

diff --git a/Robust/src/IR/Tree/OpNode.java b/Robust/src/IR/Tree/OpNode.java
index d2a9dc81d9d7504bf42dad271aaef5cc5d53b8d3..e367665e574cfc640245a58a51161e794ce9954d 100644 (file)
--- a/Robust/src/IR/Tree/OpNode.java
+++ b/Robust/src/IR/Tree/OpNode.java
@@ -77,6 +77,10 @@ public class OpNode extends ExpressionNode {
         eval = Long.valueOf(l.longValue() > 0 ? 0 : 1);
       else if (this.op.getOp() == Operation.COMP)
         eval = Long.valueOf((long)(~l.longValue()));
+      else if (this.op.getOp() == Operation.UNARYMINUS)
+        eval = Long.valueOf(-l.longValue() );
+      else if (this.op.getOp() == Operation.UNARYPLUS)
+        eval = Long.valueOf(+l.longValue());
       else {
         Long r = this.right.evaluate();
         if(r != null) {
@@ -118,10 +122,6 @@ public class OpNode extends ExpressionNode {
             eval = Long.valueOf(l.longValue() / r.longValue());
           else if (this.op.getOp() == Operation.MOD)
             eval = Long.valueOf(l.longValue() % r.longValue());
-          else if (this.op.getOp() == Operation.UNARYPLUS)
-            eval = Long.valueOf(+l.longValue());
-          else if (this.op.getOp() == Operation.UNARYMINUS)
-            eval = Long.valueOf(-l.longValue() );
           else if (this.op.getOp() == Operation.ASSIGN)
             eval = Long.valueOf(r.longValue());
         }

diff --git a/Robust/src/IR/Tree/SemanticCheck.java b/Robust/src/IR/Tree/SemanticCheck.java
index 692054232d7fc48e7d03db38bf90d2e3d9393737..8c1b5cb04f07a3a69f23bc48b93dc5d4336ac3b3 100644 (file)
--- a/Robust/src/IR/Tree/SemanticCheck.java
+++ b/Robust/src/IR/Tree/SemanticCheck.java
@@ -38,18 +38,18 @@ public class SemanticCheck {
        cd.getFieldTable().setParent(cd.getSuperDesc().getFieldTable());
        cd.getMethodTable().setParent(cd.getSuperDesc().getMethodTable());
        cd.getFlagTable().setParent(cd.getSuperDesc().getFlagTable());
-    if(state.MGC) {
-      // TODO add version for normal Java later
-      // Link together Field, Method tables do classes inherit these from 
-      // their ancestor interfaces
-      Vector<String> sifv = cd.getSuperInterface();
-      for(int i = 0; i < sifv.size(); i++) {
-        ClassDescriptor superif = getClass(sifv.elementAt(i));
-        cd.addSuperInterfaces(superif);
-        cd.getFieldTable().addParentIF(superif.getFieldTable());
-        cd.getMethodTable().addParentIF(superif.getMethodTable());
       }
-    }
+      if(state.MGC) {
+        // TODO add version for normal Java later
+        // Link together Field, Method tables do classes inherit these from 
+        // their ancestor interfaces
+        Vector<String> sifv = cd.getSuperInterface();
+        for(int i = 0; i < sifv.size(); i++) {
+          ClassDescriptor superif = getClass(sifv.elementAt(i));
+          cd.addSuperInterfaces(superif);
+          cd.getFieldTable().addParentIF(superif.getFieldTable());
+          cd.getMethodTable().addParentIF(superif.getMethodTable());
+        }
       }
       
       /* Check to see that fields are well typed */
@@ -117,6 +117,10 @@ public class SemanticCheck {
       return;       /* Done */
     else if (td.isClass()) {
       String name=td.toString();
+      int index = name.lastIndexOf('.');
+      if(index != -1) {
+        name = name.substring(index+1);
+      }
       ClassDescriptor field_cd=getClass(name);
       if (field_cd==null)
        throw new Error("Undefined class "+name);
@@ -394,8 +398,11 @@ public class SemanticCheck {
   void checkContinueBreakNode(Descriptor md, SymbolTable nametable, ContinueBreakNode cbn) {
       if (loopstack.empty())
          throw new Error("continue/break outside of loop");
-      LoopNode ln=(LoopNode)loopstack.peek();
-      cbn.setLoop(ln);
+      Object o = loopstack.peek();
+      if(o instanceof LoopNode) {
+        LoopNode ln=(LoopNode)o;
+        cbn.setLoop(ln);
+      }
   }
 
   void checkReturnNode(Descriptor d, SymbolTable nametable, ReturnNode rn) {
@@ -455,7 +462,9 @@ public class SemanticCheck {
     if(defaultb > 1) {
       throw new Error("Error: duplicate default branch in switch-case statement in Method: " + md.getSymbol());
     } else {
+      loopstack.push(sbn);
       checkBlockNode(md, nametable, sbn.getSwitchBlockStatement());
+      loopstack.pop();
       return (defaultb > 0);
     }
   }
@@ -469,6 +478,14 @@ public class SemanticCheck {
     case Kind.LiteralNode:
       checkLiteralNode(md,nametable,(LiteralNode)en,td);
       return;
+      
+    case Kind.NameNode:
+      checkNameNode(md,nametable,(NameNode)en,td);
+      return;
+      
+    case Kind.OpNode:
+      checkOpNode(md, nametable, (OpNode)en, td);
+      return;
     }
     throw new Error();
   }
@@ -587,6 +604,7 @@ public class SemanticCheck {
     if(state.MGC) {
       // TODO add version for normal Java later
     if(ltd.isStatic()) {
+      // the field access is using a class name directly
       if(ltd.getClassDesc().isEnum()) {
         int value = ltd.getClassDesc().getEnumConstant(fieldname);
         if(-1 == value) {
@@ -699,6 +717,11 @@ public class SemanticCheck {
       checkExpressionNode(md,nametable,en,td);
     } else {
       String varname=nd.toString();
+      if(varname.equals("this")) {
+        // "this"
+        nn.setVar((VarDescriptor)nametable.get("this")); 
+        return;
+      }
       Descriptor d=(Descriptor)nametable.get(varname);
       if (d==null) {
         if(state.MGC) {
@@ -729,6 +752,21 @@ public class SemanticCheck {
             return;
           }
         } else {
+          // check if the var is a static field of the class
+          if(md instanceof MethodDescriptor) {
+            cd = ((MethodDescriptor)md).getClassDesc();
+            FieldDescriptor fd = (FieldDescriptor)cd.getFieldTable().get(varname);
+            if((fd != null) && (fd.isStatic())) {
+              nn.setField(fd);
+              nn.setClassDesc(cd);
+              if (td!=null)
+                if (!typeutil.isSuperorType(td,nn.getType()))
+                  throw new Error("Field node returns "+nn.getType()+", but need "+td);
+              return;
+            } else if(fd != null) {
+              throw new Error("Name "+varname+" should not be used in " + md);
+            }
+          }
           cd=getClass(varname);
           if(cd != null) {
             // this is a class name
@@ -853,6 +891,7 @@ public class SemanticCheck {
     }
     if(out_type != null) {
       out_type = out_type.makeArray(state);
+      out_type.setStatic();
     }
     ain.setType(out_type);
   }
@@ -901,20 +940,37 @@ public class SemanticCheck {
     if (!postinc&&!typeutil.isSuperorType(an.getDest().getType(),an.getSrc().getType())) {
       TypeDescriptor dt = an.getDest().getType();
       TypeDescriptor st = an.getSrc().getType();
-      Long l = an.getSrc().evaluate();
-      if((st.isByte() || st.isShort() || st.isChar() || st.isInt()) 
-          && (l != null) 
-          && (dt.isByte() || dt.isShort() || dt.isChar() || dt.isInt() || dt.isLong())) {
-        long lnvalue = l.longValue();
-        if((dt.isByte() && ((lnvalue > 127) || (lnvalue < -128))) 
-            || (dt.isShort() && ((lnvalue > 32767) || (lnvalue < -32768)))
-            || (dt.isChar() && ((lnvalue > 65535) || (lnvalue < 0)))
-            || (dt.isInt() && ((lnvalue > 2147483647) || (lnvalue < -2147483648)))
-            || (dt.isLong() && ((lnvalue > 9223372036854775807L) || (lnvalue < -9223372036854775808L)))) {
-          throw new Error("Field node returns "+st+", but need "+dt+" in "+md);
+      if(an.getSrc().kind() == Kind.ArrayInitializerNode) {
+        if(dt.getArrayCount() != st.getArrayCount()) {
+          throw new Error("Type of rside ("+an.getSrc().getType().toPrettyString()+") not compatible with type of lside ("+an.getDest().getType().toPrettyString()+")"+an.printNode(0));
+        } else {
+          do {
+            dt = dt.dereference();
+            st = st.dereference();
+          } while(dt.isArray());
+          if((st.isByte() || st.isShort() || st.isChar() || st.isInt()) 
+              && (dt.isByte() || dt.isShort() || dt.isChar() || dt.isInt() || dt.isLong())) {
+            return;
+          } else {
+            throw new Error("Type of rside ("+an.getSrc().getType().toPrettyString()+") not compatible with type of lside ("+an.getDest().getType().toPrettyString()+")"+an.printNode(0));
+          }
         }
       } else {
-        throw new Error("Type of rside ("+an.getSrc().getType().toPrettyString()+") not compatible with type of lside ("+an.getDest().getType().toPrettyString()+")"+an.printNode(0));
+        Long l = an.getSrc().evaluate();
+        if((st.isByte() || st.isShort() || st.isChar() || st.isInt()) 
+            && (l != null) 
+            && (dt.isByte() || dt.isShort() || dt.isChar() || dt.isInt() || dt.isLong())) {
+          long lnvalue = l.longValue();
+          if((dt.isByte() && ((lnvalue > 127) || (lnvalue < -128))) 
+              || (dt.isShort() && ((lnvalue > 32767) || (lnvalue < -32768)))
+              || (dt.isChar() && ((lnvalue > 65535) || (lnvalue < 0)))
+              || (dt.isInt() && ((lnvalue > 2147483647) || (lnvalue < -2147483648)))
+              || (dt.isLong() && ((lnvalue > 9223372036854775807L) || (lnvalue < -9223372036854775808L)))) {
+            throw new Error("Type of rside ("+an.getSrc().getType().toPrettyString()+") not compatible with type of lside ("+an.getDest().getType().toPrettyString()+")"+an.printNode(0));
+          }
+        } else {
+          throw new Error("Type of rside ("+an.getSrc().getType().toPrettyString()+") not compatible with type of lside ("+an.getDest().getType().toPrettyString()+")"+an.printNode(0));
+        }
       }
     }
   }
@@ -1073,6 +1129,12 @@ NextMethod:
     /*Typecheck subexpressions
        and get types for expressions*/
 
+    boolean isstatic = false;
+    if(state.MGC) {
+      if((md instanceof MethodDescriptor) && ((MethodDescriptor)md).isStatic()) {
+        isstatic = true;
+      }
+    }
     TypeDescriptor[] tdarray=new TypeDescriptor[min.numArgs()];
     for(int i=0; i<min.numArgs(); i++) {
       ExpressionNode en=min.getArg(i);
@@ -1094,21 +1156,52 @@ NextMethod:
       if (rootname.equals("super")) {
        ClassDescriptor supercd=((MethodDescriptor)md).getClassDesc().getSuperDesc();
        typetolookin=new TypeDescriptor(supercd);
+      } else if (rootname.equals("this")) {
+        if(isstatic) {
+          throw new Error("use this object in static method md = "+ md.toString());
+        }
+        ClassDescriptor cd=((MethodDescriptor)md).getClassDesc();
+        typetolookin=new TypeDescriptor(cd);
       } else if (nametable.get(rootname)!=null) {
        //we have an expression
        min.setExpression(translateNameDescriptorintoExpression(min.getBaseName()));
        checkExpressionNode(md, nametable, min.getExpression(), null);
        typetolookin=min.getExpression().getType();
       } else {
-       //we have a type
-       ClassDescriptor cd;
-       if (min.getBaseName().getSymbol().equals("System.out"))
-         cd=getClass("System");
-       else
-         cd=getClass(min.getBaseName().getSymbol());
-       if (cd==null)
-         throw new Error("md = "+ md.toString()+ "  "+min.getBaseName()+" undefined");
-       typetolookin=new TypeDescriptor(cd);
+        if(state.MGC) {
+          if(!min.getBaseName().getSymbol().equals("System.out")) {
+            ExpressionNode nn = translateNameDescriptorintoExpression(min.getBaseName());
+            checkExpressionNode(md, nametable, nn, null);
+            typetolookin = nn.getType();
+            if(!((nn.kind()== Kind.NameNode) && (((NameNode)nn).getField() == null)
+                && (((NameNode)nn).getVar() == null) && (((NameNode)nn).getExpression() == null))) {
+              // this is not a pure class name, need to add to 
+              min.setExpression(nn);
+            }
+          } else {
+            //we have a type
+            ClassDescriptor cd = null;
+            //if (min.getBaseName().getSymbol().equals("System.out"))
+            cd=getClass("System");
+            /*else {
+            cd=getClass(min.getBaseName().getSymbol());
+          }*/
+            if (cd==null)
+              throw new Error("md = "+ md.toString()+ "  "+min.getBaseName()+" undefined");
+            typetolookin=new TypeDescriptor(cd);
+          }
+        } else {
+          // we have a type
+          ClassDescriptor cd = null;
+          if (min.getBaseName().getSymbol().equals("System.out"))
+            cd=getClass("System");
+          else {
+            cd=getClass(min.getBaseName().getSymbol());
+          }
+          if (cd==null)
+            throw new Error("md = "+ md.toString()+ "  "+min.getBaseName()+" undefined");
+          typetolookin=new TypeDescriptor(cd);
+        }
       }
     } else if ((md instanceof MethodDescriptor)&&min.getMethodName().equals("super")) {
       ClassDescriptor supercd=((MethodDescriptor)md).getClassDesc().getSuperDesc();
@@ -1156,7 +1249,7 @@ NextMethod:
     if ((td!=null)&&(min.getType()!=null)&&!typeutil.isSuperorType(td,  min.getType()))
       throw new Error(min.getType()+ " is not equal to or a subclass of "+td);
     /* Check whether we need to set this parameter to implied this */
-    if (!bestmd.isStatic()) {
+    if (! isstatic && !bestmd.isStatic()) {
       if (min.getExpression()==null) {
        ExpressionNode en=new NameNode(new NameDescriptor("this"));
        min.setExpression(en);

diff --git a/Robust/src/IR/TypeDescriptor.java b/Robust/src/IR/TypeDescriptor.java
index c306e4b4e4687fd1f86369b0ad4e0aed078de289..ff7efd91c48259a9615b98dedfc9266309aad4be 100644 (file)
--- a/Robust/src/IR/TypeDescriptor.java
+++ b/Robust/src/IR/TypeDescriptor.java
@@ -34,8 +34,6 @@ public class TypeDescriptor extends Descriptor {
        return false;
       if ((type==CLASS)&&(!t.getSymbol().equals(getSymbol())))
        return false;
-      if (isStatic != t.isStatic)
-        return false;
       if (t.arraycount!=arraycount)
        return false;
       return true;

diff --git a/Robust/src/Parse/java14.cup b/Robust/src/Parse/java14.cup
index bb39c86f921e55cb14144deaa6c61890fd9b8b3c..0158c96f8fa26bcb5b56c70923f1c63f406a6d59 100644 (file)
--- a/Robust/src/Parse/java14.cup
+++ b/Robust/src/Parse/java14.cup
@@ -1919,7 +1919,7 @@ field_access ::=
                pn.addChild("base").addChild(base);
                pn.addChild("field").addChild(id);
                RESULT=pn;
-:}
+    :}
 //     |       SUPER DOT IDENTIFIER
 //     |       name DOT SUPER DOT IDENTIFIER
        ;

diff --git a/Robust/src/buildscript b/Robust/src/buildscript
index ef24f37462557dd1a42f3e321512de60838919a4..3cd43eebd7861adfa7ae8d2d97c20f424f6cb517 100755 (executable)
--- a/Robust/src/buildscript
+++ b/Robust/src/buildscript
@@ -757,7 +757,7 @@ JAVAOPTS="$JAVAOPTS -classlibrary $ROBUSTROOT/ClassLibrary/JavaThread"
 elif $MGCFLAG
 then
 #base multicore gc files
-JAVAOPTS="$JAVAOPTS -classlibrary $ROBUSTROOT/ClassLibrary/MGC"
+JAVAOPTS="$JAVAOPTS -classlibrary $ROBUSTROOT/ClassLibrary/MGC -classlibrary $ROBUSTROOT/ClassLibrary/MGC/gnu"
 fi
 #base java stuff
 JAVAOPTS="$JAVAOPTS -classlibrary $ROBUSTROOT/ClassLibrary/Java"
@@ -767,9 +767,9 @@ fi
 
 if $MULTICOREFLAG
 then
-if ! ${ROBUSTROOT}/ourjava -Xms50m -Xmx1500m $JAVAFORWARDOPTS -classpath $ROBUSTROOT/../cup/:$ROBUSTROOT Main.Main -classlibrary \
-$ROBUSTROOT/ClassLibrary/ -classlibrary $ROBUSTROOT/ClassLibrary/gnu/ \
--dir $BUILDDIR $JAVAOPTS $SRCFILES
+if ! ${ROBUSTROOT}/ourjava -Xms50m -Xmx1500m $JAVAFORWARDOPTS -classpath $ROBUSTROOT/../cup/:$ROBUSTROOT Main.Main \
+-dir $BUILDDIR $JAVAOPTS -classlibrary $ROBUSTROOT/ClassLibrary/ \
+-classlibrary $ROBUSTROOT/ClassLibrary/gnu/ $SRCFILES
 then exit $?
 fi
 else