jackfoxy/urQL
1
1
Fork 0
mirror of https://github.com/jackfoxy/urQL.git synced 2024-09-11 11:55:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

minor refactor

Browse Source
This commit is contained in:
jackfoxy 2023-05-16 17:41:10 -07:00
parent aba310f61b
commit 1b506ee137
2 changed files with 37 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
urql/lib/parse.hoon
View File

@ -42,8 +42,7 @@
:: main loop
::
|-
?: =(~ script) :: https://github.com/urbit/arvo/issues/1024
(flop commands)
?~ =(~ script) (flop commands)
=/ check-empty u.+3:q.+3:(whitespace [[1 1] script])
?: =(0 (lent q.q:check-empty)) :: trailing whitespace after last end-command (;)
(flop commands)
@ -1191,7 +1190,7 @@
[-<.tree-stack ->-.tree-stack working-tree]
parsed +.parsed
==
unary-operator:ast
unary-op:ast
?~ working-tree
%= $
working-tree [-.parsed ~ ~]
@ -1205,18 +1204,18 @@
parsed +>.parsed
==
~|("invalid compbination of unary operators {<-.working-tree>} and {<-.parsed>}" !!)
?~ r.working-tree ~|("unary-operator, right tree empty {<working-tree>}" !!)
~|("unary-operator can't get here {<working-tree>}" !!)
binary-operator:ast
?~ r.working-tree ~|("unary-op, right tree empty {<working-tree>}" !!)
~|("unary-op can't get here {<working-tree>}" !!)
binary-op:ast
?~ working-tree !!
?~ l.working-tree ~|("binary-operator, left tree empty {<working-tree>}" !!)
?~ r.working-tree ~|("binary-operator, right tree empty {<working-tree>}" !!)
~|("binary-operator can't get here {<working-tree>}" !!)
ternary-operator:ast
?~ l.working-tree ~|("binary-op, left tree empty {<working-tree>}" !!)
?~ r.working-tree ~|("binary-op, right tree empty {<working-tree>}" !!)
~|("binary-op can't get here {<working-tree>}" !!)
ternary-op:ast
?~ working-tree !!
?~ l.working-tree ~|("ternary-operator, left tree empty {<working-tree>}" !!)
?~ r.working-tree ~|("ternary-operator, right tree empty {<working-tree>}" !!)
~|("ternary-operator can't get here {<working-tree>}" !!)
?~ l.working-tree ~|("ternary-op, left tree empty {<working-tree>}" !!)
?~ r.working-tree ~|("ternary-op, right tree empty {<working-tree>}" !!)
~|("ternary-op can't get here {<working-tree>}" !!)
conjunction:ast
?~ working-tree
%= $
@ -1229,10 +1228,10 @@
working-tree [-.parsed working-tree ~]
parsed +.parsed
==
all-any-operator:ast
all-any-op:ast
?~ working-tree ~|("operator {<-.parsed>} can only follow equality or inequality operator" !!)
?~ r.working-tree
?: ?&(?=(binary-operator:ast n.working-tree) ?!(=(%in n.working-tree)))
?: ?&(?=(binary-op:ast n.working-tree) ?!(=(%in n.working-tree)))
?: ?=(value-literal-list:ast +<.parsed)
%= $
working-tree [-.working-tree +<.working-tree [-.parsed [+<.parsed ~ ~] ~]]
@ -1243,17 +1242,17 @@
working-tree [-.working-tree +<.working-tree [-.parsed [+<.parsed ~ ~] ~]]
parsed +>.parsed
==
~|("all-any-operator {<-.parsed>} must target CTE or literal list {<+<.parsed>}" !!)
~|("all-any-operator {<-.parsed>} can only follow equality or inequality operator" !!)
~|("all-any-operator {<-.parsed>} can't get here, working-tree {<working-tree>}" !!)
~|("all-any-op {<-.parsed>} must target CTE or literal list {<+<.parsed>}" !!)
~|("all-any-op {<-.parsed>} can only follow equality or inequality operator" !!)
~|("all-any-op {<-.parsed>} can't get here, working-tree {<working-tree>}" !!)
qualified-column:ast
?~ working-tree
?: ?=(binary-operator:ast +<.parsed)
?: ?=(binary-op:ast +<.parsed)
%= $
working-tree [+<.parsed [-.parsed ~ ~] ~]
parsed +>.parsed
==
?: ?=(unary-operator:ast +<.parsed)
?: ?=(unary-op:ast +<.parsed)
?: ?&(=(%not +<.parsed) =(%between +>-.parsed))
?: =(%and +>+>-.parsed)
%= $
@ -1271,7 +1270,7 @@
working-tree [%not (produce-predicate ~[-.parsed %in +>+<.parsed]) ~]
parsed +>+>.parsed
==
~|("unary-operator {<+<.parsed>} can't get here after qualified-column, working-tree {<working-tree>}" !!)
~|("unary-op {<+<.parsed>} can't get here after qualified-column, working-tree {<working-tree>}" !!)
?: =(%between +<.parsed)
?: =(%and +>+<.parsed)
%= $
@ -1303,12 +1302,12 @@
~|("qualified-column can't get here" !!)
value-literal:ast
?~ working-tree
?: ?=(binary-operator:ast +<.parsed)
?: ?=(binary-op:ast +<.parsed)
%= $
working-tree [+<.parsed [-.parsed ~ ~] ~]
parsed +>.parsed
==
?: ?=(unary-operator:ast +<.parsed)
?: ?=(unary-op:ast +<.parsed)
?: ?&(=(%not +<.parsed) =(%between +>-.parsed))
?: =(%and +>+>-.parsed)
%= $
@ -1326,7 +1325,7 @@
working-tree [%not (produce-predicate ~[-.parsed %in +>+<.parsed]) ~]
parsed +>+>.parsed
==
~|("unary-operator {<+<.parsed>} can't get here after value-literal, working-tree {<working-tree>}" !!)
~|("unary-op {<+<.parsed>} can't get here after value-literal, working-tree {<working-tree>}" !!)
?: =(%between +<.parsed)
?: =(%and +>+<.parsed)
%= $
@ -1358,12 +1357,12 @@
~|("value-literal can't get here" !!)
aggregate:ast
?~ working-tree
?: ?=(binary-operator:ast +<.parsed)
?: ?=(binary-op:ast +<.parsed)
%= $
working-tree [+<.parsed [-.parsed ~ ~] ~]
parsed +>.parsed
==
?: ?=(unary-operator:ast +<.parsed)
?: ?=(unary-op:ast +<.parsed)
?: ?&(=(%not +<.parsed) =(%between +>-.parsed))
?: =(%and +>+>-.parsed)
%= $
@ -1381,7 +1380,7 @@
working-tree [%not (produce-predicate ~[-.parsed %in +>+<.parsed]) ~]
parsed +>+>.parsed
==
~|("unary-operator {<+<.parsed>} can't get here after aggregate, working-tree {<working-tree>}" !!)
~|("unary-op {<+<.parsed>} can't get here after aggregate, working-tree {<working-tree>}" !!)
?: =(%between +<.parsed)
?: =(%and +>+<.parsed)
%= $

