Changeset 3122

Timestamp:

11/29/08 22:56:33 (12 months ago)

Author:

sukyoungryu

Message:

[ast refactoring] Renaming AST node fields: Use names (including field names) that are not Java reserved words, nor Scala reserved words, nor Fortress reserved words.

Location:

trunk/ProjectFortress

Files:

• astgen/Fortress.ast (modified) (17 diffs)
• src/com/sun/fortress/compiler/Disambiguator.java (modified) (1 diff)
• src/com/sun/fortress/compiler/IndexBuilder.java (modified) (2 diffs)
• src/com/sun/fortress/compiler/desugarer/DesugaringVisitor.java (modified) (5 diffs)
• src/com/sun/fortress/compiler/desugarer/DottedMethodRewriteVisitor.java (modified) (1 diff)
• src/com/sun/fortress/compiler/desugarer/FreeNameCollector.java (modified) (1 diff)
• src/com/sun/fortress/compiler/desugarer/MutableVarRefRewriteVisitor.java (modified) (1 diff)
• src/com/sun/fortress/compiler/desugarer/ObjectExpressionVisitor.java (modified) (1 diff)
• src/com/sun/fortress/compiler/disambiguator/ExprDisambiguator.java (modified) (4 diffs)
• src/com/sun/fortress/compiler/disambiguator/TopLevelEnv.java (modified) (3 diffs)
• src/com/sun/fortress/compiler/disambiguator/TypeDisambiguator.java (modified) (6 diffs)
• src/com/sun/fortress/compiler/environments/TopLevelEnvGen.java (modified) (1 diff)
• src/com/sun/fortress/compiler/index/CompilationUnitIndex.java (modified) (1 diff)
• src/com/sun/fortress/compiler/index/FieldGetterMethod.java (modified) (1 diff)
• src/com/sun/fortress/compiler/index/FieldSetterMethod.java (modified) (1 diff)
• src/com/sun/fortress/compiler/index/TypeAliasIndex.java (modified) (1 diff)
• src/com/sun/fortress/compiler/typechecker/FnTypeEnv.java (modified) (1 diff)
• src/com/sun/fortress/compiler/typechecker/MethodTypeEnv.java (modified) (2 diffs)
• src/com/sun/fortress/compiler/typechecker/ObjectTypeEnv.java (modified) (1 diff)
• src/com/sun/fortress/compiler/typechecker/TypeChecker.java (modified) (18 diffs)
• src/com/sun/fortress/compiler/typechecker/TypeEnv.java (modified) (4 diffs)
• src/com/sun/fortress/interpreter/Driver.java (modified) (4 diffs)
• src/com/sun/fortress/interpreter/evaluator/BuildEnvironments.java (modified) (4 diffs)
• src/com/sun/fortress/interpreter/evaluator/BuildLetEnvironments.java (modified) (1 diff)
• src/com/sun/fortress/interpreter/evaluator/BuildTopLevelEnvironments.java (modified) (3 diffs)
• src/com/sun/fortress/interpreter/evaluator/EvalType.java (modified) (1 diff)
• src/com/sun/fortress/interpreter/evaluator/EvaluatorBase.java (modified) (1 diff)
• src/com/sun/fortress/interpreter/evaluator/LHSEvaluator.java (modified) (1 diff)
• src/com/sun/fortress/interpreter/evaluator/values/FGenericFunction.java (modified) (1 diff)
• src/com/sun/fortress/interpreter/evaluator/values/SingleFcn.java (modified) (1 diff)
• src/com/sun/fortress/interpreter/glue/NativeApp.java (modified) (1 diff)
• src/com/sun/fortress/interpreter/rewrite/DesugarerVisitor.java (modified) (2 diffs)
• src/com/sun/fortress/interpreter/rewrite/IsAnArrowName.java (modified) (2 diffs)
• src/com/sun/fortress/nodes_util/ApiMaker.java (modified) (5 diffs)
• src/com/sun/fortress/nodes_util/ErrorMsgMaker.java (modified) (2 diffs)
• src/com/sun/fortress/nodes_util/ExprFactory.java (modified) (1 diff)
• src/com/sun/fortress/nodes_util/NodeComparator.java (modified) (1 diff)
• src/com/sun/fortress/nodes_util/NodeFactory.java (modified) (4 diffs)
• src/com/sun/fortress/nodes_util/NodeUtil.java (modified) (6 diffs)
• src/com/sun/fortress/parser/TraitObject.rats (modified) (1 diff)
• src/com/sun/fortress/parser_util/FortressUtil.java (modified) (1 diff)
• src/com/sun/fortress/parser_util/SyntaxChecker.java (modified) (2 diffs)
• src/com/sun/fortress/syntax_abstractions/GrammarComposer.java (modified) (2 diffs)
• src/com/sun/fortress/syntax_abstractions/environments/EnvFactory.java (modified) (1 diff)
• src/com/sun/fortress/syntax_abstractions/parser/PreParser.java (modified) (2 diffs)
• src/com/sun/fortress/syntax_abstractions/phases/ComposingSyntaxDefTranslator.java (modified) (9 diffs)
• src/com/sun/fortress/syntax_abstractions/phases/EscapeRewriter.java (modified) (1 diff)
• src/com/sun/fortress/syntax_abstractions/phases/ExtensionDesugarer.java (modified) (3 diffs)
• src/com/sun/fortress/syntax_abstractions/phases/GrammarRewriter.java (modified) (1 diff)
• src/com/sun/fortress/syntax_abstractions/phases/TemplateParser.java (modified) (1 diff)
• src/com/sun/fortress/syntax_abstractions/phases/Transform.java (modified) (1 diff)
• src/com/sun/fortress/tools/FortressAstToConcrete.java (modified) (4 diffs)

trunk/ProjectFortress/astgen/Fortress.ast

@@ -144 +144 @@
                  *                 | QualifiedName (as Id)?
                  */
-                abstract ImportedNames(APIName api);
+                abstract ImportedNames(APIName apiName);
                     /**
                      * Names must be unqualified.
                      * e.g.) import Set.{...} except {opr UNION, union}
                      */
-                    ImportStar(List<IdOrOpOrAnonymousName> except);
+                    ImportStar(List<IdOrOpOrAnonymousName> exceptNames);
                     /**
                      * e.g.) import Set.{empty, union}
@@ -175 +175 @@
              * Alias must be unqualified.
              */
