From e9c10a236e6c84fe3539a2c49e067dffdb0f28cd Mon Sep 17 00:00:00 2001 From: Matthew Butterick Date: Tue, 28 Feb 2017 11:28:20 -0800 Subject: [PATCH] change rule name --- beautiful-racket-demo/basic-demo-3/expander.rkt | 2 +- beautiful-racket-demo/basic-demo-3/parser.rkt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/beautiful-racket-demo/basic-demo-3/expander.rkt b/beautiful-racket-demo/basic-demo-3/expander.rkt index 0965011..a451b9d 100644 --- a/beautiful-racket-demo/basic-demo-3/expander.rkt +++ b/beautiful-racket-demo/basic-demo-3/expander.rkt @@ -8,7 +8,7 @@ ([((b-line NUM STMT ...) ...) #'(LINE ...)] [(LINE-FUNC ...) (prefix-id "line-" #'(NUM ...))] [(VAR-ID ...) (find-property 'b-id #'(LINE ...))] - [(REQ-SPEC ...) (find-property 'b-import-spec #'(LINE ...))] + [(REQ-SPEC ...) (find-property 'b-import-name #'(LINE ...))] [((SHELL-ID SHELL-VAL) ...) (for/list ([(val idx) (in-indexed (current-command-line-arguments))]) (list (suffix-id #'arg idx #:context caller-stx) val))]) diff --git a/beautiful-racket-demo/basic-demo-3/parser.rkt b/beautiful-racket-demo/basic-demo-3/parser.rkt index 1aba3f9..451282e 100644 --- a/beautiful-racket-demo/basic-demo-3/parser.rkt +++ b/beautiful-racket-demo/basic-demo-3/parser.rkt @@ -21,8 +21,8 @@ b-return : /"return" b-for : /"for" b-id /"=" b-expr /"to" b-expr [/"step" b-expr] b-next : /"next" b-id b-def : /"def" b-id /"(" ID [/"," ID]* /")" /"=" b-expr -b-import : /"import" b-import-spec -@b-import-spec : (ID | STRING) +b-import : /"import" b-import-name +@b-import-name : (ID | STRING) b-expr : b-or-expr b-or-expr : [b-or-expr "or"] b-and-expr b-and-expr : [b-and-expr "and"] b-not-expr