Changes in src/main.cc [626dbc10:375a068]

File:

• src/main.cc (modified) (8 diffs)

src/main.cc

@@ -69 +69 @@
         symtabp = false,
         treep = false,
-        tuplep = false,
         validp = false,
         errorp = false,
@@ -268 +267 @@
                 Tuples::expandUniqueExpr( translationUnit );
 
-                OPTPRINT( "convertSpecializations" ) // needs to happen before tuple types are expanded
-                GenPoly::convertSpecializations( translationUnit );
-
-                OPTPRINT( "expandTuples" ); // xxx - is this the right place for this?
-                Tuples::expandTuples( translationUnit );
-                if ( tuplep ) {
-                        dump( translationUnit );
-                        return 0;
-                }
-
                 OPTPRINT("instantiateGenerics")
                 GenPoly::instantiateGeneric( translationUnit );
                 OPTPRINT( "copyParams" );
                 GenPoly::copyParams( translationUnit );
+                OPTPRINT( "convertSpecializations" )
+                GenPoly::convertSpecializations( translationUnit );
                 OPTPRINT( "convertLvalue" )
                 GenPoly::convertLvalue( translationUnit );
@@ -291 +282 @@
                 OPTPRINT( "box" )
                 GenPoly::box( translationUnit );
+                OPTPRINT( "expandTuples" ); // xxx - is this the right place for this?
+                Tuples::expandTuples( translationUnit );
 
                 // print tree right before code generation
@@ -334 +327 @@
 
 void parse_cmdline( int argc, char * argv[], const char *& filename ) {
-        enum { Ast, Bbox, Bresolver, CtorInitFix, Expr, ExprAlt, Grammar, LibCFA, Nopreamble, Parse, Prototypes, Resolver, Symbol, Tree, TupleExpansion, Validate, };
+        enum { Ast, Bbox, Bresolver, CtorInitFix, Expr, ExprAlt, Grammar, LibCFA, Nopreamble, Parse, Prototypes, Resolver, Symbol, Tree, Validate, };
 
         static struct option long_opts[] = {
@@ -351 +344 @@
                 { "symbol", no_argument, 0, Symbol },
                 { "tree", no_argument, 0, Tree },
-                { "tuple-expansion", no_argument, 0, TupleExpansion },
                 { "validate", no_argument, 0, Validate },
                 { 0, 0, 0, 0 }
@@ -360 +352 @@
 
         int c;
-        while ( (c = getopt_long( argc, argv, "abBcefglnpqrstTvyzD:F:", long_opts, &long_index )) != -1 ) {
+        while ( (c = getopt_long( argc, argv, "abBcefglnpqrstvyzD:F:", long_opts, &long_index )) != -1 ) {
                 switch ( c ) {
                   case Ast:
@@ -370 +362 @@
                         bresolvep = true;
                         break;
-                  case 'B':                                                                             // print before box steps
+                  case 'B':                                                                             // print before resolver steps
                         bboxp = true;
                         break;
@@ -416 +408 @@
                   case 't':                                                                             // build in tree
                         treep = true;
-                        break;
-                  case TupleExpansion:
-                  case 'T':                                                                             // print after tuple expansion
-                        tuplep = true;
                         break;
                   case 'v':                                                                             // dump AST after decl validation pass