From a331e63aac60f9256e929f9160a0219fb2966937 Mon Sep 17 00:00:00 2001 From: Matthew Butterick Date: Thu, 22 Dec 2016 09:27:32 -0800 Subject: [PATCH] touchups --- beautiful-racket/br/demo/jsonic-2/expander.rkt | 1 + beautiful-racket/br/demo/jsonic-2/parser-test.rkt | 6 ++---- beautiful-racket/br/demo/jsonic-2/parser.rkt | 4 ++-- beautiful-racket/br/demo/jsonic/parser.rkt | 4 ++-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/beautiful-racket/br/demo/jsonic-2/expander.rkt b/beautiful-racket/br/demo/jsonic-2/expander.rkt index d264559..2744e5a 100644 --- a/beautiful-racket/br/demo/jsonic-2/expander.rkt +++ b/beautiful-racket/br/demo/jsonic-2/expander.rkt @@ -1,5 +1,6 @@ #lang br/quicklang (require json) + (define-macro (js-module-begin PARSE-TREE) #'(#%module-begin (define result-string PARSE-TREE) diff --git a/beautiful-racket/br/demo/jsonic-2/parser-test.rkt b/beautiful-racket/br/demo/jsonic-2/parser-test.rkt index 5c5c6d1..873cdb0 100644 --- a/beautiful-racket/br/demo/jsonic-2/parser-test.rkt +++ b/beautiful-racket/br/demo/jsonic-2/parser-test.rkt @@ -1,8 +1,6 @@ #lang br -(require br/demo/jsonic-2/parser - br/demo/jsonic-2/tokenizer - brag/support - rackunit) +(require "parser.rkt" "tokenizer.rkt" + brag/support rackunit) (check-equal? (parse-tree (apply-tokenizer tokenize "// line commment\n")) diff --git a/beautiful-racket/br/demo/jsonic-2/parser.rkt b/beautiful-racket/br/demo/jsonic-2/parser.rkt index 2a282ba..69a706d 100644 --- a/beautiful-racket/br/demo/jsonic-2/parser.rkt +++ b/beautiful-racket/br/demo/jsonic-2/parser.rkt @@ -1,4 +1,4 @@ #lang brag -jsonic-program: (s-exp | json-char)* -s-exp: SEXP-TOK +jsonic-program: (json-char | s-exp)* json-char: CHAR-TOK +s-exp: SEXP-TOK diff --git a/beautiful-racket/br/demo/jsonic/parser.rkt b/beautiful-racket/br/demo/jsonic/parser.rkt index 2a282ba..69a706d 100644 --- a/beautiful-racket/br/demo/jsonic/parser.rkt +++ b/beautiful-racket/br/demo/jsonic/parser.rkt @@ -1,4 +1,4 @@ #lang brag -jsonic-program: (s-exp | json-char)* -s-exp: SEXP-TOK +jsonic-program: (json-char | s-exp)* json-char: CHAR-TOK +s-exp: SEXP-TOK