-            AliasedAPIName(APIName api,
+            AliasedAPIName(APIName apiName,
                            Option<Id> alias = Option.<Id>none());
             /**
@@ -192 +192 @@
                                          List<TraitTypeWhere> extendsClause
                                              = Collections.<TraitTypeWhere>emptyList(),
-                                         Option<WhereClause> where
+                                         Option<WhereClause> whereClause
                                              = Option.<WhereClause>none(),
                                          List<Decl> decls)
@@ -239 +239 @@
                      *       end
                      */
-                    TraitDecl(List<BaseType> excludes = Collections.<BaseType>emptyList(),
-                              Option<List<BaseType>> comprises
+                    TraitDecl(List<BaseType> excludesClause = Collections.<BaseType>emptyList(),
+                              Option<List<BaseType>> comprisesClause
                                   = Option.<List<BaseType>>none()) implements Generic;
                     /**
@@ -340 +340 @@
                        Option<Type> returnType = Option.<Type>none(),
                        Option<List<BaseType>> throwsClause = Option.<List<BaseType>>none(),
-                       Option<WhereClause> where = Option.<WhereClause>none(),
+                       Option<WhereClause> whereClause = Option.<WhereClause>none(),
                        Option<Contract> contract = Option.<Contract>none(),
                        Id unambiguousName = new Id(in_span, "FN$"+in_span.toString()),
@@ -374 +374 @@
                      * e.g.) dim Length SI_unit meter meters m
                      */
-                    DimDecl(Id dim, Option<Type> derived = Option.<Type>none(),
-                            Option<Id> default = Option.<Id>none());
+                    DimDecl(Id dimId, Option<Type> derived = Option.<Type>none(),
+                            Option<Id> defaultId = Option.<Id>none());
                     /**
                      * unit declaration
@@ -383 +383 @@
                     UnitDecl(boolean si_unit = false,
                              List<Id> units = Collections.<Id>emptyList(),
-                             Option<Type> dim = Option.<Type>none(),
-                             Option<Expr> def);
+                             Option<Type> dimType = Option.<Type>none(),
+                             Option<Expr> defExpr);
                 /**
                  * test declaration
@@ -408 +408 @@
                           List<StaticParam> staticParams
                               = Collections.<StaticParam>emptyList(),
-                          Type type);
+                          Type typeDef);
                 /**
                  * grammar declaration
                  * Names (but not extends elements) must be unqualified.
                  */
-                abstract GrammarDecl(Id name, List<Id> extends);
+                abstract GrammarDecl(Id name, List<Id> extendsClause);
                     /**
                      * grammar definition
                      */
                     GrammarDef(List<GrammarMemberDecl> members, List<TransformerDecl> transformers,
-                           boolean native);
+                               boolean nativeDef);
                 /**
                  * grammar member (nonterminal or terminal) declaration
@@ -445 +445 @@
                               List<StaticParam> staticParams
                                 = Collections.<StaticParam>emptyList(),
-                              Option<Type> type,
+                              Option<Type> paramType,
                               Option<WhereClause> whereClause
                                 = Option.<WhereClause>none());
@@ -452 +452 @@
              * nonterminal parameter
              */
-            NonterminalParameter(Id name, BaseType type);
+            NonterminalParameter(Id name, BaseType paramType);
 
             /**
@@ -464 +464 @@
                           TransformerDecl transformer);
 
-                SuperSyntaxDef(Id nonterminal, Id grammar);
+                SuperSyntaxDef(Id nonterminal, Id grammarId);
 
             /**
@@ -605 +605 @@
                      * character interval
                      */
-                    CharacterInterval(String begin, String end);
+                    CharacterInterval(String beginSymbol, String endSymbol);
             /**
              * left-hand side of variable declaration or value parameter
@@ -611 +611 @@
             abstract Binding(Id name,
                              List<Modifier> mods = Collections.<Modifier>emptyList(),
-                             Option<Type> type = Option.<Type>none()) implements Lhs;
+                             Option<Type> idType = Option.<Type>none()) implements Lhs;
                 /**
                  * left-hand side of variable declaration
@@ -896 +896 @@
                        Option<Type> returnType
                            = Option.<Type>none(),
-                       Option<WhereClause> where
+                       Option<WhereClause> whereClause
                            = Option.<WhereClause>none(),
                        Option<List<BaseType>> throwsClause
@@ -1370 +1370 @@
                     _RewriteGenericArrowType(List<StaticParam> staticParams
                                               = Collections.<StaticParam>emptyList(),
-                                             Option<WhereClause> where
+                                             Option<WhereClause> whereClause
                                               = Option.<WhereClause>none());
                 /**
@@ -2019 +2019 @@
              */
             TraitTypeWhere(BaseType type,
-                           Option<WhereClause> where
+                           Option<WhereClause> whereClause
                                = Option.<WhereClause>none());
             /**
@@ -2139 +2139 @@
                              List<Param> params,
                              Option<Type> returnType,
-                             Option<WhereClause> where);
+                             Option<WhereClause> whereClause);
 
 end;

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

@@ -217 +217 @@
                 GrammarDef og = e.getValue().ast();
                 List<GrammarIndex> ls = new LinkedList<GrammarIndex>();
-                for (Id n: og.getExtends()) {
+                for (Id n: og.getExtendsClause()) {
                     GrammarIndex g = grammars.get(n.getText());
                     if ( g == null ){

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

@@ -343 +343 @@
                     ast.getParams(),
                     ast.getThrowsClause(),
-                    ast.getWhere());
+                    ast.getWhereClause());
             constructor = Option.some(c);
             functions.add(name, c);
@@ -436 +436 @@
     private void buildDimension(DimDecl ast,
             Map<Id, Dimension> dimensions) {
-        dimensions.put(ast.getDim(), new Dimension(ast));
+        dimensions.put(ast.getDimId(), new Dimension(ast));
     }
 

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

@@ -245 +245 @@
                 obj = ExprFactory.makeVarRef(obj, obj.getExprType(),
                                              mangleName(obj.getVar()));
-                body = (Expr)forFieldRefOnly(rewrite, field.getType(),
+                body = (Expr)forFieldRefOnly(rewrite, field.getIdType(),
                                              obj, rewrite.getField());
             } else {
@@ -255 +255 @@
         if ( inTrait )
             return NodeFactory.makeFnDecl(span, mods, field.getName(),
-                                          field.getType(), Option.<Expr>none());
+                                          field.getIdType(), Option.<Expr>none());
         else
             return NodeFactory.makeFnDecl(span, mods, field.getName(),
-                                         field.getType(), body);
+                                         field.getIdType(), body);
     }
 
@@ -264 +264 @@
         Span span = field.getSpan();
         Type voidType = NodeFactory.makeVoidType(span);
-        Option<Type> ty = field.getType();
+        Option<Type> ty = field.getIdType();
         List<Modifier> mods = new LinkedList<Modifier>();
         for (Modifier mod : field.getMods()) {
@@ -581 +581 @@
         return forObjectDeclOnly(that, that.getMods(), that.getName(),
                                  that.getStaticParams(), that.getExtendsClause(),
-                                 that.getWhere(), gettersAndDecls, params_result,
+                                 that.getWhereClause(), gettersAndDecls, params_result,
                                  that.getThrowsClause(), contract_result);
     }
@@ -603 +603 @@
         return forTraitDeclOnly(that, that.getMods(), that.getName(),
                                 that.getStaticParams(), that.getExtendsClause(),
-                                that.getWhere(), gettersAndDecls,
-                                that.getExcludes(), that.getComprises());
+                                that.getWhereClause(), gettersAndDecls,
+                                that.getExcludesClause(), that.getComprisesClause());
     }
 

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

@@ -51 +51 @@
         return super.forObjectDeclOnly(that, that.getMods(), that.getName(),
                                        that.getStaticParams(),
-                                       that.getExtendsClause(), that.getWhere(),
+                                       that.getExtendsClause(), that.getWhereClause(),
                                        decls_result, that.getParams(),
                                        that.getThrowsClause(), that.getContract());

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

@@ -1014 +1014 @@
         @Override
         public void forDimDecl(DimDecl that) {
-            decledNames.add(that.getDim());
+            decledNames.add(that.getDimId());
         }
 

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

@@ -94 +94 @@
         return super.forObjectDeclOnly(that, that.getMods(), that.getName(),
                                        that.getStaticParams(),
-                                       that.getExtendsClause(), that.getWhere(),
+                                       that.getExtendsClause(), that.getWhereClause(),
                                        decls_result, that.getParams(),
                                        that.getThrowsClause(), that.getContract());

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

@@ -881 +881 @@
         VarRef varRef = ExprFactory.makeVarRef( param.getSpan(),
                                                 param.getName(),
-                                                param.getType() );
+                                                param.getIdType() );
         return varRef;
     }

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

@@ -670 +670 @@
                                 v.recurOnListOfStaticParam(that.getStaticParams()),
                                 extendsClause,
-                                v.recurOnOptionOfWhereClause(that.getWhere()),
+                                v.recurOnOptionOfWhereClause(that.getWhereClause()),
                                 v.recurOnListOfDecl(that.getDecls()),
-                                v.recurOnListOfBaseType(that.getExcludes()),
-                                v.recurOnOptionOfListOfBaseType(that.getComprises()));
+                                v.recurOnListOfBaseType(that.getExcludesClause()),
+                                v.recurOnOptionOfListOfBaseType(that.getComprisesClause()));
     }
 
@@ -718 +718 @@
                                  v.recurOnListOfStaticParam(that.getStaticParams()),
                                  extendsClause,
-                                 v.recurOnOptionOfWhereClause(that.getWhere()),
+                                 v.recurOnOptionOfWhereClause(that.getWhereClause()),
                                  v.recurOnListOfDecl(that.getDecls()),
                                  v.recurOnOptionOfListOfParam(that.getParams()),
@@ -749 +749 @@
                             v.recurOnOptionOfType(that.getReturnType()),
                             v.recurOnOptionOfListOfBaseType(that.getThrowsClause()),
-                            v.recurOnOptionOfWhereClause(that.getWhere()),
+                            v.recurOnOptionOfWhereClause(that.getWhereClause()),
                             v.recurOnOptionOfContract(that.getContract()),
                             that.getUnambiguousName(),
@@ -803 +803 @@
                              v.recurOnListOfParam(that.getParams()),
                              v.recurOnOptionOfType(that.getReturnType()),
-                             v.recurOnOptionOfWhereClause(that.getWhere()),
+                             v.recurOnOptionOfWhereClause(that.getWhereClause()),
                              v.recurOnOptionOfListOfBaseType(that.getThrowsClause()),
                              (Expr) that.getBody().accept(v));

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

@@ -707 +707 @@
                 Boolean implib = true;
                 for( AliasedAPIName api : that.getApis() ) {
-                    APIName name = api.getApi();
+                    APIName name = api.getApiName();
                     if(name.getText().equals(WellKnownNames.fortressLibrary))
                         implib=false;
@@ -718 +718 @@
             @Override
             public Boolean forImportNames(ImportNames that) {
-                APIName name = that.getApi();
+                APIName name = that.getApiName();
 
                 // TODO Handle these aliased names more thoroughly
@@ -737 +737 @@
             @Override
             public Boolean forImportStar(ImportStar that) {
-                APIName name = that.getApi();
+                APIName name = that.getApiName();
                 if( exceptions.containsKey(name) )
-                    exceptions.get(name).addAll(that.getExcept());
+                    exceptions.get(name).addAll(that.getExceptNames());
                 else
-                    exceptions.put(name, new HashSet<IdOrOpOrAnonymousName>(that.getExcept()));
+                    exceptions.put(name, new HashSet<IdOrOpOrAnonymousName>(that.getExceptNames()));
                 return !name.getText().equals(WellKnownNames.fortressLibrary);
             }

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

@@ -142 +142 @@
                 v.recurOnListOfStaticParam(that.getStaticParams()),
                 v.recurOnListOfTraitTypeWhere(that.getExtendsClause()),
-                v.recurOnOptionOfWhereClause(that.getWhere()),
+                v.recurOnOptionOfWhereClause(that.getWhereClause()),
                 v.recurOnListOfDecl(that.getDecls()),
-                v.recurOnListOfBaseType(that.getExcludes()),
-                v.recurOnOptionOfListOfBaseType(that.getComprises()));
+                v.recurOnListOfBaseType(that.getExcludesClause()),
+                v.recurOnOptionOfListOfBaseType(that.getComprisesClause()));
     }
 
@@ -160 +160 @@
                 v.recurOnListOfStaticParam(that.getStaticParams()),
                 v.recurOnListOfTraitTypeWhere(that.getExtendsClause()),
-                v.recurOnOptionOfWhereClause(that.getWhere()),
+                v.recurOnOptionOfWhereClause(that.getWhereClause()),
                 v.recurOnListOfDecl(that.getDecls()),
                 v.recurOnOptionOfListOfParam(that.getParams()),
@@ -181 +181 @@
                 v.recurOnOptionOfType(that.getReturnType()),
                 v.recurOnOptionOfListOfBaseType(that.getThrowsClause()),
-                v.recurOnOptionOfWhereClause(that.getWhere()),
+                v.recurOnOptionOfWhereClause(that.getWhereClause()),
                 v.recurOnOptionOfContract(that.getContract()),
                 that.getUnambiguousName(),
@@ -441 +441 @@
         List<Id> ls = new LinkedList<Id>();
         Collection<GrammarIndex> gs = new LinkedList<GrammarIndex>();
-        for (Id name: that.getExtends()) {
+        for (Id name: that.getExtendsClause()) {
             Id nname = handleGrammarName(name);
             ls.add(nname);
@@ -470 +470 @@
         Id name = handleGrammarName(name_result);
 
-        GrammarDef disambiguatedGrammar = new GrammarDef(that.getSpan(), name, p.first(), members_result, transformers, that.isNative());
+        GrammarDef disambiguatedGrammar = new GrammarDef(that.getSpan(), name, p.first(), members_result, transformers, that.isNativeDef());
 
         List<StaticError> newErrs = new ArrayList<StaticError>();
@@ -536 +536 @@
         TypeDisambiguator v = this.extend(that.getStaticParams());
 
-//        System.err.println("T: "+that.getType());
-
-        Option<Type> t = v.recurOnOptionOfType(that.getType());
+//        System.err.println("T: "+that.getParamType());
+
+        Option<Type> t = v.recurOnOptionOfType(that.getParamType());
 //        System.err.println("t: "+t);
         return forNonterminalHeaderOnly(that,

trunk/ProjectFortress/src/com/sun/fortress/compiler/environments/TopLevelEnvGen.java

@@ -232 +232 @@
                 ImportApi importApi = (ImportApi) imports;
                 for (AliasedAPIName api : importApi.getApis()) {
-                    importedApiNames.add(NodeUtil.nameString(api.getApi()));
+                    importedApiNames.add(NodeUtil.nameString(api.getApiName()));
                 }
             } else if (imports instanceof ImportedNames) {
                 ImportedNames importNames = (ImportedNames) imports;
-                importedApiNames.add(NodeUtil.nameString(importNames.getApi()));
+                importedApiNames.add(NodeUtil.nameString(importNames.getApiName()));
             } else {
                 throw StaticError.make("Unrecognized import type in bytecode generation", imports);

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

@@ -71 +71 @@
             _import.accept(new NodeAbstractVisitor_void() {
                 public void forImportedNames(ImportedNames that) {
-                    result.add(that.getApi());
+                    result.add(that.getApiName());
                 }
             });

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

@@ -74 +74 @@
         @Override
         public Type getReturnType() {
-                return _ast.getType().unwrap();
+                return _ast.getIdType().unwrap();
         }
 

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

@@ -61 +61 @@
                                 new Id(_ast.getSpan(), "fakeParamForImplicitSetter"),
                                 Collections.<Modifier>emptyList(),
-                                _ast.getType(),
+                                _ast.getIdType(),
                                 Option.<Expr>none());
                 return Collections.singletonList(p);

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

@@ -38 +38 @@
     public List<StaticParam> staticParameters() { return _ast.getStaticParams(); }
     
-    public Type type() { return _ast.getType(); }
+    public Type type() { return _ast.getTypeDef(); }
 
         @Override

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

@@ -86 +86 @@
                 if( param.getName().equals(IndexBuilder.SELF_NAME) ) {
                     if( param.getVarargsType().isNone() )
-                                self_type_ = param.getType();
+                                self_type_ = param.getIdType();
                         else
                                 InterpreterBug.bug("self cannot be a varargs.");

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

@@ -71 +71 @@
                                             Types.VOID,
                                              // all types have been filled in at this point
-                                            binding.getType().unwrap()));
+                                            binding.getIdType().unwrap()));
 
             } else { // method instanceof FieldSetterMethod
@@ -78 +78 @@
 
                 overloads.add(makeArrowType(binding.getSpan(),
-                                            binding.getType().unwrap(),
+                                            binding.getIdType().unwrap(),
                                             // all types have been filled in at this point
                                             Types.VOID));

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

@@ -94 +94 @@
                                                      NodeFactory.makeTraitType(_var, TypeEnv.staticParamsToArgs(decl.getStaticParams())),
                                                      decl.getStaticParams(),
-                                                     decl.getWhere());
+                                                     decl.getWhereClause());
             }
         }

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

@@ -132 +132 @@
         }
         static private Type getTypeOfLValue(LValue lval) {
-            return lval.getType().unwrap();
+            return lval.getIdType().unwrap();
         }
         private static boolean isExprMI(MathItem item) {
@@ -152 +152 @@
 
                 for (LValue binding: bindings) {
-                        if (binding.getType().isSome()) {
-                                results.add(binding.getType().unwrap());
+                        if (binding.getIdType().isSome()) {
+                                results.add(binding.getIdType().unwrap());
                         } else
                                 bug(binding, "Missing type.");
@@ -249 +249 @@
                                             if( arg1.getVarargsType().isNone() ) {
                                                         typeCount++;
-                                                        arg0.add(arg1.getType().unwrap());
+                                                        arg0.add(arg1.getIdType().unwrap());
                                                         return arg0;
                                                 }
@@ -619 +619 @@
                                                                         public Type forParam(Param that) {
                                                                             if ( that.getVarargsType().isNone() )
-                                                                                return that.getType().unwrap();
+                                                                                return that.getIdType().unwrap();
                                                                             else
                                                                                 return that.getVarargsType().unwrap();
@@ -630 +630 @@
                                                         DeclaredVariable var = (DeclaredVariable)field;
                                                         LValue bind = var.ast();
-                                                        return Option.some(bind.getType().unwrap());
+                                                        return Option.some(bind.getIdType().unwrap());
                                                 }
                                                 else {
@@ -1405 +1405 @@
                                 }
                                 else {
-                                        Type lhs_type = that.getType().unwrap();
+                                        Type lhs_type = that.getIdType().unwrap();
                                         return Pair.make(checkSubtype(rhs_type,
                                                         lhs_type, that,
@@ -1421 +1421 @@
                                 }
                                 else {
-                                        Type lhs_type = that.getType().unwrap();
+                                        Type lhs_type = that.getIdType().unwrap();
                                         return Pair.make(checkSubtype(rhs_type,
                                                         lhs_type, that,
@@ -2281 +2281 @@
                     return super.forFnDecl(that);
 
-                TypeChecker newChecker = this.extend(that.getStaticParams(), that.getParams(), that.getWhere());
+                TypeChecker newChecker = this.extend(that.getStaticParams(), that.getParams(), that.getWhereClause());
 
                 TypeCheckerResult result = new TypeCheckerResult(that);
@@ -2322 +2322 @@
                                              returnType,
                                              that.getThrowsClause(),
-                                             that.getWhere(),
+                                             that.getWhereClause(),
                                              contract,
                                              Option.<Expr>some((Expr)bodyResult.ast()));
@@ -2358 +2358 @@
                 for(Param p: that.getParams()){
                     if(p.getVarargsType().isNone()){
-                        if(p.getType().isSome()){
-                            dlist.add(p.getType().unwrap());
+                        if(p.getIdType().isSome()){
+                            dlist.add(p.getIdType().unwrap());
                         }
                         else{
@@ -2419 +2419 @@
                                 that.getParams(),
                                 (Option<Type>)TypeCheckerResult.astFromResult(returnType_result),
-                                that.getWhere(),
+                                that.getWhereClause(),
                                 (Option<List<BaseType>>)TypeCheckerResult.astFromResults(throwsClause_result),
                                 (Expr)body_result.ast() );
@@ -3345 +3345 @@
         @Override
         public TypeCheckerResult forObjectDecl(final ObjectDecl that) {
-                TypeChecker checker_with_sparams = this.extend(that.getStaticParams(), that.getParams(), that.getWhere());
+                TypeChecker checker_with_sparams = this.extend(that.getStaticParams(), that.getParams(), that.getWhereClause());
                 List<TypeCheckerResult> modsResult = checker_with_sparams.recurOnListOfModifier(that.getMods());
                 TypeCheckerResult nameResult = that.getName().accept(checker_with_sparams);
@@ -3351 +3351 @@
                 TypeCheckerResult whereResult;
                 Option<WhereClause> where;
-                if ( that.getWhere().isSome() ) {
-                        whereResult = that.getWhere().unwrap().accept(checker_with_sparams);
+                if ( that.getWhereClause().isSome() ) {
+                        whereResult = that.getWhereClause().unwrap().accept(checker_with_sparams);
                         where = Option.some((WhereClause)whereResult.ast());
                 } else {
@@ -3918 +3918 @@
         @Override
         public TypeCheckerResult forTraitDecl(final TraitDecl that) {
-                TypeChecker checker_with_sparams = this.extend(that.getStaticParams(), that.getWhere());
+                TypeChecker checker_with_sparams = this.extend(that.getStaticParams(), that.getWhereClause());
 
                 List<TypeCheckerResult> modsResult = checker_with_sparams.recurOnListOfModifier(that.getMods());
@@ -3924 +3924 @@
                 TypeCheckerResult whereResult;
                 Option<WhereClause> where;
-                if ( that.getWhere().isSome() ) {
-                        whereResult = that.getWhere().unwrap().accept(checker_with_sparams);
+                if ( that.getWhereClause().isSome() ) {
+                        whereResult = that.getWhereClause().unwrap().accept(checker_with_sparams);
                         where = Option.some((WhereClause)whereResult.ast());
                 } else {
@@ -3931 +3931 @@
                         where = Option.<WhereClause>none();
                 }
-                List<TypeCheckerResult> excludesResult = checker_with_sparams.recurOnListOfBaseType(that.getExcludes());
+                List<TypeCheckerResult> excludesResult = checker_with_sparams.recurOnListOfBaseType(that.getExcludesClause());
 
                 // Verify that this trait only extends other traits
@@ -3940 +3940 @@
                                         }}));
 
-                Option<List<TypeCheckerResult>> comprisesResult =  checker_with_sparams.recurOnOptionOfListOfBaseType(that.getComprises());
+                Option<List<TypeCheckerResult>> comprisesResult =  checker_with_sparams.recurOnOptionOfListOfBaseType(that.getComprisesClause());
 
                 TypeChecker method_checker = checker_with_sparams;
@@ -4323 +4323 @@
                 if (lhs.size() == 1) { // We have a single variable binding, not a tuple binding
                         LValue var = lhs.get(0);
-                        Option<Type> varType = var.getType();
+                        Option<Type> varType = var.getIdType();
                         if (varType.isSome()) {
                                 if (initResult.type().isNone()) {

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

@@ -131 +131 @@
     protected static Option<Type> typeFromParam(Param param) {
         if (param.getVarargsType().isNone()) {
-            return param.getType();
+            return param.getIdType();
         } else { // a varargs param
             // Convert the declared varargs type into a reference to
@@ -148 +148 @@
                                                        decl.getThrowsClause()),
                                             decl.getStaticParams(),
-                                            decl.getWhere());
+                                            decl.getWhereClause());
     }
 
@@ -161 +161 @@
         for (Param param: params) {
             if (param.getVarargsType().isNone()) {
-                Option<Type> maybeType = param.getType();
+                Option<Type> maybeType = param.getIdType();
 
                 if (maybeType.isSome()) { // An explicit type is declared.
@@ -442 +442 @@
         public BindingLookup(LValue binding) {
             var = binding.getName();
-            type = binding.getType();
+            type = binding.getIdType();
             mods = binding.getMods();
             mutable = binding.isMutable();

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

@@ -295 +295 @@
             } else if (i instanceof ImportedNames) {
                 ImportedNames ix = (ImportedNames) i;
-                APIName source = ix.getApi();
+                APIName source = ix.getApiName();
                 String from_apiname = NodeUtil.nameString(source);
 
@@ -324 +324 @@
                     /* All names BUT excepts, as they are listed. */
                     final List<IdOrOpOrAnonymousName> excepts = ((ImportStar) ix)
-                            .getExcept();
+                            .getExceptNames();
                     final Set<String> except_names = Useful.applyToAllInserting(
                             excepts,
@@ -436 +436 @@
                 List<AliasedAPIName> apis = ix.getApis();
                 for (AliasedAPIName adi : apis) {
-                    APIName id = adi.getApi();
+                    APIName id = adi.getApiName();
                     ensureApiImplemented(fr, linker, pile, id);
                 }
@@ -442 +442 @@
             else if (i instanceof ImportedNames) {
                 ImportedNames ix = (ImportedNames) i;
-                APIName source = ix.getApi();
+                APIName source = ix.getApiName();
                 ensureApiImplemented(fr, linker, pile, source);
             }

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

@@ -674 +674 @@
         LValue lvb = lhs.get(0);
 
-          Option<Type> type = lvb.getType();
+          Option<Type> type = lvb.getIdType();
           Id name = lvb.getName();
           String sname = NodeUtil.nameString(name);
@@ -749 +749 @@
 
          {
-                Option<Type> type = lvb.getType();
+                Option<Type> type = lvb.getIdType();
                 Id name = lvb.getName();
                 String sname = NodeUtil.nameString(name);
@@ -875 +875 @@
 
         EvalType et;
-        if ( x.getWhere().isSome() )
-            et = processWhereClauses(x.getWhere().unwrap(), interior);
+        if ( x.getWhereClause().isSome() )
+            et = processWhereClauses(x.getWhereClause().unwrap(), interior);
         else
             et = new EvalType(interior);
 
         List<FType> extl = et.getFTypeListFromList(extends_);
-        List<FType> excl = et.getFTypeListFromList(x.getExcludes());
+        List<FType> excl = et.getFTypeListFromList(x.getExcludesClause());
         ftt.setExtendsAndExcludes(extl, excl, interior);
-        Option<List<BaseType>> comprs = x.getComprises();
+        Option<List<BaseType>> comprs = x.getComprisesClause();
         if (!comprs.isNone()) {
             List<FType> c = et.getFTypeListFromList(comprs.unwrap());
@@ -960 +960 @@
     public void finishObjectTrait(ObjectDecl x, FTypeObject ftt) {
         List<BaseType> extends_ = NodeUtil.getTypes(x.getExtendsClause());
-        finishObjectTrait(extends_, null, x.getWhere(), ftt, containing, x);
+        finishObjectTrait(extends_, null, x.getWhereClause(), ftt, containing, x);
     }
 

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

@@ -128 +128 @@
             EvalType eval_type = new EvalType(containing);
             for (LValue lvb : lhs) {
-                if (lvb.isMutable() && lvb.getType().isSome()) {
+                if (lvb.isMutable() && lvb.getIdType().isSome()) {
                     FValue fv = lvb.accept(new_eval);
-                    FType fvt = lvb.getType().unwrap().accept(eval_type);
+                    FType fvt = lvb.getIdType().unwrap().accept(eval_type);
                     containing.putVariable(fv.getString(),fvt);
                 } else {

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

@@ -88 +88 @@
         List<AliasedAPIName> apis = x.getApis();
         for (AliasedAPIName aliased_api : apis) {
-            APIName imported = aliased_api.getApi();
+            APIName imported = aliased_api.getApiName();
             importAPIName(imported);
         }
@@ -96 +96 @@
   @Override
     public Boolean forImportNames(ImportNames x) {
-        APIName imported = x.getApi();
+        APIName imported = x.getApiName();
         importAPIName(imported);
         return null;
@@ -103 +103 @@
     @Override
     public Boolean forImportStar(ImportStar x) {
-        APIName imported = x.getApi();
+        APIName imported = x.getApiName();
         importAPIName(imported);
         return null;

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

@@ -171 +171 @@
             FType ptype;
             if (in_p.getVarargsType().isNone()) {
-                Option<Type> type = in_p.getType();
+                Option<Type> type = in_p.getIdType();
                 ptype = e.getFTypeFromOption(type, FTypeTop.ONLY);
             }

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

@@ -208 +208 @@
             try {
                 if (p.getVarargsType().isNone()) {
-                    Option<Type> t = p.getType();
+                    Option<Type> t = p.getIdType();
                     // why can't we just skip if missing?
                     if (t.isNone()) {

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

@@ -144 +144 @@
     public Voidoid forLValue(LValue x) {
         Id name = x.getName();
-        Option<Type> type = x.getType();
+        Option<Type> type = x.getIdType();
         String s = NodeUtil.nameString(name);
         boolean mutable = x.isMutable();

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

@@ -193 +193 @@
 
     protected Option<WhereClause> getWhere() {
-        return fndef.getWhere();
+        return fndef.getWhereClause();
     }
 

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

@@ -147 +147 @@
     static public List<FType> createSymbolicInstantiation(Environment bte, Applicable ap, HasAt location) throws Error {
         List<StaticParam> tpl = ap.getStaticParams();
-        Option<WhereClause> wcl = ap.getWhere();
+        Option<WhereClause> wcl = ap.getWhereClause();
 
         // The (possibly multiple and interrelated) symbolic

trunk/ProjectFortress/src/com/sun/fortress/interpreter/glue/NativeApp.java

@@ -105 +105 @@
     }
     public IdOrOpOrAnonymousName getName() { return a.getName(); }
-    public Option<WhereClause> getWhere() { return a.getWhere(); }
+    public Option<WhereClause> getWhereClause() { return a.getWhereClause(); }
     public String at() { return a.at(); }
     public String stringName() { return a.stringName(); }

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

@@ -792 +792 @@
     public Node forTraitTypeWhere(TraitTypeWhere vre) {
         lexicalNestingDepth++;
-        Option<WhereClause> owc = vre.getWhere();
+        Option<WhereClause> owc = vre.getWhereClause();
         if (owc.isSome()) {
             WhereClause wc = owc.unwrap();
@@ -880 +880 @@
                                   fndef.getStaticParams(), fndef.getParams(),
                                   fndef.getReturnType(), fndef.getThrowsClause(),
-                                  fndef.getWhere(), Option.<Contract>none(), Option.<Expr>some(b));
+                                  fndef.getWhereClause(), Option.<Contract>none(), Option.<Expr>some(b));
 
             n = visitNode(f);

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

@@ -47 +47 @@
     @Override
     public ArrowOrFunctional forLValue(LValue that) {
-        return optionTypeIsArrow(that.getType());
+        return optionTypeIsArrow(that.getIdType());
     }
 
@@ -76 +76 @@
     public ArrowOrFunctional forParam(Param that) {
         if ( that.getVarargsType().isNone() )
-            return optionTypeIsArrow(that.getType());
+            return optionTypeIsArrow(that.getIdType());
         else
             return ArrowOrFunctional.NEITHER;

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

@@ -127 +127 @@
                                                    that.getStaticParams(),
                                                    that.getExtendsClause(),
-                                                   that.getWhere(),
+                                                   that.getWhereClause(),
                                                    absDecls,
-                                                   that.getExcludes(),
-                                                   that.getComprises()));
+                                                   that.getExcludesClause(),
+                                                   that.getComprisesClause()));
         } else return Option.<Node>none();
     }
@@ -144 +144 @@
                                                     that.getStaticParams(),
                                                     that.getExtendsClause(),
-                                                    that.getWhere(),
+                                                    that.getWhereClause(),
                                                     absDecls,
                                                     that.getParams(),
@@ -159 +159 @@
             List<LValue> lhs = new ArrayList<LValue>();
             for (LValue lvb : that.getLhs()) {
-                if ( lvb.getType().isNone() )
+                if ( lvb.getIdType().isNone() )
                     log(lvb, "The type of " + lvb.getName() + " is required.");
                 if ( inObject && NodeUtil.isVar(lvb.getMods()) ) {
@@ -181 +181 @@
                 log(that, "The return type of " + that.getName() + " is required.");
             for ( Param p : that.getParams() ) {
-                if ( p.getType().isNone() &&
+                if ( p.getIdType().isNone() &&
                      p.getVarargsType().isNone() &&
                      ! p.getName().getText().equals("self") )
@@ -200 +200 @@
                                                 that.getReturnType(),
                                                 that.getThrowsClause(),
-                                                that.getWhere(),
+                                                that.getWhereClause(),
                                                 that.getContract(),
                                                 Option.<Expr>none(),

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

@@ -299 +299 @@
     public String forLValue(LValue node) {
         String r = "";
-        if (node.getType().isSome()) {
-            r = ":" + node.getType().unwrap().accept(this);
+        if (node.getIdType().isSome()) {
+            r = ":" + node.getIdType().unwrap().accept(this);
         }
         return NodeUtil.nameString(node.getName()) + r;
@@ -321 +321 @@
         sb.append(NodeUtil.nameString(node.getName()));
         if ( node.getVarargsType().isNone() ) {
-            if (node.getType().isSome()) {
+            if (node.getIdType().isSome()) {
                 sb.append(":");
-                sb.append(node.getType().unwrap().accept(this));
+                sb.append(node.getIdType().unwrap().accept(this));
             }
             if (node.getDefaultExpr().isSome()) {

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

@@ -796 +796 @@
             return new FnExpr(e.getSpan(), true, e.getName(),
                               e.getStaticParams(), e.getParams(),
-                              e.getReturnType(), e.getWhere(),
+                              e.getReturnType(), e.getWhereClause(),
                               e.getThrowsClause(), e.getBody());
         }

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

@@ -212 +212 @@
         if (x != 0) return x;
         if ((left.getVarargsType().isNone()) && (right.getVarargsType().isNone())) {
-            x = compareOptionalType(left.getType(), right.getType());
+            x = compareOptionalType(left.getIdType(), right.getIdType());
         }
         if ((left.getVarargsType().isSome()) && (right.getVarargsType().isSome())) {

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

@@ -772 +772 @@
 
     public static LValue makeLValue(LValue lvb, Id name) {
-        return new LValue(lvb.getSpan(), name, lvb.getMods(), lvb.getType(),
+        return new LValue(lvb.getSpan(), name, lvb.getMods(), lvb.getIdType(),
                           lvb.isMutable());
     }
 
     public static LValue makeLValue(LValue lvb, boolean mutable) {
-        return new LValue(lvb.getSpan(), lvb.getName(), lvb.getMods(), lvb.getType(),
+        return new LValue(lvb.getSpan(), lvb.getName(), lvb.getMods(), lvb.getIdType(),
                           mutable);
     }
@@ -787 +787 @@
                 mutable = true;
         }
-        return new LValue(lvb.getSpan(), lvb.getName(), mods, lvb.getType(), mutable);
+        return new LValue(lvb.getSpan(), lvb.getName(), mods, lvb.getIdType(), mutable);
     }
 
     public static LValue makeLValue(LValue lvb, List<Modifier> mods,
             boolean mutable) {
-        return new LValue(lvb.getSpan(), lvb.getName(), mods, lvb.getType(), mutable);
+        return new LValue(lvb.getSpan(), lvb.getName(), mods, lvb.getIdType(), mutable);
     }
 
@@ -819 +819 @@
     public static LValue makeLValue(Param param) {
         return new LValue(param.getSpan(), param.getName(),
-                          param.getMods(), param.getType(), false);
+                          param.getMods(), param.getIdType(), false);
     }
 
@@ -991 +991 @@
     public static Param makeParam(Param param, Expr expr) {
         return new Param(param.getSpan(), param.getName(), param.getMods(),
-                         param.getType(), Option.some(expr));
+                         param.getIdType(), Option.some(expr));
     }
 
     public static Param makeParam(Param param, List<Modifier> mods) {
         return new Param(param.getSpan(), param.getName(), mods,
-                         param.getType(), param.getDefaultExpr());
+                         param.getIdType(), param.getDefaultExpr());
     }
 
     public static Param makeParam(Param param, Id newId) {
         return new Param(param.getSpan(), newId, param.getMods(),
-                         param.getType(), param.getDefaultExpr());
+                         param.getIdType(), param.getDefaultExpr());
     }
 

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

@@ -88 +88 @@
             if (i instanceof ImportedNames) {
                 ImportedNames names = (ImportedNames) i;
-                all.add( names.getApi() );
+                all.add( names.getApiName() );
             } else { // i instanceof ImportApi
                 ImportApi apis = (ImportApi) i;
                 for (AliasedAPIName a : apis.getApis()) {
-                    all.add(a.getApi());
+                    all.add(a.getApiName());
                 }
             }
@@ -104 +104 @@
                 @Override
                 public void forImportedNamesDoFirst(ImportedNames that) {
-                    Debug.debug(Debug.Type.SYNTAX, 2, "Add import api ", that.getApi());
-                    all.add(that.getApi());
+                    Debug.debug(Debug.Type.SYNTAX, 2, "Add import api ", that.getApiName());
+                    all.add(that.getApiName());
                 }
 
@@ -111 +111 @@
                 public void forImportApi(ImportApi that){
                     for (AliasedAPIName api : that.getApis()){
-                        Debug.debug(Debug.Type.SYNTAX, 2, "Add aliased api ", api.getApi());
-                        all.add(api.getApi());
+                        Debug.debug(Debug.Type.SYNTAX, 2, "Add aliased api ", api.getApiName());
+                        all.add(api.getApiName());
                     }
                 }
@@ -328 +328 @@
     public static String nameString(IdOrOpOrAnonymousName n) {
         final String last = n.accept(nameGetter);
-        Option<APIName> odn = n.getApi();
+        Option<APIName> odn = n.getApiName();
         return odn.isSome() ? nameString(odn.unwrap()) + "." + last : last;
     }
@@ -383 +383 @@
             @Override
         public String forDimDecl(DimDecl node) {
-            return nameString(node.getDim());
+            return nameString(node.getDimId());
         }
             @Override
@@ -445 +445 @@
         return decl.accept(new NodeAbstractVisitor<IterableOnce<String>>() {
             public IterableOnce<String> forDimDecl(DimDecl d) {
-                return new UnitIterable<String>(d.getDim().getText());
+                return new UnitIterable<String>(d.getDimId().getText());
             }
             public IterableOnce<String> forUnitDecl(UnitDecl d) {

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

@@ -225 +225 @@
      a1:ParamFldMods? a2:PlainParam
      { if (a1 != null) {
-           if (FortressUtil.getMutable(a1) && a2.getType().isNone())
+           if (FortressUtil.getMutable(a1) && a2.getIdType().isNone())
                syntaxError(a2.getSpan(),
                            "Mutable fields should be declared with their types.");

trunk/ProjectFortress/src/com/sun/fortress/parser_util/FortressUtil.java

@@ -397 +397 @@
     public static void allHaveTypes(List<LValue> vars) {
         for (LValue l : vars) {
-            if (l.getType().isNone())
+            if (l.getIdType().isNone())
                 syntaxError(l.getSpan(),
                             "Mutable variables should be declared with their types.");

trunk/ProjectFortress/src/com/sun/fortress/parser_util/SyntaxChecker.java

@@ -143 +143 @@
         if ( that.getInit().isNone() ) { // variable declaration without a body expression
             for (LValue lvb : that.getLhs()) {
-                if ( lvb.getType().isNone() )
+                if ( lvb.getIdType().isNone() )
                     log(lvb, "The type of " + lvb.getName() + " is required.");
             }
@@ -276 +276 @@
             if ( (! hasBody) &&
                  p.getVarargsType().isNone() &&
-                 p.getType().isNone() &&
+                 p.getIdType().isNone() &&
                  ! p.getName().getText().equals("self") )
                 log(p, "The type of " + p.getName() + " is required.");

trunk/ProjectFortress/src/com/sun/fortress/syntax_abstractions/GrammarComposer.java

@@ -117 +117 @@
             Debug.debug(Debug.Type.SYNTAX, 3,
                         "Grammar " + grammarDef.getName() + 
-                        " native?: " + grammarDef.isNative());
-            if (grammarDef.isNative()) {
+                        " native?: " + grammarDef.isNativeDef());
+            if (grammarDef.isNativeDef()) {
                 // A native grammar can only contain nonterminal declarations
                 for (GrammarMemberDecl member : grammarDef.getMembers()) {
@@ -187 +187 @@
         } else if (decl instanceof SuperSyntaxDef) {
             SuperSyntaxDef def = (SuperSyntaxDef) decl;
-            for (SyntaxDecl extension : findExtension(def.getNonterminal(), def.getGrammar())){
+            for (SyntaxDecl extension : findExtension(def.getNonterminal(), def.getGrammarId())){
                 resolveAndAdd(defs, extension, false);
             }

trunk/ProjectFortress/src/com/sun/fortress/syntax_abstractions/environments/EnvFactory.java

@@ -130 +130 @@
             GrammarDef og = grammar.ast();
             List<GrammarIndex> ls = new LinkedList<GrammarIndex>();
-            for (Id n: og.getExtends()) {
+            for (Id n: og.getExtendsClause()) {
                 Debug.debug(Debug.Type.SYNTAX, 3, "Add grammar " + n.getText() + 
                             "[" + grammarMap.get(n.getText()) +

trunk/ProjectFortress/src/com/sun/fortress/syntax_abstractions/parser/PreParser.java

@@ -86 +86 @@
 
                 @Override public void forImportStarOnly(ImportStar that) {
-                    if (env.definesApi(that.getApi())) {
-                        APIName api = that.getApi();
+                    if (env.definesApi(that.getApiName())) {
+                        APIName api = that.getApiName();
                         for (GrammarIndex g: env.api(api).grammars().values()) {
-                            if (!that.getExcept().contains(g.getName())) {
+                            if (!that.getExceptNames().contains(g.getName())) {
                                 grammars.add(g);
                             }
                         }
                     } else {
-                        StaticError.make("Undefined api: "+that.getApi(), that);
+                        StaticError.make("Undefined api: "+that.getApiName(), that);
                     }
                 }
 
                 @Override public void forImportNamesOnly(ImportNames that) {
-                    if (env.definesApi(that.getApi())) {
-                        ApiIndex api = env.api(that.getApi());
+                    if (env.definesApi(that.getApiName())) {
+                        ApiIndex api = env.api(that.getApiName());
                         for (AliasedSimpleName aliasedName: that.getAliasedNames()) {
                             if (aliasedName.getName() instanceof Id) {
@@ -110 +110 @@
                         }
                     } else {
-                        StaticError.make("Undefined api: "+that.getApi(), that);
+                        StaticError.make("Undefined api: "+that.getApiName(), that);
                     }
                 }

trunk/ProjectFortress/src/com/sun/fortress/syntax_abstractions/phases/ComposingSyntaxDefTranslator.java

@@ -125 +125 @@
             String parameters = collectParameters(def, code, indents);
             String name = def.getName();
-            code.add(String.format("yyValue = new _SyntaxTransformation%s(createSpan(yyStart,yyCount), \"%s\", %s, %s);", 
+            code.add(String.format("yyValue = new _SyntaxTransformation%s(createSpan(yyStart,yyCount), \"%s\", %s, %s);",
                                    type, name, BOUND_VARIABLES, parameters));
             indents.add(3);
@@ -135 +135 @@
     }
 
-    private static String collectParameters( NamedTransformerDef def, 
-                                             List<String> code, 
+    private static String collectParameters( NamedTransformerDef def,
+                                             List<String> code,
                                              List<Integer> indents ){
         String variable = FreshName.getFreshName("parameterList");
-        code.add(String.format("java.util.List %s = new java.util.LinkedList<String>();", 
+        code.add(String.format("java.util.List %s = new java.util.LinkedList<String>();",
                                variable));
         indents.add(3);
         for ( NonterminalParameter parameter : def.getParameters() ){
-            code.add( String.format( "%s.add( \"%s\" );", 
-                                     variable, 
+            code.add( String.format( "%s.add( \"%s\" );",
+                                     variable,
                                      parameter.getName().getText() ) );
             indents.add(3);
@@ -165 +165 @@
         }
 
-        @Override 
+        @Override
         public void forNonterminalSymbol(NonterminalSymbol that) {
             Debug.debug( Debug.Type.SYNTAX, 3,
@@ -227 +227 @@
                         @Override
                         public CharRange forCharacterInterval(CharacterInterval that) {
-                            if (that.getBegin().length() != 1) {
-                                new MacroError(mess +that.getBegin());
+                            if (that.getBeginSymbol().length() != 1) {
+                                new MacroError(mess +that.getBeginSymbol());
                             }
-                            if (that.getEnd().length() != 1) {
-                                new MacroError(mess+that.getEnd());
+                            if (that.getEndSymbol().length() != 1) {
+                                new MacroError(mess+that.getEndSymbol());
                             }
-                            return new CharRange(that.getBegin().charAt(0), that.getEnd().charAt(0));
+                            return new CharRange(that.getBeginSymbol().charAt(0), that.getEndSymbol().charAt(0));
                         }
 
@@ -418 +418 @@
                 String varName = prefixJavaVariable(varId.getText());
                 String baseFortressType = inner.gapEnv.getJavaType(varId);
-                String fullType = varMap.get(varId).getType(baseFortressType); 
+                String fullType = varMap.get(varId).getType(baseFortressType);
                 indents2.add(1);
                 code2.add(modifier.unpackDecl(fullType, varName, packedName, index));
@@ -451 +451 @@
         }
         public String unpackDecl(String fullType, String varName, String packedName, int index) {
-            return String.format("List<%s> %s = com.sun.fortress.syntax_abstractions.util.ArrayUnpacker.<%s>unpack(%s, %d);", 
+            return String.format("List<%s> %s = com.sun.fortress.syntax_abstractions.util.ArrayUnpacker.<%s>unpack(%s, %d);",
                                  fullType, varName, fullType, packedName, index);
         }
@@ -473 +473 @@
          */
         public String unpackDecl(String fullType, String varName, String packedName, int index) {
-            return String.format("%s %s = (%s)(%s == null ? null : %s[%d]);", 
-                                 fullType, varName, fullType, 
+            return String.format("%s %s = (%s)(%s == null ? null : %s[%d]);",
+                                 fullType, varName, fullType,
                                  packedName, packedName, index);
         }
@@ -565 +565 @@
 
             indents.add(3);
-            code.add(String.format("%s.put(\"%s\", new Level(NodeFactory.makeSpan(\"blame ComposingSyntaxDefTranslater\"), %d, %s));", 
-                                   BOUND_VARIABLES, 
-                                   var, 
-                                   levelDepth, 
+            code.add(String.format("%s.put(\"%s\", new Level(NodeFactory.makeSpan(\"blame ComposingSyntaxDefTranslater\"), %d, %s));",
+                                   BOUND_VARIABLES,
+                                   var,
+                                   levelDepth,
                                    prefixJavaVariable(resultVar)));
         }
@@ -583 +583 @@
     }
 
-    private static String convertToStringLiteralExpr(String id, List<String> code, 
+    private static String convertToStringLiteralExpr(String id, List<String> code,
                                                      List<Integer> indents) {
         String name = FreshName.getFreshName("stringLiteral");
         indents.add(3);
-        code.add("StringLiteralExpr " + prefixJavaVariable(name) + 
+        code.add("StringLiteralExpr " + prefixJavaVariable(name) +
                  " = new StringLiteralExpr(NodeFactory.makeSpan(\"blame ComposingSyntaxDefTranslater\"), \"\"+" + prefixJavaVariable(id) + ");");
         return name;

trunk/ProjectFortress/src/com/sun/fortress/syntax_abstractions/phases/EscapeRewriter.java

@@ -87 +87 @@
                 public List<CharacterSymbol> forCharacterInterval(CharacterInterval that) {
                     List<CharacterSymbol> head = new LinkedList<CharacterSymbol>();
-                    String begin = removeLeadingEscape(that.getBegin(), head);
+                    String begin = removeLeadingEscape(that.getBeginSymbol(), head);
                     List<CharacterSymbol> tail = new LinkedList<CharacterSymbol>();
-                    String end = removeTrailingEscape(that.getSpan(), that.getEnd(), tail);
+                    String end = removeTrailingEscape(that.getSpan(), that.getEndSymbol(), tail);
                     head.add(new CharacterInterval(that.getSpan(), begin, end));
                     head.addAll(tail);

trunk/ProjectFortress/src/com/sun/fortress/syntax_abstractions/phases/ExtensionDesugarer.java

@@ -144 +144 @@
         // Recombine into GrammarDef
         GrammarDef result =
-            new GrammarDef(grammar.getSpan(), grammar.getName(), grammar.getExtends(),
-                           newMembers, grammar.getTransformers(), grammar.isNative());
+            new GrammarDef(grammar.getSpan(), grammar.getName(), grammar.getExtendsClause(),
+                           newMembers, grammar.getTransformers(), grammar.isNativeDef());
         Debug.debug(Debug.Type.SYNTAX, 3,
                     "Desugared grammar into:\n" + result.accept(new FortressAstToConcrete()));
@@ -233 +233 @@
                 } else if (decl instanceof SuperSyntaxDef) {
                     SuperSyntaxDef ssd = (SuperSyntaxDef) decl;
-                    Id superGrammarName = ssd.getGrammar();
+                    Id superGrammarName = ssd.getGrammarId();
                     if (availableGrammarNames.contains(superGrammarName)) {
                         availableGrammarNames.remove(superGrammarName);
@@ -246 +246 @@
                         throw new MacroError(decl,
                                              "No extensions of " + name + 
-                                             " in grammar " + ssd.getGrammar());
+                                             " in grammar " + ssd.getGrammarId());
                     }
                 }

trunk/ProjectFortress/src/com/sun/fortress/syntax_abstractions/phases/GrammarRewriter.java

@@ -162 +162 @@
                 GrammarDef og = e.getValue().ast();
                 List<GrammarIndex> ls = new LinkedList<GrammarIndex>();
-                for (Id n: og.getExtends()) {
+                for (Id n: og.getExtendsClause()) {
                     ls.add(grammars.get(n.getText()));
                 }

trunk/ProjectFortress/src/com/sun/fortress/syntax_abstractions/phases/TemplateParser.java

@@ -62 +62 @@
         return (Api) raw.accept(new NodeUpdateVisitor() {
                 @Override public Node forGrammarDef(GrammarDef that) {
-                    if (!that.isNative()){
+                    if (!that.isNativeDef()){
                         final Class<?> parser = createParser(findGrammar(that));
                         return that.accept(new NodeUpdateVisitor() {

trunk/ProjectFortress/src/com/sun/fortress/syntax_abstractions/phases/Transform.java

@@ -271 +271 @@
             List<Param> params_result = Useful.applyToAll(that.getParams(), renameParam);
             Option<Type> returnType_result = recurOnOptionOfType(that.getReturnType());
-            Option<WhereClause> where_result = recurOnOptionOfWhereClause(that.getWhere());
+            Option<WhereClause> where_result = recurOnOptionOfWhereClause(that.getWhereClause());
             Option<List<BaseType>> throwsClause_result = recurOnOptionOfListOfBaseType(that.getThrowsClause());
             Expr body_result = (Expr) recur(that.getBody());

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

@@ -413 +413 @@
             List<String> staticParams_result = recurOnListOfStaticParam(that.getStaticParams());
             List<String> extendsClause_result = recurOnListOfTraitTypeWhere(that.getExtendsClause());
-            Option<String> where_result = recurOnOptionOfWhereClause(that.getWhere());
-            List<String> excludes_result = recurOnListOfBaseType(that.getExcludes());
-            Option<List<String>> comprises_result = recurOnOptionOfListOfBaseType(that.getComprises());
+            Option<String> where_result = recurOnOptionOfWhereClause(that.getWhereClause());
+            List<String> excludes_result = recurOnListOfBaseType(that.getExcludesClause());
+            Option<List<String>> comprises_result = recurOnOptionOfListOfBaseType(that.getComprisesClause());
             List<String> decls_result = myRecurOnListOfDecl(that.getDecls());
             return forTraitDeclOnly(that, mods_result, name_result,
@@ -477 +477 @@
             List<String> staticParams_result = recurOnListOfStaticParam(that.getStaticParams());
             List<String> extendsClause_result = recurOnListOfTraitTypeWhere(that.getExtendsClause());
-            Option<String> where_result = recurOnOptionOfWhereClause(that.getWhere());
+            Option<String> where_result = recurOnOptionOfWhereClause(that.getWhereClause());
             Option<List<String>> params_result = recurOnOptionOfListOfParam(that.getParams());
             Option<List<String>> throwsClause_result = recurOnOptionOfListOfBaseType(that.getThrowsClause());
@@ -793 +793 @@
         StringBuilder s = new StringBuilder();
 
-        if ( that.isNative() ){
+        if ( that.isNativeDef() ){
             s.append( "native " );
         }
@@ -1065 +1065 @@
 
     @Override public String forCharacterIntervalOnly(CharacterInterval that) {
-        return that.getBegin() + ":" + that.getEnd();
+        return that.getBeginSymbol() + ":" + that.getEndSymbol();
     }