From dc5e7102563b9c0714391f86b6dcf852445ee192 Mon Sep 17 00:00:00 2001
From: Ziv Scully <ziv@mit.edu>
Date: Mon, 10 Nov 2014 22:04:40 -0500
Subject: Progress towards invalidation based on equalities of fields.

---
 src/sql.sig | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

(limited to 'src/sql.sig')

diff --git a/src/sql.sig b/src/sql.sig
index cf2ae14a..5f5d1b23 100644
--- a/src/sql.sig
+++ b/src/sql.sig
@@ -26,24 +26,30 @@ datatype exp =
        | Recd of (string * exp) list
        | Proj of exp * string
 
-datatype reln =
-         Known
-       | Sql of string
-       | PCon0 of string
-       | PCon1 of string
-       | Eq
+datatype cmp =
+         Eq
        | Ne
        | Lt
        | Le
        | Gt
        | Ge
 
+datatype reln =
+         Known
+       | Sql of string
+       | PCon0 of string
+       | PCon1 of string
+       | Cmp of cmp
+
+datatype lop =
+         And
+       | Or
+
 datatype prop =
          True
        | False
        | Unknown
-       | And of prop * prop
-       | Or of prop * prop
+       | Lop of lop * prop * prop
        | Reln of reln * exp list
        | Cond of exp * prop
 
@@ -52,8 +58,8 @@ type 'a parser
 val parse : 'a parser -> Mono.exp -> 'a option
 
 datatype Rel =
-         Exps of exp * exp -> prop
-       | Props of prop * prop -> prop
+         RCmp of cmp
+       | RLop of lop
 
 datatype sqexp =
          SqConst of Prim.t
-- 
cgit v1.2.3