Changeset 4149 for trunk/ProjectFortress/astgen

Timestamp:

09/09/09 20:18:36 (3 months ago)

Author:

skilpat

Message:

[ast] Split CoercionInvocation? node into three subnodes for traits, tuples, and arrows. Subsequent refactoring. Fixed bug in CollectingVisitor? generation.
[scala] Added a couple utility methods in scala_src.useful.Lists.
[desugarer] Flesh out the CoercionDesugarer? to desugar all types of CoercionInvocations? into function applications.
[type checker] Refactored some code for function application for use by coercions code. Changed CoercionOracle? to actually build the CoercionInvocation? nodes while checking the "coerces to" relation. Consequently the FnRefs? used in the final rewriting of coercion invocations are created here. Weird, but avoids some even more complicated work in the CoercionDesugarer?.

Files:

• trunk/ProjectFortress/astgen/Fortress.ast (modified) (1 diff)

trunk/ProjectFortress/astgen/Fortress.ast

@@ -931 +931 @@
                          * after inferring the implicit coercion invocations
                          */
-                        CoercionInvocation(Type toType,
-                                           List<StaticArg> staticArgs,
-                                           Expr arg);
+                        abstract CoercionInvocation(Type toType,
+                                                    Expr arg);
+                            /**
+                             * Coercion invocation to a trait type. The FnRef is
+                             * the actual function that coercion calls, along
+                             * with any static args for the coercion.
+                             */
+                            TraitCoercionInvocation(
+                                TraitType toType,
+                                FnRef coercionFn);
+                            /**
+                             * Coercion invocation to a tuple type. Each type
+                             * in the tuple may or may not require a coercion;
+                             * the list of options corresponds to those that do.
+                             */
+                            TupleCoercionInvocation(
+                                TupleType toType,
+                                List<Option<CoercionInvocation>> subCoercions,
+                                Option<Option<CoercionInvocation>> varargCoercion);
+                            /**
+                             * Coercion invocation to an arrow type. Each type
+                             * in the arrow may or may not require a coercion;
+                             * the two options correspond to those that do.
+                             */
+                            ArrowCoercionInvocation(
+                                ArrowType toType,
+                                Option<CoercionInvocation> domainCoercion,
+                                Option<CoercionInvocation> rangeCoercion);
                         /**
                          * a method invocation