Changeset 3093

Timestamp:

11/24/08 18:09:59 (12 months ago)

Author:

sukyoungryu

Message:

[ast restructuring] Remove distinctions between declarations in APIs (AbsDecl?) and in components (Decl).

Location:

trunk

Files:

• Library/FortressSyntax.fsi (modified) (1 diff)
• ProjectFortress/astgen/Fortress.ast (modified) (19 diffs)
• ProjectFortress/compiler_tests (added)
• ProjectFortress/src/com/sun/fortress/compiler/IndexBuilder.java (modified) (3 diffs)
• ProjectFortress/src/com/sun/fortress/compiler/desugarer/PreDisambiguationDesugaringVisitor.java (modified) (2 diffs)
• ProjectFortress/src/com/sun/fortress/compiler/disambiguator/ExprDisambiguator.java (modified) (5 diffs)
• ProjectFortress/src/com/sun/fortress/compiler/disambiguator/TypeDisambiguator.java (modified) (2 diffs)
• ProjectFortress/src/com/sun/fortress/compiler/typechecker/SubtypeCheckerJUTest.java (modified) (4 diffs)
• ProjectFortress/src/com/sun/fortress/compiler/typechecker/TypeAnalyzerJUTest.java (modified) (4 diffs)
• ProjectFortress/src/com/sun/fortress/interpreter/Driver.java (modified) (1 diff)
• ProjectFortress/src/com/sun/fortress/interpreter/evaluator/BuildApiEnvironment.java (modified) (2 diffs)
• ProjectFortress/src/com/sun/fortress/interpreter/evaluator/BuildEnvironments.java (modified) (5 diffs)
• ProjectFortress/src/com/sun/fortress/interpreter/evaluator/BuildTopLevelEnvironments.java (modified) (13 diffs)
• ProjectFortress/src/com/sun/fortress/interpreter/evaluator/types/FTraitOrObject.java (modified) (2 diffs)
• ProjectFortress/src/com/sun/fortress/interpreter/evaluator/types/FTraitOrObjectOrGeneric.java (modified) (5 diffs)
• ProjectFortress/src/com/sun/fortress/interpreter/evaluator/types/FTypeGeneric.java (modified) (3 diffs)
• ProjectFortress/src/com/sun/fortress/interpreter/evaluator/types/FTypeObject.java (modified) (4 diffs)
• ProjectFortress/src/com/sun/fortress/interpreter/evaluator/types/FTypeObjectInstance.java (modified) (2 diffs)
• ProjectFortress/src/com/sun/fortress/interpreter/evaluator/types/FTypeTop.java (modified) (2 diffs)
• ProjectFortress/src/com/sun/fortress/interpreter/evaluator/types/FTypeTrait.java (modified) (4 diffs)
• ProjectFortress/src/com/sun/fortress/interpreter/evaluator/types/FTypeTraitInstance.java (modified) (3 diffs)
• ProjectFortress/src/com/sun/fortress/interpreter/evaluator/types/SymbolicInstantiatedType.java (modified) (2 diffs)
• ProjectFortress/src/com/sun/fortress/interpreter/evaluator/types/SymbolicOprType.java (modified) (2 diffs)
• ProjectFortress/src/com/sun/fortress/interpreter/evaluator/types/SymbolicType.java (modified) (2 diffs)
• ProjectFortress/src/com/sun/fortress/interpreter/evaluator/types/SymbolicWhereType.java (modified) (2 diffs)
• ProjectFortress/src/com/sun/fortress/interpreter/evaluator/values/Constructor.java (modified) (3 diffs)
• ProjectFortress/src/com/sun/fortress/interpreter/rewrite/DesugarerVisitor.java (modified) (20 diffs)
• ProjectFortress/src/com/sun/fortress/nodes_util/ApiMaker.java (modified) (4 diffs)
• ProjectFortress/src/com/sun/fortress/nodes_util/NodeUtil.java (modified) (1 diff)
• ProjectFortress/src/com/sun/fortress/parser/Compilation.rats (modified) (2 diffs)
• ProjectFortress/src/com/sun/fortress/parser/Declaration.rats (modified) (2 diffs)
• ProjectFortress/src/com/sun/fortress/parser/Method.rats (modified) (1 diff)
• ProjectFortress/src/com/sun/fortress/parser/TraitObject.rats (modified) (12 diffs)
• ProjectFortress/src/com/sun/fortress/parser/preparser/PreCompilation.rats (modified) (3 diffs)
• ProjectFortress/src/com/sun/fortress/tools/FortressAstToConcrete.java (modified) (3 diffs)

trunk/Library/FortressSyntax.fsi

@@ -39 +39 @@
       Decls : List[\Decl\]
       Decl : List[\Decl\]
-      AbsDecls : List[\AbsDecl\]
-      AbsDecl : AbsDecl
+      AbsDecls : List[\Decl\]
+      AbsDecl : Decl
   end
 

trunk/ProjectFortress/astgen/Fortress.ast

@@ -76 +76 @@
      * declaration in components or APIs
      */
-    interface AbsDeclOrDecl();
-        /**
-         * declaration in APIs
-         */
-        interface AbsDecl();
-        /**
-         * declaration in components
-         */
-        interface Decl();
+    interface Decl();
     /**
      * left-hand-side of assignments, local variable declarations, or
@@ -108 +100 @@
      */
     interface HasParams(Option<List<Param>> params,
-                        List<? extends AbsDeclOrDecl> decls);
+                        List<Decl> decls);
     /**
      * with a where clause
@@ -135 +127 @@
      */
     interface GenericWithParams() extends Generic, HasParams;
-    interface GenericAbsDeclOrDecl() extends Generic, AbsDeclOrDecl;
-        interface GenericDecl() extends Decl;
-    interface GenericAbsDeclOrDeclWithParams() extends GenericWithParams,
-                                                       GenericAbsDeclOrDecl;
-        interface GenericDeclWithParams() extends GenericDecl;
+    interface GenericDecl() extends Generic, Decl;
+        interface GenericDeclWithParams() extends GenericWithParams;
 
     /**
@@ -183 +172 @@
              *       end
              */
-            Api(List<AbsDecl> decls);
+            Api(List<Decl> decls);
         /**
          * import statement
@@ -232 +221 @@
          */
         abstract TraitObjectAbsDeclOrDecl(List<Modifier> mods
-                                              = Collections.<Modifier>emptyList(),
-                                          Id name,
-                                          List<StaticParam> staticParams
-                                              = Collections.<StaticParam>emptyList(),
-                                          List<TraitTypeWhere> extendsClause
-                                              = Collections.<TraitTypeWhere>emptyList(),
-                                          Option<WhereClause> where
-                                              = Option.<WhereClause>none(),
-                                          List<? extends AbsDeclOrDecl> decls)
-                                         implements HasWhere, GenericAbsDeclOrDecl;
+                                     = Collections.<Modifier>emptyList(),
+                                 Id name,
+                                 List<StaticParam> staticParams
+                                     = Collections.<StaticParam>emptyList(),
+                                 List<TraitTypeWhere> extendsClause
+                                     = Collections.<TraitTypeWhere>emptyList(),
+                                 Option<WhereClause> where
+                                     = Option.<WhereClause>none(),
+                                 List<Decl> decls)
+                                 implements HasWhere, GenericDecl;
             /**
              * trait declaration in components or APIs
              */
             abstract TraitAbsDeclOrDecl(List<BaseType> excludes
-                                            = Collections.<BaseType>emptyList(),
-                                        Option<List<BaseType>> comprises
-                                            = Option.<List<BaseType>>none(),
-                                        List<? extends AbsDeclOrDecl> decls);
+                                   = Collections.<BaseType>emptyList(),
+                               Option<List<BaseType>> comprises
+                                   = Option.<List<BaseType>>none(),
+                               List<Decl> decls);
                 /**
                  * trait declaration in APIs
@@ -274 +263 @@
                  *       end
                  */
