Changeset 8e4aa05 for src/main.cc

Timestamp:

Mar 4, 2021, 7:40:25 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

77d601f

Parents:

342af53 (diff), a5040fe (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) (7 diffs)

src/main.cc

@@ -10 +10 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Mon Dec  7 15:29:00 2020
-// Update Count     : 639
+// 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
@@ -492 +492 @@
 
 static const char * description[] = {
-        "diagnostic color: never, always, or auto.",            // -c
+        "diagnostic color: never, always, auto",                        // -c
         "wait for gdb to attach",                                                       // -g
-        "print help message",                                                           // -h
+        "print translator help message",                                        // -h
         "generate libcfa.c",                                                            // -l
         "generate line marks",                                                          // -L
@@ -500 +500 @@
         "do not generate line marks",                                           // -N
         "do not read prelude",                                                          // -n
-        "generate prototypes for prelude functions",            // -p
+        "do not generate prelude prototypes => prelude not printed", // -p
         "only print deterministic output",                  // -d
         "Use the old-ast",                                                                      // -O
@@ -506 +506 @@
         "print",                                                                                        // -P
         "<directory> prelude directory for debug/nodebug",      // no flag
-        "<option-list> enable profiling information:\n          counters,heap,time,all,none", // -S
+        "<option-list> enable profiling information: counters, heap, time, all, none", // -S
         "building cfa standard lib",                                            // -t
         "",                                                                                                     // -w
@@ -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 //