Fix factories in Frog to correspond to the new syntax.

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
 
 class Node:
@@ skipping 80 matching lines @@
 
 class Definition(Node): pass
 
 class TypeReference(Node): pass
 
 nodes = [
   Definition('Directive', 'Identifier name, List<ArgumentNode> arguments'),
 
   Definition('Type',
     'bool isClass, Identifier name, List<ParameterType> typeParameters, '+
-    'List<TypeReference> extendsTypes, List<TypeReference> implementsTypes,'+
-    'NativeType nativeType, TypeReference factoryType, List<Statement> body'),
+    'List<TypeReference> extendsTypes, List<TypeReference> implementsTypes, '+
+    'NativeType nativeType, DefaultTypeReference defaultType, '+
+    'List<Statement> body'),
 
   Definition('FunctionType',
     'FunctionDefinition func, List<ParameterType> typeParameters'),
 
   Definition('Variable',
     'List<Token> modifiers, TypeReference type, List<Identifier> names,' +
     'List<Expression> values'),
 
   Definition('Function',
     'List<Token> modifiers, TypeReference returnType, Identifier name,' +
-    'List<FormalNode> formals, List<ParameterType> typeParameters,' +
-    'List<Expression> initializers, String nativeBody, Statement body'),
+    'List<FormalNode> formals, List<Expression> initializers, ' +
+    'String nativeBody, Statement body'),
 
   Statement('Return', 'Expression value'),
   Statement('Throw', 'Expression value'),
   Statement('Assert', 'Expression test'),
 
   Statement('Break', 'Identifier label'),
   Statement('Continue', 'Identifier label'),
 
   Statement('If',
     'Expression test, Statement trueBranch, Statement falseBranch'),
@@ skipping 51 matching lines @@
   Expression('Literal', 'var value, TypeReference type, String text'),
 
   # TODO(jimhug): Split into Simple and Qualified names
   TypeReference('Name',
     'bool isFinal, Identifier name, List<Identifier> names'),
 
   TypeReference('Generic',
     'TypeReference baseType, List<TypeReference> typeArguments, int depth'),
   TypeReference('Function',
     'bool isFinal, FunctionDefinition func'),
+  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'),
   Node('Case',
     'Identifier label, List<Expression> cases, List<Statement> statements'),
@@ skipping 33 matching lines @@
   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()