-                AbsTraitDecl(List<AbsDecl> decls) implements AbsDecl;
+                AbsTraitDecl(List<Decl> decls) implements Decl;
                 /**
                  * trait declaration in components
@@ -298 +287 @@
              */
             abstract ObjectAbsDeclOrDecl(Option<List<Param>> params
-                                             = Option.<List<Param>>none(),
-                                         Option<List<BaseType>> throwsClause
-                                             = Option.<List<BaseType>>none(),
-                                         Option<Contract> contract
-                                             = Option.<Contract>none(),
-                                         List<? extends AbsDeclOrDecl> decls)
-                                        implements GenericAbsDeclOrDeclWithParams;
+                                    = Option.<List<Param>>none(),
+                                Option<List<BaseType>> throwsClause
+                                    = Option.<List<BaseType>>none(),
+                                Option<Contract> contract
+                                    = Option.<Contract>none(),
+                                List<Decl> decls)
+                               implements GenericDeclWithParams;
                 /**
                  * object declaration in APIs
@@ -328 +317 @@
                  * e.g.) object Empty[\alph\]() extends List[\alpha\] end
                  */
-                AbsObjectDecl(List<AbsDecl> decls) implements AbsDecl;
+                AbsObjectDecl(List<Decl> decls) implements Decl;
                 /**
                  * object declaration in components
@@ -344 +333 @@
                  *       end
                  */
-                ObjectDecl(List<Decl> decls)
-                          implements GenericDeclWithParams;
+                ObjectDecl(List<Decl> decls) implements GenericDeclWithParams;
         /**
          * variable declaration in components or APIs
          */
-        abstract VarAbsDeclOrDecl(List<LValue> lhs) implements AbsDeclOrDecl;
+        abstract VarAbsDeclOrDecl(List<LValue> lhs) implements Decl;
             /**
              * variable declaration in APIs
@@ -362 +350 @@
              * e.g.) var (x, y): ZZ64...
              */
-            AbsVarDecl() implements AbsDecl, Decl;
+            AbsVarDecl() implements Decl;
             /**
              * variable declaration in components
@@ -391 +379 @@
          */
         abstract FnAbsDeclOrDecl(List<Modifier> mods
-                                     = Collections.<Modifier>emptyList(),
-                                 IdOrOpOrAnonymousName name,
-                                 List<StaticParam> staticParams
-                                     = Collections.<StaticParam>emptyList(),
-                                 List<Param> params
-                                     = Collections.<Param>emptyList(),
-                                 Option<Type> returnType
-                                     = Option.<Type>none(),
-                                 Option<List<BaseType>> throwsClause
-                                     = Option.<List<BaseType>>none(),
-                                 Option<WhereClause> where
-                                     = Option.<WhereClause>none(),
-                                 Option<Contract> contract
-                                     = Option.<Contract>none(),
-                                 Id unambiguousName = new Id(in_span, "FN$"+in_span.toString()))
-                                implements Applicable, GenericDecl;
+                            = Collections.<Modifier>emptyList(),
+                        IdOrOpOrAnonymousName name,
+                        List<StaticParam> staticParams
+                            = Collections.<StaticParam>emptyList(),
+                        List<Param> params
+                            = Collections.<Param>emptyList(),
+                        Option<Type> returnType
+                            = Option.<Type>none(),
+                        Option<List<BaseType>> throwsClause
+                            = Option.<List<BaseType>>none(),
+                        Option<WhereClause> where
+                            = Option.<WhereClause>none(),
+                        Option<Contract> contract
+                            = Option.<Contract>none(),
+                        Id unambiguousName = new Id(in_span, "FN$"+in_span.toString()))
+                       implements Applicable, GenericDecl;
             /**
              * functional declaration in components or APIs
@@ -424 +412 @@
              * e.g.) swap (x: Object, y: Object): (Object, Object)
              */
-            AbsFnDecl() implements AbsDecl;
+            AbsFnDecl() implements Decl;
             /**
              * functional declaration in components
@@ -466 +454 @@
          *               | (unit | SI_unit) Id+ (: Type)? (= Expr)?
          */
-        abstract DimUnitDecl() implements Decl, AbsDecl;
+        abstract DimUnitDecl() implements Decl;
             /**
              * dimension declaration
@@ -490 +478 @@
          */
         TestDecl(Id name, List<GeneratorClause> gens, Expr expr)
-                implements Decl, AbsDecl;
+                implements Decl;
         /**
          * property declaration
@@ -498 +486 @@
          */
         PropertyDecl(Option<Id> name = Option.<Id>none(), List<Param> params,
-                     Expr expr) implements Decl, AbsDecl;
+                     Expr expr) implements Decl;
         /**
          * grammar declaration
          * Names (but not extends elements) must be unqualified.
          */
-        abstract GrammarDecl(Id name, List<Id> extends) implements AbsDecl;
+        abstract GrammarDecl(Id name, List<Id> extends) implements Decl;
             /**
              * grammar definition
@@ -513 +501 @@
          * Names and params must be unqualified.
          */
-        abstract GrammarMemberDecl(Id name) implements AbsDecl;
+        abstract GrammarMemberDecl(Id name) implements Decl;
             /**
              * nonterminal declaration
@@ -547 +535 @@
          * syntax declaration
          */
-        abstract SyntaxDecl(Option<String> modifier) implements AbsDecl;
+        abstract SyntaxDecl(Option<String> modifier) implements Decl;
             /**
              * syntax definition in syntax declarations
@@ -559 +547 @@
           * Transformation declaration
           */
