@@ -18,7 +18,7 @@
19 %+ knee *ast
19 %+ knee *ast
21− %+ ifix [gaw gaw]
21+ %+ ifix [ws ws]
23 (cook |=(=blok [%blok blok]) parse-blok)
23 (cook |=(=blok [%blok blok]) parse-blok)
@@ -151,7 +151,7 @@
153 |=([* =table *] table)
153 |=([* =table *] table)
154− ;~ (glue gaw)
154+ ;~ (glue ws)
155 (just '{')
155 (just '{')
156 parse-field-list
156 parse-field-list
157 (just '}')
157 (just '}')
@@ -177,8 +177,8 @@
179 |=([=field-list *] field-list)
179 |=([=field-list *] field-list)
180− ;~ (glue gaw)
180+ ;~ (glue ws)
181− (more (ifix [gaw gaw] field-sep) parse-field)
181+ (more (ifix [ws ws] field-sep) parse-field)
182 (punt field-sep)
182 (punt field-sep)
@@ -209,7 +209,7 @@
211 |=([* key=expr * * val=expr] [%keyed key val])
211 |=([* key=expr * * val=expr] [%keyed key val])
212− ;~ (glue gaw)
212+ ;~ (glue ws)
213 (just '[')
213 (just '[')
214 parse-expr
214 parse-expr
215 (just ']')
215 (just ']')
@@ -219,7 +219,7 @@
221 |=([=name * =expr] [%keyed [%string name] expr])
221 |=([=name * =expr] [%keyed [%string name] expr])
222− ;~ (glue gaw)
222+ ;~ (glue ws)
223 parse-name
223 parse-name
225 parse-expr
225 parse-expr
@@ -341,7 +341,7 @@
341++ parse-exprlist
341++ parse-exprlist
342 %+ knee *exprlist
342 %+ knee *exprlist
344− %+ most (ifix [gaw gaw] com) parse-expr
344+ %+ most (ifix [ws ws] com) parse-expr
@@ -380,7 +380,7 @@
380 |= =prefix-expr
380 |= =prefix-expr
382 |=([* =expr *] [%indexed prefix-expr expr])
382 |=([* =expr *] [%indexed prefix-expr expr])
383− ;~ (glue gaw)
383+ ;~ (glue ws)
384 (just '[')
384 (just '[')
385 parse-expr
385 parse-expr
386 (just ']')
386 (just ']')
@@ -418,7 +418,7 @@
418++ parse-varlist
418++ parse-varlist
419 %+ knee *varlist
419 %+ knee *varlist
421− %+ most (ifix [gaw gaw] com) parse-var
421+ %+ most (ifix [ws ws] com) parse-var
422:: Prefix Expr
422:: Prefix Expr
424+$ prefix-expr
424+$ prefix-expr
@@ -462,7 +462,7 @@
464 |=([* =blok *] [%blok blok])
464 |=([* =blok *] [%blok blok])
465− ;~ (glue gawn)
465+ ;~ (glue wss)
466 (jest 'do')
466 (jest 'do')
467 (knee *blok |.(parse-blok))
467 (knee *blok |.(parse-blok))
468 (jest 'end')
468 (jest 'end')
@@ -470,7 +470,7 @@
472 |=([=varlist * =exprlist] [%asmnt varlist exprlist])
472 |=([=varlist * =exprlist] [%asmnt varlist exprlist])
473− ;~ (glue gaw)
473+ ;~ (glue ws)
474 parse-varlist
474 parse-varlist
475 (just '=')
475 (just '=')
476 parse-exprlist
476 parse-exprlist
@@ -502,7 +502,7 @@
502++ parse-blok
502++ parse-blok
503 %+ knee *blok
503 %+ knee *blok
505− (most gawn parse-stat)
505+ (most wss parse-stat)
506:: Helpers
506:: Helpers
508++ commaed
508++ commaed
@@ -510,7 +510,7 @@
512 %+ join "," l
512 %+ join "," l
513−++ gawn (cold ~ (plus ;~(pose vul gah)))
513+:: ++ gawn (cold ~ (plus ;~(pose vul gah)))
514++ parse-name
514++ parse-name
515 %+ knee *name
515 %+ knee *name
@@ -531,4 +531,15 @@
531 =/ prev-edge (prev nail)
531 =/ prev-edge (prev nail)
532 ?~ q.prev-edge prev-edge
532 ?~ q.prev-edge prev-edge
533 ((cont p.u.q.prev-edge) q.u.q.prev-edge)
533 ((cont p.u.q.prev-edge) q.u.q.prev-edge)