made case-lambda work with the magic [ thing and fixed up some test suites
svn: r3754
This commit is contained in:
parent
1c5d7c5c62
commit
daf17eb616
|
@ -1266,7 +1266,7 @@
|
||||||
(ormap
|
(ormap
|
||||||
(λ (x)
|
(λ (x)
|
||||||
(text-between-equal? x text backward-match before-whitespace-pos))
|
(text-between-equal? x text backward-match before-whitespace-pos))
|
||||||
'("cond" "field" "provide/contract")))
|
'("case-lambda" "cond" "field" "provide/contract")))
|
||||||
(change-to 2 #\())]))]
|
(change-to 2 #\())]))]
|
||||||
[(not (zero? before-whitespace-pos))
|
[(not (zero? before-whitespace-pos))
|
||||||
;; this is the first thing in the sequence
|
;; this is the first thing in the sequence
|
||||||
|
|
|
@ -27,43 +27,6 @@
|
||||||
;; tests : (listof test)
|
;; tests : (listof test)
|
||||||
(define tests
|
(define tests
|
||||||
(list
|
(list
|
||||||
|
|
||||||
;; the next two tests are new, complex ones that need to
|
|
||||||
;; move to the bottom of the test file, when the rest of these
|
|
||||||
;; tests are cleaned up.
|
|
||||||
;; right now, there is a bug that causes lots of tests to fail for a stupid reason
|
|
||||||
|
|
||||||
(build-test "(module m mzscheme (define-syntax rename #f) (require (rename mzscheme ++ +)))"
|
|
||||||
'(("(" default-color)
|
|
||||||
("module" imported-identifier)
|
|
||||||
(" m mzscheme (" default-color)
|
|
||||||
("define-syntax" imported-identifier)
|
|
||||||
(" " default-color)
|
|
||||||
("rename" lexically-bound-identifier)
|
|
||||||
(" #f) (" default-color)
|
|
||||||
("require" imported-identifier)
|
|
||||||
(" (rename mzscheme ++ +)))" default-color))
|
|
||||||
|
|
||||||
(list '((10 18) (20 33) (46 53))
|
|
||||||
'((54 76) (20 33) (46 53))))
|
|
||||||
|
|
||||||
(build-test "(module m mzscheme (define-syntax rename #f) (define f 1) (provide (rename f g)))"
|
|
||||||
'(("(" default-color)
|
|
||||||
("module" imported-identifier)
|
|
||||||
(" m mzscheme (" default-color)
|
|
||||||
("define-syntax" imported-identifier)
|
|
||||||
(" " default-color)
|
|
||||||
("rename" lexically-bound-identifier)
|
|
||||||
(" #f) (" default-color)
|
|
||||||
("define" imported-identifier)
|
|
||||||
(" " default-color)
|
|
||||||
("f" lexically-bound-identifier)
|
|
||||||
(" 1) (" default-color)
|
|
||||||
("provide" imported-identifier)
|
|
||||||
(" (rename f g)))" default-color))
|
|
||||||
(list '((10 18) (20 33) (46 52) (59 66))
|
|
||||||
'((53 54) (75 76))))
|
|
||||||
|
|
||||||
(build-test "12345"
|
(build-test "12345"
|
||||||
'(("12345" constant)))
|
'(("12345" constant)))
|
||||||
(build-test "'abcdef"
|
(build-test "'abcdef"
|
||||||
|
@ -640,6 +603,45 @@
|
||||||
(list '((10 45) (47 52))
|
(list '((10 45) (47 52))
|
||||||
'((62 63) (64 65) (68 69))))
|
'((62 63) (64 65) (68 69))))
|
||||||
|
|
||||||
|
|
||||||
|
;; the next two tests are new, complex ones that need to
|
||||||
|
;; move to the bottom of the test file, when the rest of these
|
||||||
|
;; tests are cleaned up.
|
||||||
|
;; right now, there is a bug that causes lots of tests to fail for a stupid reason
|
||||||
|
|
||||||
|
(build-test "(module m mzscheme (define-syntax rename #f) (require (rename mzscheme ++ +)))"
|
||||||
|
'(("(" default-color)
|
||||||
|
("module" imported-identifier)
|
||||||
|
(" m mzscheme (" default-color)
|
||||||
|
("define-syntax" imported-identifier)
|
||||||
|
(" " default-color)
|
||||||
|
("rename" lexically-bound-identifier)
|
||||||
|
(" #f) (" default-color)
|
||||||
|
("require" imported-identifier)
|
||||||
|
(" (rename mzscheme ++ +)))" default-color))
|
||||||
|
|
||||||
|
(list '((10 18) (20 33) (46 53))
|
||||||
|
'((54 76) (20 33) (46 53))))
|
||||||
|
|
||||||
|
(build-test "(module m mzscheme (define-syntax rename #f) (define f 1) (provide (rename f g)))"
|
||||||
|
'(("(" default-color)
|
||||||
|
("module" imported-identifier)
|
||||||
|
(" m mzscheme (" default-color)
|
||||||
|
("define-syntax" imported-identifier)
|
||||||
|
(" " default-color)
|
||||||
|
("rename" lexically-bound-identifier)
|
||||||
|
(" #f) (" default-color)
|
||||||
|
("define" imported-identifier)
|
||||||
|
(" " default-color)
|
||||||
|
("f" lexically-bound-identifier)
|
||||||
|
(" 1) (" default-color)
|
||||||
|
("provide" imported-identifier)
|
||||||
|
(" (rename " default-color)
|
||||||
|
("f" lexically-bound-identifier)
|
||||||
|
(" g)))" default-color))
|
||||||
|
(list '((10 18) (20 33) (46 52) (59 66))
|
||||||
|
'((53 54) (75 76))))
|
||||||
|
|
||||||
(make-dir-test "(module m mzscheme (require \"~a/list.ss\") foldl foldl)"
|
(make-dir-test "(module m mzscheme (require \"~a/list.ss\") foldl foldl)"
|
||||||
'(("(" default-color)
|
'(("(" default-color)
|
||||||
("module" imported-syntax)
|
("module" imported-syntax)
|
||||||
|
|
|
@ -122,6 +122,7 @@
|
||||||
(build-open-bracket-spec "(provide/contract " 18 #\[)
|
(build-open-bracket-spec "(provide/contract " 18 #\[)
|
||||||
(build-open-bracket-spec "(kond " 5 #\()
|
(build-open-bracket-spec "(kond " 5 #\()
|
||||||
(build-open-bracket-spec "(cond " 5 #\[)
|
(build-open-bracket-spec "(cond " 5 #\[)
|
||||||
|
(build-open-bracket-spec "(case-lambda " 13 #\[)
|
||||||
(build-open-bracket-spec "(let ([]" 8 #\[)
|
(build-open-bracket-spec "(let ([]" 8 #\[)
|
||||||
(build-open-bracket-spec "(let ({}" 8 #\{)
|
(build-open-bracket-spec "(let ({}" 8 #\{)
|
||||||
(build-open-bracket-spec "()" 2 #\()
|
(build-open-bracket-spec "()" 2 #\()
|
||||||
|
|
Loading…
Reference in New Issue
Block a user