-        abstract TransformerDecl() implements AbsDecl;
+        abstract TransformerDecl() implements Decl;
             /**
              * pre transformer definition in transformer declarations
@@ -1722 +1710 @@
                           = Collections.<StaticParam>emptyList(),
                       Type type)
-                     implements Decl, AbsDecl;
+                     implements Decl;
             /**
              * coercion constraint declared in where clauses

trunk/ProjectFortress/src/com/sun/fortress/compiler/IndexBuilder.java

@@ -180 +180 @@
             }
         };
-        for (AbsDecl decl : ast.getDecls()) {
+        for (Decl decl : ast.getDecls()) {
             decl.accept(handleDecl);
         }
@@ -295 +295 @@
             }
         };
-        for (AbsDeclOrDecl decl : ast.getDecls()) {
+        for (Decl decl : ast.getDecls()) {
             decl.accept(handleDecl);
         }
@@ -371 +371 @@
             }
         };
-        for (AbsDeclOrDecl decl : ast.getDecls()) {
+        for (Decl decl : ast.getDecls()) {
             decl.accept(handleDecl);
         }

trunk/ProjectFortress/src/com/sun/fortress/compiler/desugarer/PreDisambiguationDesugaringVisitor.java

@@ -83 +83 @@
                                         List<BaseType> excludes,
                                         Option<List<BaseType>> comprises,
-                                        List<AbsDecl> decls) {
+                                        List<Decl> decls) {
         if (!that.getName().equals(anyTypeId)) {
             extendsClause = rewriteExtendsClause(that, extendsClause);
@@ -118 +118 @@
                                          Option<List<BaseType>> throwsClause,
                                          Option<Contract> contract,
-                                         List<AbsDecl> decls) {
+                                         List<Decl> decls) {
         extendsClause = rewriteExtendsClause(that, extendsClause);
         return super.forAbsObjectDeclOnly(that, mods, name, staticParams, extendsClause,

trunk/ProjectFortress/src/com/sun/fortress/compiler/disambiguator/ExprDisambiguator.java

@@ -30 +30 @@
 import com.sun.fortress.exceptions.StaticError;
 import com.sun.fortress.nodes.APIName;
-import com.sun.fortress.nodes.AbsDeclOrDecl;
+import com.sun.fortress.nodes.Decl;
 import com.sun.fortress.nodes.AbsFnDecl;
 import com.sun.fortress.nodes.AbsObjectDecl;
@@ -399 +399 @@
 
     private Triple<Set<Id>, Set<IdOrOpOrAnonymousName>, Set<IdOrOpOrAnonymousName>>
-        extractDeclNames(List<? extends AbsDeclOrDecl> decls) {
+        extractDeclNames(List<Decl> decls) {
         final Set<IdOrOpOrAnonymousName> accessors = new HashSet<IdOrOpOrAnonymousName>();
 
@@ -466 +466 @@
 
         Set<Id> vars = new HashSet<Id>();
-        for (AbsDeclOrDecl decl : decls) {
+        for (Decl decl : decls) {
             vars.addAll(decl.accept(var_finder));
         }
 
         Set<IdOrOpOrAnonymousName> fns = new HashSet<IdOrOpOrAnonymousName>();
-        for (AbsDeclOrDecl decl : decls) {
+        for (Decl decl : decls) {
             fns.addAll(decl.accept(fn_finder));
         }
@@ -603 +603 @@
                                    v.recurOnListOfBaseType(that.getExcludes()),
                                    v.recurOnOptionOfListOfBaseType(that.getComprises()),
-                                   v.recurOnListOfAbsDecl(that.getDecls()));
+                                   v.recurOnListOfDecl(that.getDecls()));
     }
 
@@ -821 +821 @@
                                     v.recurOnOptionOfListOfBaseType(that.getThrowsClause()),
                                     v.recurOnOptionOfContract(that.getContract()),
-                                    v.recurOnListOfAbsDecl(that.getDecls()));
+                                    v.recurOnListOfDecl(that.getDecls()));
     }
 

trunk/ProjectFortress/src/com/sun/fortress/compiler/disambiguator/TypeDisambiguator.java

@@ -147 +147 @@
                 v.recurOnListOfBaseType(that.getExcludes()),
                 v.recurOnOptionOfListOfBaseType(that.getComprises()),
-                v.recurOnListOfAbsDecl(that.getDecls()));
+                v.recurOnListOfDecl(that.getDecls()));
     }
 
@@ -185 +185 @@
                 v.recurOnOptionOfListOfBaseType(that.getThrowsClause()),
                 v.recurOnOptionOfContract(that.getContract()),
-                v.recurOnListOfAbsDecl(that.getDecls()));
+                v.recurOnListOfDecl(that.getDecls()));
     }
 

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

@@ -320 +320 @@
      * Make an ApiIndex with the given name and traits.
      * @param name  Assumed to consist of a single part (has no '.' separators).
-     * @param traits  Each index is assumed to wrap an AbsDecl (not a Decl).
+     * @param traits  Each index is assumed to wrap an Decl (not a Decl).
      */
     private static ApiIndex api(String name, TraitIndex... traits) {
-        List<AbsDecl> traitDecls = new ArrayList<AbsDecl>(traits.length);
+        List<Decl> traitDecls = new ArrayList<Decl>(traits.length);
         Map<Id, TypeConsIndex> traitMap = new HashMap<Id, TypeConsIndex>();
         for (TraitIndex t : traits) {
-            traitDecls.add((AbsDecl) t.ast());
+            traitDecls.add((Decl) t.ast());
             traitMap.put(t.ast().getName(), t);
         }
@@ -345 +345 @@
      * Make a ComponentIndex with the given name and traits.
      * @param name  Assumed to consist of a single part (has no '.' separators).
-     * @param traits  Each index is assumed to wrap a Decl (not an AbsDecl).
+     * @param traits  Each index is assumed to wrap a Decl (not an Decl).
      */
     private static ComponentIndex component(String name, TraitIndex... traits) {
@@ -378 +378 @@
 
     /**
-     * Make a ProperTraitIndex with the given name and supertypes.  Wrapped AST is an AbsDecl.
+     * Make a ProperTraitIndex with the given name and supertypes.  Wrapped AST is an Decl.
      * @param name  A simple name.
      * @param supers  Type strings (parsed by parseType()); must parse to TraitTypes.
@@ -397 +397 @@
             ast = new AbsTraitDecl(span, NodeFactory.makeId(span, name), sparams,
                                    extendsClause,
-                                   Collections.<AbsDecl>emptyList());
+                                   Collections.<Decl>emptyList());
         }
         else {

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

@@ -393 +393 @@
      * Make an ApiIndex with the given name and traits.
      * @param name  Assumed to consist of a single part (has no '.' separators).
-     * @param traits  Each index is assumed to wrap an AbsDecl (not a Decl).
+     * @param traits  Each index is assumed to wrap an Decl (not a Decl).
      */
     private static ApiIndex api(String name, TraitIndex... traits) {
-        List<AbsDecl> traitDecls = new ArrayList<AbsDecl>(traits.length);
+        List<Decl> traitDecls = new ArrayList<Decl>(traits.length);
         Map<Id, TypeConsIndex> traitMap = new HashMap<Id, TypeConsIndex>();
         for (TraitIndex t : traits) {
-            traitDecls.add((AbsDecl) t.ast());
+            traitDecls.add((Decl) t.ast());
             traitMap.put(t.ast().getName(), t);
         }
@@ -418 +418 @@
      * Make a ComponentIndex with the given name and traits.
      * @param name  Assumed to consist of a single part (has no '.' separators).
-     * @param traits  Each index is assumed to wrap a Decl (not an AbsDecl).
+     * @param traits  Each index is assumed to wrap a Decl (not an Decl).
      */
     private static ComponentIndex component(String name, TraitIndex... traits) {
@@ -451 +451 @@
 
     /**
-     * Make a ProperTraitIndex with the given name and supertypes.  Wrapped AST is an AbsDecl.
+     * Make a ProperTraitIndex with the given name and supertypes.  Wrapped AST is an Decl.
      * @param name  A simple name.
      * @param supers  Type strings (parsed by parseType()); must parse to TraitTypes.
@@ -470 +470 @@
                                    Collections.<StaticParam>emptyList(),
                                    extendsClause,
-                                   Collections.<AbsDecl>emptyList());
+                                   Collections.<Decl>emptyList());
         }
         else {

trunk/ProjectFortress/src/com/sun/fortress/interpreter/Driver.java

@@ -58 +58 @@
 import com.sun.fortress.interpreter.glue.WellKnownNames;
 import com.sun.fortress.nodes.APIName;
-import com.sun.fortress.nodes.AbsDecl;
 import com.sun.fortress.nodes.AbsFnDecl;
 import com.sun.fortress.nodes.AbsObjectDecl;

trunk/ProjectFortress/src/com/sun/fortress/interpreter/evaluator/BuildApiEnvironment.java

@@ -26 +26 @@
 import com.sun.fortress.interpreter.rewrite.ArrowOrFunctional;
 import com.sun.fortress.interpreter.rewrite.IsAnArrowName;
-import com.sun.fortress.nodes.AbsDeclOrDecl;
+import com.sun.fortress.nodes.Decl;
 import com.sun.fortress.nodes.AbsFnDecl;
 import com.sun.fortress.nodes.AbsObjectDecl;
@@ -162 +162 @@
     }
 
-    private void handlePossibleFM(List<? extends AbsDeclOrDecl> tdecls) {
-        for (AbsDeclOrDecl adod : tdecls) {
+    private void handlePossibleFM(List<Decl> tdecls) {
+        for (Decl adod : tdecls) {
             ArrowOrFunctional aof = adod
                     .accept(IsAnArrowName.isAnArrowName);

trunk/ProjectFortress/src/com/sun/fortress/interpreter/evaluator/BuildEnvironments.java

@@ -173 +173 @@
 
 
-     protected static void doDefs(BuildEnvironments inner, List<? extends AbsDeclOrDecl> defs) {
-        for (AbsDeclOrDecl def : defs) {
+     protected static void doDefs(BuildEnvironments inner, List<Decl> defs) {
+        for (Decl def : defs) {
             def.accept(inner);
         }
     }
 
-    protected void doDefs(List<? extends AbsDeclOrDecl> defs) {
-        for (AbsDeclOrDecl def : defs) {
+    protected void doDefs(List<Decl> defs) {
+        for (Decl def : defs) {
             def.accept(this);
         }
@@ -196 +196 @@
 //        BetterEnv into = ftt.getMembers();
 //        BetterEnv forTraitMethods = ftt.getMethodExecutionEnv();
-//        List<? extends AbsDeclOrDecl> defs = ftt.getASTmembers();
+//        List<Decl> defs = ftt.getASTmembers();
 //
 //        BuildTraitEnvironment inner = new BuildTraitEnvironment(into,
@@ -205 +205 @@
 //    }
 //
-    public void doDefs1234(List<? extends AbsDeclOrDecl> defs) {
+    public void doDefs1234(List<Decl> defs) {
         doDefs(defs);
         doDefs234(defs);
     }
 
-    public void doDefs234(List<? extends AbsDeclOrDecl> defs) {
+    public void doDefs234(List<Decl> defs) {
         secondPass();
         doDefs(defs);
@@ -528 +528 @@
     public void scanForFunctionalMethodNames(
             FTraitOrObjectOrGeneric x,
-            List<? extends AbsDeclOrDecl> defs) {
+            List<Decl> defs) {
         scanForFunctionalMethodNames(x, defs, false);
     }
 
     public void scanForFunctionalMethodNames(FTraitOrObjectOrGeneric x,
-            List<? extends AbsDeclOrDecl> defs, boolean bogus) {
+            List<Decl> defs, boolean bogus) {
         // This is probably going away.
         Environment topLevel = containing;
@@ -891 +891 @@
             ftt.setComprises(Useful.<FType>set(c));
         }
-        List<? extends AbsDeclOrDecl> fns = x.getDecls();
+        List<Decl> fns = x.getDecls();
 
         // doTraitMethodDefs(ftt, null); /* NOTICE THE DIFFERENT ENVIRONMENT! */

trunk/ProjectFortress/src/com/sun/fortress/interpreter/evaluator/BuildTopLevelEnvironments.java

@@ -30 +30 @@
 import com.sun.fortress.interpreter.evaluator.values.SingleFcn;
 import com.sun.fortress.nodes.APIName;
-import com.sun.fortress.nodes.AbsDeclOrDecl;
+import com.sun.fortress.nodes.Decl;
 import com.sun.fortress.nodes.AbsTraitDecl;
 import com.sun.fortress.nodes.AliasedAPIName;
@@ -67 +67 @@
      */
     public Set<String> typeNames = new HashSet<String>();
-    
+
     /**
      * Used for mapping API Names to their environments
@@ -130 +130 @@
     @Override
     public Boolean forApi(Api x) {
-        List<? extends AbsDeclOrDecl> decls = x.getDecls();
+        List<Decl> decls = x.getDecls();
 
         switch (getPass()) {
@@ -141 +141 @@
 
     }
-    
+
     public Boolean for_RewriteFnOverloadDecl(_RewriteFnOverloadDecl x) {
         switch (getPass()) {
@@ -150 +150 @@
         }
         break;
-        
+
         case 3: {
             String s = x.getName().stringName();
@@ -157 +157 @@
                 Option<APIName> oapi = fn.getApi();
                 FValue oapi_val = null;
-                
+
                 if (fn instanceof Id) {
                     oapi_val = bindInto.getValueNull((Id) fn, Environment.TOP_LEVEL); // top-level reference
@@ -165 +165 @@
                     bug("Unexpected change to AST node hierarchy");
                 }
-                
+
                 if (oapi_val == null) {
                     bug("Failed to find overload member " + fn + " for " + x);
                 }
-                
+
                 if (oapi_val instanceof SingleFcn) {
                     of.addOverload((SingleFcn) oapi_val, true);
@@ -177 +177 @@
                     bug("Unexpected function binding for " + fn +" , value is " + oapi_val);
                 }
-                
-            }
-            
+
+            }
+
             of.finishInitializing();
-            
-        }
-        
+
+        }
+
         }
         return null;
@@ -195 +195 @@
     @Override
     public Boolean forComponent(Component x) {
-        List<? extends AbsDeclOrDecl> defs = x.getDecls();
+        List<Decl> defs = x.getDecls();
         switch (getPass()) {
         case 1: forComponent1(x); break;
 
-        case 2: doDefs(this, defs); 
+        case 2: doDefs(this, defs);
         break;
         case 3: {
             ForceTraitFinish v = new ForceTraitFinish() ;
-            for (AbsDeclOrDecl def : defs) {
+            for (Decl def : defs) {
                 v.visit(def);
             }
@@ -214 +214 @@
 
     public Boolean forComponentDefs(Component x) {
-        List<? extends AbsDeclOrDecl> defs = x.getDecls();
+        List<Decl> defs = x.getDecls();
         doDefs(this, defs);
         return null;
@@ -223 +223 @@
         List<Import> imports = x.getImports();
         // List<Export> exports = x.getExports();
-        List<? extends AbsDeclOrDecl> defs = x.getDecls();
+        List<Decl> defs = x.getDecls();
 
         // SComponent comp = new SComponent(BetterEnv.primitive(x), x);
@@ -229 +229 @@
 
         forComponentDefs(x);
-        
+
         for (Import imp : imports) {
             imp.accept(this);
@@ -280 +280 @@
         }
 
-        void visit(AbsDeclOrDecl def) {
+        void visit(Decl def) {
             def.accept(this);
         }
     }
-    
+
     public void setExporterAndApi(CUWrapper exporter, CUWrapper api) {
         bug("Can only set exporter of API environment builder.");
     }
-    
+
 
 }

trunk/ProjectFortress/src/com/sun/fortress/interpreter/evaluator/types/FTraitOrObject.java

@@ -37 +37 @@
 import com.sun.fortress.interpreter.evaluator.values.Overload;
 import com.sun.fortress.interpreter.evaluator.values.OverloadedFunction;
-import com.sun.fortress.nodes.AbsDeclOrDecl;
+import com.sun.fortress.nodes.Decl;
 import com.sun.fortress.nodes.AbstractNode;
 import com.sun.fortress.nodes.FnDecl;
@@ -225 +225 @@
     }
 
-    public FTraitOrObject(String name, Environment env, HasAt at, List<? extends AbsDeclOrDecl> members, AbstractNode def) {
+    public FTraitOrObject(String name, Environment env, HasAt at, List<Decl> members, AbstractNode def) {
         super(name, env, def);
         this.members = members;

trunk/ProjectFortress/src/com/sun/fortress/interpreter/evaluator/types/FTraitOrObjectOrGeneric.java

@@ -28 +28 @@
 import com.sun.fortress.interpreter.evaluator.values.FunctionalMethod;
 import com.sun.fortress.interpreter.evaluator.values.GenericFunctionalMethod;
-import com.sun.fortress.nodes.AbsDeclOrDecl;
+import com.sun.fortress.nodes.Decl;
 import com.sun.fortress.nodes.AbstractNode;
 import com.sun.fortress.nodes.FnAbsDeclOrDecl;
@@ -55 +55 @@
     }
 
-    List<? extends AbsDeclOrDecl> members;
+    List<Decl> members;
 
     Environment env;
@@ -69 +69 @@
     }
 
-    public List<? extends AbsDeclOrDecl> getASTmembers() {
+    public List<Decl> getASTmembers() {
         return members;
     }
@@ -90 +90 @@
             return;
         FTraitOrObjectOrGeneric x = this;
-        // List<? extends AbsDeclOrDecl> defs = members;
+        // List<Decl> defs = members;
 
         SortedSet<FnAbsDeclOrDecl> defs = Useful
-                .<AbsDeclOrDecl, FnAbsDeclOrDecl> filteredSortedSet(members,
-                        new Fn<AbsDeclOrDecl, FnAbsDeclOrDecl>() {
+                .<Decl, FnAbsDeclOrDecl> filteredSortedSet(members,
+                        new Fn<Decl, FnAbsDeclOrDecl>() {
                             @Override
-                            public FnAbsDeclOrDecl apply(AbsDeclOrDecl x) {
+                            public FnAbsDeclOrDecl apply(Decl x) {
                                 if (x instanceof FnAbsDeclOrDecl)
                                     return (FnAbsDeclOrDecl) x;
@@ -163 +163 @@
 
         topLevel = topLevel.getTopLevel();
-        
-        List<? extends AbsDeclOrDecl> defs = members;
 
-        for (AbsDeclOrDecl dod : defs) {
+        List<Decl> defs = members;
+
+        for (Decl dod : defs) {
             // Filter out non-functions.
             if (dod instanceof FnAbsDeclOrDecl) {

trunk/ProjectFortress/src/com/sun/fortress/interpreter/evaluator/types/FTypeGeneric.java

@@ -32 +32 @@
 import com.sun.fortress.interpreter.evaluator.InstantiationLock;
 import com.sun.fortress.interpreter.rewrite.OprInstantiaterVisitor;
-import com.sun.fortress.nodes.AbsDeclOrDecl;
+import com.sun.fortress.nodes.Decl;
 import com.sun.fortress.nodes.AbstractNode;
 import com.sun.fortress.nodes.BoolParam;
@@ -92 +92 @@
         pendingFunctionalMethodFinishes = new ArrayList<FTraitOrObjectOrGeneric>();
     }
-    
+
     private final Generic def;
     private final FTypeGeneric original;
 
-    public FTypeGeneric(Environment e, Generic d, List<? extends AbsDeclOrDecl> members, AbstractNode decl) {
+    public FTypeGeneric(Environment e, Generic d, List<Decl> members, AbstractNode decl) {
         super(NodeUtil.stringName(d), e, decl);
         def = d;
@@ -346 +346 @@
             rval = bug( within, errorMsg("The use of generic type is " +
                         "found at unexpected place; it needs to be either " +
-                        "within a trait, an object, or an object " + 
+                        "within a trait, an object, or an object " +
                         "expression type, but found: " + gen.def) );
        }

trunk/ProjectFortress/src/com/sun/fortress/interpreter/evaluator/types/FTypeObject.java

@@ -26 +26 @@
 import com.sun.fortress.interpreter.evaluator.BuildObjectEnvironment;
 import com.sun.fortress.interpreter.evaluator.Environment;
-import com.sun.fortress.nodes.AbsDeclOrDecl;
+import com.sun.fortress.nodes.Decl;
 import com.sun.fortress.nodes.AbstractNode;
 import com.sun.fortress.nodes.FnAbsDeclOrDecl;
@@ -61 +61 @@
     public FTypeObject(String name, Environment env, HasAt at,
                        Option<List<Param>> params,
-                       List<? extends AbsDeclOrDecl> members, AbstractNode def) {
+                       List<Decl> members, AbstractNode def) {
         super(name, env, at, members, def);
         this.declaredMembersOf = new BetterEnv(at);
-        for(AbsDeclOrDecl v : members) {
+        for(Decl v : members) {
             if (v instanceof VarAbsDeclOrDecl) {
                 for (LValue lhs : ((VarAbsDeclOrDecl)v).getLhs()) {
@@ -109 +109 @@
                return;
         BetterEnv into = getMembersInternal();
-         List<? extends AbsDeclOrDecl> defs = getASTmembers();
+         List<Decl> defs = getASTmembers();
 
         /* The parameters to BuildObjectEnvironment are
@@ -124 +124 @@
 
         // This is a minor hack to deal with messed-up object environments.
-        for(AbsDeclOrDecl v : members) {
+        for(Decl v : members) {
             if (v instanceof FnAbsDeclOrDecl) {
                 String s = NodeUtil.nameAsMethod((FnAbsDeclOrDecl)v);//.getName().stringName();

trunk/ProjectFortress/src/com/sun/fortress/interpreter/evaluator/types/FTypeObjectInstance.java

@@ -22 +22 @@
 
 import com.sun.fortress.interpreter.evaluator.Environment;
-import com.sun.fortress.nodes.AbsDeclOrDecl;
+import com.sun.fortress.nodes.Decl;
 import com.sun.fortress.nodes.Param;
 import com.sun.fortress.nodes.Type;
@@ -37 +37 @@
                                List<FType> bind_args, List<FType> name_args,
                                Option<List<Param>> params,
-                               List<? extends AbsDeclOrDecl> members) {
+                               List<Decl> members) {
         super(name, interior, interior.getAt(), params, members, generic.getDecl());
         this.generic = generic;

trunk/ProjectFortress/src/com/sun/fortress/interpreter/evaluator/types/FTypeTop.java

@@ -25 +25 @@
 
 import com.sun.fortress.interpreter.env.BetterEnv;
-import com.sun.fortress.nodes.AbsDeclOrDecl;
+import com.sun.fortress.nodes.Decl;
 import com.sun.fortress.useful.HasAt;
 import com.sun.fortress.useful.Useful;
@@ -36 +36 @@
     private FTypeTop() {
         super("Any",BetterEnv.blessedEmpty(),new HasAt.FromString("Built in"),
-                Collections.<AbsDeclOrDecl>emptyList(), null); // HACK need a token here.
+                Collections.<Decl>emptyList(), null); // HACK need a token here.
         membersInitialized = true;
     }

trunk/ProjectFortress/src/com/sun/fortress/interpreter/evaluator/types/FTypeTrait.java

@@ -27 +27 @@
 import com.sun.fortress.interpreter.evaluator.BuildTraitEnvironment;
 import com.sun.fortress.interpreter.evaluator.Environment;
-import com.sun.fortress.nodes.AbsDeclOrDecl;
+import com.sun.fortress.nodes.Decl;
 import com.sun.fortress.nodes.AbstractNode;
 import com.sun.fortress.useful.BASet;
@@ -49 +49 @@
     protected volatile Set<FType> transitiveComprises;
 
-    public FTypeTrait(String name, Environment interior, HasAt at, List<? extends AbsDeclOrDecl> members, AbstractNode decl) {
+    public FTypeTrait(String name, Environment interior, HasAt at, List<Decl> members, AbstractNode decl) {
         super(name, interior, at, members, decl);
         this.declaredMembersOf = new BetterEnv(at);
@@ -103 +103 @@
         Environment into = getMembersInternal();
         Environment forTraitMethods = getMethodExecutionEnv();
-        List<? extends AbsDeclOrDecl> defs = getASTmembers();
+        List<Decl> defs = getASTmembers();
 
         BuildTraitEnvironment inner = new BuildTraitEnvironment(into,
@@ -126 +126 @@
         return declaredMembersOf;
     }
- 
+
 }

trunk/ProjectFortress/src/com/sun/fortress/interpreter/evaluator/types/FTypeTraitInstance.java

@@ -22 +22 @@
 
 import com.sun.fortress.interpreter.evaluator.Environment;
-import com.sun.fortress.nodes.AbsDeclOrDecl;
+import com.sun.fortress.nodes.Decl;
 import com.sun.fortress.nodes.Type;
 import com.sun.fortress.useful.BoundingMap;
@@ -47 +47 @@
     public FTypeTraitInstance(String name, Environment interior,
             FTypeGeneric generic, List<FType> bind_args, List<FType> name_args,
-            List<? extends AbsDeclOrDecl> members) {
+            List<Decl> members) {
         super(name, interior, interior.getAt(), members, generic.getDecl());
         this.generic = generic;
@@ -67 +67 @@
                 throw new Error("Badly layered environment");
             }
-            
+
         }
     }

trunk/ProjectFortress/src/com/sun/fortress/interpreter/evaluator/types/SymbolicInstantiatedType.java

@@ -21 +21 @@
 
 import com.sun.fortress.interpreter.evaluator.Environment;
-import com.sun.fortress.nodes.AbsDeclOrDecl;
+import com.sun.fortress.nodes.Decl;
 import com.sun.fortress.nodes.AbstractNode;
 
@@ -31 +31 @@
      */
     public SymbolicInstantiatedType(String name, Environment interior, AbstractNode decl) {
-        super(name, interior, Collections.<AbsDeclOrDecl>emptyList(), decl);
+        super(name, interior, Collections.<Decl>emptyList(), decl);
         isSymbolic = true;
     }

trunk/ProjectFortress/src/com/sun/fortress/interpreter/evaluator/types/SymbolicOprType.java

@@ -20 +20 @@
 
 import com.sun.fortress.interpreter.evaluator.Environment;
-import com.sun.fortress.nodes.AbsDeclOrDecl;
+import com.sun.fortress.nodes.Decl;
 import com.sun.fortress.nodes.AbstractNode;
 
@@ -26 +26 @@
 
     public SymbolicOprType(String name, Environment interior, AbstractNode decl) {
-        super(name, interior, Collections.<AbsDeclOrDecl>emptyList(), decl);
+        super(name, interior, Collections.<Decl>emptyList(), decl);
         isSymbolic = true;
     }

trunk/ProjectFortress/src/com/sun/fortress/interpreter/evaluator/types/SymbolicType.java

@@ -28 +28 @@
 import com.sun.fortress.interpreter.evaluator.Environment;
 import com.sun.fortress.interpreter.evaluator.values.FValue;
-import com.sun.fortress.nodes.AbsDeclOrDecl;
+import com.sun.fortress.nodes.Decl;
 import com.sun.fortress.nodes.AbstractNode;
 
@@ -42 +42 @@
     }
 
-    public SymbolicType(String name, Environment interior, List<? extends AbsDeclOrDecl> members, AbstractNode decl) {
+    public SymbolicType(String name, Environment interior, List<Decl> members, AbstractNode decl) {
         super(name, interior, interior.getAt(), members, decl);
         membersInitialized = true;

trunk/ProjectFortress/src/com/sun/fortress/interpreter/evaluator/types/SymbolicWhereType.java

@@ -22 +22 @@
 
 import com.sun.fortress.interpreter.evaluator.Environment;
-import com.sun.fortress.nodes.AbsDeclOrDecl;
+import com.sun.fortress.nodes.Decl;
 import com.sun.fortress.nodes.AbstractNode;
 import com.sun.fortress.useful.NI;
@@ -33 +33 @@
      */
     public SymbolicWhereType(String name, Environment interior, AbstractNode decl) {
-        super(name, interior, Collections.<AbsDeclOrDecl>emptyList(), decl);
+        super(name, interior, Collections.<Decl>emptyList(), decl);
         NI.nyi("Where clauses cause a stack overflow error");
         // TODO Auto-generated constructor stub

trunk/ProjectFortress/src/com/sun/fortress/interpreter/evaluator/values/Constructor.java

@@ -41 +41 @@
 import com.sun.fortress.interpreter.glue.NativeApp;
 import com.sun.fortress.interpreter.glue.WellKnownNames;
-import com.sun.fortress.nodes.AbsDeclOrDecl;
+import com.sun.fortress.nodes.Decl;
 import com.sun.fortress.nodes.FnDecl;
 import com.sun.fortress.nodes.GenericWithParams;
@@ -79 +79 @@
 
     IdOrOpOrAnonymousName cfn;
-    List<? extends AbsDeclOrDecl> defs;
+    List<Decl> defs;
     Option<List<Param>> params;
 
@@ -174 +174 @@
 
     public Constructor(Environment env, FTypeObject selfType, HasAt def,
-                IdOrOpOrAnonymousName name, List<? extends AbsDeclOrDecl> defs,
+                IdOrOpOrAnonymousName name, List<Decl> defs,
                 Option<List<Param>> params) {
         super(env); // TODO verify that this is the proper env.

trunk/ProjectFortress/src/com/sun/fortress/interpreter/rewrite/DesugarerVisitor.java

@@ -46 +46 @@
 import com.sun.fortress.nodes_util.Span;
 import com.sun.fortress.nodes.APIName;
-import com.sun.fortress.nodes.AbsDecl;
-import com.sun.fortress.nodes.AbsDeclOrDecl;
 import com.sun.fortress.nodes.AbsFnDecl;
 import com.sun.fortress.nodes.AbsTraitDecl;
@@ -273 +271 @@
         return rewrites.put(k, d);
     }
-    
+
     public Thing obj_rewrites_put(String k, Thing d) {
         return rewrites.put(k, d);
     }
-    
+
     public Thing rewrites_put(String k, Thing d) {
         return rewrites.put(k, d);
     }
-    
+
     public Thing type_rewrites_put(String k, Thing d) {
         return rewrites.put(k, d);
@@ -491 +489 @@
             // circular dependences between type names. See above.
             Component com = (Component) tlnode;
-            List<? extends AbsDeclOrDecl> defs = com.getDecls();
+            List<Decl> defs = com.getDecls();
             defsToLocals(defs);
             functionalMethodsOfDefsToLocals(defs);
@@ -500 +498 @@
             // circular dependences between type names. See above.
             Api com = (Api) tlnode;
-            List<? extends AbsDeclOrDecl> defs = com.getDecls();
+            List<Decl> defs = com.getDecls();
             defsToLocals(defs);
             functionalMethodsOfDefsToLocals(defs);
@@ -664 +662 @@
     @Override
     public Node forComponent(Component com) {
-        List<? extends AbsDeclOrDecl> defs = com.getDecls();
+        List<Decl> defs = com.getDecls();
         defsToLocals(defs);
 
@@ -701 +699 @@
     @Override
     public Node forApi(Api com) {
-        List<? extends AbsDeclOrDecl> defs = com.getDecls();
+        List<Decl> defs = com.getDecls();
         defsToLocals(defs);
         return visitNode(com);
@@ -804 +802 @@
             boolean change = false;
             List<WhereBinding> lwb = wc.getBindings();
-            
+
             for (WhereBinding wb : lwb) {
                 type_rewrites_put(wb.getName().getText(), new Local());
             }
-            
+
             /* Handcoded visit to avoid a "recur" visit on the WhereClause
               The binding action of a WhereClause in a TraitTypeWhere seems
               to be different.
             */
-            
+
             WhereClause nwc = (WhereClause) visitNode(wc);
             BaseType t = vre.getType();
@@ -824 +822 @@
             return visitNode(vre);
         }
-        
-        
+
+
     }
 
@@ -831 +829 @@
   public Node forWhereClause(WhereClause wc) {
       lexicalNestingDepth++;
-      
+
           List<WhereBinding> lwb = wc.getBindings();
           for (WhereBinding wb : lwb) {
               type_rewrites_put(wb.getName().getText(), new Local());
           }
-      
+
       return visitNode(wc);
   }
@@ -966 +964 @@
 
 
-   
+
 
     @Override
     public Node for_RewriteObjectExpr(_RewriteObjectExpr oe) {
-        List<? extends AbsDeclOrDecl> defs = oe.getDecls();
+        List<Decl> defs = oe.getDecls();
         List<BaseType> xtends = NodeUtil.getTypes(oe.getExtendsClause());
         objectNestingDepth++;
@@ -980 +978 @@
         return n;
     }
-    
+
     @Override
     public Node forObjectExpr(ObjectExpr oe) {
@@ -1016 +1014 @@
         lexicalNestingDepth++;
         // defined var is no longer eligible for rewrite.
-        List<FnDecl> defs = lf.getFns();
+        List<Decl> defs = new ArrayList<Decl>();
+        for (FnDecl d : lf.getFns()) {
+            defs.add((Decl)d);
+        }
         defsToLocals(defs);
         // All the function names are in scope in the function
@@ -1044 +1045 @@
         // extended traits
         // are mapped to "self".
-        List<? extends AbsDeclOrDecl> defs = od.getDecls();
+        List<Decl> defs = od.getDecls();
         Option<List<Param>> params = od.getParams();
         List<StaticParam> tparams = od.getStaticParams();
@@ -1067 +1068 @@
     @Override
     public Node forAbsTraitDecl(AbsTraitDecl td) {
-        List<? extends AbsDecl> defs = td.getDecls();
+        List<Decl> defs = td.getDecls();
         List<StaticParam> tparams = td.getStaticParams();
         // TODO wip
@@ -1086 +1087 @@
     @Override
     public Node forTraitDecl(TraitDecl td) {
-        List<? extends Decl> defs = td.getDecls();
+        List<Decl> defs = td.getDecls();
         List<StaticParam> tparams = td.getStaticParams();
         // TODO wip
@@ -1333 +1334 @@
      * @param defs
      */
-    private void defsToLocals(List<? extends AbsDeclOrDecl> defs) {
-        for (AbsDeclOrDecl d : defs) {
+    private void defsToLocals(List<Decl> defs) {
+        for (Decl d : defs) {
             if (d instanceof TraitAbsDeclOrDecl) {
                 String s = d.stringName();
@@ -1367 +1368 @@
      * @param defs
      */
-    private void functionalMethodsOfDefsToLocals(List<? extends AbsDeclOrDecl> defs) {
-        for (AbsDeclOrDecl d : defs) {
+    private void functionalMethodsOfDefsToLocals(List<Decl> defs) {
+        for (Decl d : defs) {
             if (d instanceof TraitObjectAbsDeclOrDecl) {
                 TraitObjectAbsDeclOrDecl dod = (TraitObjectAbsDeclOrDecl) d;
-                List <? extends AbsDeclOrDecl> tdecls = dod.getDecls();
+                List <Decl> tdecls = dod.getDecls();
                 handlePossibleFM(tdecls);
             } else {
@@ -1379 +1380 @@
     }
 
-    private void handlePossibleFM(List<? extends AbsDeclOrDecl> tdecls) {
-        for (AbsDeclOrDecl adod : tdecls) {
+    private void handlePossibleFM(List<Decl> tdecls) {
+        for (Decl adod : tdecls) {
             ArrowOrFunctional aof = adod.accept(IsAnArrowName.isAnArrowName);
                 if (aof == ArrowOrFunctional.FUNCTIONAL) {
@@ -1475 +1476 @@
      * @param defs
      */
-    private void defsToMembers(List<? extends AbsDeclOrDecl> defs) {
-        for (AbsDeclOrDecl dd : defs) {
+    private void defsToMembers(List<Decl> defs) {
+        for (Decl dd : defs) {
 
             if (dd instanceof VarDecl) {
@@ -1602 +1603 @@
                             // types.add(s); // The trait is known by this
                             // name.
-                            for (AbsDeclOrDecl dd : tdod.getDecls()) {
+                            for (Decl dd : tdod.getDecls()) {
                                 String sdd = dd.stringName();
                                 if (dd instanceof VarDecl) {

trunk/ProjectFortress/src/com/sun/fortress/nodes_util/ApiMaker.java

@@ -90 +90 @@
     }
 
-    private List<AbsDecl> declsToAbsDecls(final List<Decl> that) {
+    private List<Decl> declsToDecls(final List<Decl> that) {
         boolean changed = false;
-        List<AbsDecl> result = new java.util.ArrayList<AbsDecl>(0);
+        List<Decl> result = new java.util.ArrayList<Decl>(0);
         for (Decl elt : that) {
             Option<Node> elt_result = elt.accept(this);
             if ( elt_result.isSome() )
-                result.add((AbsDecl)elt_result.unwrap());
+                result.add((Decl)elt_result.unwrap());
         }
         return result;
@@ -105 +105 @@
                               that.getName(),
                               that.getImports(),
-                              declsToAbsDecls(that.getDecls()));
+                              declsToDecls(that.getDecls()));
         try {
             writer.close();
@@ -117 +117 @@
         if ( ! isPrivate(that) ) {
             inTrait = true;
-            List<AbsDecl> absDecls = declsToAbsDecls(that.getDecls());
+            List<Decl> absDecls = declsToDecls(that.getDecls());
             inTrait = false;
             return Option.<Node>some(new AbsTraitDecl(that.getSpan(),
@@ -134 +134 @@
         if ( ! isPrivate(that) ) {
             inObject = true;
-            List<AbsDecl> absDecls = declsToAbsDecls(that.getDecls());
+            List<Decl> absDecls = declsToDecls(that.getDecls());
             inObject = false;
             return Option.<Node>some(new AbsObjectDecl(that.getSpan(),

trunk/ProjectFortress/src/com/sun/fortress/nodes_util/NodeUtil.java

@@ -425 +425 @@
     }
 
-    public static IterableOnce<String> stringNames(AbsDeclOrDecl decl) {
+    public static IterableOnce<String> stringNames(Decl decl) {
         return decl.accept(new NodeAbstractVisitor<IterableOnce<String>>() {
             public IterableOnce<String> forDimDecl(DimDecl d) {

trunk/ProjectFortress/src/com/sun/fortress/parser/Compilation.rats

@@ -71 +71 @@
      }
    / a1:Imports w semicolon? a2:(w yyValue:AbsDecls w semicolon?)?
-     { if (a2 == null) a2 = Collections.<AbsDecl>emptyList();
+     { if (a2 == null) a2 = Collections.<Decl>emptyList();
        Span span = createSpan(yyStart,yyCount);
        String file = span.begin.getFileName();
@@ -143 +143 @@
                                  " has the different name " + a4 + " at the end.");
        if (a2 == null) a2 = Collections.<Import>emptyList();
-       if (a3 == null) a3 = Collections.<AbsDecl>emptyList();
+       if (a3 == null) a3 = Collections.<Decl>emptyList();
        yyValue = new Api(span, a1, a2, a3);
      };

trunk/ProjectFortress/src/com/sun/fortress/parser/Declaration.rats

@@ -58 +58 @@
 
 /* AbsDecls ::= AbsDecl (br AbsDecl)* */
-List<AbsDecl> AbsDecls = a1:AbsDecl a2s:(br AbsDecl)*
-     { for (List<AbsDecl> ds : a2s.list()) {
+List<Decl> AbsDecls = a1:AbsDecl a2s:(br AbsDecl)*
+     { for (List<Decl> ds : a2s.list()) {
          a1.addAll(ds);
        }
@@ -76 +76 @@
    | GrammarDef
  */
-List<AbsDecl> AbsDecl =
-     a1:AbsTraitDecl  { yyValue = FortressUtil.mkList((AbsDecl)a1); }
-   / a1:AbsObjectDecl { yyValue = FortressUtil.mkList((AbsDecl)a1); }
-   / a1:AbsVarDecl    { yyValue = FortressUtil.mkList((AbsDecl)a1); }
-   / a1:AbsFnDecl     { yyValue = FortressUtil.mkList((AbsDecl)a1); }
+List<Decl> AbsDecl =
+     a1:AbsTraitDecl  { yyValue = FortressUtil.mkList((Decl)a1); }
+   / a1:AbsObjectDecl { yyValue = FortressUtil.mkList((Decl)a1); }
+   / a1:AbsVarDecl    { yyValue = FortressUtil.mkList((Decl)a1); }
+   / a1:AbsFnDecl     { yyValue = FortressUtil.mkList((Decl)a1); }
    / DimUnitDecl
-   / a1:TypeAlias     { yyValue = FortressUtil.mkList((AbsDecl)a1); }
-   / a1:TestDecl      { yyValue = FortressUtil.mkList((AbsDecl)a1); }
-   / a1:PropertyDecl  { yyValue = FortressUtil.mkList((AbsDecl)a1); }
-   / a1:GrammarDef    { yyValue = FortressUtil.mkList((AbsDecl)a1); }
+   / a1:TypeAlias     { yyValue = FortressUtil.mkList((Decl)a1); }
+   / a1:TestDecl      { yyValue = FortressUtil.mkList((Decl)a1); }
+   / a1:PropertyDecl  { yyValue = FortressUtil.mkList((Decl)a1); }
+   / a1:GrammarDef    { yyValue = FortressUtil.mkList((Decl)a1); }
    ;

trunk/ProjectFortress/src/com/sun/fortress/parser/Method.rats

@@ -165 +165 @@
    coerce (w StaticParams)? w ( w BindId w IsType w ) CoercionClauses (w widens)?
  */
-AbsDecl AbsCoercion =
+Decl AbsCoercion =
      coerce a1:(w StaticParams)? w openparen w a2:BindId w a3:IsType w closeparen
      a4:CoercionClauses a5:(w widens)?

trunk/ProjectFortress/src/com/sun/fortress/parser/TraitObject.rats

@@ -317 +317 @@
                                  " has the different name " + a5 + " at the end.");
        if (a1 == null) a1 = FortressUtil.emptyModifiers();
-       if (a4 == null) a4 = Collections.<AbsDecl>emptyList();
+       if (a4 == null) a4 = Collections.<Decl>emptyList();
        yyValue = new AbsTraitDecl
            (span, a1, a2.getName(),
@@ -356 +356 @@
    | AbsCoercions
  */
-private List<AbsDecl> AbsGoInATrait =
+private List<Decl> AbsGoInATrait =
      a1:AbsCoercions
-     { yyValue = new ArrayList<AbsDecl>();
+     { yyValue = new ArrayList<Decl>();
        yyValue.addAll(a1);
      }
@@ -382 +382 @@
      }
    / a1:(AbsCoercions br)? a2:AbsGoFrontInATrait a3:(br AbsGoBackInATrait)?
-     { yyValue = new ArrayList<AbsDecl>();
+     { yyValue = new ArrayList<Decl>();
        if (a1 != null) yyValue.addAll(a1);
        yyValue.addAll(a2);
@@ -388 +388 @@
      }
    / a1:(AbsCoercions br)? a2:AbsGoBackInATrait
-     { yyValue = new ArrayList<AbsDecl>();
+     { yyValue = new ArrayList<Decl>();
        if (a1 != null) yyValue.addAll(a1);
        yyValue.addAll(a2);
@@ -394 +394 @@
 
 /* AbsCoercions ::= AbsCoercion (br AbsCoercion)* */
-private List<AbsDecl> AbsCoercions = a1:AbsCoercion a2s:(br AbsCoercion)*
+private List<Decl> AbsCoercions = a1:AbsCoercion a2s:(br AbsCoercion)*
      { yyValue = FortressUtil.mkList(a1, a2s.list()); };
 
 /* AbsGoFrontInATrait ::= AbsGoesFrontInATrait (br AbsGoesFrontInATrait)* */
-private List<AbsDecl> AbsGoFrontInATrait =
+private List<Decl> AbsGoFrontInATrait =
      a1:AbsGoesFrontInATrait a2s:(br AbsGoesFrontInATrait)*
      { yyValue = FortressUtil.mkList(a1, a2s.list()); };
 
 /* AbsGoesFrontInATrait ::= ApiFldDecl | AbsGetterSetterDecl | PropertyDecl */
-private AbsDecl AbsGoesFrontInATrait =
+private Decl AbsGoesFrontInATrait =
      ApiFldDecl
    / AbsGetterSetterDecl
@@ -409 +409 @@
 
 /* AbsGoBackInATrait ::= AbsGoesBackInATrait (br AbsGoesBackInATrait)* */
-private List<AbsDecl> AbsGoBackInATrait =
+private List<Decl> AbsGoBackInATrait =
      a1:AbsGoesBackInATrait a2s:(br AbsGoesBackInATrait)*
      { yyValue = FortressUtil.mkList(a1, a2s.list()); };
 
 /* AbsGoesBackInATrait ::= AbsMdDecl | PropertyDecl */
-private AbsDecl AbsGoesBackInATrait =
+private Decl AbsGoesBackInATrait =
      AbsMdDecl
    / PropertyDecl ;
@@ -429 +429 @@
                                  " has the different name " + a4 + " at the end.");
        if (a1 == null) a1 = FortressUtil.emptyModifiers();
-       if (a3 == null) a3 = Collections.<AbsDecl>emptyList();
+       if (a3 == null) a3 = Collections.<Decl>emptyList();
        FnHeaderClause fhc = a2.getFnHeaderClause();
        Option<Contract> contract = fhc.getContractClause();
@@ -445 +445 @@
    | AbsCoercions
  */
-List<AbsDecl> AbsGoInAnObject =
+List<Decl> AbsGoInAnObject =
      a1:AbsCoercions
-     { yyValue = new ArrayList<AbsDecl>();
+     { yyValue = new ArrayList<Decl>();
        yyValue.addAll(a1);
      }
@@ -471 +471 @@
      }
    / a1:(AbsCoercions br)? a2:AbsGoFrontInAnObject a3:(br AbsGoBackInAnObject)?
-     { yyValue = new ArrayList<AbsDecl>();
+     { yyValue = new ArrayList<Decl>();
        if (a1 != null) yyValue.addAll(a1);
        yyValue.addAll(a2);
@@ -477 +477 @@
      }
    / a1:(AbsCoercions br)? a2:AbsGoBackInAnObject
-     { yyValue = new ArrayList<AbsDecl>();
+     { yyValue = new ArrayList<Decl>();
        if (a1 != null) yyValue.addAll(a1);
        yyValue.addAll(a2);
@@ -485 +485 @@
      AbsGoesFrontInAnObject (br AbsGoesFrontInAnObject)*
  */
-private List<AbsDecl> AbsGoFrontInAnObject =
+private List<Decl> AbsGoFrontInAnObject =
      a1:AbsGoesFrontInAnObject a2s:(br AbsGoesFrontInAnObject)*
      { yyValue = FortressUtil.mkList(a1, a2s.list()); };
 
 /* AbsGoesFrontInAnObject ::= ApiFldDecl | AbsGetterSetterDecl | PropertyDecl */
-private AbsDecl AbsGoesFrontInAnObject =
+private Decl AbsGoesFrontInAnObject =
      ApiFldDecl
    / AbsGetterSetterDecl
@@ -496 +496 @@
 
 /* AbsGoBackInAnObject ::= AbsGoesBackInAnObject (br AbsGoesBackInAnObject)* */
-private List<AbsDecl> AbsGoBackInAnObject =
+private List<Decl> AbsGoBackInAnObject =
      a1:AbsGoesBackInAnObject a2s:(br AbsGoesBackInAnObject)*
      { yyValue = FortressUtil.mkList(a1, a2s.list()); };
 
 /* AbsGoesBackInAnObject ::= AbsMdDecl | PropertyDecl */
-private AbsDecl AbsGoesBackInAnObject =
+private Decl AbsGoesBackInAnObject =
      AbsMdDecl
    / PropertyDecl ;

trunk/ProjectFortress/src/com/sun/fortress/parser/preparser/PreCompilation.rats

@@ -50 +50 @@
    / w a1:Imports w semicolon? w (_)*
      { if (a1 == null) a1 = Collections.<Import>emptyList();
-       List<AbsDecl> a2 = Collections.<AbsDecl>emptyList();
+       List<Decl> a2 = Collections.<Decl>emptyList();
        Span span = createSpan(yyStart,yyCount);
        String file = span.begin.getFileName();
@@ -69 +69 @@
        APIName name = NodeFactory.makeAPINameFromPath(span, file, "\\.");
        yyValue = new Api(span, name, Collections.<Import>emptyList(),
-                         Collections.<AbsDecl>emptyList());
+                         Collections.<Decl>emptyList());
      };
 
@@ -109 +109 @@
    / api w a1:APIName a2:(w yyValue:Imports w semicolon?)? w (_)*
      { if (a2 == null) a2 = Collections.<Import>emptyList();
-       List<AbsDecl> a3 = Collections.<AbsDecl>emptyList();
+       List<Decl> a3 = Collections.<Decl>emptyList();
        Span span = createSpan(yyStart,yyCount);
        yyValue = new Api(span, a1, a2, a3);

trunk/ProjectFortress/src/com/sun/fortress/tools/FortressAstToConcrete.java

@@ -418 +418 @@
     }
 
-    public List<String> myRecurOnListOfAbsDecl(List<AbsDecl> that) {
+    public List<String> myRecurOnListOfDecl(List<Decl> that) {
         boolean sawField = false;
         boolean sawGetterSetter = false;
         List<String> accum = new java.util.ArrayList<String>(that.size());
-        for (AbsDecl elt : that) {
+        for (Decl elt : that) {
             if ( elt instanceof AbsVarDecl ) {
                 sawField = true;
@@ -452 +452 @@
         List<String> excludes_result = recurOnListOfBaseType(that.getExcludes());
         Option<List<String>> comprises_result = recurOnOptionOfListOfBaseType(that.getComprises());
-        List<String> decls_result = myRecurOnListOfAbsDecl(that.getDecls());
+        List<String> decls_result = myRecurOnListOfDecl(that.getDecls());
         return forAbsTraitDeclOnly(that, mods_result, name_result,
                                    staticParams_result, extendsClause_result,
@@ -544 +544 @@
         Option<List<String>> throwsClause_result = recurOnOptionOfListOfBaseType(that.getThrowsClause());
         Option<String> contract_result = recurOnOptionOfContract(that.getContract());
-        List<String> decls_result = myRecurOnListOfAbsDecl(that.getDecls());
+        List<String> decls_result = myRecurOnListOfDecl(that.getDecls());
         return forAbsObjectDeclOnly(that, mods_result, name_result,
                                     staticParams_result, extendsClause_result,