From 121c26450ec9b2750f97506bf9c0bffc1111b9b8 Mon Sep 17 00:00:00 2001 From: Jack Firth Date: Mon, 28 Mar 2022 17:13:21 -0700 Subject: [PATCH] Fix more module imports --- parser-tools/lex.rkt | 14 ++++++-------- parser-tools/private-lex/deriv.rkt | 7 +++---- parser-tools/private-lex/front.rkt | 9 ++++----- parser-tools/private-lex/re.rkt | 5 ++--- parser-tools/private-lex/unicode-chars.rkt | 2 +- parser-tools/private-yacc/grammar.rkt | 3 +-- parser-tools/private-yacc/lalr.rkt | 1 - parser-tools/private-yacc/lr0.rkt | 1 - parser-tools/private-yacc/parser-builder.rkt | 1 - parser-tools/private-yacc/table.rkt | 1 - parser-tools/yacc-to-scheme.rkt | 3 +-- parser-tools/yacc.rkt | 12 ++++++------ rules/lexer.rkt | 1 - rules/parser.rkt | 1 - rules/stx.rkt | 4 +--- 15 files changed, 25 insertions(+), 40 deletions(-) diff --git a/parser-tools/lex.rkt b/parser-tools/lex.rkt index c26aeef..e4602d0 100644 --- a/parser-tools/lex.rkt +++ b/parser-tools/lex.rkt @@ -3,21 +3,19 @@ ;; Provides the syntax used to create lexers and the functions needed to ;; create and use the buffer that the lexer reads from. See docs. -(require (for-syntax racket/list - racket/syntax +(require (for-syntax racket/syntax syntax/stx syntax/define - syntax/boundmap - "private-lex/util.rkt" - "private-lex/actions.rkt" - "private-lex/front.rkt" - "private-lex/unicode-chars.rkt" + yaragg/parser-tools/private-lex/util + yaragg/parser-tools/private-lex/actions + yaragg/parser-tools/private-lex/front + yaragg/parser-tools/private-lex/unicode-chars racket/base racket/promise)) (require racket/stxparam syntax/readerr - "private-lex/token.rkt") + yaragg/parser-tools/private-lex/token) (provide lexer lexer-src-pos lexer-srcloc define-lex-abbrev define-lex-abbrevs define-lex-trans diff --git a/parser-tools/private-lex/deriv.rkt b/parser-tools/private-lex/deriv.rkt index d87e846..9b55eec 100644 --- a/parser-tools/private-lex/deriv.rkt +++ b/parser-tools/private-lex/deriv.rkt @@ -1,8 +1,7 @@ #lang racket/base -(require racket/list - (prefix-in is: data/integer-set) - "re.rkt" - "util.rkt") +(require (prefix-in is: data/integer-set) + yaragg/parser-tools/private-lex/re + yaragg/parser-tools/private-lex/util) (provide build-dfa print-dfa (struct-out dfa)) diff --git a/parser-tools/private-lex/front.rkt b/parser-tools/private-lex/front.rkt index c34eba2..467ac4d 100644 --- a/parser-tools/private-lex/front.rkt +++ b/parser-tools/private-lex/front.rkt @@ -2,12 +2,11 @@ (require racket/base racket/match (prefix-in is: data/integer-set) - racket/list syntax/stx - "util.rkt" - "stx.rkt" - "re.rkt" - "deriv.rkt") + yaragg/parser-tools/private-lex/util + yaragg/parser-tools/private-lex/stx + yaragg/parser-tools/private-lex/re + yaragg/parser-tools/private-lex/deriv) (provide build-lexer) diff --git a/parser-tools/private-lex/re.rkt b/parser-tools/private-lex/re.rkt index 35b2ced..e319d69 100644 --- a/parser-tools/private-lex/re.rkt +++ b/parser-tools/private-lex/re.rkt @@ -1,8 +1,7 @@ #lang racket/base -(require racket/list - racket/match +(require racket/match (prefix-in is: data/integer-set) - "util.rkt") + yaragg/parser-tools/private-lex/util) (provide ->re build-epsilon build-zero build-char-set build-concat build-repeat build-or build-and build-neg diff --git a/parser-tools/private-lex/unicode-chars.rkt b/parser-tools/private-lex/unicode-chars.rkt index f10d05e..a6dd678 100644 --- a/parser-tools/private-lex/unicode-chars.rkt +++ b/parser-tools/private-lex/unicode-chars.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require racket/promise yaragg/parser-tools/private-lex/util) +(require racket/promise) (provide (all-defined-out)) diff --git a/parser-tools/private-yacc/grammar.rkt b/parser-tools/private-yacc/grammar.rkt index 07aea77..17eefd2 100644 --- a/parser-tools/private-yacc/grammar.rkt +++ b/parser-tools/private-yacc/grammar.rkt @@ -3,8 +3,7 @@ ;; representation of the input to the parser generator. (require racket/class - (except-in racket/list remove-duplicates) - "yacc-helper.rkt" + yaragg/parser-tools/private-yacc/yacc-helper racket/contract) ;; Each production has a unique index 0 <= index <= number of productions diff --git a/parser-tools/private-yacc/lalr.rkt b/parser-tools/private-yacc/lalr.rkt index 25fbdf2..0ed19b7 100644 --- a/parser-tools/private-yacc/lalr.rkt +++ b/parser-tools/private-yacc/lalr.rkt @@ -1,7 +1,6 @@ #lang racket/base (require yaragg/parser-tools/private-yacc/lr0 yaragg/parser-tools/private-yacc/grammar - racket/list racket/class) ;; Compute LALR lookaheads from DeRemer and Pennello 1982 diff --git a/parser-tools/private-yacc/lr0.rkt b/parser-tools/private-yacc/lr0.rkt index a98fa9e..dc773da 100644 --- a/parser-tools/private-yacc/lr0.rkt +++ b/parser-tools/private-yacc/lr0.rkt @@ -1,7 +1,6 @@ #lang racket/base (require yaragg/parser-tools/private-yacc/grammar yaragg/parser-tools/private-yacc/graph - racket/list racket/class) ;; Handle the LR0 automaton diff --git a/parser-tools/private-yacc/parser-builder.rkt b/parser-tools/private-yacc/parser-builder.rkt index a7cf01c..87e804d 100644 --- a/parser-tools/private-yacc/parser-builder.rkt +++ b/parser-tools/private-yacc/parser-builder.rkt @@ -63,7 +63,6 @@ (let ((BIND void) ... (TMP void) ...) (void BOUND ... ... TERM-GROUP ... START ... END ... PREC ...))))) -(require racket/list "parser-actions.rkt") (define (build-parser filename src-pos suppress input-terms start end assocs prods) (define grammar (parse-input input-terms start end assocs prods src-pos)) diff --git a/parser-tools/private-yacc/table.rkt b/parser-tools/private-yacc/table.rkt index e096315..ebf0e51 100644 --- a/parser-tools/private-yacc/table.rkt +++ b/parser-tools/private-yacc/table.rkt @@ -4,7 +4,6 @@ yaragg/parser-tools/private-yacc/lalr yaragg/parser-tools/private-yacc/parser-actions racket/contract - racket/list racket/class) ;; Routine to build the LALR table diff --git a/parser-tools/yacc-to-scheme.rkt b/parser-tools/yacc-to-scheme.rkt index 6fd6480..184610c 100644 --- a/parser-tools/yacc-to-scheme.rkt +++ b/parser-tools/yacc-to-scheme.rkt @@ -2,8 +2,7 @@ (require yaragg/parser-tools/lex (prefix-in : yaragg/parser-tools/lex-sre) yaragg/parser-tools/yacc - syntax/readerr - racket/list) + syntax/readerr) (provide trans) (define match-double-string diff --git a/parser-tools/yacc.rkt b/parser-tools/yacc.rkt index c4184a2..107d0a4 100644 --- a/parser-tools/yacc.rkt +++ b/parser-tools/yacc.rkt @@ -1,11 +1,11 @@ #lang racket/base (require (for-syntax racket/base - "private-yacc/parser-builder.rkt" - "private-yacc/grammar.rkt" - "private-yacc/yacc-helper.rkt" - "private-yacc/parser-actions.rkt") - "private-lex/token.rkt" - "private-yacc/parser-actions.rkt" + yaragg/parser-tools/private-yacc/parser-builder + yaragg/parser-tools/private-yacc/grammar + yaragg/parser-tools/private-yacc/yacc-helper + yaragg/parser-tools/private-yacc/parser-actions) + yaragg/parser-tools/private-lex/token + yaragg/parser-tools/private-yacc/parser-actions racket/local racket/pretty syntax/readerr) diff --git a/rules/lexer.rkt b/rules/lexer.rkt index 1efe66c..612cd37 100755 --- a/rules/lexer.rkt +++ b/rules/lexer.rkt @@ -6,7 +6,6 @@ yaragg/rules/rule-structs (only-in yaragg/support from/to) racket/string - syntax-color/racket-lexer racket/match) (provide lex/1 tokenize) diff --git a/rules/parser.rkt b/rules/parser.rkt index 4e8f6c8..5e97010 100755 --- a/rules/parser.rkt +++ b/rules/parser.rkt @@ -1,7 +1,6 @@ #lang racket/base (require yaragg/parser-tools/yacc yaragg/parser-tools/lex - racket/list racket/match yaragg/rules/rule-structs) diff --git a/rules/stx.rkt b/rules/stx.rkt index 1e4e4eb..01484ef 100755 --- a/rules/stx.rkt +++ b/rules/stx.rkt @@ -1,9 +1,7 @@ #lang racket/base (require yaragg/rules/rule-structs - yaragg/parser-tools/lex - racket/match - syntax/strip-context) + racket/match) (provide rule->stx)