Changeset 58b5d03

Timestamp:

Jun 14, 2016, 11:51:31 AM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

7b21d99

Parents:

905cf4b

Message:

update keywords and add addition tests

Location:

src/examples

Files:

• ctxts.c (modified) (1 diff)
• esskaykay.c (modified) (1 diff)
• io.c (modified) (2 diffs)

src/examples/ctxts.c

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar  2 18:10:21 2016
-// Update Count     : 3
+// Last Modified On : Fri Jun 10 15:18:33 2016
+// Update Count     : 4
 //
 
-trait has_f( type T ) {
+trait has_f( otype T ) {
         T f( T );
 };
 
-trait has_g( type U | has_f( U ) ) {
+trait has_g( otype U | has_f( U ) ) {
         U g( U );
 };
 
-forall( type V | has_g( V ) ) void h( V );
+forall( otype V | has_g( V ) ) void h( V );
 
 // Local Variables: //

src/examples/esskaykay.c

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed May 27 18:11:45 2015
-// Update Count     : 2
+// Last Modified On : Fri Jun 10 15:25:12 2016
+// Update Count     : 4
 //
 
-// forall (type A, type B, type C) C ess (C (*f) (A,B), B (*g) (A), A x) { return f(x,g(x)); }
-forall (type A, type B, type C) C ess (C (*(*f)(A))(B), B (*g)(A), A x) { return f(x)(g(x)); }
+// forall (otype A, otype B, otype C) C ess (C (*f) (A,B), B (*g) (A), A x) { return f(x,g(x)); }
+forall (otype A, otype B, otype C) C ess (C (*(*f)(A))(B), B (*g)(A), A x) { return f(x)(g(x)); }
 
-// forall (type A, type B) A kay (A a, B b) { return a; }
-forall (type A, type B) A (*kay(A a))(B b);
+// forall (otype A, otype B) A kay (A a, B b) { return a; }
+forall (otype A, otype B) A (*kay(A a))(B b);
 
 // Now is the following function well-typed, or not?
 
-forall (type A) A esskaykay (A x) { ess (kay, kay, x); }
+forall (otype A) A esskaykay (A x) { ess (kay, kay, x); }
 
 // Local Variables: //

src/examples/io.c

@@ -11 +11 @@
 // Created On       : Wed Mar  2 16:56:02 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu May 26 10:06:00 2016
-// Update Count     : 28
+// Last Modified On : Wed Jun  8 22:52:04 2016
+// Update Count     : 30
 // 
 
@@ -34 +34 @@
         long double _Complex ldc;
         char s1[10], s2[10];
+
+        int x = 3, y = 5, z = 7;
+        sout | x * 3 | y + 1 | z << 2 | x == y | (x | y) | (x || y) | (x > z ? 1 : 2) | endl;
+        sout | 1 | 2 | 3 | endl;
+        sout | '1' | '2' | '3' | endl;
+        sout | 1 | "" | 2 | "" | 3 | endl;
+        sout | endl;
 
         ifstream in;                                                                                            // create / open file