Changeset 37466ba0

Timestamp:

May 3, 2017, 2:04:26 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

ecb27a7

Parents:

6db9dab (diff), c469f43 (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:/u/cforall/software/cfa/cfa-cc

Files:

• src/libcfa/concurrency/monitor (modified) (1 diff)
• src/tests/.expect/rational.txt (modified) (1 diff)
• src/tests/rational.c (modified) (2 diffs)
• tools/vscode/uwaterloo.cforall-0.1.0/cforall.configuration.json (added)
• tools/vscode/uwaterloo.cforall-0.1.0/images/icon.odg (added)
• tools/vscode/uwaterloo.cforall-0.1.0/images/icon.svg (added)
• tools/vscode/uwaterloo.cforall-0.1.0/package.json (added)
• tools/vscode/uwaterloo.cforall-0.1.0/snippets/snippets.json (added)
• tools/vscode/uwaterloo.cforall-0.1.0/syntaxes/cfa.tmLanguage (added)

src/libcfa/concurrency/monitor

@@ -81 +81 @@
 }
 
+static inline void ^?{}( condition * this ) {
+        free( this->monitors );
+}
+
 void wait( condition * this );
 void signal( condition * this );

src/tests/.expect/rational.txt

@@ -25 +25 @@
 355/113
 decompose
-355/113 0 9
 more tests
 -3/2

src/tests/rational.c

@@ -10 +10 @@
 // Created On       : Mon Mar 28 08:43:12 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Apr 27 17:05:19 2017
-// Update Count     : 40
+// Last Modified On : Tue May  2 22:11:05 2017
+// Update Count     : 41
 // 
 
@@ -63 +63 @@
         sout | "decompose" | endl;
         RationalImpl n, d;
-        [n, d] = a;
-        sout | a | n | d | endl;
+//      [n, d] = a;
+//      sout | a | n | d | endl;
 
         sout | "more tests" | endl;