From 8feed88328e50e56fa7b781794ac0904f730aca3 Mon Sep 17 00:00:00 2001 From: Jack Firth Date: Mon, 28 Mar 2022 13:51:43 -0700 Subject: [PATCH] Use collection-based module paths in parser-tools --- .../br-parser-tools/private-lex/error-tests.rkt | 2 +- br-parser-tools-lib/br-parser-tools/private-lex/stx.rkt | 2 +- br-parser-tools-lib/br-parser-tools/private-lex/token.rkt | 2 +- .../br-parser-tools/private-lex/unicode-chars.rkt | 2 +- .../br-parser-tools/private-yacc/input-file-parser.rkt | 6 +++--- br-parser-tools-lib/br-parser-tools/private-yacc/lalr.rkt | 4 ++-- br-parser-tools-lib/br-parser-tools/private-yacc/lr0.rkt | 4 ++-- .../br-parser-tools/private-yacc/parser-actions.rkt | 2 +- .../br-parser-tools/private-yacc/parser-builder.rkt | 6 +++--- .../br-parser-tools/private-yacc/table.rkt | 8 ++++---- .../br-parser-tools/private-yacc/yacc-helper.rkt | 2 +- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/br-parser-tools-lib/br-parser-tools/private-lex/error-tests.rkt b/br-parser-tools-lib/br-parser-tools/private-lex/error-tests.rkt index 7ee2adf..108dca2 100644 --- a/br-parser-tools-lib/br-parser-tools/private-lex/error-tests.rkt +++ b/br-parser-tools-lib/br-parser-tools/private-lex/error-tests.rkt @@ -1,6 +1,6 @@ #lang racket/base (require (for-syntax racket/base) - "../lex.rkt" + br-parser-tools/private-lex/lex rackunit) (define-syntax (catch-syn-error stx) diff --git a/br-parser-tools-lib/br-parser-tools/private-lex/stx.rkt b/br-parser-tools-lib/br-parser-tools/private-lex/stx.rkt index 6b5ab9a..9d1f90e 100644 --- a/br-parser-tools-lib/br-parser-tools/private-lex/stx.rkt +++ b/br-parser-tools-lib/br-parser-tools/private-lex/stx.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require "util.rkt" syntax/id-table racket/syntax) +(require br-parser-tools/private-lex/util syntax/id-table racket/syntax) (provide parse) (define (bad-args stx num) diff --git a/br-parser-tools-lib/br-parser-tools/private-lex/token.rkt b/br-parser-tools-lib/br-parser-tools/private-lex/token.rkt index 07e1fa5..7e5f0f0 100644 --- a/br-parser-tools-lib/br-parser-tools/private-lex/token.rkt +++ b/br-parser-tools-lib/br-parser-tools/private-lex/token.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require (for-syntax racket/base "token-syntax.rkt")) +(require (for-syntax racket/base br-parser-tools/private-lex/token-syntax)) ;; Defining tokens diff --git a/br-parser-tools-lib/br-parser-tools/private-lex/unicode-chars.rkt b/br-parser-tools-lib/br-parser-tools/private-lex/unicode-chars.rkt index d8580b6..1832aca 100644 --- a/br-parser-tools-lib/br-parser-tools/private-lex/unicode-chars.rkt +++ b/br-parser-tools-lib/br-parser-tools/private-lex/unicode-chars.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require racket/promise "util.rkt") +(require racket/promise br-parser-tools/private-lex/util) (provide (all-defined-out)) diff --git a/br-parser-tools-lib/br-parser-tools/private-yacc/input-file-parser.rkt b/br-parser-tools-lib/br-parser-tools/private-yacc/input-file-parser.rkt index fa99240..52ca94f 100644 --- a/br-parser-tools-lib/br-parser-tools/private-yacc/input-file-parser.rkt +++ b/br-parser-tools-lib/br-parser-tools/private-yacc/input-file-parser.rkt @@ -1,7 +1,7 @@ #lang racket/base -(require "yacc-helper.rkt" - "../private-lex/token-syntax.rkt" - "grammar.rkt" +(require br-parser-tools/private-yacc/yacc-helper + br-parser-tools/private-lex/token-syntax + br-parser-tools/private-yacc/grammar racket/class racket/contract (for-template racket/base)) diff --git a/br-parser-tools-lib/br-parser-tools/private-yacc/lalr.rkt b/br-parser-tools-lib/br-parser-tools/private-yacc/lalr.rkt index ed21c37..d6b1b10 100644 --- a/br-parser-tools-lib/br-parser-tools/private-yacc/lalr.rkt +++ b/br-parser-tools-lib/br-parser-tools/private-yacc/lalr.rkt @@ -1,6 +1,6 @@ #lang racket/base -(require "lr0.rkt" - "grammar.rkt" +(require br-parser-tools/private-yacc/lr0 + br-parser-tools/private-yacc/grammar racket/list racket/class) diff --git a/br-parser-tools-lib/br-parser-tools/private-yacc/lr0.rkt b/br-parser-tools-lib/br-parser-tools/private-yacc/lr0.rkt index a3b1fcc..f771e20 100644 --- a/br-parser-tools-lib/br-parser-tools/private-yacc/lr0.rkt +++ b/br-parser-tools-lib/br-parser-tools/private-yacc/lr0.rkt @@ -1,6 +1,6 @@ #lang racket/base -(require "grammar.rkt" - "graph.rkt" +(require br-parser-tools/private-yacc/grammar + br-parser-tools/private-yacc/graph racket/list racket/class) diff --git a/br-parser-tools-lib/br-parser-tools/private-yacc/parser-actions.rkt b/br-parser-tools-lib/br-parser-tools/private-yacc/parser-actions.rkt index 11e4557..81b25b3 100644 --- a/br-parser-tools-lib/br-parser-tools/private-yacc/parser-actions.rkt +++ b/br-parser-tools-lib/br-parser-tools/private-yacc/parser-actions.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require "grammar.rkt") +(require br-parser-tools/private-yacc/grammar) (provide (except-out (all-defined-out) make-reduce make-reduce*) (rename-out [make-reduce* make-reduce])) diff --git a/br-parser-tools-lib/br-parser-tools/private-yacc/parser-builder.rkt b/br-parser-tools-lib/br-parser-tools/private-yacc/parser-builder.rkt index 87638e3..5bf89b8 100644 --- a/br-parser-tools-lib/br-parser-tools/private-yacc/parser-builder.rkt +++ b/br-parser-tools-lib/br-parser-tools/private-yacc/parser-builder.rkt @@ -1,7 +1,7 @@ #lang racket/base -(require "input-file-parser.rkt" - "grammar.rkt" - "table.rkt" +(require br-parser-tools/private-yacc/input-file-parser + br-parser-tools/private-yacc/grammar + br-parser-tools/private-yacc/table racket/class racket/contract) (require (for-template racket/base)) diff --git a/br-parser-tools-lib/br-parser-tools/private-yacc/table.rkt b/br-parser-tools-lib/br-parser-tools/private-yacc/table.rkt index 81c9a8d..200f5b7 100644 --- a/br-parser-tools-lib/br-parser-tools/private-yacc/table.rkt +++ b/br-parser-tools-lib/br-parser-tools/private-yacc/table.rkt @@ -1,8 +1,8 @@ #lang racket/base -(require "grammar.rkt" - "lr0.rkt" - "lalr.rkt" - "parser-actions.rkt" +(require br-parser-tools/private-yacc/grammar + br-parser-tools/private-yacc/lr0 + br-parser-tools/private-yacc/lalr + br-parser-tools/private-yacc/parser-actions racket/contract racket/list racket/class) diff --git a/br-parser-tools-lib/br-parser-tools/private-yacc/yacc-helper.rkt b/br-parser-tools-lib/br-parser-tools/private-yacc/yacc-helper.rkt index 5f63471..90e465e 100644 --- a/br-parser-tools-lib/br-parser-tools/private-yacc/yacc-helper.rkt +++ b/br-parser-tools-lib/br-parser-tools/private-yacc/yacc-helper.rkt @@ -1,6 +1,6 @@ #lang racket/base (require (prefix-in rl: racket/list) - "../private-lex/token-syntax.rkt") + br-parser-tools/private-lex/token-syntax) ;; General helper routines (provide duplicate-list? remove-duplicates overlap? vector-andmap display-yacc)