22
urql/sur/ast.hoon
View File

@ -68,25 +68,25 @@
::
:: { = | <> | != | > | >= | !> | < | <= | !< | BETWEEN...AND...
:: | IS DISTINCT FROM | IS NOT DISTINCT FROM }
+$ ternary-operator %between
+$ inequality-operator ?(%neq %gt %gte %lt %lte)
+$ all-any-operator ?(%all %any)
+$ binary-operator ?(%eq inequality-operator %equiv %not-equiv %in)
+$ unary-operator ?(%not %exists)
+$ ternary-op %between
+$ inequality-op ?(%neq %gt %gte %lt %lte)
+$ all-any-op ?(%all %any)
+$ binary-op ?(%eq inequality-op %equiv %not-equiv %in)
+$ unary-op ?(%not %exists)
+$ conjunction ?(%and %or)
+$ ops-and-conjs
?(ternary-operator binary-operator unary-operator all-any-operator conjunction)
?(ternary-op binary-op unary-op all-any-op conjunction)
+$ predicate-component
?(ops-and-conjs qualified-column value-literal value-literal-list aggregate)
+$ predicate (tree predicate-component)
+$ datum $%(qualified-column value-literal)
+$ datum-or-scalar $@(datum scalar-function)
+$ scalar-operator ?(%lus %tar %hep %fas %ket)
+$ scalar-token ?(%pal %par scalar-operator)
+$ scalar-op ?(%lus %tar %hep %fas %ket)
+$ scalar-token ?(%pal %par scalar-op)
+$ arithmatic
$:
%arithmetic
operator=scalar-operator
operator=scalar-op
left=* :: datum-or-scalar
right=* :: datum-or-scalar
==
@ -230,7 +230,7 @@
name=@t
set-cmds
==
+$ set-operators
+$ set-ops
$?
%union
%except
@ -246,7 +246,7 @@
%multee
==
+$ set-cmds $%(delete insert update query merge)
+$ set-functions ?(set-operators set-cmds)
+$ set-functions ?(set-ops set-cmds)
::
:: data manipulation ASTs
::