push a bunch of old changes i had related to inner classes and such... hope this...

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

diff --git a/Robust/src/IR/Tree/BuildIR.java b/Robust/src/IR/Tree/BuildIR.java
index 4f4a4ee5b95081913a365d17513ae1af56a243ad..483677543811773d7785d06dd0389408d0a798f0 100644 (file)
--- a/Robust/src/IR/Tree/BuildIR.java
+++ b/Robust/src/IR/Tree/BuildIR.java
@@ -764,7 +764,6 @@ private void addOuterClassReferences( ClassDescriptor cn, int depth )
     ClassDescriptor icn=new ClassDescriptor(cn.getPackage(), classname, false);
     pushChainMaps();
     icn.setImports(mandatoryImports, multiimports);
-    icn.setAsInnerClass();
     icn.setSurroundingClass(cn.getSymbol());
     icn.setSurrounding(cn);
     cn.addInnerClass(icn);
@@ -794,6 +793,9 @@ private void addOuterClassReferences( ClassDescriptor cn, int depth )
     }
     icn.setModifiers(parseModifiersList(pn.getChild("modifiers")));
 
+   if (!icn.isStatic())
+     icn.setAsInnerClass();
+
     parseClassBody(icn, pn.getChild("classbody"));
 
     boolean hasConstructor = false;