Merge branch 'charm' of charmgit:charm into charm
authorAaron Becker <akbecker@gmail.com>
Tue, 1 Jun 2010 07:27:50 +0000 (02:27 -0500)
committerAaron Becker <akbecker@gmail.com>
Tue, 1 Jun 2010 07:27:50 +0000 (02:27 -0500)
Conflicts:
src/langs/charj/src/charj/translator/CharjEmitter.g

1  2 
src/langs/charj/src/charj/translator/Charj.g
src/langs/charj/src/charj/translator/Charj.stg
src/langs/charj/src/charj/translator/CharjASTModifier.g
src/langs/charj/src/charj/translator/CharjEmitter.g
src/langs/charj/src/charj/translator/CharjSemantics.g

index 5bde6d6fd0b0cab1fcd3c09a264727bc314c2215,f2696c166b159c3eda4753b8ca0fa4beaeee4bab..12476d031b2771e4d8b5c4c64e877e2def80ef49
@@@ -63,9 -61,10 +61,10 @@@ importDeclarations returns [List<CharjA
  typeDeclaration[List<CharjAST> imports] returns [ClassSymbol sym]
      :   ^(TYPE (CLASS | chareType) IDENT (^('extends' parent=type))? (^('implements' type+))? classScopeDeclaration*)
          {
-             $TYPE.tree.addChild(puper.getPupRoutineNode());
-             $TYPE.tree.addChild(puper.getInitRoutineNode());
-             puper = new PupRoutineCreator();
+             $TYPE.tree.addChild(astmod.getPupRoutineNode());
+             $TYPE.tree.addChild(astmod.getInitRoutineNode());
 -            
+             astmod.ensureDefaultCtor($TYPE.tree);
++            astmod = new AstModifier();
          }
      |   ^(INTERFACE IDENT (^('extends' type+))?  interfaceScopeDeclaration*)
      |   ^(ENUM IDENT (^('implements' type+))? enumConstant+ classScopeDeclaration*)