Changeset 4096 for trunk/ProjectFortress/astgen

Timestamp:

08/19/09 07:28:50 (3 months ago)

Author:

jrhil47

Message:

[ast] Changed Assignment a bit to use a list of CompoundAssignmentInfo? to keep track of checked OpRefs? and hidden coercions.\n[type checker] Integrated the new Assignment info so that compound assignments involving coercion contain that information.

Files:

• trunk/ProjectFortress/astgen/Fortress.ast (modified) (2 diffs)

trunk/ProjectFortress/astgen/Fortress.ast

@@ -476 +476 @@
                  * e.g.) x += 1
                  *
-                 * <opsForLhs>
-                 * An assignment that has passed typechecking, and uses an operator.
-                 * Because different static args can be inferred for each Lhs assignment
-                 * opr, this node gives a separate FunctionalRef for each Lhs.
-                 */
-                Assignment(List<Lhs> lhs, Option<FunctionalRef> assignOp, Expr rhs,
-                           Option<List<FunctionalRef>> opsForLhs);
+                 * If this is a compound assignment, there should an assignment
+                 * info for every constituent assignment (or 1 if there is only
+                 * a single assignment). If this is not a compound assignment,
+                 * then there are no assignment infos.
+                 */
+                Assignment(List<Lhs> lhs,
+                           Option<FunctionalRef> assignOp,
+                           Expr rhs,
+                           List<CompoundAssignmentInfo> assignmentInfos);
                 /**
                  * sequence of block elements implicitly enclosed by do/end
@@ -1916 +1918 @@
                  */
                 MethodInfo(Type selfType, int selfPosition);
+                /**
+                 * Metadata for each constituent assignment in an assignment
+                 * expression. `opForLhs` contains the FunctionalRef representing
+                 * the actual checked operator for this compound assignment.
+                 * `compoundCoercionOuter` holds the coercion for the outer
+                 * compound OpExpr. `compoundCoercionInner` holds the coercion
+                 * for the occurence of the LHS within the OpExpr.
+                 */
+                CompoundAssignmentInfo(FunctionalRef opForLhs,
+                                       Option<CoercionInvocation> compoundCoercionOuter,
+                                       Option<CoercionInvocation> compoundCoercionInner);
             /*
              * Keeps track of ellipses properties. This is special cased