Changeset 32ce9b7 for tests/userLiterals.cfa

Timestamp:

Feb 19, 2020, 3:37:18 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

1d72a11

Parents:

4aac9ff (diff), e326ebca (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:

• tests/userLiterals.cfa (moved) (moved from tests/zombies/userLiterals.cfa) (6 diffs)

tests/userLiterals.cfa

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// user_literals.cfa --
+// userLiterals.cfa --
 //
 // Author           : Peter A. Buhr
 // Created On       : Wed Sep  6 21:40:50 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Dec  4 22:03:10 2018
-// Update Count     : 56
+// Last Modified On : Wed Feb 19 07:48:45 2020
+// Update Count     : 74
 //
 
@@ -24 +24 @@
 int ?`__thingy_( int x ) { sout | "_thingy_" | x; return x; }
 
-int ?`s( const char * s ) { sout | "secs" | s; return 0; }
-int ?`m( const char16_t * m ) { sout | "mins" | m; return 0;}
-int ?`h( const char32_t * h ) { sout | "hours" | h; return 0; }
+int ?`s( const char * s ) { sout | "s" | s; return 0; }
+int ?`m( const char16_t * m ) { sout | "m" | m; return 0;}
+int ?`h( const char32_t * h ) { sout | "h" | h; return 0; }
 int ?`_A_( const wchar_t * str ) { sout | "_A_" | str; return 0; }
 int ?`__thingy_( const char * str ) { sout | "_thingy_" | str; return 0; }
@@ -37 +37 @@
         return (Weight){ l.stones + r.stones };
 }
-ofstream & ?|?( ofstream & os, Weight w ) { return os | w.stones; }
+ofstream & ?|?( ofstream & os, Weight w ) { return os | wd(1,1, w.stones); }
+void ?|?( ofstream & os, Weight w ) { (ofstream)(os | w); ends( os ); }
 
 Weight ?`st( double w ) { return (Weight){ w }; }               // backquote for user literals
@@ -60 +61 @@
         sout | w;
 
-//      0`secs;
+        0`s;
         1`s;
         23`s;
@@ -82 +83 @@
 
         "abc"`s;
-//      u"abc"`m;
-//      U_"abc"`h;
-//      L"abc"`_A_;
+        // FIX ME: requires char16_t, char32_t, and wchar_t be unique types
+        // u"abc"`m;
+        // U_"abc"`h;
+        // L"abc"`_A_;
         u8_"abc"`__thingy_;
 } // main
@@ -90 +92 @@
 // Local Variables: //
 // tab-width: 4 //
-// compile-command: "cfa user_literals.cfa" //
+// compile-command: "cfa userLiterals.cfa" //
 // End: //