Changeset 7cde04e for src

Timestamp:

Feb 20, 2021, 10:41:37 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

47e18f3, ee0fa3a

Parents:

6cb7a92 (diff), e499381 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

src/main.cc

@@ -9 +9 @@
 // Author           : Peter Buhr and Rob Schluntz
 // Created On       : Fri May 15 23:12:02 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Feb  8 21:10:16 2021
-// Update Count     : 642
+// Last Modified By : Andrew Beach
+// Last Modified On : Fri Feb 19 14:59:00 2021
+// Update Count     : 643
 //
 
@@ -104 +104 @@
 static void parse( FILE * input, LinkageSpec::Spec linkage, bool shouldExit = false );
 static void dump( list< Declaration * > & translationUnit, ostream & out = cout );
+static void dump( ast::TranslationUnit && transUnit, ostream & out = cout );
 
 static void backtrace( int start ) {                                    // skip first N stack frames
@@ -349 +350 @@
                         PASS( "Resolve", ResolvExpr::resolve( transUnit ) );
                         if ( exprp ) {
-                                translationUnit = convert( move( transUnit ) );
-                                dump( translationUnit );
+                                dump( move( transUnit ) );
                                 return EXIT_SUCCESS;
                         } // if
@@ -732 +732 @@
 } // dump
 
+static void dump( ast::TranslationUnit && transUnit, ostream & out ) {
+        std::list< Declaration * > translationUnit = convert( move( transUnit ) );
+        dump( translationUnit, out );
+}
+
 // Local Variables: //
 // tab-width: 4 //