Changeset 72ae87c

Timestamp:

Oct 2, 2017, 11:55:30 AM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

617b4b2

Parents:

b8116cd (diff), f802e46 (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

Location:

src

Files:

• Parser/ExpressionNode.cc (modified) (2 diffs)
• tests/.expect/64/literals.txt (modified) (1 diff)
• tests/coroutine.c (modified) (4 diffs)
• tests/gmp.c (modified) (2 diffs)

src/Parser/ExpressionNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 13:17:07 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Sep 26 11:23:36 2017
-// Update Count     : 780
+// Last Modified On : Wed Sep 27 22:51:55 2017
+// Update Count     : 781
 //
 
@@ -207 +207 @@
 
         assert( 0 <= size && size < 6 );
+        // Constant type is correct for overload resolving.
         ret = new ConstantExpr( Constant( new BasicType( noQualifiers, kind[Unsigned][size] ), str, v ) );
-        if ( size < 2 ) {                                                                       // hh or h, less than int ?
+        if ( Unsigned && size < 2 ) {                                           // hh or h, less than int ?
                 // int i = -1uh => 65535 not -1, so cast is necessary for unsigned, which unfortunately eliminates warnings for large values.
                 ret = new CastExpr( ret, new BasicType( Type::Qualifiers(), kind[Unsigned][size] ) );

src/tests/.expect/64/literals.txt

@@ -1252 +1252 @@
     ((void)(-((long double )0x.0123456789p09)));
     ((void)__f__F_c__1('a'));
-    ((void)__f__F_Sc__1(((signed char )20)));
+    ((void)__f__F_Sc__1(20));
     ((void)__f__F_Uc__1(((unsigned char )21u)));
-    ((void)__f__F_s__1(((signed short int )22)));
+    ((void)__f__F_s__1(22));
     ((void)__f__F_Us__1(((unsigned short int )23u)));
     ((void)__f__F_Ul__1(((unsigned long int )24)));

src/tests/coroutine.c

@@ -10 +10 @@
 // Created On       : Thu Jun  8 07:29:37 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jun  8 07:37:12 2017
-// Update Count     : 5
+// Last Modified On : Sun Sep 17 21:38:15 2017
+// Update Count     : 7
 //
 
@@ -18 +18 @@
 
 coroutine Fibonacci {
-        int fn;                                         // used for communication
+        int fn;                                                                                         // used for communication
 };
 
@@ -26 +26 @@
 
 void main( Fibonacci & this ) {
-        int fn1, fn2;                                   // retained between resumes
-        this.fn = 0;                                    // case 0
+        int fn1, fn2;                                                                           // retained between resumes
+        this.fn = 0;                                                                            // case 0
         fn1 = this.fn;
-        suspend();                                              // return to last resume
+        suspend();                                                                                      // restart last resume
 
-        this.fn = 1;                                    // case 1
-        fn2 = fn1;
-        fn1 = this.fn;
-        suspend();                                              // return to last resume
+        this.fn = 1;                                                                            // case 1
+        fn2 = fn1;  fn1 = this.fn;
+        suspend();                                                                                      // restart last resume
 
-        for ( ;; ) {                                    // general case
+        for ( ;; ) {                                                                            // general case
                 this.fn = fn1 + fn2;
-                fn2 = fn1;
-                fn1 = this.fn;
-                suspend();                                      // return to last resume
+                fn2 = fn1;  fn1 = this.fn;
+                suspend();                                                                              // restart last resume
         } // for
 }
 
 int next( Fibonacci & this ) {
-        resume( this );                                 // transfer to last suspend
+        resume( this );                                                                         // restart last suspend
         return this.fn;
 }
@@ -52 +50 @@
         Fibonacci f1, f2;
         for ( int i = 1; i <= 10; i += 1 ) {
-                sout | next( f1 ) | ' ' | next( f2 ) | endl;
+                sout | next( f1 ) | next( f2 ) | endl;
         } // for
 }

src/tests/gmp.c

@@ -10 +10 @@
 // Created On       : Tue Apr 19 08:55:51 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Sep  4 09:51:18 2017
-// Update Count     : 550
+// Last Modified On : Thu Sep 28 18:33:51 2017
+// Update Count     : 555
 // 
 
@@ -97 +97 @@
 
         sout | "Factorial Numbers" | endl;
-        Int fact;
-        fact = 1;                                                                                       // 1st case
+        Int fact = 1;                                                                           // 1st case
         sout | (int)0 | fact | endl;
         for ( unsigned int i = 1; i <= 40; i += 1 ) {