use new require specs in many places

svn: r8774

original commit: b1a08edd5a8c0db0bae4a9e052d9a93d1faabb4f
tokens
Eli Barzilay 17 years ago
parent 2224a46b6f
commit 13db5fbef7

@ -29,12 +29,12 @@
;; tokens. ;; tokens.
(module cfg-parser mzscheme (module cfg-parser mzscheme
(require (lib "yacc.ss" "parser-tools") (require parser-tools/yacc
(lib "lex.ss" "parser-tools") parser-tools/lex
(lib "list.ss") mzlib/list
(lib "etc.ss")) mzlib/etc)
(require-for-syntax (lib "boundmap.ss" "syntax") (require-for-syntax syntax/boundmap
(lib "list.ss") mzlib/list
(lib "token-syntax.ss" "parser-tools" "private-lex")) (lib "token-syntax.ss" "parser-tools" "private-lex"))
(provide cfg-parser) (provide cfg-parser)

@ -2,9 +2,9 @@
;; Import the parser and lexer generators. ;; Import the parser and lexer generators.
(require (lib "yacc.ss" "parser-tools") (require parser-tools/yacc
(lib "lex.ss" "parser-tools") parser-tools/lex
(prefix : (lib "lex-sre.ss" "parser-tools"))) (prefix : parser-tools/lex-sre))
(define-tokens value-tokens (NUM VAR FNCT)) (define-tokens value-tokens (NUM VAR FNCT))
(define-empty-tokens op-tokens (newline = OP CP + - * / ^ EOF NEG)) (define-empty-tokens op-tokens (newline = OP CP + - * / ^ EOF NEG))

@ -4,10 +4,10 @@
(module read mzscheme (module read mzscheme
(require (lib "lex.ss" "parser-tools") (require parser-tools/lex
(prefix : (lib "lex-sre.ss" "parser-tools")) (prefix : parser-tools/lex-sre)
(lib "yacc.ss" "parser-tools") parser-tools/yacc
(lib "readerr.ss" "syntax")) syntax/readerr)
(define-tokens data (DATUM)) (define-tokens data (DATUM))
(define-empty-tokens delim (OP CP HASHOP QUOTE QUASIQUOTE UNQUOTE UNQUOTE-SPLICING DOT EOF)) (define-empty-tokens delim (OP CP HASHOP QUOTE QUASIQUOTE UNQUOTE UNQUOTE-SPLICING DOT EOF))

@ -1,6 +1,6 @@
(module lex-plt-v200 mzscheme (module lex-plt-v200 mzscheme
(require (lib "lex.ss" "parser-tools") (require parser-tools/lex
(prefix : (lib "lex-sre.ss" "parser-tools"))) (prefix : parser-tools/lex-sre))
(provide epsilon (provide epsilon
~ ~

@ -1,5 +1,5 @@
(module lex-sre mzscheme (module lex-sre mzscheme
(require (lib "lex.ss" "parser-tools")) (require parser-tools/lex)
(provide (rename sre-* *) (provide (rename sre-* *)
(rename sre-+ +) (rename sre-+ +)

@ -3,17 +3,17 @@
;; Provides the syntax used to create lexers and the functions needed to ;; Provides the syntax used to create lexers and the functions needed to
;; create and use the buffer that the lexer reads from. See docs. ;; create and use the buffer that the lexer reads from. See docs.
(require-for-syntax (lib "list.ss") (require-for-syntax mzlib/list
(lib "stx.ss" "syntax") syntax/stx
(lib "define.ss" "syntax") syntax/define
(lib "boundmap.ss" "syntax") syntax/boundmap
"private-lex/util.ss" "private-lex/util.ss"
"private-lex/actions.ss" "private-lex/actions.ss"
"private-lex/front.ss" "private-lex/front.ss"
"private-lex/unicode-chars.ss") "private-lex/unicode-chars.ss")
(require (lib "stxparam.ss") (require mzlib/stxparam
(lib "readerr.ss" "syntax") syntax/readerr
"private-lex/token.ss") "private-lex/token.ss")
(provide lexer lexer-src-pos define-lex-abbrev define-lex-abbrevs define-lex-trans (provide lexer lexer-src-pos define-lex-abbrev define-lex-abbrevs define-lex-trans

@ -1,6 +1,6 @@
(module actions mzscheme (module actions mzscheme
(provide (all-defined)) (provide (all-defined))
(require (lib "stx.ss" "syntax")) (require syntax/stx)
;; get-special-action: (syntax-object list) syntax-object syntax-object -> syntax-object ;; get-special-action: (syntax-object list) syntax-object syntax-object -> syntax-object
;; Returns the first action from a rule of the form ((which-special) action) ;; Returns the first action from a rule of the form ((which-special) action)

@ -1,7 +1,7 @@
(module deriv mzscheme (module deriv mzscheme
(require (lib "list.ss") (require mzlib/list
(prefix is: (lib "integer-set.ss")) (prefix is: mzlib/integer-set)
"re.ss" "re.ss"
"util.ss") "util.ss")

@ -1,7 +1,7 @@
(module front mzscheme (module front mzscheme
(require (prefix is: (lib "integer-set.ss")) (require (prefix is: mzlib/integer-set)
(lib "list.ss") mzlib/list
(lib "stx.ss" "syntax") syntax/stx
"util.ss" "util.ss"
"stx.ss" "stx.ss"
"re.ss" "re.ss"

@ -1,7 +1,7 @@
(module re mzscheme (module re mzscheme
(require (lib "match.ss") (require mzlib/match
(lib "list.ss") mzlib/list
(prefix is: (lib "integer-set.ss")) (prefix is: mzlib/integer-set)
"util.ss") "util.ss")
(provide ->re build-epsilon build-zero build-char-set build-concat (provide ->re build-epsilon build-zero build-char-set build-concat

@ -1,5 +1,5 @@
(module stx mzscheme (module stx mzscheme
(require (lib "boundmap.ss" "syntax") (require syntax/boundmap
"util.ss") "util.ss")
(provide parse) (provide parse)

@ -1,5 +1,5 @@
(module util mzscheme (module util mzscheme
(require (lib "list.ss")) (require mzlib/list)
(provide (all-defined)) (provide (all-defined))

@ -3,10 +3,10 @@
(module grammar mzscheme (module grammar mzscheme
(require (lib "class.ss") (require mzlib/class
(lib "list.ss") mzlib/list
"yacc-helper.ss" "yacc-helper.ss"
(lib "contract.ss")) mzlib/contract)
;; Each production has a unique index 0 <= index <= number of productions ;; Each production has a unique index 0 <= index <= number of productions
(define-struct prod (lhs rhs index prec action) (make-inspector)) (define-struct prod (lhs rhs index prec action) (make-inspector))

@ -6,8 +6,8 @@
(require "yacc-helper.ss" (require "yacc-helper.ss"
"../private-lex/token-syntax.ss" "../private-lex/token-syntax.ss"
"grammar.ss" "grammar.ss"
(lib "class.ss") mzlib/class
(lib "contract.ss")) mzlib/contract)
(require-for-template mzscheme) (require-for-template mzscheme)

@ -4,8 +4,8 @@
(require "lr0.ss" (require "lr0.ss"
"grammar.ss" "grammar.ss"
(lib "list.ss") mzlib/list
(lib "class.ss")) mzlib/class)
(provide compute-LA) (provide compute-LA)

@ -4,8 +4,8 @@
(require "grammar.ss" (require "grammar.ss"
"graph.ss" "graph.ss"
(lib "list.ss") mzlib/list
(lib "class.ss")) mzlib/class)
(provide build-lr0-automaton lr0% (provide build-lr0-automaton lr0%
(struct trans-key (st gs)) trans-key-list-remove-dups (struct trans-key (st gs)) trans-key-list-remove-dups

@ -3,8 +3,8 @@
(require "input-file-parser.ss" (require "input-file-parser.ss"
"grammar.ss" "grammar.ss"
"table.ss" "table.ss"
(lib "class.ss") mzlib/class
(lib "contract.ss")) mzlib/contract)
(require-for-template mzscheme) (require-for-template mzscheme)
(provide/contract (provide/contract
@ -69,7 +69,7 @@
#`(when #f #`(when #f
(let ((bind void) ... (tmp void) ...) (let ((bind void) ... (tmp void) ...)
(void bound ... ... term-group ... start ... end ... prec ...)))))) (void bound ... ... term-group ... start ... end ... prec ...))))))
(require (lib "list.ss") "parser-actions.ss") (require mzlib/list "parser-actions.ss")
(define (build-parser filename src-pos suppress input-terms start end assocs prods) (define (build-parser filename src-pos suppress input-terms start end assocs prods)
(let* ((grammar (parse-input input-terms start end assocs prods src-pos)) (let* ((grammar (parse-input input-terms start end assocs prods src-pos))
(table (build-table grammar filename suppress)) (table (build-table grammar filename suppress))

@ -6,9 +6,9 @@
"lr0.ss" "lr0.ss"
"lalr.ss" "lalr.ss"
"parser-actions.ss" "parser-actions.ss"
(lib "contract.ss") mzlib/contract
(lib "list.ss") mzlib/list
(lib "class.ss")) mzlib/class)
(provide/contract (provide/contract
(build-table ((is-a?/c grammar%) string? any/c . -> . (build-table ((is-a?/c grammar%) string? any/c . -> .

@ -1,6 +1,6 @@
(module yacc-helper mzscheme (module yacc-helper mzscheme
(require (lib "list.ss") (require mzlib/list
"../private-lex/token-syntax.ss") "../private-lex/token-syntax.ss")
;; General helper routines ;; General helper routines

@ -1,9 +1,9 @@
(module yacc-to-scheme mzscheme (module yacc-to-scheme mzscheme
(require (lib "lex.ss" "parser-tools") (require parser-tools/lex
(prefix : (lib "lex-sre.ss" "parser-tools")) (prefix : parser-tools/lex-sre)
(lib "yacc.ss" "parser-tools") parser-tools/yacc
(lib "readerr.ss" "syntax") syntax/readerr
(lib "list.ss")) mzlib/list)
(provide trans) (provide trans)
(define match-double-string (define match-double-string

@ -6,9 +6,9 @@
"private-yacc/parser-actions.ss") "private-yacc/parser-actions.ss")
(require "private-lex/token.ss" (require "private-lex/token.ss"
"private-yacc/parser-actions.ss" "private-yacc/parser-actions.ss"
(lib "etc.ss") mzlib/etc
(lib "pretty.ss") mzlib/pretty
(lib "readerr.ss" "syntax")) syntax/readerr)
(provide parser) (provide parser)

Loading…
Cancel
Save