Changeset 000ff2c for doc/papers/general/evaluation/cfa-pair.c

Timestamp:

Mar 2, 2018, 6:22:52 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:

2097cd4, 82c367d

Parents:

938dd75 (diff), c9b3a41 (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

File:

• doc/papers/general/evaluation/cfa-pair.c (modified) (4 diffs)

doc/papers/general/evaluation/cfa-pair.c

@@ -1 +1 @@
 #include "cfa-pair.h"
+#include "fstream"
 
-forall(otype R, otype S 
+forall(otype R, otype S
         | { int ?==?(R, R); int ?<?(R, R); int ?<?(S, S); })
 int ?<?(pair(R, S) p, pair(R, S) q) {
@@ -7 +8 @@
 }
 
-forall(otype R, otype S 
+forall(otype R, otype S
         | { int ?==?(R, R); int ?<?(R, R); int ?<=?(S, S); })
 int ?<=?(pair(R, S) p, pair(R, S) q) {
@@ -23 +24 @@
 }
 
-forall(otype R, otype S 
+forall(otype R, otype S
         | { int ?==?(R, R); int ?>?(R, R); int ?>?(S, S); })
 int ?>?(pair(R, S) p, pair(R, S) q) {
@@ -29 +30 @@
 }
 
-forall(otype R, otype S 
+forall(otype R, otype S
         | { int ?==?(R, R); int ?>?(R, R); int ?>=?(S, S); })
 int ?>=?(pair(R, S) p, pair(R, S) q) {
         return p.first > q.first || ( p.first == q.first && p.second >= q.second );
 }
+
+forall(otype R, otype S)
+forall(dtype ostype | ostream( ostype ) | { ostype & ?|?( ostype &, R ); ostype & ?|?( ostype &, S );  })
+ostype & ?|?( ostype & os, pair(R, S) p ) {
+        return os | '[' | p.first | ',' | p.second | ']';
+} // ?|?