Changeset d67cdb7 for src/CodeGen/CodeGenerator.cc

Timestamp:

Sep 26, 2017, 11:27:38 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

5dc26f5

Parents:

201aeb9

Message:

merge

File:

• src/CodeGen/CodeGenerator.cc (modified) (10 diffs)

src/CodeGen/CodeGenerator.cc

@@ -443 +443 @@
         void CodeGenerator::postvisit( UntypedExpr * untypedExpr ) {
                 extension( untypedExpr );
-                if ( NameExpr * nameExpr = dynamic_cast< NameExpr* >( untypedExpr->get_function() ) ) {
+                if ( NameExpr * nameExpr = dynamic_cast< NameExpr* >( untypedExpr->function ) ) {
                         OperatorInfo opInfo;
-                        if ( operatorLookup( nameExpr->get_name(), opInfo ) ) {
-                                std::list< Expression* >::iterator arg = untypedExpr->get_args().begin();
+                        if ( operatorLookup( nameExpr->name, opInfo ) ) {
+                                std::list< Expression* >::iterator arg = untypedExpr->args.begin();
                                 switch ( opInfo.type ) {
                                   case OT_INDEX:
-                                        assert( untypedExpr->get_args().size() == 2 );
+                                        assert( untypedExpr->args.size() == 2 );
                                         (*arg++)->accept( *visitor );
                                         output << "[";
@@ -461 +461 @@
                                   case OT_CTOR:
                                   case OT_DTOR:
-                                        if ( untypedExpr->get_args().size() == 1 ) {
+                                        if ( untypedExpr->args.size() == 1 ) {
                                                 // the expression fed into a single parameter constructor or destructor may contain side
                                                 // effects, so must still output this expression
@@ -480 +480 @@
                                                 (*arg++)->accept( *visitor );
                                                 output << opInfo.symbol << "{ ";
-                                                genCommaList( arg, untypedExpr->get_args().end() );
+                                                genCommaList( arg, untypedExpr->args.end() );
                                                 output << "}) /* " << opInfo.inputName << " */";
                                         } // if
@@ -488 +488 @@
                                   case OT_PREFIXASSIGN:
                                   case OT_LABELADDRESS:
-                                        assert( untypedExpr->get_args().size() == 1 );
+                                        assert( untypedExpr->args.size() == 1 );
                                         output << "(";
                                         output << opInfo.symbol;
@@ -497 +497 @@
                                   case OT_POSTFIX:
                                   case OT_POSTFIXASSIGN:
-                                        assert( untypedExpr->get_args().size() == 1 );
+                                        assert( untypedExpr->args.size() == 1 );
                                         (*arg)->accept( *visitor );
                                         output << opInfo.symbol;
@@ -504 +504 @@
                                   case OT_INFIX:
                                   case OT_INFIXASSIGN:
-                                        assert( untypedExpr->get_args().size() == 2 );
+                                        assert( untypedExpr->args.size() == 2 );
                                         output << "(";
                                         (*arg++)->accept( *visitor );
@@ -517 +517 @@
                                 } // switch
                         } else {
-                                if ( nameExpr->get_name() == "..." ) { // case V1 ... V2 or case V1~V2
-                                        assert( untypedExpr->get_args().size() == 2 );
-                                        (*untypedExpr->get_args().begin())->accept( *visitor );
-                                        output << " ... ";
-                                        (*--untypedExpr->get_args().end())->accept( *visitor );
-                                } else {                                                                // builtin routines
-                                        nameExpr->accept( *visitor );
-                                        output << "(";
-                                        genCommaList( untypedExpr->get_args().begin(), untypedExpr->get_args().end() );
-                                        output << ")";
-                                } // if
+                                // builtin routines
+                                nameExpr->accept( *visitor );
+                                output << "(";
+                                genCommaList( untypedExpr->args.begin(), untypedExpr->args.end() );
+                                output << ")";
                         } // if
                 } else {
-                        untypedExpr->get_function()->accept( *visitor );
+                        untypedExpr->function->accept( *visitor );
                         output << "(";
-                        genCommaList( untypedExpr->get_args().begin(), untypedExpr->get_args().end() );
+                        genCommaList( untypedExpr->args.begin(), untypedExpr->args.end() );
                         output << ")";
                 } // if
@@ -538 +532 @@
 
         void CodeGenerator::postvisit( RangeExpr * rangeExpr ) {
-                rangeExpr->get_low()->accept( *visitor );
+                rangeExpr->low->accept( *visitor );
                 output << " ... ";
-                rangeExpr->get_high()->accept( *visitor );
+                rangeExpr->high->accept( *visitor );
         }
 
@@ -885 +879 @@
 
         void CodeGenerator::postvisit( CaseStmt * caseStmt ) {
+                updateLocation( caseStmt );
+                output << indent;
                 if ( caseStmt->isDefault()) {
                         output << "default";
@@ -1026 +1022 @@
 } // namespace CodeGen
 
+std::ostream & operator<<( std::ostream & out, const BaseSyntaxNode * node ) {
+        if ( node ) {
+                node->print( out );
+        } else {
+                out << "nullptr";
+        }
+        return out;
+}
+
 // Local Variables: //
 // tab-width: 4 //