twc/ludus
4
0
Fork 0
Code Issues 33 Pull Requests Packages Projects 8 Releases Wiki Activity

delete_structs #13

Merged
scott merged 6 commits from delete_structs into main 2023-12-18 00:21:38 +00:00
Conversation 0 Commits 6 Files Changed 8 +13 -11
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7c7b556115 - Show all commits

24
src/ludus/grammar.cljc
View File

@ -58,11 +58,11 @@
(quiet :rbrace) (quiet :rbrace)
]) ])
(defp struct-pattern group order-1 [(quiet :startstruct) ; (defp struct-pattern group order-1 [(quiet :startstruct)
(quiet (zero+ separator)) ; (quiet (zero+ separator))
(zero+ dict-pattern-entry) ; (zero+ dict-pattern-entry)
(quiet :rbrace) ; (quiet :rbrace)
]) ; ])
(defp guard order-0 [(quiet :if) simple]) (defp guard order-0 [(quiet :if) simple])
@ -75,7 +75,7 @@
:else :else
tuple-pattern tuple-pattern
dict-pattern dict-pattern
struct-pattern ;struct-pattern
list-pattern]) list-pattern])
(defp match-clause group weak-order [pattern (maybe guard) (quiet :rarrow) expression]) (defp match-clause group weak-order [pattern (maybe guard) (quiet :rarrow) expression])
@ -141,14 +141,15 @@
(defp pair group order-0 [:keyword non-binding]) (defp pair group order-0 [:keyword non-binding])
;; "struct-term" and "struct-entry" are necessary for nses
(defp struct-term flat choice [:word pair]) (defp struct-term flat choice [:word pair])
(defp struct-entry order-1 [struct-term separators]) (defp struct-entry order-1 [struct-term separators])
(defp struct-literal group order-1 [(quiet :startstruct) ; (defp struct-literal group order-1 [(quiet :startstruct)
(quiet (zero+ separator)) ; (quiet (zero+ separator))
(zero+ struct-entry) ; (zero+ struct-entry)
(quiet :rbrace)]) ; (quiet :rbrace)])
(defp dict-term flat choice [splat :word pair]) (defp dict-term flat choice [splat :word pair])
@ -230,7 +231,8 @@
(defp repeat-expr group order-1 [(quiet :repeat) (choice :times [:word :number]) block]) (defp repeat-expr group order-1 [(quiet :repeat) (choice :times [:word :number]) block])
(defp collection flat choice [struct-literal dict list-literal set-literal tuple]) (defp collection flat choice [;struct-literal
dict list-literal set-literal tuple])
(defp simple flat choice [literal collection synthetic recur-call lambda]) (defp simple flat choice [literal collection synthetic recur-call lambda])