fix bug...

diff --git a/Robust/src/IR/TypeUtil.java b/Robust/src/IR/TypeUtil.java
index 43c2076e3197c154224e927baf0bb0024fdf0e86..c7a468abeb9f432b0e9746e832fdb82aae53e0f1 100644 (file)
--- a/Robust/src/IR/TypeUtil.java
+++ b/Robust/src/IR/TypeUtil.java
@@ -148,6 +148,7 @@ public class TypeUtil {
   public MethodDescriptor getMain() {
     ClassDescriptor cd=getMainClass();
     Set mainset=cd.getMethodTable().getSet("main");
+
     for(Iterator mainit=mainset.iterator(); mainit.hasNext();) {
       MethodDescriptor md=(MethodDescriptor)mainit.next();
       if (md.numParameters()!=1)
@@ -157,9 +158,8 @@ public class TypeUtil {
                           .getType();
       if (tpd.getArrayCount()!=1)
        continue;
-      if (!tpd.getSymbol().equals("String"))
+      if (!tpd.getSymbol().equals(StringClass))
        continue;
-
       if (!md.getModifiers().isStatic())
        throw new Error("Error: Non static main");
       return md;

diff --git a/Robust/src/buildscript b/Robust/src/buildscript
index 25d2a99e962b126c1b9d7e644864d89b3ff7a159..d95fa20d7a3ca3d725a39f3f5f9fa95a62a896fd 100755 (executable)
--- a/Robust/src/buildscript
+++ b/Robust/src/buildscript
@@ -767,7 +767,7 @@ fi
 # Setup class path
 if $JNI
 then
-JAVAOPTS="$JAVAOPTS -classlibrary $ROBUSTROOT/classpath/"
+JAVAOPTS="$JAVAOPTS -classlibrary $ROBUSTROOT/classpath/ $ROBUSTROOT/classpath/vm/reference"
 elif $MGCINTELFLAG
 then
 JAVAOPTS="$JAVAOPTS -classlibrary $ROBUSTROOT/ClassLibrary/MGC/ -classlibrary $ROBUSTROOT/ClassLibrary/MGC/gnu/"