Changeset b2b039d for src/tests/Context.c

Timestamp:

Jun 21, 2016, 12:11:40 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

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:

6bc4734

Parents:

f6d4204 (diff), 7ba3a25 (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:

• src/tests/Context.c (modified) (1 diff)

src/tests/Context.c

@@ -1 @@
-//cforall context declaration
-context has_q( otype T ) {
+// trait declaration
+
+trait has_q( otype T ) {
         T q( T );
 };
 
 forall( otype z | has_q( z ) ) void f() {
-        context has_r( otype T, otype U ) {
+        trait has_r( otype T, otype U ) {
                 T r( T, T (T,U) );
         };