Changeset 3875

Timestamp:

06/18/09 19:15:43 (5 months ago)

Author:

sukyoungryu

Message:

[overloading checker] Fixed the implementation of identifying the intersection of types with comprises clauses with the union of their common subtypes.
[parser] Added io to arrow types. Added a test.
[shell] Eliminated the temporary shell commands to test the Scala type checker. Added a flag, -typecheck-java, to the fortress compile command.

Location:

trunk/ProjectFortress

Files:

• astgen/Fortress.ast (modified) (2 diffs)
• compiler_tests/AfterTypeChecking.test (modified) (1 diff)
• compiler_tests/XXX5j.test (added)
• compiler_tests/nyi.Compiled6.t.fss (modified) (1 diff)
• parser_tests/ioTests.fss (added)
• src/com/sun/fortress/Shell.java (modified) (5 diffs)
• src/com/sun/fortress/nodes_util/NodeFactory.java (modified) (1 diff)
• src/com/sun/fortress/parser/Compilation.rats (modified) (1 diff)
• src/com/sun/fortress/parser/NoNewlineType.rats (modified) (1 diff)
• src/com/sun/fortress/parser/Type.rats (modified) (1 diff)
• src/com/sun/fortress/parser/import_collector/Compilation.rats (modified) (1 diff)
• src/com/sun/fortress/scala_src/typechecker/ExclusionOracle.scala (modified) (3 diffs)
• src/com/sun/fortress/scala_src/typechecker/ExportChecker.scala (modified) (1 diff)
• src/com/sun/fortress/scala_src/typechecker/OverloadingChecker.scala (modified) (5 diffs)
• src/com/sun/fortress/scala_src/typechecker/STypeChecker.scala (modified) (19 diffs)
• src/com/sun/fortress/scala_src/typechecker/TypeWellFormedChecker.scala (modified) (1 diff)
• src/com/sun/fortress/tests/unit_tests/FileTests.java (modified) (8 diffs)
• src/com/sun/fortress/tests/unit_tests/ScalaTypeCheckerJUTest.java (added)

trunk/ProjectFortress/astgen/Fortress.ast

@@ -1065 +1065 @@
                 /**
                  * arrow type
-                 * Type ::= Type -> Type Throws?
+                 * Type ::= io? Type -> Type Throws?
                  * e.g.) (String, NN..., p = Printer) -> NN throws IOException
                  *
@@ -1072 +1072 @@
                  * type of a generic function, used during static checking
                  */
