Mercurial > urweb

diff src/sql.sig @ 2216:70ec9bb337be

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Progress towards invalidation based on equalities of fields.
author Ziv Scully <ziv@mit.edu>
date Mon, 10 Nov 2014 22:04:40 -0500
parents 639e62ca2530
children f8903af753ff
line wrap: on
line diff
--- a/src/sql.sig	Fri Oct 31 09:25:03 2014 -0400
+++ b/src/sql.sig	Mon Nov 10 22:04:40 2014 -0500
@@ -26,24 +26,30 @@
        | 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 @@
 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