Changeset 7cde04e

Timestamp:

Feb 20, 2021, 10:41:37 PM (3 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

Files:

• src/main.cc (modified) (4 diffs)
• tests/.expect/mathX.nast.arm64.txt (modified) (1 diff)
• tests/.expect/mathX.nast.x86.txt (modified) (1 diff)

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 //

tests/.expect/mathX.nast.arm64.txt

@@ -1172 +1172 @@
 ceiling(9223372036854775808, 9223372036854775808) = 9223372036854775808, ceiling(9223372036854775810, 9223372036854775808) = 0, ceiling(9223372036854775806, 9223372036854775808) = 9223372036854775808
 
-floor:1. 1. 1.
-ceil:2. 2. 2.
-trunc:3. 3. 3.
-rint:2. 2. 2.
-rint:2 2 2
-rint:2 2 2
-lrint:2 2 2
-llrint:2 2 2
-nearbyint:4. 4. 4.
-round:2. 2. 2.
-round:2 2 2
-round:2 2 2
-lround:2 2 2
-llround:2 2 2
-copysign:-1. -1. -1.
-frexp:0.5 3 0.5 3 0.5 3
-ldexp:8. 8. 8.
-modf:2. 0.3 2. 0.3 2. 0.3
-modf:2., 0.3 2., 0.3 2., 0.3
-nextafter:2. 2. 2.
-nexttoward:2. 2. 2.
-scalbn:16. 16. 16.
-scalbln:16. 16. 16.

tests/.expect/mathX.nast.x86.txt

@@ -980 +980 @@
 ceiling(9223372036854775808, 9223372036854775808) = 9223372036854775808, ceiling(9223372036854775810, 9223372036854775808) = 0, ceiling(9223372036854775806, 9223372036854775808) = 9223372036854775808
 
-floor:1. 1. 1.
-ceil:2. 2. 2.
-trunc:3. 3. 3.
-rint:2. 2. 2.
-rint:2 2 2
-rint:2 2 2
-lrint:2 2 2
-llrint:2 2 2
-nearbyint:4. 4. 4.
-round:2. 2. 2.
-round:2 2 2
-round:2 2 2
-lround:2 2 2
-llround:2 2 2
-copysign:-1. -1. -1.
-frexp:0.5 3 0.5 3 0.5 3
-ldexp:8. 8. 8.
-modf:2. 0.3 2. 0.3 2. 0.3
-modf:2., 0.3 2., 0.3 2., 0.3
-nextafter:2. 2. 2.
-nexttoward:2. 2. 2.
-scalbn:16. 16. 16.
-scalbln:16. 16. 16.