Changeset 3851

Timestamp:

06/15/09 12:40:58 (5 months ago)

Author:

jrhil47

Message:

[typechecker] Added Typecase, As, AsIf? to Scala type checker; it now passes Compiled8. Changed a few Compiled6 tests to include return types.

Location:

trunk/ProjectFortress

Files:

• compiler_tests/Compiled6.g.fss (modified) (1 diff)
• compiler_tests/Compiled6.h.fss (modified) (1 diff)
• compiler_tests/Compiled6.i.fss (modified) (1 diff)
• compiler_tests/Compiled6.m.fss (modified) (1 diff)
• compiler_tests/XXX6g.test (modified) (1 diff)
• compiler_tests/XXX6i.test (modified) (1 diff)
• src/com/sun/fortress/compiler/ReturnTypeChecker.java (modified) (2 diffs)
• src/com/sun/fortress/scala_src/typechecker/STypeChecker.scala (modified) (3 diffs)
• src/com/sun/fortress/tests/unit_tests/FileTests.java (modified) (1 diff)

trunk/ProjectFortress/compiler_tests/Compiled6.g.fss

@@ -20 +20 @@
 
 object O
-  setter x(y:ZZ32) = y
+  setter x(y:ZZ32): () = y
 end
 

trunk/ProjectFortress/compiler_tests/Compiled6.h.fss

@@ -20 +20 @@
 
 object O
-  setter x(y:ZZ32) = ()
+  setter x(y:ZZ32): () = ()
   getter x(): String = ""
 end

trunk/ProjectFortress/compiler_tests/Compiled6.i.fss

@@ -20 +20 @@
 
 object O
-  x(y: ZZ32) = ()
-  x(y: ZZ32) = ()
+  x(y: ZZ32): () = ()
+  x(y: ZZ32): () = ()
 end
 

trunk/ProjectFortress/compiler_tests/Compiled6.m.fss

@@ -25 +25 @@
 
 object O extends T
-  f(y:ZZ32) = ()
+  f(y:ZZ32): () = ()
 end
 

trunk/ProjectFortress/compiler_tests/XXX6g.test

@@ -18 +18 @@
 compile
 compile_err_equals=\
-${STATIC_TESTS_DIR}/Compiled6.g.fss:22:3-22:\n\
-\ Setter declarations must return void.\n\
+${STATIC_TESTS_DIR}/Compiled6.g.fss:22:26:\n\
+\ Function body has type ZZ32, but declared return type is ().\n\
 File Compiled6.g.fss has 1 error.\n
 compile_out_equals=

trunk/ProjectFortress/compiler_tests/XXX6i.test

@@ -18 +18 @@
 compile
 compile_err_equals=\
-${STATIC_TESTS_DIR}/Compiled6.i.fss:22:3-17:\n\
-${STATIC_TESTS_DIR}/Compiled6.i.fss:23:3-17:\n\
+${STATIC_TESTS_DIR}/Compiled6.i.fss:22:3-21:\n\
+${STATIC_TESTS_DIR}/Compiled6.i.fss:23:3-21:\n\
 \ There are multiple declarations of x with the same type: ZZ32 -> ()\n\
 File Compiled6.i.fss has 1 error.\n

trunk/ProjectFortress/src/com/sun/fortress/compiler/ReturnTypeChecker.java

@@ -22 +22 @@
 import com.sun.fortress.exceptions.StaticError;
 import com.sun.fortress.nodes.FnDecl;
+import com.sun.fortress.nodes.IdOrOp;
+import com.sun.fortress.nodes.IdOrOpOrAnonymousName;
 import com.sun.fortress.nodes.LetFn;
 import com.sun.fortress.nodes.Node;
@@ -44 +46 @@
   @Override
   public void forFnDecl(FnDecl that) {
-      if(that.getHeader().getReturnType().isNone()){
+      IdOrOpOrAnonymousName name = that.getHeader().getName();
+      boolean isCoercion = (name instanceof IdOrOp) ?
+          ((IdOrOp)name).getText().equals("coerce") :
+          false;
+      if (!isCoercion && that.getHeader().getReturnType().isNone()) {
         errors.add(StaticError.make("The Scala Typechecker requires return types on function:" + that.getUnambiguousName(), that));
       }

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

@@ -112 +112 @@
                                analyzer.extend(sparams, where), errors)
   }
