Changeset 4318 for trunk/ProjectFortress/src

Timestamp:

11/06/09 14:37:52 (3 weeks ago)

Author:

jmaessen

Message:

[compiler, tests] Some refactoring on TreapAndTest. Fixed #362 and
added a test for it. Some misc cleanups on AbstractMethodChecker
that didn't make it into the last commit [Still looking to fix this to
avoid O(n^{2) behavior].}

Location:

trunk/ProjectFortress/src/com/sun/fortress

Files:

• compiler/codegen/CodeGen.java (modified) (5 diffs)
• scala_src/typechecker/AbstractMethodChecker.scala (modified) (3 diffs)

trunk/ProjectFortress/src/com/sun/fortress/compiler/codegen/CodeGen.java

@@ -524 +524 @@
     private void doStatements(List<Expr> stmts) {
         int onStack = 0;
+        if (stmts.isEmpty()) {
+            pushVoid();
+            return;
+        }
         for ( Expr e : stmts ) {
             popAll(onStack);
@@ -555 +559 @@
         inABlock=oldInABlock;
     }
+
     public void forChainExpr(ChainExpr x) {
         debug( "forChainExpr", x);
@@ -651 +656 @@
 
         dumpClass( packageAndClassName );
-        
+
         try {
             jos.close();
@@ -2410 +2415 @@
         Type receiverType = exprType(obj);
         if (!(receiverType instanceof TraitType)) {
-            sayWhat(x, "receiver type is not TraitType in " + x);
+            sayWhat(x, "receiver type "+receiverType+" is not TraitType in " + x);
         }
 
@@ -2482 +2487 @@
     public void for_RewriteFnApp(_RewriteFnApp x) {
         debug("for_RewriteFnApp ", x,
-                     " args = ", x.getArgument(), " function = ", x.getFunction(), 
+                     " args = ", x.getArgument(), " function = ", x.getFunction(),
               " function class = ", x.getFunction());
         // This is a little weird.  If a function takes no arguments the parser gives me a void literal expr

trunk/ProjectFortress/src/com/sun/fortress/scala_src/typechecker/AbstractMethodChecker.scala

@@ -74 +74 @@
         val inherited = inheritedMethods(traits, extendsC, Set(), typeAnalyzer)
                         .map(t => t._1.asInstanceOf[IdOrOp].getText)
-        for ( d <- decls ; if d.isInstanceOf[FnDecl] ) {
-          if ( NU.isFunctionalMethod(NU.getParams(d.asInstanceOf[FnDecl])) &&
-               ! inherited.exists(NU.getName(d.asInstanceOf[FnDecl]).asInstanceOf[IdOrOp].getText.equals(_)) )
-            error(span, "Object expressions should not define any new " +
-                  "functional methods.")
-        }
+        for {
+          d <- decls;
+          if d.isInstanceOf[FnDecl];
+          if NU.isFunctionalMethod(NU.getParams(d.asInstanceOf[FnDecl]));
+          if !inherited.exists(NU.getName(d.asInstanceOf[FnDecl]).asInstanceOf[IdOrOp]
+                               .getText.equals(_))
+        } error(span, "Object expressions should not define any new " +
+                      "functional methods.")
 
       case _ => super.walk(node)
@@ -95 +97 @@
     typeAnalyzer = typeAnalyzer.extend(sparams, None)
     val toCheck = inheritedAbstractMethods(extendsC)
-    for ( (owner, d) <- toCheck ) {
-      if ( ! implement(d, decls, owner) ) {
+    for ( (owner, d) <- toCheck; if (!implement(d, decls, owner)) ) {
         error(span,
               "The inherited abstract method " + d + " from the trait " + owner +
               "\n    in the object " + name +
               " is not defined in the component " + componentName + ".")
-      }
     }
     typeAnalyzer = oldTypeAnalyzer
@@ -129 +129 @@
   private def collectAbstractMethods(name: IdOrOp, decls: List[Decl]) = {
     val set = new HashSet[FnDecl]
-    decls.foreach( (d: Decl) => d match {
-                   case fd@SFnDecl(_,SFnHeader(_,mods,_,_,_,_,_,_),_,body,_) =>
-                     if ( component.typeConses.containsKey(name) ) {
-                       if ( ! body.isDefined ) set += fd
-                     } else if ( mods.isAbstract ) set += fd
-                   case _ => })
+    for ( fd@SFnDecl(_,SFnHeader(_,mods,_,_,_,_,_,_),_,body,_) <- decls ) {
+      if ( component.typeConses.containsKey(name) ) {
+        if ( ! body.isDefined ) set += fd
+      } else if ( mods.isAbstract ) set += fd
+    }
     set
   }