-                ArrowType(Type domain, Type range, Effect effect);
+                ArrowType(Type domain, Type range, Effect effect, boolean io);
                 /**
                  * inferred type

trunk/ProjectFortress/compiler_tests/AfterTypeChecking.test

@@ -14 +14 @@
 #    trademarks of Sun Microsystems, Inc. in the U.S. and other countries.
 
-tests=Compiled1.ag Compiled1.ah Compiled1.ai Compiled1.aj Compiled1.ak Compiled1.as Compiled1.au Compiled1.av Compiled2.g Compiled2.t Compiled3.b Compiled3.c Compiled3.d Compiled3.e Compiled3.f Compiled3.h Compiled3.i Compiled3.j Compiled3.k Compiled3.m Compiled3.p Compiled3.q Compiled3.t Compiled3.v Compiled3.x Compiled5.e Compiled5.j Compiled5.o Compiled5.q Compiled6 Compiled7 Compiled8
+tests=Compiled1.ag Compiled1.ah Compiled1.ai Compiled1.aj Compiled1.ak Compiled1.as Compiled1.au Compiled1.av Compiled2.g Compiled2.t Compiled3.b Compiled3.c Compiled3.d Compiled3.e Compiled3.f Compiled3.h Compiled3.i Compiled3.j Compiled3.k Compiled3.m Compiled3.p Compiled3.q Compiled3.t Compiled3.v Compiled3.x Compiled5.e Compiled5.o Compiled5.q Compiled6 Compiled7 Compiled8
 desugar

trunk/ProjectFortress/compiler_tests/nyi.Compiled6.t.fss

@@ -19 +19 @@
 export Executable
 
-f(x:ZZ32) = x
-g(x:ZZ32) = x
+f(x:ZZ32):ZZ32 = x
+g(x:ZZ32):ZZ32 = x
 
 run(): () = printlnZZ32(g(3))

trunk/ProjectFortress/src/com/sun/fortress/Shell.java

@@ -312 +312 @@
                 setPhase( PhaseOrder.CODEGEN );
                 return_code = compilerPhases(args, Option.<String>none(), what);
-            } else if (what.equals("compile-scala")) {
-                WellKnownNames.useCompilerLibraries();
-                Types.useCompilerLibraries();
-                setTypeChecking(true);
-                //setScala(true);
-                setPhase( PhaseOrder.CODEGEN );
-                return_code = compilerPhases(args, Option.<String>none(), what);
             } else if (what.equals("link")) {
                 WellKnownNames.useCompilerLibraries();
                 Types.useCompilerLibraries();
-                setTypeChecking(true);
-                setPhase( PhaseOrder.CODEGEN );
-                return_code = link(args);
-            } else if (what.equals("link-scala")) {
-                WellKnownNames.useCompilerLibraries();
-                Types.useCompilerLibraries();
-                setScala(true);
                 setTypeChecking(true);
                 setPhase( PhaseOrder.CODEGEN );
@@ -353 +339 @@
                 setPhase( PhaseOrder.DISAMBIGUATE );
                 return_code = compilerPhases(args, Option.<String>none(), what);
-            } else if ( what.equals( "disambiguate-scala" ) ){
-                setScala(true);
-                setPhase( PhaseOrder.DISAMBIGUATE );
-                return_code = compilerPhases(args, Option.<String>none(), what);
             } else if ( what.equals( "desugar" ) ){
                 setTypeChecking(true);
@@ -371 +353 @@
                 setPhase( PhaseOrder.TYPECHECK );
                 return_code = compilerPhases(args, Option.<String>none(), what);
-            } else if (what.equals("typecheck-scala")){
-                WellKnownNames.useCompilerLibraries();
-                Types.useCompilerLibraries();
-                setTypeChecking(true);
-                setScala(true);
-                setPhase( PhaseOrder.TYPECHECK );
-                return_code = compilerPhases(args, Option.<String>none(), what);
             } else if (what.equals("test-coercion")) {
                 setTypeChecking(true);
-                setScala(true);
                 setPhase(PhaseOrder.TYPECHECK);
                 return_code = compilerPhases(args, Option.<String>none(), what);
@@ -749 +723 @@
                 Types.useCompilerLibraries();
             }
-            else if (s.equals("-typecheck-scala")) {
-                setScala(true);
+            else if (s.equals("-typecheck-java")) {
+                setScala(false);
             }
             else if (s.equals("-coercion")) {
@@ -940 +914 @@
             if (s.equals("-debug")){
                 rest = Debug.parseOptions(rest);
-            }
-            else if (s.equals("-typecheck-scala")) {
-                setScala(true);
             }
             else

trunk/ProjectFortress/src/com/sun/fortress/nodes_util/NodeFactory.java

@@ -743 +743 @@
                                           Option<WhereClause> where) {
         TypeInfo info = makeTypeInfo(span, parenthesized, sparams, where);
-        return new ArrowType(info, domain, range, effect);
+        return new ArrowType(info, domain, range, effect, false);
     }
 

trunk/ProjectFortress/src/com/sun/fortress/parser/Compilation.rats

@@ -100 +100 @@
 
 /* Component ::=
-     (native w)? component w APIName w comprises w APINames
-     w end ((s component)? s APIName)?
-   | (native w)? component w APIName w ImportOrExports (w ;)?
+     (native w)? component w APIName w ImportOrExports (w ;)?
      (w Decls (w ;)?)? w end ((s component)? s APIName)?
  */

