Changeset 8a443f4 for src/CodeGen

Timestamp:

Aug 2, 2016, 6:40:27 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

73bf8cf2

Parents:

4d2434a (diff), becba789 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into ctor

Location:

src/CodeGen

Files:

• CodeGenerator.cc (modified) (17 diffs)
• CodeGenerator.h (modified) (2 diffs)

src/CodeGen/CodeGenerator.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jul 15 15:53:15 2016
-// Update Count     : 306
+// Last Modified By : 
+// Last Modified On : Sun Jul 31 08:42:18 2016
+// Update Count     : 345
 //
 
@@ -45 +45 @@
         bool wantSpacing( Statement * stmt) {
                 return dynamic_cast< IfStmt * >( stmt ) || dynamic_cast< CompoundStmt * >( stmt ) ||
-                        dynamic_cast< WhileStmt * >( stmt ) || dynamic_cast< ForStmt * > ( stmt ) || dynamic_cast< SwitchStmt *>( stmt );
+                        dynamic_cast< WhileStmt * >( stmt ) || dynamic_cast< ForStmt * >( stmt ) || dynamic_cast< SwitchStmt *>( stmt );
         }
 
@@ -83 +83 @@
         }
 
-        CodeGenerator::CodeGenerator( std::ostream &os ) : indent( *this), cur_indent( 0 ), insideFunction( false ), output( os ), printLabels( *this ) { }
+        CodeGenerator::CodeGenerator( std::ostream &os ) : indent( *this), cur_indent( 0 ), insideFunction( false ), output( os ), printLabels( *this ) {}
 
         CodeGenerator::CodeGenerator( std::ostream &os, std::string init, int indentation, bool infunp )
@@ -155 +155 @@
                         objectDecl->get_init()->accept( *this );
                 } // if
+
                 if ( objectDecl->get_bitfieldWidth() ) {
                         output << ":";
@@ -172 +173 @@
 
                         cur_indent += CodeGenerator::tabsize;
-                        for ( std::list< Declaration* >::iterator i = memb.begin(); i != memb.end();  i++) {
+                        for ( std::list< Declaration* >::iterator i = memb.begin(); i != memb.end(); i++ ) {
                                 output << indent;
                                 (*i)->accept( *this );
                                 output << ";" << endl;
-                        }
+                        } // for
 
                         cur_indent -= CodeGenerator::tabsize;
@@ -257 +258 @@
                                 (*iter)->accept( *this );
                                 output << "]";
-                        }
-                }
+                        } // if
+                } // for
                 output << " = ";
         }
@@ -317 +318 @@
                                         // do nothing
                                         ;
-                                }
+                                } // switch
 
                                 switch ( opInfo.type ) {
@@ -385 +386 @@
                                         // there are no intrinsic definitions of 0/1 or label addresses as functions
                                         assert( false );
-                                }
+                                } // switch
                         } else {
                                 varExpr->accept( *this );
@@ -417 +418 @@
                                   case OT_CALL:
                                         assert( false );
-
 
                                   case OT_CTOR:
@@ -437 +437 @@
                                                 // no constructors with 0 or more than 2 parameters
                                                 assert( false );
-                                        }
+                                        } // if
                                         break;
 
@@ -470 +470 @@
                                         // there are no intrinsic definitions of 0 or 1 as functions
                                         assert( false );
-                                }
+                                } // switch
                         } else {
-                                nameExpr->accept( *this );
-                                output << "(";
-                                genCommaList( untypedExpr->get_args().begin(), untypedExpr->get_args().end() );
-                                output << ")";
+                                if ( nameExpr->get_name() == "Range" ) { // case V1 ... V2 or case V1~V2
+                                        assert( untypedExpr->get_args().size() == 2 );
+                                        (*untypedExpr->get_args().begin())->accept( *this );
+                                        output << " ... ";
+                                        (*--untypedExpr->get_args().end())->accept( *this );
+                                } else {                                                                // builtin routines
+                                        nameExpr->accept( *this );
+                                        output << "(";
+                                        genCommaList( untypedExpr->get_args().begin(), untypedExpr->get_args().end() );
+                                        output << ")";
+                                } // if
                         } // if
                 } else {
@@ -521 +528 @@
                         // otherwise, the cast is to an lvalue type, so the cast should be dropped, since the result of a cast is
                         // never an lvalue in C
-                }
+                } // if
                 castExpr->get_arg()->accept( *this );
                 output << ")";
@@ -654 +661 @@
                         if ( wantSpacing( *i ) ) {
                                 output << endl;
-                        }
+                        } // if
                 }
                 cur_indent -= CodeGenerator::tabsize;
@@ -737 +744 @@
                         (*i)->accept( *this );
                         output << endl;
-                }
+                } // for
                 cur_indent -= CodeGenerator::tabsize;
         }
@@ -759 +766 @@
                         output << "continue";
                         break;
-                }
+                } // switch
                 output << ";";
         }
@@ -798 +805 @@
                 if ( forStmt->get_condition() != 0 ) {
                         forStmt->get_condition()->accept( *this );
-                }
+                } // if
                 output << ";";
 
@@ -805 +812 @@
                         Expression * expr = new CastExpr( forStmt->get_increment() );
                         expr->accept( *this );
-                }
+                } // if
                 output << ") ";
 

src/CodeGen/CodeGenerator.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jul  4 17:12:40 2016
-// Update Count     : 34
+// Last Modified On : Sat Jul 30 11:10:42 2016
+// Update Count     : 37
 //
 
@@ -118 +118 @@
                 void handleAggregate( AggregateDecl *aggDecl );
                 void handleTypedef( NamedTypeDecl *namedType );
-        };
+        }; // CodeGenerator
 
         template< class Iterator >