From cd92964eefb8e812318d43677e23bcb66897eec9 Mon Sep 17 00:00:00 2001 From: Jay McCarthy Date: Mon, 15 Aug 2011 09:33:07 -0600 Subject: [PATCH] Converting away from racket to racket/base --- collects/datalog/ast.rkt | 4 +++- collects/datalog/eval.rkt | 3 ++- collects/datalog/main.rkt | 2 +- collects/datalog/parse.rkt | 4 +++- collects/datalog/pretty.rkt | 7 +++++-- collects/datalog/private/env.rkt | 6 ++++-- collects/datalog/private/lex.rkt | 2 +- collects/datalog/private/pprint.rkt | 3 ++- collects/datalog/private/subst.rkt | 7 +++++-- collects/datalog/private/unify.rkt | 7 +++++-- collects/datalog/private/variant.rkt | 8 ++++++-- collects/datalog/runtime.rkt | 8 ++++++-- collects/datalog/stx.rkt | 2 +- collects/racklog/main.rkt | 2 +- collects/racklog/unify.rkt | 8 +++++++- 15 files changed, 52 insertions(+), 21 deletions(-) diff --git a/collects/datalog/ast.rkt b/collects/datalog/ast.rkt index 41052706aa..bce5f04d32 100644 --- a/collects/datalog/ast.rkt +++ b/collects/datalog/ast.rkt @@ -1,4 +1,6 @@ -#lang racket +#lang racket/base +(require racket/contract + racket/match) (define srcloc/c (or/c syntax? diff --git a/collects/datalog/eval.rkt b/collects/datalog/eval.rkt index 5cd00f4a4a..a2c3ade358 100644 --- a/collects/datalog/eval.rkt +++ b/collects/datalog/eval.rkt @@ -1,5 +1,6 @@ -#lang racket +#lang racket/base (require racket/list + racket/contract "ast.rkt" "pretty.rkt" "runtime.rkt") diff --git a/collects/datalog/main.rkt b/collects/datalog/main.rkt index 4c8161cff3..bfb4500756 100644 --- a/collects/datalog/main.rkt +++ b/collects/datalog/main.rkt @@ -1,4 +1,4 @@ -#lang racket +#lang racket/base (require "runtime.rkt" "serialize.rkt" "stx.rkt") diff --git a/collects/datalog/parse.rkt b/collects/datalog/parse.rkt index e6e58ac3a5..cc7cc7508f 100644 --- a/collects/datalog/parse.rkt +++ b/collects/datalog/parse.rkt @@ -1,6 +1,8 @@ -#lang racket +#lang racket/base (require parser-tools/lex parser-tools/yacc + racket/list + racket/contract "private/lex.rkt" "ast.rkt") diff --git a/collects/datalog/pretty.rkt b/collects/datalog/pretty.rkt index 23872f8a7c..697684e346 100644 --- a/collects/datalog/pretty.rkt +++ b/collects/datalog/pretty.rkt @@ -1,5 +1,8 @@ -#lang racket -(require "private/pprint.rkt" +#lang racket/base +(require racket/match + racket/list + racket/contract + "private/pprint.rkt" "ast.rkt") (define (format-datum s) diff --git a/collects/datalog/private/env.rkt b/collects/datalog/private/env.rkt index e89411b440..018cbc4442 100644 --- a/collects/datalog/private/env.rkt +++ b/collects/datalog/private/env.rkt @@ -1,5 +1,7 @@ -#lang racket -(require "../ast.rkt") +#lang racket/base +(require racket/contract + racket/list + "../ast.rkt") (define env/c (and/c hash? immutable?)) diff --git a/collects/datalog/private/lex.rkt b/collects/datalog/private/lex.rkt index 30ded8a8e8..bca8b74531 100644 --- a/collects/datalog/private/lex.rkt +++ b/collects/datalog/private/lex.rkt @@ -1,4 +1,4 @@ -#lang racket +#lang racket/base (require parser-tools/lex (prefix-in : parser-tools/lex-sre)) diff --git a/collects/datalog/private/pprint.rkt b/collects/datalog/private/pprint.rkt index 92fb922a41..8d3051a62d 100644 --- a/collects/datalog/private/pprint.rkt +++ b/collects/datalog/private/pprint.rkt @@ -1,4 +1,5 @@ -#lang racket +#lang racket/base +(require racket/list) (provide (all-defined-out)) (define (text s) s) diff --git a/collects/datalog/private/subst.rkt b/collects/datalog/private/subst.rkt index 9de80d26dc..7c96b49026 100644 --- a/collects/datalog/private/subst.rkt +++ b/collects/datalog/private/subst.rkt @@ -1,5 +1,8 @@ -#lang racket -(require "../ast.rkt" +#lang racket/base +(require racket/match + racket/function + racket/contract + "../ast.rkt" "env.rkt") (define (subst-term env t) diff --git a/collects/datalog/private/unify.rkt b/collects/datalog/private/unify.rkt index 10f5b3798e..92a5122078 100644 --- a/collects/datalog/private/unify.rkt +++ b/collects/datalog/private/unify.rkt @@ -1,5 +1,8 @@ -#lang racket -(require "../ast.rkt" +#lang racket/base +(require racket/match + racket/list + racket/contract + "../ast.rkt" "env.rkt") (define (chase env t) diff --git a/collects/datalog/private/variant.rkt b/collects/datalog/private/variant.rkt index e55fe3498d..74cb799656 100644 --- a/collects/datalog/private/variant.rkt +++ b/collects/datalog/private/variant.rkt @@ -1,5 +1,9 @@ -#lang racket -(require "../ast.rkt" +#lang racket/base +(require racket/list + racket/match + racket/contract + racket/dict + "../ast.rkt" "env.rkt") ; Variants diff --git a/collects/datalog/runtime.rkt b/collects/datalog/runtime.rkt index ac599d2d95..9e476e6e57 100644 --- a/collects/datalog/runtime.rkt +++ b/collects/datalog/runtime.rkt @@ -1,5 +1,9 @@ -#lang racket -(require "ast.rkt" +#lang racket/base +(require racket/contract + racket/list + racket/match + racket/function + "ast.rkt" "private/env.rkt" "private/subst.rkt" "private/unify.rkt" diff --git a/collects/datalog/stx.rkt b/collects/datalog/stx.rkt index 87c480b18c..5f9fd101a8 100644 --- a/collects/datalog/stx.rkt +++ b/collects/datalog/stx.rkt @@ -1,4 +1,4 @@ -#lang racket +#lang racket/base (require (for-syntax syntax/parse racket/local racket/function diff --git a/collects/racklog/main.rkt b/collects/racklog/main.rkt index f88748d88c..dcaa64ca69 100644 --- a/collects/racklog/main.rkt +++ b/collects/racklog/main.rkt @@ -1,3 +1,3 @@ -#lang racket +#lang racket/base (require "racklog.rkt") (provide (all-from-out "racklog.rkt")) diff --git a/collects/racklog/unify.rkt b/collects/racklog/unify.rkt index 0c73a9de39..7c4e73d252 100644 --- a/collects/racklog/unify.rkt +++ b/collects/racklog/unify.rkt @@ -1,4 +1,10 @@ -#lang racket +#lang racket/base +(require (for-syntax racket/base) + racket/list + racket/match + racket/function + racket/vector + racket/set) (provide (all-defined-out)) ; same hash