1
Fork 0

fix silly bug with is distinct from parsing

This commit is contained in:
Jake Wheat 2015-08-05 22:57:36 +03:00
parent 136257bfd5
commit 2c817f4088

View file

@ -1082,7 +1082,9 @@ messages, but both of these are too important.
> ,prefixSym "~" > ,prefixSym "~"
> ,binarySym "&" E.AssocRight > ,binarySym "&" E.AssocRight
> ,binarySym "|" E.AssocRight] > ,binarySym "|" E.AssocRight]
> ,[binaryKeyword "overlaps" E.AssocNone] > ,[binaryKeyword "overlaps" E.AssocNone]
> ,[binaryKeyword "like" E.AssocNone > ,[binaryKeyword "like" E.AssocNone
> -- have to use try with inSuffix because of a conflict > -- have to use try with inSuffix because of a conflict
> -- with 'in' in position function, and not between > -- with 'in' in position function, and not between
@ -1090,12 +1092,13 @@ messages, but both of these are too important.
> -- ambiguity > -- ambiguity
> ,E.Postfix $ try inSuffix > ,E.Postfix $ try inSuffix
> ,E.Postfix betweenSuffix] > ,E.Postfix betweenSuffix]
> -- todo: figure out where to put the try > -- todo: figure out where to put the try?
> ++ [binaryKeywords $ makeKeywordTree > ++ [binaryKeywords $ makeKeywordTree
> ["not like" > ["not like"
> ,"is similar to" > ,"is similar to"
> ,"is not similar to"]] > ,"is not similar to"]]
> ++ [multisetBinOp] > ++ [multisetBinOp]
> ,[binarySym "<" E.AssocNone > ,[binarySym "<" E.AssocNone
> ,binarySym ">" E.AssocNone > ,binarySym ">" E.AssocNone
> ,binarySym ">=" E.AssocNone > ,binarySym ">=" E.AssocNone
@ -1103,6 +1106,7 @@ messages, but both of these are too important.
> ,binarySym "!=" E.AssocRight > ,binarySym "!=" E.AssocRight
> ,binarySym "<>" E.AssocRight > ,binarySym "<>" E.AssocRight
> ,binarySym "=" E.AssocRight] > ,binarySym "=" E.AssocRight]
> ,[postfixKeywords $ makeKeywordTree > ,[postfixKeywords $ makeKeywordTree
> ["is null" > ["is null"
> ,"is not null" > ,"is not null"
@ -1111,12 +1115,17 @@ messages, but both of these are too important.
> ,"is false" > ,"is false"
> ,"is not false" > ,"is not false"
> ,"is unknown" > ,"is unknown"
> ,"is not unknown" > ,"is not unknown"]]
> ,"is distinct from" > ++ [binaryKeywords $ makeKeywordTree
> ["is distinct from"
> ,"is not distinct from"]] > ,"is not distinct from"]]
> ,[prefixKeyword "not"] > ,[prefixKeyword "not"]
> ,if bExpr then [] else [binaryKeyword "and" E.AssocLeft] > ,if bExpr then [] else [binaryKeyword "and" E.AssocLeft]
> ,[binaryKeyword "or" E.AssocLeft] > ,[binaryKeyword "or" E.AssocLeft]
> ] > ]
> where > where
> binarySym nm assoc = binary (symbol_ nm) nm assoc > binarySym nm assoc = binary (symbol_ nm) nm assoc