trunk/ProjectFortress/src/com/sun/fortress/parser/NoNewlineType.rats

@@ -36 +36 @@
 /* NoNewlineType ::= NoNewlineTypePrimary (w in w NoNewlineExpr)? */
 Type NoNewlineType =
-     !(one) a1:TypePrimary a2:(w void:in w NoNewlineExpr)?
+     !(one) (io w)? a1:TypePrimary a2:(w void:in w NoNewlineExpr)?
      { Type ty = TypeResolver.resolveOps(a1);
        if (a2 == null)

trunk/ProjectFortress/src/com/sun/fortress/parser/Type.rats

@@ -34 +34 @@
 /* Type ::= TypePrimary (w in w Expr)? */
 Type Type =
-     !(one) a1:TypePrimary a2:(w void:in w Expr)?
+     !(one) (io w)? a1:TypePrimary a2:(w void:in w Expr)?
      { Type ty = TypeResolver.resolveOps(a1);
        Span span = NodeUtil.getSpan(ty);

trunk/ProjectFortress/src/com/sun/fortress/parser/import_collector/Compilation.rats

@@ -65 +65 @@
 
 /* Component ::=
-     (native w)? component w APIName w comprises w APINames
-     w end ((s component)? s APIName)?
-   | (native w)? component w APIName (w Imports w ;?)? w Exports w ;?
+     (native w)? component w APIName (w Imports w ;?)? w Exports w ;?
      (w Decls w ;?)? w end ((s component)? s APIName)?
  */

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

@@ -56 +56 @@
    * The following types are not yet supported:
    *     Types tagged with dimensions or units
-   *     Effects on arrow types
+   *     Effects and io on arrow types
    *     Keyword parameters and varargs parameters
    *     Intersection types
@@ -134 +134 @@
             false
         }
-      case (SArrowType(_,_,_,_), SArrowType(_,_,_,_)) => false
-      case (SArrowType(_,_,_,_), _) => true
-      case (_, SArrowType(_,_,_,_)) => true
+      case (SArrowType(_,_,_,_,_), SArrowType(_,_,_,_,_)) => false
+      case (SArrowType(_,_,_,_,_), _) => true
+      case (_, SArrowType(_,_,_,_,_)) => true
       case (f@STupleType(_,_,_,_), s@STupleType(_,_,_,_)) =>
         NodeUtil.differentArity(f, s) || {
@@ -215 +215 @@
       case STraitType(i,n,a,p) => STraitType(i, n, a.map(saSubst), p.map(spSubst))
       case STupleType(i,e,v,k) => STupleType(i, e.map(tySubst), v, k)
-      case SArrowType(i,d,r,e) => SArrowType(i, tySubst(d), tySubst(r), e)
+      case SArrowType(i,d,r,e,b) => SArrowType(i, tySubst(d), tySubst(r), e, b)
       case _ => tau
     }

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

@@ -403 +403 @@
                 equalOptTypes(varargsL, varargsR) &&
                 equalListKeywordTypes(kwdL, kwdR)
-            case (SArrowType(_, domL, ranL, effL),
-                  SArrowType(_, domR, ranR, effR)) =>
+            case (SArrowType(_, domL, ranL, effL, ioL),
+                  SArrowType(_, domR, ranR, effR, ioR)) =>
                   equalTypes(domL, domR) &&
                   equalTypes(ranL, ranR) &&
-                  equalEffects(effL, effR)
+                  equalEffects(effL, effR) &&
+                  ioL == ioR
             case _ => false
         }

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

@@ -242 +242 @@
         typeAnalyzer = typeAnalyzer.extend(staticParameters, none[WhereClause])
         var result = false
