Fix more module imports

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
+(require (for-syntax racket/syntax
-                     racket/syntax
                      syntax/stx
                      syntax/define
-                     syntax/boundmap
+                     yaragg/parser-tools/private-lex/util
-                     "private-lex/util.rkt"
+                     yaragg/parser-tools/private-lex/actions
-                     "private-lex/actions.rkt"
+                     yaragg/parser-tools/private-lex/front
-                     "private-lex/front.rkt"
+                     yaragg/parser-tools/private-lex/unicode-chars
-                     "private-lex/unicode-chars.rkt"
                      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
            

parser-tools/private-lex/deriv.rkt

@@ -1,8 +1,7 @@
 #lang racket/base
-(require racket/list
+(require (prefix-in is: data/integer-set)
-         (prefix-in is: data/integer-set)
+         yaragg/parser-tools/private-lex/re
-         "re.rkt"
+         yaragg/parser-tools/private-lex/util)
-         "util.rkt")
 
 (provide build-dfa print-dfa (struct-out dfa))
 

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"
+         yaragg/parser-tools/private-lex/util
-         "stx.rkt"
+         yaragg/parser-tools/private-lex/stx
-         "re.rkt"
+         yaragg/parser-tools/private-lex/re
-         "deriv.rkt")
+         yaragg/parser-tools/private-lex/deriv)
   
 (provide build-lexer)
   

parser-tools/private-lex/re.rkt

@@ -1,8 +1,7 @@
 #lang racket/base
-(require racket/list
+(require racket/match
-         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

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))
 

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)
+         yaragg/parser-tools/private-yacc/yacc-helper
-         "yacc-helper.rkt"
          racket/contract)
   
 ;; Each production has a unique index 0 <= index <= number of productions

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

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

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))

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

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
+         syntax/readerr)
-         racket/list)
 (provide trans)
   
 (define match-double-string

parser-tools/yacc.rkt

@@ -1,11 +1,11 @@
 #lang racket/base
 (require (for-syntax racket/base
-                     "private-yacc/parser-builder.rkt"
+                     yaragg/parser-tools/private-yacc/parser-builder
-                     "private-yacc/grammar.rkt"
+                     yaragg/parser-tools/private-yacc/grammar
-                     "private-yacc/yacc-helper.rkt"
+                     yaragg/parser-tools/private-yacc/yacc-helper
-                     "private-yacc/parser-actions.rkt")
+                     yaragg/parser-tools/private-yacc/parser-actions)
-         "private-lex/token.rkt"
+         yaragg/parser-tools/private-lex/token
-         "private-yacc/parser-actions.rkt"
+         yaragg/parser-tools/private-yacc/parser-actions
          racket/local
          racket/pretty
          syntax/readerr)

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)

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)
 

rules/stx.rkt

@@ -1,9 +1,7 @@
 #lang racket/base
 
 (require yaragg/rules/rule-structs
-         yaragg/parser-tools/lex
+         racket/match)
-         racket/match
-         syntax/strip-context)
 
 (provide rule->stx)