Changeset 3915 for trunk/ProjectFortress/src/com/sun/fortress/compiler/index/DeclaredMethod.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/DeclaredMethod.java (modified) (4 diffs)

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

@@ -21 +21 @@
 import java.util.List;
 
+import com.sun.fortress.compiler.Types;
 import com.sun.fortress.compiler.typechecker.StaticTypeReplacer;
 import com.sun.fortress.nodes.BaseType;
@@ -36 +37 @@
 import com.sun.fortress.nodes_util.Span;
 
+import edu.rice.cs.plt.lambda.SimpleBox;
 import edu.rice.cs.plt.tuple.Option;
 
@@ -46 +48 @@
         _ast = ast;
         _declaringTrait = declaringTrait;
+        putThunk(SimpleBox.make(NodeUtil.getReturnType(_ast)));
     }
 
@@ -93 +96 @@
 
         @Override
-        public Type getReturnType() {
-                return NodeUtil.getReturnType(_ast).unwrap();
-        }
-
-        @Override
         public Id getDeclaringTrait() {
                 return this._declaringTrait;