diff --git a/yaragg-lib/yaragg/codegen/expander.rkt b/yaragg-lib/yaragg/codegen/expander.rkt index d8dc64c..6eb156d 100755 --- a/yaragg-lib/yaragg/codegen/expander.rkt +++ b/yaragg-lib/yaragg/codegen/expander.rkt @@ -48,7 +48,7 @@ [TOKEN (datum->syntax rules-stx 'token)] ; for repl [RULE-IDS (map syntax-e rule-ids)] [RULES-STX rules-stx]) - ;; this stx object represents the top level of a #lang brag module. + ;; this stx object represents the top level of a #lang yaragg module. ;; so any `define`s are automatically available at the repl. ;; and only identifiers explicitly `provide`d are visible on import. #'(#%module-begin diff --git a/yaragg-lib/yaragg/examples/01-equal.rkt b/yaragg-lib/yaragg/examples/01-equal.rkt index c53bd18..ceac5dd 100755 --- a/yaragg-lib/yaragg/examples/01-equal.rkt +++ b/yaragg-lib/yaragg/examples/01-equal.rkt @@ -1,4 +1,4 @@ -#lang brag +#lang yaragg ## Equal numbers of 0 and 1s in a string. ## diff --git a/yaragg-lib/yaragg/examples/0n1.rkt b/yaragg-lib/yaragg/examples/0n1.rkt index 53beae0..b8afe4d 100755 --- a/yaragg-lib/yaragg/examples/0n1.rkt +++ b/yaragg-lib/yaragg/examples/0n1.rkt @@ -1,3 +1,3 @@ -#lang brag +#lang yaragg rule: "0"* "1" diff --git a/yaragg-lib/yaragg/examples/0n1n.rkt b/yaragg-lib/yaragg/examples/0n1n.rkt index 25b0ea5..d6a6511 100755 --- a/yaragg-lib/yaragg/examples/0n1n.rkt +++ b/yaragg-lib/yaragg/examples/0n1n.rkt @@ -1,3 +1,3 @@ -#lang brag +#lang yaragg rule-0n1n: ["0" rule-0n1n "1"] diff --git a/yaragg-lib/yaragg/examples/add-mult.rkt b/yaragg-lib/yaragg/examples/add-mult.rkt index bde2ac5..2a5688c 100755 --- a/yaragg-lib/yaragg/examples/add-mult.rkt +++ b/yaragg-lib/yaragg/examples/add-mult.rkt @@ -1,4 +1,4 @@ -#lang brag +#lang yaragg expr : term (/'+' term)* @term : factor (/'*' @factor)* diff --git a/yaragg-lib/yaragg/examples/baby-json-alt.rkt b/yaragg-lib/yaragg/examples/baby-json-alt.rkt index c454397..56b1100 100755 --- a/yaragg-lib/yaragg/examples/baby-json-alt.rkt +++ b/yaragg-lib/yaragg/examples/baby-json-alt.rkt @@ -1,4 +1,4 @@ -#lang brag +#lang yaragg ;; Simple baby example of JSON structure json ::= number | string diff --git a/yaragg-lib/yaragg/examples/baby-json-alt2.rkt b/yaragg-lib/yaragg/examples/baby-json-alt2.rkt index 15d75b2..40064da 100755 --- a/yaragg-lib/yaragg/examples/baby-json-alt2.rkt +++ b/yaragg-lib/yaragg/examples/baby-json-alt2.rkt @@ -1,4 +1,4 @@ -#lang brag +#lang yaragg ;; Simple baby example of JSON structure json: number diff --git a/yaragg-lib/yaragg/examples/baby-json-hider.rkt b/yaragg-lib/yaragg/examples/baby-json-hider.rkt index 769ecfd..89648ba 100755 --- a/yaragg-lib/yaragg/examples/baby-json-hider.rkt +++ b/yaragg-lib/yaragg/examples/baby-json-hider.rkt @@ -1,4 +1,4 @@ -#lang brag +#lang yaragg #:prefix-out my: ;; Simple baby example of JSON structure diff --git a/yaragg-lib/yaragg/examples/baby-json.rkt b/yaragg-lib/yaragg/examples/baby-json.rkt index 491dfc8..ded2698 100755 --- a/yaragg-lib/yaragg/examples/baby-json.rkt +++ b/yaragg-lib/yaragg/examples/baby-json.rkt @@ -1,4 +1,4 @@ -#lang brag +#lang yaragg ;; Simple baby example of JSON structure json: number | string diff --git a/yaragg-lib/yaragg/examples/bnf.rkt b/yaragg-lib/yaragg/examples/bnf.rkt index 2349038..2a73d71 100755 --- a/yaragg-lib/yaragg/examples/bnf.rkt +++ b/yaragg-lib/yaragg/examples/bnf.rkt @@ -1,4 +1,4 @@ -#lang brag +#lang yaragg ## The following comes from: http://en.wikipedia.org/wiki/Backus%E2%80%93Naur_Form diff --git a/yaragg-lib/yaragg/examples/codepoints.rkt b/yaragg-lib/yaragg/examples/codepoints.rkt index 1196aef..8074f17 100644 --- a/yaragg-lib/yaragg/examples/codepoints.rkt +++ b/yaragg-lib/yaragg/examples/codepoints.rkt @@ -1,4 +1,4 @@ -#lang brag +#lang yaragg start: A c def hello-world A : "\"\101\\" ; A c : '\'\U0063\\' ; c diff --git a/yaragg-lib/yaragg/examples/curly-quantifier.rkt b/yaragg-lib/yaragg/examples/curly-quantifier.rkt index a2de3ac..db28053 100644 --- a/yaragg-lib/yaragg/examples/curly-quantifier.rkt +++ b/yaragg-lib/yaragg/examples/curly-quantifier.rkt @@ -1,4 +1,4 @@ -#lang brag +#lang yaragg ;; test the curly quantifier start : a-rule | b-rule | c-rule | d-rule | e-rule a-rule : "a"{2} ; exactly 2 diff --git a/yaragg-lib/yaragg/examples/cutter-another.rkt b/yaragg-lib/yaragg/examples/cutter-another.rkt index 3e21b1c..07ce0a9 100755 --- a/yaragg-lib/yaragg/examples/cutter-another.rkt +++ b/yaragg-lib/yaragg/examples/cutter-another.rkt @@ -1,4 +1,4 @@ -#lang brag +#lang yaragg top : w | x | y | z | a | b | c w : /"w" ; atom x : /("x") ; seq diff --git a/yaragg-lib/yaragg/examples/cutter.rkt b/yaragg-lib/yaragg/examples/cutter.rkt index 7cd7023..a9ecf61 100755 --- a/yaragg-lib/yaragg/examples/cutter.rkt +++ b/yaragg-lib/yaragg/examples/cutter.rkt @@ -1,4 +1,4 @@ -#lang brag +#lang yaragg top : expr (/"," expr)* expr : "x" | list list : "(" expr ("," expr)* ")" \ No newline at end of file diff --git a/yaragg-lib/yaragg/examples/empty-symbol.rkt b/yaragg-lib/yaragg/examples/empty-symbol.rkt index 35a45c8..995bc14 100755 --- a/yaragg-lib/yaragg/examples/empty-symbol.rkt +++ b/yaragg-lib/yaragg/examples/empty-symbol.rkt @@ -1,4 +1,4 @@ -#lang brag +#lang yaragg top : xs | ys | zs xs : () | "x" xs diff --git a/yaragg-lib/yaragg/examples/hide-and-splice.rkt b/yaragg-lib/yaragg/examples/hide-and-splice.rkt index e1e422d..84aa7d5 100644 --- a/yaragg-lib/yaragg/examples/hide-and-splice.rkt +++ b/yaragg-lib/yaragg/examples/hide-and-splice.rkt @@ -1,4 +1,4 @@ -#lang brag +#lang yaragg top : x | y /x : Ø | "x" @x @y : Ø | "y" y \ No newline at end of file diff --git a/yaragg-lib/yaragg/examples/lua-parser.rkt b/yaragg-lib/yaragg/examples/lua-parser.rkt index 75781e9..d1312ed 100755 --- a/yaragg-lib/yaragg/examples/lua-parser.rkt +++ b/yaragg-lib/yaragg/examples/lua-parser.rkt @@ -1,4 +1,4 @@ -#lang brag +#lang yaragg ;; Lua parser, adapted from: ;; http://www.lua.org/manual/5.1/manual.html#8 diff --git a/yaragg-lib/yaragg/examples/nested-repeats.rkt b/yaragg-lib/yaragg/examples/nested-repeats.rkt index 17eaa5e..9f69576 100644 --- a/yaragg-lib/yaragg/examples/nested-repeats.rkt +++ b/yaragg-lib/yaragg/examples/nested-repeats.rkt @@ -1,3 +1,3 @@ -#lang brag +#lang yaragg start : ( (X | X Y) A* )* diff --git a/yaragg-lib/yaragg/examples/nested-word-list.rkt b/yaragg-lib/yaragg/examples/nested-word-list.rkt index b7489c4..b7386d4 100755 --- a/yaragg-lib/yaragg/examples/nested-word-list.rkt +++ b/yaragg-lib/yaragg/examples/nested-word-list.rkt @@ -1,3 +1,3 @@ -#lang brag +#lang yaragg nested-word-list: WORD | LEFT-PAREN nested-word-list* RIGHT-PAREN diff --git a/yaragg-lib/yaragg/examples/quotation-marks-and-backslashes.rkt b/yaragg-lib/yaragg/examples/quotation-marks-and-backslashes.rkt index 18bc00f..2fc3307 100644 --- a/yaragg-lib/yaragg/examples/quotation-marks-and-backslashes.rkt +++ b/yaragg-lib/yaragg/examples/quotation-marks-and-backslashes.rkt @@ -1,2 +1,2 @@ -#lang brag +#lang yaragg start: "a" "\"" "'" "\\" 'a' '"' '\'' '\\' \ No newline at end of file diff --git a/yaragg-lib/yaragg/examples/simple-arithmetic-grammar.rkt b/yaragg-lib/yaragg/examples/simple-arithmetic-grammar.rkt index 69a5f2c..d06d80b 100755 --- a/yaragg-lib/yaragg/examples/simple-arithmetic-grammar.rkt +++ b/yaragg-lib/yaragg/examples/simple-arithmetic-grammar.rkt @@ -1,4 +1,4 @@ -#lang brag +#lang yaragg expr : term ('+' term)* term : factor ('*' factor)* diff --git a/yaragg-lib/yaragg/examples/simple-line-drawing.rkt b/yaragg-lib/yaragg/examples/simple-line-drawing.rkt index b97bdf5..7b6e775 100755 --- a/yaragg-lib/yaragg/examples/simple-line-drawing.rkt +++ b/yaragg-lib/yaragg/examples/simple-line-drawing.rkt @@ -1,4 +1,4 @@ -#lang brag +#lang yaragg ;; ;; See: http://stackoverflow.com/questions/12345647/rewrite-this-script-by-designing-an-interpreter-in-racket diff --git a/yaragg-lib/yaragg/examples/simple-line-drawing/grammar.rkt b/yaragg-lib/yaragg/examples/simple-line-drawing/grammar.rkt index b97bdf5..7b6e775 100755 --- a/yaragg-lib/yaragg/examples/simple-line-drawing/grammar.rkt +++ b/yaragg-lib/yaragg/examples/simple-line-drawing/grammar.rkt @@ -1,4 +1,4 @@ -#lang brag +#lang yaragg ;; ;; See: http://stackoverflow.com/questions/12345647/rewrite-this-script-by-designing-an-interpreter-in-racket diff --git a/yaragg-lib/yaragg/examples/start-and-atok.rkt b/yaragg-lib/yaragg/examples/start-and-atok.rkt index 4abf557..5504155 100755 --- a/yaragg-lib/yaragg/examples/start-and-atok.rkt +++ b/yaragg-lib/yaragg/examples/start-and-atok.rkt @@ -1,3 +1,3 @@ -#lang brag +#lang yaragg top : ("start" | "atok")+ \ No newline at end of file diff --git a/yaragg-lib/yaragg/examples/statlist-grammar.rkt b/yaragg-lib/yaragg/examples/statlist-grammar.rkt index 18b2561..ec9a049 100755 --- a/yaragg-lib/yaragg/examples/statlist-grammar.rkt +++ b/yaragg-lib/yaragg/examples/statlist-grammar.rkt @@ -1,4 +1,4 @@ -#lang brag +#lang yaragg ## Statlist grammar diff --git a/yaragg-lib/yaragg/examples/subrule.rkt b/yaragg-lib/yaragg/examples/subrule.rkt index 7183bfc..0c2a6d3 100644 --- a/yaragg-lib/yaragg/examples/subrule.rkt +++ b/yaragg-lib/yaragg/examples/subrule.rkt @@ -1,4 +1,4 @@ -#lang brag +#lang yaragg start: next next: "0" diff --git a/yaragg-lib/yaragg/examples/top-level-cut-1.rkt b/yaragg-lib/yaragg/examples/top-level-cut-1.rkt index f91a6ca..c1ac256 100644 --- a/yaragg-lib/yaragg/examples/top-level-cut-1.rkt +++ b/yaragg-lib/yaragg/examples/top-level-cut-1.rkt @@ -1,3 +1,3 @@ -#lang brag +#lang yaragg /top : sub sub : "x" \ No newline at end of file diff --git a/yaragg-lib/yaragg/examples/top-level-cut-2.rkt b/yaragg-lib/yaragg/examples/top-level-cut-2.rkt index d2b46e7..e7287af 100644 --- a/yaragg-lib/yaragg/examples/top-level-cut-2.rkt +++ b/yaragg-lib/yaragg/examples/top-level-cut-2.rkt @@ -1,3 +1,3 @@ -#lang brag +#lang yaragg /top : sub /sub : "x" \ No newline at end of file diff --git a/yaragg-lib/yaragg/examples/top-level-cut-3.rkt b/yaragg-lib/yaragg/examples/top-level-cut-3.rkt index e3a793c..165a62a 100644 --- a/yaragg-lib/yaragg/examples/top-level-cut-3.rkt +++ b/yaragg-lib/yaragg/examples/top-level-cut-3.rkt @@ -1,3 +1,3 @@ -#lang brag +#lang yaragg /top : sub @sub : "x" \ No newline at end of file diff --git a/yaragg-lib/yaragg/examples/whitespace.rkt b/yaragg-lib/yaragg/examples/whitespace.rkt index 9b2101a..fb3afa0 100644 --- a/yaragg-lib/yaragg/examples/whitespace.rkt +++ b/yaragg-lib/yaragg/examples/whitespace.rkt @@ -1,4 +1,4 @@ -#lang brag +#lang yaragg start: (tab | space | newline | letter | return | all)* tab: '\t' space: " " diff --git a/yaragg-lib/yaragg/examples/wordy.rkt b/yaragg-lib/yaragg/examples/wordy.rkt index 66c9042..3cab259 100755 --- a/yaragg-lib/yaragg/examples/wordy.rkt +++ b/yaragg-lib/yaragg/examples/wordy.rkt @@ -1,4 +1,4 @@ -#lang brag +#lang yaragg ;; A parser for a silly language sentence: verb optional-adjective object verb: greeting diff --git a/yaragg-lib/yaragg/test/test-errors.rkt b/yaragg-lib/yaragg/test/test-errors.rkt index 54417c7..3967172 100755 --- a/yaragg-lib/yaragg/test/test-errors.rkt +++ b/yaragg-lib/yaragg/test/test-errors.rkt @@ -36,7 +36,7 @@ ;; errors with position are sensitive to length of lang line -(define lang-line "#lang brag") +(define lang-line "#lang yaragg") (check-compile-error (format "~a" lang-line) "The grammar does not appear to have any rules") @@ -52,34 +52,34 @@ -(check-compile-error "#lang brag\n x: NUMBER\nx:STRING" +(check-compile-error "#lang yaragg\n x: NUMBER\nx:STRING" "Rule x has a duplicate definition") ;; Check to see that missing definitions for rules also raise good syntax ;; errors: -(check-compile-error "#lang brag\nx:y" +(check-compile-error "#lang yaragg\nx:y" "Rule y has no definition") -(check-compile-error "#lang brag\nnumber : 1flarbl" +(check-compile-error "#lang yaragg\nnumber : 1flarbl" "Rule 1flarbl has no definition") -(check-compile-error "#lang brag\nprogram: EOF" +(check-compile-error "#lang yaragg\nprogram: EOF" "Token EOF is reserved and can not be used in a grammar") ;; Nontermination checks: -(check-compile-error "#lang brag\nx : x" +(check-compile-error "#lang yaragg\nx : x" "Rule x has no finite derivation") (check-compile-error #<