-        val meet = (reduce(typeAnalyzer.meet(first._1._2, second._1._2)),
-                    reduce(typeAnalyzer.meet(first._1._3, second._1._3)))
+        val exclusionOracle = new ExclusionOracle(typeAnalyzer, new ErrorLog())
+        val meet = (reduce(typeAnalyzer.meet(first._1._2, second._1._2), exclusionOracle),
+                    reduce(typeAnalyzer.meet(first._1._3, second._1._3), exclusionOracle))
         for ( f <- set ; if ! result )
             if ( subtype(f._1._2, meet._1) &&
@@ -262 +263 @@
      *    simplif "t"
      */
-    private def reduce(t: Type): Type = t match {
+    private def reduce(t: Type, exclusionOracle: ExclusionOracle): Type = t match {
         case SIntersectionType(info, elements) =>
             val (tuples, nots) = elements.partition(NodeUtil.isTupleType)
@@ -269 +270 @@
                 // If all the "elements" have comprises clauses
                 // and they all include type "M", then "M" is the meet.
-                existComprisedMeet(elements) match {
+                existComprisedMeet(elements, exclusionOracle) match {
                     case Some(m) => m
                     case _ => t
@@ -292 +293 @@
 
     /* If all the "types" have comprises clauses
-     * and they all include type "M", then "M" is the meet.
-     */
-    private def existComprisedMeet(types: List[Type]): Option[TraitType] = {
-      var meet: List[TraitType] = null
+     * and they all include types "comprised",
+     * then if "comprised" = {"M"} and all the others are exclusive
+     *      then "M" is the meet
+     */
+    private def existComprisedMeet(types: List[Type],
+                                   exclusionOracle: ExclusionOracle): Option[TraitType] = {
+      var allComprises = List[(Id, List[TraitType])]()
+      var meets: List[TraitType] = null
       for ( t <- types ) {
         if ( t.isInstanceOf[TraitType] ) {
-          STypesUtil.getTypes(t.asInstanceOf[TraitType].getName,
-                              globalEnv, compilation_unit) match {
+          val name = t.asInstanceOf[TraitType].getName
+          STypesUtil.getTypes(name, globalEnv, compilation_unit) match {
             case ti:ProperTraitIndex =>
               var comprises = List[TraitType]()
-            for ( s <- toSet(ti.comprisesTypes) ) comprises = s::comprises
+              for ( s <- toSet(ti.comprisesTypes) ) comprises = s::comprises
+              allComprises = (name, comprises)::allComprises
               if ( ! comprises.isEmpty ) {
-                if ( meet == null ) meet = comprises
-                else meet = meet.intersect(comprises)
+                if ( meets == null ) meets = comprises
+                else meets = meets.intersect(comprises)
               } else return None // no comprises clause
             case _ => return None // not a trait
@@ -311 +317 @@
         } else return None
       }
-      if ( meet.length == 1 ) Some(meet.head)
-      else  None
+      if ( meets.length == 1 ) {
+        val meet = meets.head
+        def nonExclusive(pair: (List[TraitType], List[TraitType])): Boolean = {
+          for ( first <- pair._1 - meet ) {
+            for ( second <- pair._2 - meet ) {
+              if ( typeAnalyzer.equivalent(first, second).isFalse &&
+                   ! exclusionOracle.excludes(first, second) )
+                return true
+            }
+          }
+          false
+        }
+        for ( first <- allComprises ) {
+          for ( second <- allComprises ;
+                if ! first._1.getText.equals(second._1.getText) ) {
+            if ( nonExclusive(first._2, second._2) ) return None
+          }
+        }
+        Some(meet)
+      } else  None
     }
 

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

@@ -484 +484 @@
                  overloading2: (ArrowType, List[StaticArg])): Boolean = {
 
-      val SArrowType(_, domain1, range1, _) = overloading1._1
-      val SArrowType(_, domain2, range2, _) = overloading2._1
+      val SArrowType(_, domain1, range1, _, _) = overloading1._1
+      val SArrowType(_, domain2, range2, _, _) = overloading2._1
 
       if (equivalentTypes(domain1, domain2)) false
@@ -699 +699 @@
       signal(application, message)
     }
-  
+
   /**
    * Create an error message that will have type and expected type inserted.
@@ -706 +706 @@
   private def errorString(message: String): String =
     message + " has type %s, but it must have %s type."
-  
+
   /**
    * Create an error message that will have type and expected type inserted.
@@ -856 +856 @@
                                    analyzer.extend(statics, wheres))
       val newContract = contract.map(c => newChecker.check(c))
-      
+
       // If setter decl and no return type given, make it void.
       val returnType =
@@ -863 +863 @@
         else
           rType
-      
+
       // Get the new return type and body.
       val (newReturnType, newBody) = returnType match {
-        
+
         // If there is a declared return type, check the body, expecting this
         // type. If this is a setter, check that the return type is a void too.
@@ -874 +874 @@
           (Some(rt), newChecker.checkExpr(body, rt, errorString("Function body",
                                                                 "declared return")))
-          
+
         case None =>
           val newBody = newChecker.checkExpr(body)
@@ -983 +983 @@
   }
 
-  
+
   /**
    * Check an expression and guarantee that its type is substitutable for the
@@ -991 +991 @@
    * operators in it; the first is replaced with the actual type and the second
    * with the expected type.
-   * 
+   *
    * @param expr The expression node to type check.
    * @param expected The expected type of this expression.
@@ -1005 +1005 @@
     val checkedExpr = checkExpr(expr, Some(expected))
     getType(checkedExpr) match {
-      case Some(typ) => 
+      case Some(typ) =>
         isSubtype(typ, expected, expr, message.format(normalize(typ), normalize(expected)))
         addType(checkedExpr, typ)
@@ -1027 +1027 @@
    * Check an expression, returning the rewritten node. This overloading should
    * be called whenever there is no expected type.
-   * 
+   *
    * @param expr The expression node to type check.
    * @return The rewritten expression node.
@@ -1038 +1038 @@
    * should only ever be called by the other two overloadings. That is, no cases
    * in the implementation should call this method itself.
-   * 
+   *
    * @param expr The expression node to type check.
    * @param expected The expected type of this expression, if there is one.
@@ -1047 +1047 @@
   def checkExpr(expr: Expr,
                 expected: Option[Type]): Expr = expr match {
-    
+
     case o@SObjectExpr(SExprInfo(span,parenthesized,_),
                      STraitTypeHeader(sparams, mods, name, where,
@@ -1719 +1719 @@
                    bindIds, bindExpr, clauses, elseClause) => {
       val (checkedExpr, checkedType) = bindExpr.map(checkExpr) match {
-        
+
         // If expr exists and was checked properly, make sure the bindIds are
         // not shadowing.
@@ -1729 +1729 @@
             })
           (Some(checkedE), getType(checkedE).getOrElse(return expr))
-        
+
         // If expr does not exist, make sure thr bindIds are not mutable.
         case _ =>
@@ -1737 +1737 @@
                          "binding expression cannot be a mutable variable: %s").
                            format(id)))
-          
+
           val idTypes = bindIds.map(getTypeFromName(_).getOrElse(return expr))
           (None, NodeFactory.makeMaybeTupleType(NodeUtil.getSpan(expr),
                                                 toJavaList(idTypes)))
       }
-      
+
       // Check that the number of bindIds matches the size of the bindExpr.
       val isMultipleIds = bindIds.size > 1
@@ -1770 +1770 @@
           return c
         }
-        
+
         // Construct the types that correspond to each id.
         val newType =
@@ -1780 +1780 @@
             List[Type](normalize(NodeFactory.makeIntersectionType(checkedType, matchType.first)))
           }
-        
+
         val checkedBody =
           this.extend(bindIds, newType).
           checkExpr(body).asInstanceOf[Block]
-        
+
         STypecaseClause(info, matchType, checkedBody)
       }
@@ -1790 +1790 @@
       val clauseTypes =
         checkedClauses.map(c => getType(c.getBody).getOrElse(return expr))
-      
+
       // Check the else clause with the new binding.
       val newType =
@@ -1802 +1802 @@
             checkExpr(e).asInstanceOf[Block])
       val elseType = checkedElse.map(getType(_).getOrElse(return expr))
-      
+
       // Build union type of all clauses and else.
       val allTypes = elseType match {

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

@@ -129 +129 @@
         }
       // Effects are not yet supported...
-      case SArrowType(_, domain, range, effect) => walk(domain); walk(range)
+      case SArrowType(_, domain, range, effect, io) => walk(domain); walk(range)
       case SIntersectionType(_, elements) => elements.foreach((t:Type) => walk(t))
       case SUnionType(_, elements) => elements.foreach((t:Type) => walk(t))

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

@@ -55 +55 @@
 
 public class FileTests {
-
-    private static String option = "";
 
     public static class BaseTest extends TestCase {
@@ -624 +622 @@
         protected int justTheTest()
                 throws FileNotFoundException, IOException, Throwable {
-            String[] tokens;
-            if ( option.equals("") )
-                tokens = new String [] {"compile", dir+"/"+makeTestFileName(name)};
-            else
-                tokens = new String [] {"compile", option, dir+"/"+makeTestFileName(name)};
+            String[] tokens = new String [] {"compile", dir+"/"+makeTestFileName(name)};
             int rc = com.sun.fortress.Shell.subMain(tokens);
             return rc;
@@ -660 +654 @@
             throws FileNotFoundException, IOException, Throwable {
             // might need to strip the .fss off f "f".
-            String[] tokens;
-            if ( option.equals("") )
-                tokens = new String [] {"desugar", dir+"/"+makeTestFileName(name)};
-            else
-                tokens = new String [] {"desugar", option, dir+"/"+makeTestFileName(name)};
+            String[] tokens = new String [] {"desugar", dir+"/"+makeTestFileName(name)};
             int rc = com.sun.fortress.Shell.subMain(tokens);
             return rc;
@@ -695 +685 @@
                 throws FileNotFoundException, IOException, Throwable {
             // might need to strip the .fss off f "f".
-            String[] tokens;
-            if ( option.equals("") )
-                tokens = new String [] {"link", dir+"/"+makeTestFileName(name)};
-            else
-                tokens = new String [] {"link", option, dir+"/"+makeTestFileName(name)};
+            String[] tokens = new String [] {"link", dir+"/"+makeTestFileName(name)};
             int rc = com.sun.fortress.Shell.subMain(tokens);
             return rc;
-
-
         }
 
@@ -860 +844 @@
                                           boolean failsOnly,
                                           boolean expect_failure,
-                                          boolean scala_test) throws IOException {
-
-        if (scala_test) option = "-typecheck-scala";
+                                          boolean typechecker_test) throws IOException {
 
         TestSuite suite = new TestSuite("Runs all tests in " + dir_name) {
@@ -921 +903 @@
                           while  (st.hasMoreTokens()) {
                               String token = st.nextToken();
-                              if (addTest(scala_test, token))
+                              if (addTest(typechecker_test, token))
                                   standardCompilerTests(props, dir, dirname, token,
                                                         expect_failure, shouldFail, failsOnly,
@@ -929 +911 @@
                       }
                       else {
-                          if (addTest(scala_test, testname))
+                          if (addTest(typechecker_test, testname))
                               standardCompilerTests(props, dir, dirname, testname,
                                                     expect_failure, shouldFail, failsOnly,
@@ -963 +945 @@
     }
 
-    private static boolean addTest(boolean scala_test,
+    private static boolean addTest(boolean typechecker_test,
                                    String test_name) {
-        return ( ! scala_test
+        return ( ! typechecker_test
                  || test_name.startsWith("Compiled0")
                  || test_name.startsWith("Compiled1")