angle-hiding in parser

beautiful-racket/br/demo/txtadv/expander.rkt

@@ -35,7 +35,7 @@
   #'(module-begin _section ...))
 
 (provide verb-section)
-(define-inverting #'(verb-section _heading _verb-item ...)
+(define-inverting #'(verb-section _verb-item ...)
   (inject-syntax ([#'in-verbs (shared-syntax 'in-verbs)])
                  #'(define-verbs in-verbs
                      _verb-item ...)))
@@ -47,14 +47,11 @@
 
 (provide verb-name)
 (define-cases #'verb-name
-  ;; cases with literals go first, so they're not caught by wildcards
-  [#'(_ "," _id) #'(_id #f)]
-  [#'(_ "," _id _underscore) #'(_id #t)]
   [#'(_ _id) #'(_id #f)]
   [#'(_ _id _underscore) #'(_id #t)])
 
 (provide everywhere-section)
-(define-inverting #'(everywhere-section _heading [_name _desc] ...)
+(define-inverting #'(everywhere-section [_name _desc] ...)
   #'(define-everywhere everywhere-actions
       ([_name _desc] ...)))
 
@@ -63,7 +60,7 @@
   #'(_id _desc))
 
 (provide things-section)
-(define-inverting #'(things-section _heading _thing ...)
+(define-inverting #'(things-section _thing ...)
   #'(begin _thing ...))
 
 (provide thing-item)
@@ -71,7 +68,7 @@
   #'(define-thing _thingname [_actionname _actiondesc] ...))
 
 (provide places-section)
-(define-inverting #'(places-section _heading _placeitem ...)
+(define-inverting #'(places-section _placeitem ...)
   #'(begin _placeitem ...))
 
 (provide place-item)
@@ -82,18 +79,17 @@
 (define #'(place-descrip _desc) #'_desc)
 
 (provide place-items)
-(define-inverting #'(place-items "[" _id ... "]") #'(_id ...))
+(define-inverting #'(place-items _id ...) #'(_id ...))
 
 (provide place-name)
 (define-cases #'place-name
-  [#'(_ "," _id) #'_id]
   [#'(_ _id) #'_id])
 
 
 (provide s-exp)
 (define-cases-inverting #'s-exp
-  [#'(_ "(" _sx ... ")") #'(_sx ...)]
+  [#'(_ _sx) #'_sx]
-  [#'(_ _sx) #'_sx])
+  [#'(_ _sx ... ) #'(_sx ...)])
 
 
 ;; todo: consolidate the game-starters.
@@ -107,7 +103,7 @@
                               everywhere-actions)))
 
 (provide start-section)
-(define #'(start-section _heading _where)
+(define #'(start-section _where)
   (inject-syntax ([#'in-verbs (shared-syntax 'in-verbs)])
                  #'(init-game _where
                               in-verbs

beautiful-racket/br/demo/txtadv/parser.rkt

@@ -2,30 +2,30 @@
 
 txtadv-program : verb-section everywhere-section things-section places-section start-section
 
-verb-section : "===VERBS===" verb-item+
+verb-section : <"===VERBS==="> verb-item+
 
 verb-item : verb-name+ s-exp
 
-verb-name : [","] ID ["_"]
+verb-name : [<",">] ID ["_"]
 
-everywhere-section : "===EVERYWHERE===" id-desc+
+everywhere-section : <"===EVERYWHERE==="> id-desc+
 
-things-section : "===THINGS===" thing-item+
+things-section : <"===THINGS==="> thing-item+
 
 thing-item : DASHED-NAME id-desc+
 
-places-section : "===PLACES===" place-item+
+places-section : <"===PLACES==="> place-item+
 
 place-item : DASHED-NAME place-descrip place-items id-desc+
 
 place-descrip : STRING ; `place-desc` is already used in expander
 
-place-items : "[" place-name* "]" ; `place-things` is already used
+place-items : <"["> place-name* <"]"> ; `place-things` is already used
 
-place-name : [","] ID
+place-name : [<",">] ID
 
-start-section : "===START===" place-name
+start-section : <"===START==="> place-name
 
 id-desc : ID s-exp
 
-s-exp : ID | STRING | "(" s-exp* ")"
+s-exp : ID | STRING | <"("> s-exp* <")">