From 7b573be83c3558e1525ee7dee867bb4a163aeff0 Mon Sep 17 00:00:00 2001 From: Matthew Butterick Date: Wed, 8 Feb 2017 17:25:58 -0800 Subject: [PATCH] updates --- beautiful-racket-demo/basic-demo/expander-runtime-errors.rkt | 2 +- beautiful-racket-demo/basic-demo/parser.rkt | 4 ++-- .../basic-demo/private/sample-pseudocode.rkt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/beautiful-racket-demo/basic-demo/expander-runtime-errors.rkt b/beautiful-racket-demo/basic-demo/expander-runtime-errors.rkt index de03e0b..289cb6a 100644 --- a/beautiful-racket-demo/basic-demo/expander-runtime-errors.rkt +++ b/beautiful-racket-demo/basic-demo/expander-runtime-errors.rkt @@ -5,7 +5,7 @@ (define-macro (b-module-begin (b-program LINE ...)) (with-pattern ([(LINE-NUM ...) - (filter-stx-prop 'b-line-number + (filter-stx-prop 'b-line-num (stx-flatten #'(LINE ...)))] [(LINE-ID ...) (prefix-ids "line-" #'(LINE-NUM ...))]) #'(#%module-begin diff --git a/beautiful-racket-demo/basic-demo/parser.rkt b/beautiful-racket-demo/basic-demo/parser.rkt index dcac829..5f503d8 100644 --- a/beautiful-racket-demo/basic-demo/parser.rkt +++ b/beautiful-racket-demo/basic-demo/parser.rkt @@ -1,7 +1,7 @@ #lang brag b-program : [b-line] (/NEWLINE [b-line])* -b-line : b-line-number [b-statement] (/":" [b-statement])* [b-rem] -@b-line-number : INTEGER +b-line : b-line-num [b-statement] (/":" [b-statement])* [b-rem] +@b-line-num : INTEGER @b-statement : b-end | b-print | b-goto b-rem : REM b-end : /"end" diff --git a/beautiful-racket-demo/basic-demo/private/sample-pseudocode.rkt b/beautiful-racket-demo/basic-demo/private/sample-pseudocode.rkt index 1decc26..5b6fe15 100644 --- a/beautiful-racket-demo/basic-demo/private/sample-pseudocode.rkt +++ b/beautiful-racket-demo/basic-demo/private/sample-pseudocode.rkt @@ -3,6 +3,6 @@ (define (50) (print "never gets here")) (define (40) (end)) (define (60) (print "three") (print (+ 1.0 3))) -(define (70) (goto (+ 11 18.5 0.5))) +(define (70) (goto (+ 11 18.5 0.5)) (rem "ignored")) (define (10) (print "o" "n" "e")) (define (20) (print) (goto 60) (end)) \ No newline at end of file