From ab8a7437a92cb6c2854095e410bbcf57a0304b06 Mon Sep 17 00:00:00 2001 From: Jack Firth Date: Mon, 28 Mar 2022 13:30:27 -0700 Subject: [PATCH] Use collection-based module paths --- brag-lib/brag/codegen/codegen.rkt | 2 +- brag-lib/brag/codegen/expander.rkt | 6 +-- brag-lib/brag/main.rkt | 4 +- brag-lib/brag/rules/lexer.rkt | 6 +-- brag-lib/brag/rules/parser.rkt | 2 +- brag-lib/brag/rules/stx.rkt | 2 +- brag-lib/brag/test/test-all.rkt | 46 +++++++++++------------ brag-lib/brag/test/test-weird-grammar.rkt | 2 +- 8 files changed, 35 insertions(+), 35 deletions(-) diff --git a/brag-lib/brag/codegen/codegen.rkt b/brag-lib/brag/codegen/codegen.rkt index 029eb64..19c2e6e 100755 --- a/brag-lib/brag/codegen/codegen.rkt +++ b/brag-lib/brag/codegen/codegen.rkt @@ -3,7 +3,7 @@ racket/syntax brag/rules/stx-types syntax/id-table - (prefix-in sat: "satisfaction.rkt") + (prefix-in sat: brag/codegen/satisfaction) (for-template racket/base brag/codegen/runtime brag/private/internal-support)) diff --git a/brag-lib/brag/codegen/expander.rkt b/brag-lib/brag/codegen/expander.rkt index cf1d137..3711899 100755 --- a/brag-lib/brag/codegen/expander.rkt +++ b/brag-lib/brag/codegen/expander.rkt @@ -1,9 +1,9 @@ #lang racket/base (require (for-syntax racket/base racket/list - "codegen.rkt" - "runtime.rkt" - "flatten.rkt") + brag/codegen/codegen + brag/codegen/runtime + brag/codegen/flatten) br-parser-tools/lex br-parser-tools/cfg-parser (prefix-in bs: brag/support) diff --git a/brag-lib/brag/main.rkt b/brag-lib/brag/main.rkt index 860a3c3..0976af4 100755 --- a/brag-lib/brag/main.rkt +++ b/brag-lib/brag/main.rkt @@ -1,8 +1,8 @@ #lang racket/base (module reader racket/base - (require "codegen/reader.rkt") - (provide (all-from-out "codegen/reader.rkt"))) + (require brag/codegen/reader) + (provide (all-from-out brag/codegen/reader))) ;; this creates dummy identifiers ;; so cross-refs in `brag` docs will work diff --git a/brag-lib/brag/rules/lexer.rkt b/brag-lib/brag/rules/lexer.rkt index af52495..620f73d 100755 --- a/brag-lib/brag/rules/lexer.rkt +++ b/brag-lib/brag/rules/lexer.rkt @@ -1,9 +1,9 @@ #lang racket/base -(require (for-syntax racket/base "parser.rkt")) +(require (for-syntax racket/base brag/rules/parser)) (require br-parser-tools/lex (prefix-in : br-parser-tools/lex-sre) - "parser.rkt" - "rule-structs.rkt" + brag/rules/parser + brag/rules/rule-structs (only-in brag/support from/to) racket/string syntax-color/racket-lexer diff --git a/brag-lib/brag/rules/parser.rkt b/brag-lib/brag/rules/parser.rkt index 18b8e44..52baaca 100755 --- a/brag-lib/brag/rules/parser.rkt +++ b/brag-lib/brag/rules/parser.rkt @@ -3,7 +3,7 @@ br-parser-tools/lex racket/list racket/match - "rule-structs.rkt") + brag/rules/rule-structs) ;; A parser for grammars. diff --git a/brag-lib/brag/rules/stx.rkt b/brag-lib/brag/rules/stx.rkt index 7573bda..27789ef 100755 --- a/brag-lib/brag/rules/stx.rkt +++ b/brag-lib/brag/rules/stx.rkt @@ -1,6 +1,6 @@ #lang racket/base -(require "rule-structs.rkt" +(require brag/rules/rule-structs br-parser-tools/lex racket/match syntax/strip-context) diff --git a/brag-lib/brag/test/test-all.rkt b/brag-lib/brag/test/test-all.rkt index a101de0..948e544 100755 --- a/brag-lib/brag/test/test-all.rkt +++ b/brag-lib/brag/test/test-all.rkt @@ -1,26 +1,26 @@ #lang racket/base -(require "test-0n1.rkt" - "test-0n1n.rkt" - "test-01-equal.rkt" - "test-baby-json.rkt" - "test-baby-json-hider.rkt" - "test-curly-quantifier.rkt" - "test-cutter.rkt" - "test-empty-symbol.rkt" - "test-errors.rkt" - "test-flatten.rkt" - "test-hide-and-splice.rkt" - "test-lexer.rkt" - "test-nested-repeats.rkt" - "test-old-token.rkt" - "test-parser.rkt" - "test-quotation-marks-and-backslashes.rkt" - "test-simple-arithmetic-grammar.rkt" - "test-simple-line-drawing.rkt" - "test-start-and-atok.rkt" - "test-top-level-cut.rkt" - "test-weird-grammar.rkt" - "test-whitespace.rkt" - "test-wordy.rkt" +(require brag/test/test-0n1 + brag/test/test-0n1n + brag/test/test-01-equal + brag/test/test-baby-json + brag/test/test-baby-json-hider + brag/test/test-curly-quantifier + brag/test/test-cutter + brag/test/test-empty-symbol + brag/test/test-errors + brag/test/test-flatten + brag/test/test-hide-and-splice + brag/test/test-lexer + brag/test/test-nested-repeats + brag/test/test-old-token + brag/test/test-parser + brag/test/test-quotation-marks-and-backslashes + brag/test/test-simple-arithmetic-grammar + brag/test/test-simple-line-drawing + brag/test/test-start-and-atok + brag/test/test-top-level-cut + brag/test/test-weird-grammar + brag/test/test-whitespace + brag/test/test-wordy (submod brag/codegen/satisfaction test)) diff --git a/brag-lib/brag/test/test-weird-grammar.rkt b/brag-lib/brag/test/test-weird-grammar.rkt index 1847feb..d7efa9c 100755 --- a/brag-lib/brag/test/test-weird-grammar.rkt +++ b/brag-lib/brag/test/test-weird-grammar.rkt @@ -1,6 +1,6 @@ #lang racket/base -(require "weird-grammar.rkt" +(require brag/test/weird-grammar rackunit) (check-equal? (syntax->datum (parse '("foo")))