Changeset 3915 for trunk/ProjectFortress/src/com/sun/fortress/compiler/index/DeclaredFunction.java

Timestamp:

07/02/09 07:59:33 (5 months ago)

Author:

jrhil47

Message:

[index] Changed all Functional indices to store a thunk to get the return types, since during type checking the return types might need to be lazily evaluated. Also changed Functional indices to yield an Option for return types.
[type checker] Started implementing extraction of bindings from nodes for type environments.

Files:

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

trunk/ProjectFortress/src/com/sun/fortress/compiler/index/DeclaredFunction.java

@@ -37 +37 @@
 import com.sun.fortress.useful.NI;
 
+import edu.rice.cs.plt.lambda.SimpleBox;
 import edu.rice.cs.plt.tuple.Option;
 
@@ -42 +43 @@
     private final FnDecl _ast;
 
-    public DeclaredFunction(FnDecl ast) { _ast = ast; }
+    public DeclaredFunction(FnDecl ast) {
+      _ast = ast;
+      putThunk(SimpleBox.make(NodeUtil.getReturnType(_ast)));
+    }
 
     public FnDecl ast() { return _ast; }
@@ -98 +102 @@
 
         @Override
-        public Type getReturnType() {
-                return NodeUtil.getReturnType(_ast).unwrap();
-        }
-
-        @Override
         public Functional acceptNodeUpdateVisitor(NodeUpdateVisitor visitor) {
                 return new DeclaredFunction((FnDecl)this._ast.accept(visitor));