Changeset 3803

Timestamp:

06/05/09 08:26:41 (6 months ago)

Author:

EricAllen

Message:

Lifted method for checking existence of static parameters into general type environments.
Fixed client sites.

Location:

trunk

Files:

• ProjectFortress/src/com/sun/fortress/compiler/typechecker/StaticParamTypeEnv.java (modified) (1 diff)
• ProjectFortress/src/com/sun/fortress/compiler/typechecker/TypeEnv.java (modified) (1 diff)
• ProjectFortress/src/com/sun/fortress/scala_src/typechecker/TypeWellFormedChecker.scala (modified) (1 diff)
• README.txt (modified) (1 diff)

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

@@ -76 +76 @@
         }
         return Option.none();
-    }
-
-    public boolean bound(Id name) {
-        for ( StaticParam param : entries ) {
-            if ( param.getName().getText().equals(name.getText()) )
-                return true;
-        }
-        return false;
     }
 

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

@@ -255 +255 @@
 
     /**
+     * Return true iff the given id is bound as a StaticParam. 
+     */
+    public boolean boundStaticParam(Id id) { return staticParam(id).isSome(); }
+
+    /**
      * Return the {@code Node} that declared the given id, or None if the id does not
      * exist. Note that this method should not be passed the id of a function, since

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

@@ -95 +95 @@
       case SBottomType(_) => // OK
       case t@SVarType(_, name, _) =>
-        if ( analyzer.typeEnv.isInstanceOf[StaticParamTypeEnv] ) {
-          if ( ! analyzer.typeEnv.asInstanceOf[StaticParamTypeEnv].bound(name) )
-            error("Unbound type: " + name, t)
-        } else error("Unbound type: " + name, t)
+        if (! analyzer.typeEnv.boundStaticParam(name)) {
+          error("Unbound type: " + name, t)
+        } 
       case t@STraitType(_, name, sargs, _) =>
         getTypes(name) match {

trunk/README.txt

@@ -187 +187 @@
 known to work on Eclipse 3.4, and should work on Eclipse 3.3 as well.
 These will change preferences for all your Eclipse projects.
-Open up Window --> Preferences to start configuring your global
+Open up Eclipse Preferences to start configuring your global
 settings. First select General --> Editors --> Text Editors
 and make sure the checkbox is enabled for "Insert spaces for tabs".