Changeset d939274 for src

Timestamp:

Jun 2, 2015, 1:59:11 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

4eb1db6

Parents:

b2152e7a

Message:

documentation, reformatting, operator+ for iterators

Location:

src

Files:

• CodeGen/CodeGenerator.cc (modified) (1 diff)
• CodeGen/CodeGenerator.h (modified) (1 diff)
• Common/utility.h (modified) (2 diffs)
• ControlStruct/MLEMutator.cc (modified) (7 diffs)
• SynTree/Mutator.h (modified) (2 diffs)
• SynTree/ObjectDecl.cc (modified) (2 diffs)

src/CodeGen/CodeGenerator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Tue Jun 02 13:25:22 2015
-// Update Count     : 118
+// Last Modified On : Tue Jun 02 13:45:20 2015
+// Update Count     : 119
 //
 

src/CodeGen/CodeGenerator.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Tue Jun 02 13:25:09 2015
-// Update Count     : 12
+// Last Modified On : Tue Jun 02 13:43:29 2015
+// Update Count     : 14
 //
 

src/Common/utility.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 19 15:34:57 2015
-// Update Count     : 3
+// Last Modified By : Rob Schluntz
+// Last Modified On : Fri May 29 16:17:02 2015
+// Update Count     : 7
 //
 
@@ -198 +198 @@
 }
 
+// it's nice to actually be able to increment iterators by an arbitrary amount
+template< typename Iterator >
+Iterator operator+(Iterator i, int inc) {
+        while ( inc > 0 ) {
+                ++i;
+                --inc;
+        }
+        return i;
+}
+
 #endif // _UTILITY_H
 

src/ControlStruct/MLEMutator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Tue Jun 02 13:35:49 2015
-// Update Count     : 91
+// Last Modified On : Tue Jun 02 13:43:01 2015
+// Update Count     : 92
 //
 
@@ -33 +33 @@
                 } // if
 
+                // a child statement may set the break label
+                // - if they do, attach it to the next statement
                 std::list< Statement * > &kids = cmpndStmt->get_kids();
                 for ( std::list< Statement * >::iterator k = kids.begin(); k != kids.end(); k++ ) {
@@ -38 +40 @@
 
                         if ( ! get_breakLabel().empty() ) {
-                                std::list< Statement * >::iterator next = k; next++;
+                                std::list< Statement * >::iterator next = k+1;
                                 if ( next == kids.end() ) {
                                         std::list<Label> ls; ls.push_back( get_breakLabel() );
@@ -58 +60 @@
                 } // if
 
-                //mutateAll( cmpndStmt->get_kids(), *this );
                 return cmpndStmt;
         }
@@ -76 +77 @@
         Statement *MLEMutator::mutate( ForStmt *forStmt ) {
                 enclosingLoops.push_back( Entry( forStmt ) );
-                maybeMutate( forStmt->get_body(), *this );
+                forStmt->set_body( maybeMutate( forStmt->get_body(), *this ) );
 
                 Entry &e = enclosingLoops.back();
@@ -185 +186 @@
 
         Statement *MLEMutator::mutateLoop( Statement *bodyLoop, Entry &e ) {
+                // ensure loop body is a block
                 CompoundStmt *newBody;
                 if ( ! (newBody = dynamic_cast<CompoundStmt *>( bodyLoop )) ) {
@@ -216 +218 @@
         }
 
-        //*** Entry's methods
+        //*** Entry's methods - ensure these labels can be set at most once
         void MLEMutator::Entry::set_contExit( Label l ) {
                 assert ( contExit == "" || contExit == l );

src/SynTree/Mutator.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon May 18 10:12:28 2015
-// Update Count     : 3
+// Last Modified By : Rob Schluntz
+// Last Modified On : Fri May 29 16:34:08 2015
+// Update Count     : 4
 //
 #include <cassert>
@@ -104 +104 @@
                 assert( newnode );
                 return newnode;
-///         return tree->acceptMutator( mutator );
         } else {
                 return 0;

src/SynTree/ObjectDecl.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 : Mon May 18 10:14:18 2015
-// Update Count     : 2
+// Last Modified By : Rob Schluntz
+// Last Modified On : Thu May 28 14:10:02 2015
+// Update Count     : 8
 //
 
@@ -65 +65 @@
 
 void ObjectDecl::printShort( std::ostream &os, int indent ) const {
+#if 0
+        if ( get_mangleName() != "") {
+                os << get_mangleName() << ": a "; 
+        } else 
+#endif
         if ( get_name() != "" ) {
                 os << get_name() << ": a ";