Changes in / [7d94d805:86c934a]

Location:

src

Files:

• GenPoly/Lvalue.cc (modified) (1 diff)
• main.cc (modified) (5 diffs)

src/GenPoly/Lvalue.cc

@@ -465 +465 @@
                                         return ret;
                                 }
+                        } else if ( CastExpr * castExpr = dynamic_cast< CastExpr * > ( arg ) ) {
+                                // need to move cast to pointer type out a level since address of pointer
+                                // is not valid C code (can be introduced in prior passes, e.g., InstantiateGeneric)
+                                if ( InitTweak::getPointerBase( castExpr->result ) ) {
+                                        addrExpr->arg = castExpr->arg;
+                                        castExpr->arg = addrExpr;
+                                        castExpr->result = new PointerType( Type::Qualifiers(), castExpr->result );
+                                        return castExpr;
+                                }
                         }
                         return addrExpr;

src/main.cc

@@ -80 +80 @@
         exprp = false,
         expraltp = false,
+        genericsp = false,
         libcfap = false,
         nopreludep = false,
@@ -320 +321 @@
                 OPTPRINT("instantiateGenerics")
                 GenPoly::instantiateGeneric( translationUnit );
+                if ( genericsp ) {
+                        dump( translationUnit );
+                        return 0;
+                }
                 OPTPRINT( "convertLvalue" )
                 GenPoly::convertLvalue( translationUnit );
 
+
                 if ( bboxp ) {
                         dump( translationUnit );
@@ -340 +346 @@
 
                 CodeTools::fillLocations( translationUnit );
+                OPTPRINT( "codegen" )
                 CodeGen::generate( translationUnit, *output, ! noprotop, prettycodegenp, true, linemarks );
 
                 CodeGen::FixMain::fix( *output, treep ? "../prelude/bootloader.c" : CFA_LIBDIR "/bootloader.c" );
+                OPTPRINT( "end" )
 
                 if ( output != &cout ) {
@@ -407 +415 @@
 
         int c;
-        while ( (c = getopt_long( argc, argv, "abBcCdefglLmnNpqrstTvyzZD:F:", long_opts, &long_index )) != -1 ) {
+        while ( (c = getopt_long( argc, argv, "abBcCdefgGlLmnNpqrstTvyzZD:F:", long_opts, &long_index )) != -1 ) {
                 switch ( c ) {
                   case Ast:
@@ -442 +450 @@
                   case 'g':                                                                             // bison debugging info (grammar rules)
                         yydebug = true;
+                        break;
+                  case 'G':                   // dump AST after instantiate generics
+                        genericsp = true;
                         break;
                   case LibCFA: