* Newlines at EOFs

* Another big chunk of v4-require-isms
* Allow `#lang framework/keybinding-lang' for keybinding files
* Move hierlist sources into "mrlib/hierlist", leave stub behind

svn: r10689

original commit: 7d50e61c7f6831936e13e6af5140db65db18fe1c
This commit is contained in:
Eli Barzilay 2008-07-09 07:18:06 +00:00
parent 3aeffe3d9f
commit 362100e41e
40 changed files with 60 additions and 65 deletions

View File

@ -15,4 +15,4 @@
(module o typed-scheme
(require 'n))
(require 'o)
(require 'o)

View File

@ -12,4 +12,4 @@
(define-typed-struct (type-un type) ([cases : (Listof type)]) #:transparent)
(define-typed-struct (type-vals type) ([elems : (Listof type)]) #:transparent)
(define-typed-struct (type-poly type) ([vars : (Listof (U (type-dots type-var) type-var))]))
(define-typed-struct (type-poly type) ([vars : (Listof (U (type-dots type-var) type-var))]))

View File

@ -5,4 +5,4 @@
(let ()
(: x (Boxof Number))
(define x (box "foo"))
x)
x)

View File

@ -25,4 +25,4 @@
(require 'client)
(try-it #t)
(try-it #t)

View File

@ -16,4 +16,4 @@
(require-typed-struct term ([posn : Number]) 'source)
(require-typed-struct (var term) (
[id : Symbol])
'source))
'source))

View File

@ -6,4 +6,3 @@
(f : (-> Void) (lambda () (set! x (quote foo)))))
(if (number? x) (begin (f) (add1 x)) 12))

View File

@ -1,4 +1,4 @@
#lang typed-scheme
(apply append '((1 2 3) (4 5 6)))
(apply append (list (list 1 2 3) (list 4 5 6)))
(apply append (list (list 1 2 3) (list 4 5 6)))

View File

@ -2,4 +2,4 @@
(: cross1 ((Listof Number) -> (Listof Number)))
(define (cross1 m)
(map (lambda: ([m1 : Number]) #{(error 'bad) :: Number}) m))
(map (lambda: ([m1 : Number]) #{(error 'bad) :: Number}) m))

View File

@ -1,7 +1,7 @@
#lang typed-scheme
;;syntax-only requires
(require (only-in (lib "etc.ss") let+))
(require (only-in (lib "match.ss") match))
(require (only-in mzlib/etc let+))
(require (only-in mzlib/match match))
(define-type-alias number Number)
(define-type-alias boolean Boolean)

View File

@ -5,4 +5,4 @@
(let ()
(: x (Boxof Number))
(define x (box 1))
x)
x)

View File

@ -4,5 +4,3 @@
(let-syntax ([m (syntax-rules ()
[(_) x])])
(m)))

View File

@ -7,4 +7,4 @@
(: loop (Int -> Int))
(define (loop x)
(loop x))
(loop 0))
(loop 0))

View File

@ -34,10 +34,10 @@
(define-type-alias top Any)
(define-type-alias list-of Listof)
(require
(except-in (lib "67.ss" "srfi") current-compare =? <?)
(except-in srfi/67 current-compare =? <?)
#;"typed-list.ss"
#;(lib "42.ss" "srfi")
#;(only (lib "list.ss") foldl))
#;srfi/42
#;(only mzlib/list foldl))
#;(provide (all-defined))
(provide comparator Heap elements empty fold heap-node? find-min empty? insert insert* delete-min size union)
@ -48,9 +48,9 @@
;; fixme - type aliases should work in require
(require/typed current-compare (-> (top top -> number)) (lib "67.ss" "srfi"))
(require/typed =? ((top top -> number) top top -> boolean) (lib "67.ss" "srfi"))
(require/typed <? ((top top -> number) top top -> boolean) (lib "67.ss" "srfi"))
(require/typed current-compare (-> (top top -> number)) srfi/67)
(require/typed =? ((top top -> number) top top -> boolean) srfi/67)
(require/typed <? ((top top -> number) top top -> boolean) srfi/67)
;;; DATA DEFINITION

View File

@ -3,4 +3,4 @@
(: x : (Listof (Vectorof Integer)))
(define x (list (vector 1 2 3)))
(list-ref x 0)
(list-ref x 0)

View File

@ -1,7 +1,7 @@
#lang typed-scheme
#;(require (lib "etc.ss"))
#;(require mzlib/etc)
#;(require "prims.ss")
(require (lib "match.ss")
(require mzlib/match
(for-syntax scheme/base))
(define-type-alias number Number)

View File

@ -71,4 +71,3 @@
(cond [(null? l) (make-Nothing)]
[(= v (car l)) (make-Just v)]
[else (find v (cdr l))])))

View File

@ -3,4 +3,4 @@
(: f ((U String Number) -> Void))
(define (f x) (void))
(map f (list 1 2 3))
(map f (list 1 2 3))

View File

@ -1,4 +1,4 @@
#lang typed-scheme
(map add1 #{(list 1 2 3) :: (Listof Integer)})
(map add1 #{(list 1 2 3) :: (Listof Number)})
(map add1 #{(list 1 2 3) :: (Listof Number)})

View File

@ -1,8 +1,8 @@
#lang typed-scheme
#;(require (lib "etc.ss"))
#;(require mzlib/etc)
;(require "prims.ss")
(require (lib "match.ss"))
(require mzlib/match)
(define-typed-struct pt ([x : Number] [y : Number]))

View File

@ -4,4 +4,4 @@
(match 1
[2 3]
[x 4])
[x 4])

View File

@ -16,13 +16,13 @@
(require/typed explode-path (Path -> (Listof Path)) (lib "file.ss"))
(require/typed srfi48::format (Port String String top .. -> top) "patch.ss")
;; FIXME - prefix
#;(require/typed srfi48:format ( Port String String top .. -> top) (prefix-in srfi48: (lib "48.ss" "srfi")))
(require (lib "match.ss")
;(lib "file.ss")
;(lib "list.ss")
;(lib "etc.ss")
(prefix-in srfi13: (lib "13.ss" "srfi"))
;(prefix srfi48: (lib "48.ss" "srfi"))
#;(require/typed srfi48:format ( Port String String top .. -> top) (prefix-in srfi48: srfi/48))
(require mzlib/match
;mzlib/file
;mzlib/list
;mzlib/etc
(prefix-in srfi13: srfi/13)
;(prefix srfi48: srfi/48)
)
(define-type-alias Sexpr Any)

View File

@ -2,4 +2,4 @@
(parameterize ([current-directory ".."])
(current-directory)
(current-directory ".."))
(current-directory ".."))

View File

@ -1,3 +1,3 @@
(module patch scheme
(define srfi48::format format)
(provide srfi48::format))
(provide srfi48::format))

View File

@ -8,4 +8,4 @@
(module foo typed-scheme
(require/opaque-type Srcloc s:srcloc? 'srcloc))
(require/opaque-type Srcloc s:srcloc? 'srcloc))

View File

@ -2,7 +2,7 @@
(module source mzscheme
(require (lib "contract.ss"))
(require mzlib/contract)
(define-struct ast (loc))
@ -11,4 +11,4 @@
(module client typed-scheme
(require-typed-struct ast ([loc : Any]) 'source))
(require-typed-struct ast ([loc : Any]) 'source))

View File

@ -14,4 +14,4 @@
(require-typed-struct term ([posn : Number]) 'source)
(require-typed-struct var (
[id : Symbol])
'source))
'source))

View File

@ -13,4 +13,4 @@
(define-type-alias Srcloc Any)
(require-typed-struct term ([posn : Srcloc]) 'source))
(require-typed-struct term ([posn : Srcloc]) 'source))

View File

@ -13,4 +13,4 @@
(m:foo (m:make-x 1 #f))
m:x?)
(require 'n)
(require 'n)

View File

@ -2,4 +2,4 @@
(define-syntax-rule (foo) 1)
(provide foo)
(provide foo)

View File

@ -11,14 +11,14 @@
; 3. The non-generic parts (record type, time, error) are here.
;
; load the module with
; (require (lib "random-bits.ss" "srfi"))
; (require srfi/random-bits)
;
; history of this file:
; SE, 17-May-2003: initial version
(module random-bits typed-scheme
#;(require (lib "9.ss" "srfi"))
#;(require (lib "23.ss" "srfi"))
#;(require srfi/9)
#;(require srfi/23)
(provide
random-integer random-real default-random-source

View File

@ -1,3 +1,3 @@
#lang typed-scheme
(require "simple-poly.ss")
(require "simple-poly.ss")

View File

@ -8,4 +8,4 @@
(module trequire typed-scheme
(require 'bang-tests)
(define: y : Number x)
(display y))
(display y))

View File

@ -1,7 +1,7 @@
#lang typed-scheme
#;(require (lib "etc.ss"))
#;(require mzlib/etc)
#;(require "prims.ss")
(require (lib "match.ss"))
(require mzlib/match)
(define-type-alias number Number)
(define-type-alias boolean Boolean)

View File

@ -2,4 +2,4 @@
(: f (All (a) (a -> a)))
(define (f x) x)
(define: z : Any 2)
(provide f))
(provide f))

View File

@ -2,4 +2,4 @@
(require string-constants/string-constant)
(string-constant cancel)
(string-constant cancel)

View File

@ -13,4 +13,4 @@
;; Comment out the below and it works fine.
(provide (all-defined-out)))
(require 'broken)
(require 'broken)

View File

@ -1,4 +1,3 @@
#lang typed-scheme
(define-typed-struct/exec X ([a : Number] [b : Boolean]) [(lambda: ([x : X]) (+ 3 )) : (X -> Number)])
((make-X 1 #f))

View File

@ -2,4 +2,4 @@
(letrec-syntaxes+values () ([(#{x : Number}) (values 1)]) #{(vector x) :: (Vectorof Number)})
(letrec-values ([(#{x : Number}) (values 1)]) #{(vector x) :: (Vectorof Number)})
(letrec ([#{x : Number} (values 1)]) #{(vector x) :: (Vectorof Number)})
(letrec ([#{x : Number} (values 1)]) #{(vector x) :: (Vectorof Number)})

View File

@ -85,4 +85,4 @@
Parameter Tuple Class
)
(provide-extra-tnames)
(provide-extra-tnames)

View File

@ -25,20 +25,20 @@ This file defines two sorts of primitives. All of them are provided into any mod
(require (for-syntax
scheme/base
"type-rep.ss"
(lib "match.ss")
mzlib/match
"parse-type.ss"
(lib "struct.ss" "syntax")
(lib "stx.ss" "syntax")
"utils.ss"
syntax/struct
syntax/stx
"utils.ss"
"tc-utils.ss"
"type-name-env.ss"
"type-contract.ss"))
(require "require-contract.ss"
"internal-forms.ss"
(except-in (lib "contract.ss") ->)
(only-in (lib "contract.ss") [-> c->])
(lib "struct.ss")
(except-in mzlib/contract ->)
(only-in mzlib/contract [-> c->])
mzlib/struct
"base-types.ss")
(define-for-syntax (ignore stx) (syntax-property stx 'typechecker:ignore #t))