+  
+  private def extend(id: Id, typ: Type): STypeChecker =
+    extend(List[LValue](NodeFactory.makeLValue(id, typ)))
 
   private def extendWithFunctions(methods: Relation[IdOrOpOrAnonymousName, JavaFunctionalMethod]) =
@@ -827 +830 @@
       val newContract = contract.map(c => newChecker.check(c))
       val newBody = newChecker.checkExpr(body, returnType, "Function body",
-                                         "declared return")
-
+                                                           "declared return")
 
       val newType = (returnType, getType(newBody)) match {
-        case (_, Some(bt)) if NodeUtil.isSetter(f) =>
-          isSubtype(bt, Types.VOID, f, "Setter declarations must return void.")
+        case (Some(rt), _) if NodeUtil.isSetter(f) =>
+          isSubtype(rt, Types.VOID, f, "Setter declarations must return void.")
           Some(Types.VOID)
         case (None, bt) => bt
@@ -1640 +1642 @@
         case None => signal(id, errorMsg("Type of the variable '", id, "' not found.")); v
       }
+      
+    case STypecase(SExprInfo(span, paren, _),
+                   bindIds, bindExpr, clauses, elseClause) => {
+      if (bindIds.size != 1)
+        NI.nyi("Typecase only supports a single identifier for now.")
+      
+      // Make sure the bindId is not shadowing.
+      val bindId = bindIds.first
+      if (getTypeFromName(bindId).isDefined) {
+        signal(bindId, "Cannot shadow name: %s".format(bindId))
+        return expr
+      }
+      
+      // Make sure the expr has a type.
+      val checkedExpr = bindExpr.map(checkExpr).
+        getOrElse(NI.nyi("Typecase currently must have a bound expression."))
+      val checkedType = getType(checkedExpr).getOrElse(return expr)
+      
+      // Check each clause with the bound id having static type of the guard.
+      def checkClause(c: TypecaseClause): TypecaseClause = c match {        
+        case STypecaseClause(info, List(matchType), body) =>
+          val checkedBody =
+            this.extend(bindId, matchType).
+            checkExpr(body).asInstanceOf[Block]
+          STypecaseClause(info, List(matchType), checkedBody)
+          
+        case _ =>
+          NI.nyi("Typecase only supports a single match type for now.")
+      }
+      val checkedClauses = clauses.map(checkClause)
+      val clauseTypes =
+        checkedClauses.map(c => getType(c.getBody).getOrElse(return expr))
+      
+      // Check the else clause with the new binding.
+      val checkedElse =
+        elseClause.map(e => this.extend(bindId, checkedType).
+                              checkExpr(e).asInstanceOf[Block])
+      val elseType = checkedElse.map(getType(_).getOrElse(return expr))
+      
+      // Build union type of all clauses and else.
+      val allTypes = elseType match {
+        case Some(t) => Set(clauseTypes:_*) + t
+        case _ => Set(clauseTypes:_*)
+      }
+      val unionType = NodeFactory.makeUnionType(allTypes)
+      
+      STypecase(SExprInfo(span, paren, Some(unionType)),
+                bindIds,
+                Some(checkedExpr),
+                checkedClauses,
+                checkedElse)
+    }
+    
+    case SAsExpr(SExprInfo(span, paren, _), sub, typ) => {
+      val checkedSub = checkExpr(sub, Some(typ), "Expression", "ascripted")
+      SAsExpr(SExprInfo(span, paren, Some(typ)), checkedSub, typ)
+    }
+    
+    case SAsIfExpr(SExprInfo(span, paren, _), sub, typ) => {
+      val checkedSub = checkExpr(sub, Some(typ), "Expression", "assumed")
+      SAsIfExpr(SExprInfo(span, paren, Some(typ)), checkedSub, typ)
+    }
 
     case _ => throw new Error(errorMsg("Not yet implemented: ", expr.getClass))

trunk/ProjectFortress/src/com/sun/fortress/tests/unit_tests/FileTests.java

@@ -972 +972 @@
                  || test_name.startsWith("Compiled4")
                  || test_name.startsWith("Compiled5")
+                 //|| test_name.startsWith("Compiled6")
+                // || test_name.startsWith("Compiled7")
+                // || test_name.startsWith("Compiled8")
                  );
     }