Changeset 3292 for trunk/ProjectFortress/src/com/sun/fortress/compiler/typechecker/TypeChecker.java

Timestamp:

01/07/09 18:53:22 (11 months ago)

Author:

EricAllen

Message:

Added a type normalizer to improve presentation of types in error messages.
Got the type checker working over more of our first 20 compiled programs.
Added corresponding tests to CompilerJUTests.

Files:

• trunk/ProjectFortress/src/com/sun/fortress/compiler/typechecker/TypeChecker.java (modified) (3 diffs)

trunk/ProjectFortress/src/com/sun/fortress/compiler/typechecker/TypeChecker.java

@@ -86 +86 @@
 import edu.rice.cs.plt.tuple.Pair;
 import edu.rice.cs.plt.tuple.Triple;
+
+import static com.sun.fortress.compiler.typechecker.TypeNormalizer.normalize;
 
 /**
@@ -923 +925 @@
         else {
             String err = "Applicable overloading of function " + that.getFunction() +
-                            " could not be found for argument type " + argument_result.type(); // error message needs work
+                " could not be found for argument type " + normalize(argument_result.type().unwrap()); // error message needs work
             result = new TypeCheckerResult(that, TypeError.make(err, that));
             result_type = Option.none();
@@ -2346 +2348 @@
 //                         }
 //                         System.err.println("equal? " + bodyType.equals(returnType.unwrap()));
-            result = newChecker.checkSubtype(bodyType,
-                                                         returnType.unwrap(),
-                                                         that,
-                                                         errorMsg("Function body has type ", bodyType, ", but ",
-                                                                  "declared return type is ", returnType.unwrap()));
+            result = newChecker.checkSubtype(normalize(bodyType),
+                                             normalize(returnType.unwrap()),
+                                             that,
+                                             errorMsg("Function body has type ", normalize(bodyType), ", but ",
+                                                      "declared return type is ", normalize(returnType.unwrap())));
         }