Lots of frog cleanup

frog/scripts/tree_gen.py

 #!/usr/bin/env python
 # Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 '''Generates the many subtypes of Node as well as a NodeVisitor into
    tree.g.dart.'''
 
 from codegen import CodeWriter
 
@@ skipping 162 matching lines @@
   Expression('Var', 'Identifier name'),
 
   Expression('This'),
   Expression('Super'),
 
   Expression('Literal', 'Value value'),
 
   Expression('StringInterp', 'List<Expression> pieces'),
 
   # TODO(jimhug): Split into Simple and Qualified names
+  TypeReference('Simple', 'Type type'),
   TypeReference('Name',
     'bool isFinal, Identifier name, List<Identifier> names'),
 
   TypeReference('Generic',
     'TypeReference baseType, List<TypeReference> typeArguments, int depth'),
   TypeReference('Function',
     'bool isFinal, FunctionDefinition func'),
+  # TODO(jimhug): This shouldn't be a subtype of TypeReference.
   TypeReference('Default', 'bool oldFactory, NameTypeReference baseType, '+
     'List<ParameterType> typeParameters'),
 
   Node('Argument', 'Identifier label, Expression value'),
   Node('Formal',
     'bool isThis,  bool isRest, TypeReference type, Identifier name,'+
     'Expression value'),
 
   Node('Catch',
     'DeclaredIdentifier exception, DeclaredIdentifier trace, Statement body'),
@@ skipping 10 matching lines @@
   Expression('DeclaredIdentifier!', 'TypeReference type, Identifier name'),
 ]
 
 def main():
   cw = CodeWriter(__file__)
 
   for node in nodes:
     node.write(cw)
     cw.writeln()
 
-  # TypeReference is a bit special: it's a base type, but we also create it
-  # directly. Add it to nodes after we've generated the nodes.
-  nodes.append(TypeReference('', 'Type type'))
-
   cw.writeln()
   cw.enterBlock('interface TreeVisitor {')
   for node in nodes:
     node.writeVisitInterfaceMethod(cw)
     cw.writeln()
 
   cw.exitBlock('}')
 
   cw.writeln()
   cw.enterBlock('class TreePrinter implements TreeVisitor {')
 
   cw.writeln('var output;')
   cw.writeln('TreePrinter(this.output) { output.printer = this; }')
   for node in nodes:
     node.writePrettyPrintMethod(cw)
     cw.writeln()
   cw.exitBlock('}')
 
   cw.writeToFile('tree')
 
 if __name__ == '__main__': main()