Changeset ea46db7 for src/tests/user_literals.c

Timestamp:

Mar 4, 2018, 12:20:36 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

1feb535f, d893266a

Parents:

0a2168f

git-author:

Peter A. Buhr <pabuhr@…> (03/04/18 10:35:22)

git-committer:

Peter A. Buhr <pabuhr@…> (03/04/18 12:20:36)

Message:

updates, and extend section on user literals

File:

• src/tests/user_literals.c (modified) (2 diffs)

src/tests/user_literals.c

@@ -10 +10 @@
 // Created On       : Wed Sep  6 21:40:50 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Dec  7 09:12:36 2017
-// Update Count     : 50
+// Last Modified On : Sun Mar  4 11:14:02 2018
+// Update Count     : 52
 // 
 
@@ -31 +31 @@
 
 
-struct Weight {
-        double stones;
-};
-void ?{}( Weight & w ) { w.stones = 0; }                                // operations
+struct Weight { double stones; };
+void ?{}( Weight & w ) { w.stones = 0; }
 void ?{}( Weight & w, double w ) { w.stones = w; }
-Weight ?+?( Weight l, Weight r ) { return (Weight){ l.stones + r.stones }; }
+Weight ?+?( Weight l, Weight r ) {
+        return (Weight){ l.stones + r.stones };
+}
 ofstream & ?|?( ofstream & os, Weight w ) { return os | w.stones; }
 
 Weight ?`st( double w ) { return (Weight){ w }; }               // backquote for user literals
 Weight ?`lb( double w ) { return (Weight){ w / 14.0 }; }
-Weight ?`kg( double w ) { return (Weight) { w * 0.1575}; }
-
+Weight ?`kg( double w ) { return (Weight) { w * 0.16 }; }
 
 int main() {
-        Weight w, hw = { 14 };                                                          // 14 stone
-        w = 11`st + 1`lb;
+        Weight w, heavy = { 20 };                                                       // 20 stone
+        w = 155`lb;
+        sout | w | endl;
+        w = 0b_1111`st;
+        sout | w | endl;
+        w = 0_233`lb;                                                                           // octal weight (155)
+        sout | w | endl;
+        w = 0x_9b_u`kg;
         sout | w | endl;
         w = 70.3`kg;
         sout | w | endl;
-        w = 155`lb;
+        w = 11`st + 1`lb;
         sout | w | endl;
-        w = 0x_9b_u`lb;                                                                         // hexadecimal unsigned weight (155)
-        sout | w | endl;
-        w = 0_233`lb;                                                                           // octal weight (155)
-        sout | w | endl;
-        w = 5`st + 8`kg + 25`lb + hw;
+        w = 5`st + 8`kg + 25`lb + heavy;
         sout | w | endl;