Changeset 3834

Timestamp:

06/10/09 18:11:17 (6 months ago)

Author:

sukyoungryu

Message:

[type checker] Fixed small things in the Scala type checker. Moved three tests from not_working_static_tests to compiler_tests.

Location:

trunk

Files:

• Library/CompilerLibrary.fsi (modified) (1 diff)
• ProjectFortress/compiler_tests/Compiled0.w.fss (added)
• ProjectFortress/compiler_tests/Compiled0.x.fss (added)
• ProjectFortress/compiler_tests/Compiled0.y.fss (added)
• ProjectFortress/compiler_tests/XXX0w.test (added)
• ProjectFortress/compiler_tests/XXX0x.test (added)
• ProjectFortress/compiler_tests/XXX0y.test (added)
• ProjectFortress/not_working_static_tests/DXXCantExtendObject.fss (deleted)
• ProjectFortress/not_working_static_tests/DXXCantExtendObject2.fss (deleted)
• ProjectFortress/not_working_static_tests/DXXCantExtendObject3.fss (deleted)
• ProjectFortress/src/com/sun/fortress/scala_src/typechecker/STypeChecker.scala (modified) (15 diffs)

trunk/Library/CompilerLibrary.fsi

@@ -18 +18 @@
 api CompilerLibrary
 
+ignore(_:Any):()
+
 end

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

@@ -304 +304 @@
                                           receiverType: Type):
                                               Set[Method] = {
-    
+
     val traitTypes = traitTypesCallable(receiverType)
     val ttAsWheres = traitTypes.map(NodeFactory.makeTraitTypeWhere)
@@ -430 +430 @@
                                             expectedType: Option[Type]):
                                       Option[(ArrowType, List[StaticArg])] = {
-    
+
     val arrows = conjuncts(fnType).toList.map(_.asInstanceOf[ArrowType])
     staticallyMostApplicableArrow(arrows, argType, expectedType)
   }
-  
+
   /**
    * Return the statically most applicable arrow type along with the static args
@@ -445 +445 @@
                                             expectedType: Option[Type]):
                                         Option[(ArrowType, List[StaticArg])] = {
-    
+
     // Filter applicable arrows and their instantiated args.
     val arrowsAndInstantiations =
@@ -705 +705 @@
       extendsC.foreach( (t:TraitTypeWhere) =>
                         assertTrait(t.getBaseType,
-                                    "Objects can only extend traits.", o) )
+                                    "Objects can only extend traits.", t.getBaseType) )
       val checkerWSparams = this.extend(sparams, params, where)
       var method_checker = checkerWSparams
@@ -927 +927 @@
       extendsC.foreach( (t:TraitTypeWhere) =>
                         assertTrait(t.getBaseType,
-                                    "Objects can only extend traits.", o) )
+                                    "Objects can only extend traits.", t.getBaseType) )
       var method_checker = this
       var field_checker = this
@@ -943 +943 @@
       val oi = IndexBuilder.buildObjectExprIndex(o)
       val methods = new UnionRelation(inheritedMethods(extendsC),
-                                      oi.asInstanceOf[ObjectTraitIndex].dottedMethods.asInstanceOf)
+                                      oi.asInstanceOf[ObjectTraitIndex].dottedMethods.asInstanceOf[Relation[IdOrOpOrAnonymousName, Method]])
       method_checker = method_checker.extendWithMethods(methods)
       method_checker = method_checker.extendWithFunctions(oi.asInstanceOf[ObjectTraitIndex].functionalMethods)
@@ -1308 +1308 @@
     }
 
-    case SSubscriptExpr(SExprInfo(span, paren, _), obj, subs, op, sargs) => {    
+    case SSubscriptExpr(SExprInfo(span, paren, _), obj, subs, op, sargs) => {
       val checkedObj = checkExpr(obj)
       val checkedSubs = subs.map(checkExpr)
       val objType = getType(checkedObj).getOrElse(return expr)
-      
+
       // Convert sub types into a single type or tuple of types.
       if (!haveTypes(checkedSubs)) return expr
@@ -1320 +1320 @@
           NodeFactory.makeTupleType(NodeUtil.getSpan(expr), toJavaList(t))
       }
-      
+
       // Get the methods and arrows from the op.
       val methods = findMethodsInTraitHierarchy(op.get, objType)
@@ -1328 +1328 @@
                flatMap(m => staticInstantiation(sargs, getArrowFromMethod(m))).
                map(_.asInstanceOf[ArrowType])
-      
+
       staticallyMostApplicableArrow(arrows.toList, subsType, None) match {
         case Some((arrow, sargs)) =>
@@ -1336 +1336 @@
                          op,
                          sargs)
-        case one => 
+        case one =>
           // TODO: Better error message.
           signal(expr, "Receiver type %s does not have applicable overloading of %s for argument type %s.".
@@ -1343 +1343 @@
       }
     }
-    
+
     case SStringLiteralExpr(SExprInfo(span,parenthesized,_), text) =>
       SStringLiteralExpr(SExprInfo(span,parenthesized,Some(Types.STRING)), text)
@@ -1436 +1436 @@
       val checkedArgs = args.map(checkExpr)
       if (!haveTypes(checkedArgs)) return expr
-      
+
       def checkAsInfix() = checkExpr(checkedArgs.reduceLeft(
         (e1, e2) => SOpExpr(info, infixOp, List(e1, e2))))
 
-      // Attempt to check the multifix.      
+      // Attempt to check the multifix.
       val checkedMultifixOp =
         new TryChecker(current, traits, env, analyzer).
           tryCheckExpr(multifixOp).
           getOrElse(return checkAsInfix())
-      
+
       val opType = getType(checkedMultifixOp).getOrElse(return expr)
       val argType =
@@ -1602 +1602 @@
     // "\n" + expr.toStringVerbose())
   }
-  
+
   /**
    * A type checker that doesn't report its errors. Use the tryCheck() and
@@ -1623 +1623 @@
       throw errors.errors.last
     }
-  
+
     /**
      * Adds to error log and throws the exception it made.
      */
     override protected def signal(hasAt:HasAt, msg:String) = signal(msg, hasAt)
-    
+
     /**
      * Check the given node; return it if successful, None otherwise.
@@ -1641 +1641 @@
       }
     }
-    
+
     /**
      * Check the given expression; return it if successful, None otherwise.