Merge pull request #306 from owaddell/owaddell/reject-invisible
Reject attempts to visit invisible library original commit: 454cf722eff397d4c9e2afbe3da2fc6477ae61a0
This commit is contained in:
R. Kent Dybvig
GitHub
commit
ced22b147e
7
LOG
7
LOG
|
|
@ -937,3 +937,10 @@
|
|||
wininstall/product.wxs
|
||||
- Use Windows path separator character when finding boot files on Windows.
|
||||
scheme.c
|
||||
- Propagate enable-check-prelex-flags to separate-eval sub-process in tests.
|
||||
mats.ss
|
||||
- Reject attempts to visit libraries that compile-whole-program has rendered
|
||||
invisible due to libs-visible? flag.
|
||||
compile.ss, 7.ms, root-experr-compile-0-f-f-f, root-experr-compile-2-f-f-f,
|
||||
patch-compile-0-f-t-f, patch-compile-0-t-f-f, patch-interpret-0-f-f-f,
|
||||
patch-interpret-0-f-t-f, patch-interpret-3-f-f-f, patch-interpret-3-f-t-f
|
||||
201
mats/7.ms
201
mats/7.ms
|
|
@ -1614,6 +1614,13 @@ evaluating module init
|
|||
"testfile-wpo-prog")
|
||||
"()\n")
|
||||
|
||||
(equal?
|
||||
(separate-compile
|
||||
'(lambda (x)
|
||||
(compile-whole-program (format "~a.wpo" x) (format "~a-none.so" x) #f))
|
||||
"testfile-wpo-prog")
|
||||
"()\n")
|
||||
|
||||
(delete-file "testfile-wpo-lib.ss")
|
||||
(delete-file "testfile-wpo-lib.so")
|
||||
(delete-file "testfile-wpo-lib.wpo")
|
||||
|
|
@ -1622,6 +1629,9 @@ evaluating module init
|
|||
(separate-eval '(load-program "testfile-wpo-prog-all.so"))
|
||||
"3628800\n3628800\n")
|
||||
|
||||
(error?
|
||||
(separate-eval '(load-program "testfile-wpo-prog-none.so")))
|
||||
|
||||
(begin
|
||||
(with-output-to-file "testfile-wpo-a3.ss"
|
||||
(lambda ()
|
||||
|
|
@ -3180,6 +3190,197 @@ evaluating module init
|
|||
"(9 . 5)\n")
|
||||
)
|
||||
|
||||
(mat library-manager
|
||||
(begin
|
||||
(with-output-to-file "testfile-lm-a.ss"
|
||||
(lambda ()
|
||||
(pretty-print
|
||||
'(library (testfile-lm-a)
|
||||
(export ct-a rt-a)
|
||||
(import (scheme))
|
||||
(meta define ct-a (begin (display "ct-a rhs\n") 123))
|
||||
(define rt-a (begin (display "rt-a rhs\n") 456)))))
|
||||
'replace)
|
||||
(with-output-to-file "testfile-lm-b.ss"
|
||||
(lambda ()
|
||||
(pretty-print
|
||||
'(library (testfile-lm-b)
|
||||
(export b)
|
||||
(import (scheme) (testfile-lm-a))
|
||||
(define-syntax (use-ct-val x) (if (odd? ct-a) #'"odd" #'"even"))
|
||||
(define b use-ct-val))))
|
||||
'replace)
|
||||
(with-output-to-file "testfile-lm-c.ss"
|
||||
(lambda ()
|
||||
(pretty-print
|
||||
'(library (testfile-lm-c)
|
||||
(export c)
|
||||
(import (scheme) (testfile-lm-a))
|
||||
(define use-rt-val rt-a)
|
||||
(define c use-rt-val))))
|
||||
'replace)
|
||||
(with-output-to-file "testfile-lm-combined.ss"
|
||||
(lambda ()
|
||||
(pretty-print
|
||||
'(begin
|
||||
(include "testfile-lm-a.ss")
|
||||
(include "testfile-lm-b.ss")
|
||||
(include "testfile-lm-c.ss"))))
|
||||
'replace)
|
||||
(with-output-to-file "testfile-lm-use-b.ss"
|
||||
(lambda ()
|
||||
(pretty-print
|
||||
'(library (testfile-lm-use-b)
|
||||
(export x)
|
||||
(import (scheme) (testfile-lm-b))
|
||||
(meta define x b))))
|
||||
'replace)
|
||||
(with-output-to-file "testfile-lm-use-c.ss"
|
||||
(lambda ()
|
||||
(pretty-print
|
||||
'(library (testfile-lm-use-c)
|
||||
(export x)
|
||||
(import (scheme) (testfile-lm-c))
|
||||
(define-syntax (x x) c))))
|
||||
'replace)
|
||||
#t)
|
||||
(equal?
|
||||
(separate-eval
|
||||
'(import-notify #t)
|
||||
'(compile-library "testfile-lm-a"))
|
||||
(string-append
|
||||
"compiling testfile-lm-a.ss with output to testfile-lm-a.so\n"
|
||||
"ct-a rhs\n"))
|
||||
(equal?
|
||||
(separate-eval
|
||||
'(import-notify #t)
|
||||
'(library-extensions '((".ss" . ".so")))
|
||||
'(compile-library "testfile-lm-b")
|
||||
'(printf "b = ~s\n" (let () (import (testfile-lm-b)) b)))
|
||||
(string-append
|
||||
"compiling testfile-lm-b.ss with output to testfile-lm-b.so\n"
|
||||
"import: found source file \"testfile-lm-a.ss\"\n"
|
||||
"import: found corresponding object file \"testfile-lm-a.so\"\n"
|
||||
"import: object file is not older\n"
|
||||
"import: loading object file \"testfile-lm-a.so\"\n"
|
||||
"ct-a rhs\n"
|
||||
"b = \"odd\"\n"))
|
||||
(equal?
|
||||
(separate-eval
|
||||
'(import-notify #t)
|
||||
'(library-extensions '((".ss" . ".so")))
|
||||
'(compile-library "testfile-lm-c")
|
||||
'(printf "c = ~s\n" (let () (import (testfile-lm-c)) c)))
|
||||
(string-append
|
||||
"compiling testfile-lm-c.ss with output to testfile-lm-c.so\n"
|
||||
"import: found source file \"testfile-lm-a.ss\"\n"
|
||||
"import: found corresponding object file \"testfile-lm-a.so\"\n"
|
||||
"import: object file is not older\n"
|
||||
"import: loading object file \"testfile-lm-a.so\"\n"
|
||||
"rt-a rhs\n"
|
||||
"c = 456\n"))
|
||||
(equal?
|
||||
;; library manager revisits object file containing a single library
|
||||
;; to resolve dependencies after earlier visit
|
||||
(separate-eval
|
||||
'(import-notify #t)
|
||||
'(library-extensions '((".ss" . ".so")))
|
||||
'(visit "testfile-lm-a.so")
|
||||
'(let () (import (testfile-lm-c)) c))
|
||||
(string-append
|
||||
"import: found source file \"testfile-lm-c.ss\"\n"
|
||||
"import: found corresponding object file \"testfile-lm-c.so\"\n"
|
||||
"import: object file is not older\n"
|
||||
"import: loading object file \"testfile-lm-c.so\"\n"
|
||||
"import: attempting to 'revisit' previously 'visited' \"testfile-lm-a.so\" for library (testfile-lm-a) run-time info\n"
|
||||
"rt-a rhs\n"
|
||||
"456\n"))
|
||||
(equal?
|
||||
;; library manager visits object file containing a single library
|
||||
;; to resolve dependencies after earlier revisit
|
||||
(separate-eval
|
||||
'(import-notify #t)
|
||||
'(library-extensions '((".ss" . ".so")))
|
||||
'(revisit "testfile-lm-a.so")
|
||||
'(let () (import (testfile-lm-b)) b))
|
||||
(string-append
|
||||
"import: found source file \"testfile-lm-b.ss\"\n"
|
||||
"import: found corresponding object file \"testfile-lm-b.so\"\n"
|
||||
"import: object file is not older\n"
|
||||
"import: loading object file \"testfile-lm-b.so\"\n"
|
||||
"import: attempting to 'visit' previously 'revisited' \"testfile-lm-a.so\" for library (testfile-lm-a) compile-time info\n"
|
||||
"\"odd\"\n"))
|
||||
(equal?
|
||||
(separate-eval
|
||||
'(import-notify #t)
|
||||
'(library-extensions '((".ss" . ".so")))
|
||||
'(compile-file "testfile-lm-combined"))
|
||||
(string-append
|
||||
"compiling testfile-lm-combined.ss with output to testfile-lm-combined.so\n"
|
||||
"ct-a rhs\n"))
|
||||
(equal?
|
||||
;; library manager revisits object file containing related libraries
|
||||
;; to resolve dependencies after earlier visit
|
||||
(separate-eval
|
||||
'(import-notify #t)
|
||||
'(visit "testfile-lm-combined.so")
|
||||
'(let ()
|
||||
(import (testfile-lm-a))
|
||||
(define-syntax (foo x) ct-a)
|
||||
(printf "foo = ~s\n" foo))
|
||||
'(let () (import (testfile-lm-c)) c))
|
||||
(string-append
|
||||
"ct-a rhs\n"
|
||||
"foo = 123\n"
|
||||
"import: attempting to 'revisit' previously 'visited' \"testfile-lm-combined.so\" for library (testfile-lm-c) run-time info\n"
|
||||
"rt-a rhs\n"
|
||||
"456\n"))
|
||||
(equal?
|
||||
;; library manager visits object file containing related libraries
|
||||
;; to resolve dependencies after earlier revisit
|
||||
(separate-eval
|
||||
'(import-notify #t)
|
||||
'(revisit "testfile-lm-combined.so")
|
||||
'(let ()
|
||||
(import (testfile-lm-a))
|
||||
(define foo rt-a)
|
||||
(printf "foo = ~s\n" foo))
|
||||
'(let () (import (testfile-lm-b)) b))
|
||||
(string-append
|
||||
"import: attempting to 'visit' previously 'revisited' \"testfile-lm-combined.so\" for library (testfile-lm-a) compile-time info\n"
|
||||
"rt-a rhs\n"
|
||||
"foo = 456\n"
|
||||
"\"odd\"\n"))
|
||||
(equal?
|
||||
;; library manager does not revisit due to earlier load
|
||||
(separate-eval
|
||||
'(import-notify #t)
|
||||
'(load "testfile-lm-combined.so")
|
||||
'(let ()
|
||||
(import (testfile-lm-a))
|
||||
(define-syntax (foo x) ct-a)
|
||||
(printf "foo = ~s\n" foo))
|
||||
'(let () (import (testfile-lm-c)) c))
|
||||
(string-append
|
||||
"ct-a rhs\n"
|
||||
"foo = 123\n"
|
||||
"rt-a rhs\n"
|
||||
"456\n"))
|
||||
(equal?
|
||||
;; library manager does not revisit due to earlier load
|
||||
(separate-eval
|
||||
'(import-notify #t)
|
||||
'(load "testfile-lm-combined.so")
|
||||
'(let ()
|
||||
(import (testfile-lm-a))
|
||||
(define foo rt-a)
|
||||
(printf "foo = ~s\n" foo))
|
||||
'(let () (import (testfile-lm-b)) b))
|
||||
(string-append
|
||||
"rt-a rhs\n"
|
||||
"foo = 456\n"
|
||||
"\"odd\"\n"))
|
||||
)
|
||||
|
||||
|
||||
;;; section 7.2:
|
||||
|
|
|
|||
|
|
@ -380,6 +380,7 @@
|
|||
(open-process-ports (format "~a -q" (patch-exec-path *scheme*))
|
||||
(buffer-mode block)
|
||||
(native-transcoder))])
|
||||
(pretty-print `(#%$enable-check-prelex-flags ,(#%$enable-check-prelex-flags)) to-stdin)
|
||||
(for-each (lambda (expr) (pretty-print expr to-stdin)) expr*)
|
||||
(close-port to-stdin)
|
||||
(let* ([stdout-stuff (slurp from-stdout)]
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
*** errors-compile-0-f-f-f 2018-01-13 17:04:08.000000000 -0500
|
||||
--- errors-compile-0-f-t-f 2018-01-13 16:31:53.000000000 -0500
|
||||
*** errors-compile-0-f-f-f 2018-05-21 16:24:51.416317188 -0400
|
||||
--- errors-compile-0-f-t-f 2018-05-21 15:45:38.426922815 -0400
|
||||
***************
|
||||
*** 125,131 ****
|
||||
3.mo:Expected error in mat dipa-letrec: "attempt to reference undefined variable a".
|
||||
|
|
@ -58,7 +58,7 @@
|
|||
3.mo:Expected error in mat mrvs: "attempt to apply non-procedure 17".
|
||||
3.mo:Expected error in mat mrvs: "returned two values to single value return context".
|
||||
***************
|
||||
*** 3680,3686 ****
|
||||
*** 3697,3703 ****
|
||||
misc.mo:Expected error in mat cpletrec: "foreign-procedure: no entry for "foo"".
|
||||
misc.mo:Expected error in mat cpletrec: "attempt to reference undefined variable q".
|
||||
misc.mo:Expected error in mat cpletrec: "attempt to reference undefined variable bar".
|
||||
|
|
@ -66,7 +66,7 @@
|
|||
misc.mo:Expected error in mat cpletrec: "attempt to reference undefined variable b".
|
||||
misc.mo:Expected error in mat cpletrec: "attempt to reference undefined variable b".
|
||||
misc.mo:Expected error in mat cpletrec: "attempt to reference undefined variable a".
|
||||
--- 3680,3686 ----
|
||||
--- 3697,3703 ----
|
||||
misc.mo:Expected error in mat cpletrec: "foreign-procedure: no entry for "foo"".
|
||||
misc.mo:Expected error in mat cpletrec: "attempt to reference undefined variable q".
|
||||
misc.mo:Expected error in mat cpletrec: "attempt to reference undefined variable bar".
|
||||
|
|
@ -75,7 +75,7 @@
|
|||
misc.mo:Expected error in mat cpletrec: "attempt to reference undefined variable b".
|
||||
misc.mo:Expected error in mat cpletrec: "attempt to reference undefined variable a".
|
||||
***************
|
||||
*** 7130,7137 ****
|
||||
*** 7148,7155 ****
|
||||
7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid space gnu".
|
||||
7.mo:Expected error in mat error: "a: hit me!".
|
||||
7.mo:Expected error in mat error: "f: n is 0".
|
||||
|
|
@ -84,7 +84,7 @@
|
|||
record.mo:Expected error in mat record2: "invalid value 3 for foreign type double-float".
|
||||
record.mo:Expected error in mat record2: "3 is not of type #<record type fudge>".
|
||||
record.mo:Expected error in mat record2: "make-record-type: invalid field list ((immutable double-float a) . b)".
|
||||
--- 7130,7137 ----
|
||||
--- 7148,7155 ----
|
||||
7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid space gnu".
|
||||
7.mo:Expected error in mat error: "a: hit me!".
|
||||
7.mo:Expected error in mat error: "f: n is 0".
|
||||
|
|
@ -94,7 +94,7 @@
|
|||
record.mo:Expected error in mat record2: "3 is not of type #<record type fudge>".
|
||||
record.mo:Expected error in mat record2: "make-record-type: invalid field list ((immutable double-float a) . b)".
|
||||
***************
|
||||
*** 7139,7153 ****
|
||||
*** 7157,7171 ****
|
||||
record.mo:Expected error in mat type-descriptor: "invalid syntax (type-descriptor 3)".
|
||||
record.mo:Expected error in mat type-descriptor: "type-descriptor: unrecognized record car".
|
||||
record.mo:Expected error in mat record3: "variable set-fudge-a! is not bound".
|
||||
|
|
@ -110,7 +110,7 @@
|
|||
record.mo:Expected error in mat record9: "record-reader: invalid input #f".
|
||||
record.mo:Expected error in mat record9: "record-reader: invalid second argument fudge".
|
||||
record.mo:Expected error in mat record9: "record-reader: invalid second argument fudge".
|
||||
--- 7139,7153 ----
|
||||
--- 7157,7171 ----
|
||||
record.mo:Expected error in mat type-descriptor: "invalid syntax (type-descriptor 3)".
|
||||
record.mo:Expected error in mat type-descriptor: "type-descriptor: unrecognized record car".
|
||||
record.mo:Expected error in mat record3: "variable set-fudge-a! is not bound".
|
||||
|
|
@ -127,7 +127,7 @@
|
|||
record.mo:Expected error in mat record9: "record-reader: invalid second argument fudge".
|
||||
record.mo:Expected error in mat record9: "record-reader: invalid second argument fudge".
|
||||
***************
|
||||
*** 7160,7185 ****
|
||||
*** 7178,7203 ****
|
||||
record.mo:Expected error in mat record10: "read: unresolvable cycle constructing record of type #<record type bar> at char 3 of #<input port string>".
|
||||
record.mo:Expected error in mat record16: "read: unresolvable cycle constructing record of type #<record type bazar> at char 3 of #<input port string>".
|
||||
record.mo:Expected error in mat record16: "read: unresolvable cycle constructing record of type #<record type bazar> at char 3 of #<input port string>".
|
||||
|
|
@ -154,7 +154,7 @@
|
|||
record.mo:Expected error in mat foreign-data: "foreign-alloc: 0 is not a positive fixnum".
|
||||
record.mo:Expected error in mat foreign-data: "foreign-alloc: <int> is not a positive fixnum".
|
||||
record.mo:Expected error in mat foreign-data: "foreign-alloc: -5 is not a positive fixnum".
|
||||
--- 7160,7185 ----
|
||||
--- 7178,7203 ----
|
||||
record.mo:Expected error in mat record10: "read: unresolvable cycle constructing record of type #<record type bar> at char 3 of #<input port string>".
|
||||
record.mo:Expected error in mat record16: "read: unresolvable cycle constructing record of type #<record type bazar> at char 3 of #<input port string>".
|
||||
record.mo:Expected error in mat record16: "read: unresolvable cycle constructing record of type #<record type bazar> at char 3 of #<input port string>".
|
||||
|
|
@ -182,7 +182,7 @@
|
|||
record.mo:Expected error in mat foreign-data: "foreign-alloc: <int> is not a positive fixnum".
|
||||
record.mo:Expected error in mat foreign-data: "foreign-alloc: -5 is not a positive fixnum".
|
||||
***************
|
||||
*** 7310,7348 ****
|
||||
*** 7328,7366 ****
|
||||
record.mo:Expected error in mat record22: "invalid field specifier (immutable creepy q)".
|
||||
record.mo:Expected error in mat record22: "invalid field specifier (immutable creepy q)".
|
||||
record.mo:Expected error in mat record23: "make-record-type: cannot extend sealed record type #<record type foo>".
|
||||
|
|
@ -222,7 +222,7 @@
|
|||
record.mo:Expected error in mat record?: "record?: 4 is not a record type descriptor".
|
||||
record.mo:Expected error in mat record?: "record?: a is not a record type descriptor".
|
||||
record.mo:Expected error in mat record?: "record?: #(1) is not a record type descriptor".
|
||||
--- 7310,7348 ----
|
||||
--- 7328,7366 ----
|
||||
record.mo:Expected error in mat record22: "invalid field specifier (immutable creepy q)".
|
||||
record.mo:Expected error in mat record22: "invalid field specifier (immutable creepy q)".
|
||||
record.mo:Expected error in mat record23: "make-record-type: cannot extend sealed record type #<record type foo>".
|
||||
|
|
@ -263,7 +263,7 @@
|
|||
record.mo:Expected error in mat record?: "record?: a is not a record type descriptor".
|
||||
record.mo:Expected error in mat record?: "record?: #(1) is not a record type descriptor".
|
||||
***************
|
||||
*** 7357,7413 ****
|
||||
*** 7375,7431 ****
|
||||
record.mo:Expected error in mat r6rs-records-procedural: "make-record-constructor-descriptor: invalid protocol flimflam".
|
||||
record.mo:Expected error in mat r6rs-records-procedural: "attempt to apply non-procedure not-a-procedure".
|
||||
record.mo:Expected error in mat r6rs-records-procedural: "attempt to apply non-procedure spam".
|
||||
|
|
@ -321,7 +321,7 @@
|
|||
record.mo:Expected error in mat r6rs-records-syntactic: "define-record-type: incompatible record type cpoint - different parent".
|
||||
record.mo:Expected error in mat r6rs-records-syntactic: "define-record-type: incompatible record type cpoint - different parent".
|
||||
record.mo:Expected error in mat r6rs-records-syntactic: "cannot extend define-record-type parent fratrat".
|
||||
--- 7357,7413 ----
|
||||
--- 7375,7431 ----
|
||||
record.mo:Expected error in mat r6rs-records-procedural: "make-record-constructor-descriptor: invalid protocol flimflam".
|
||||
record.mo:Expected error in mat r6rs-records-procedural: "attempt to apply non-procedure not-a-procedure".
|
||||
record.mo:Expected error in mat r6rs-records-procedural: "attempt to apply non-procedure spam".
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,5 +1,5 @@
|
|||
*** errors-compile-0-f-f-f 2018-01-13 17:04:08.000000000 -0500
|
||||
--- errors-interpret-0-f-f-f 2018-01-13 16:46:53.000000000 -0500
|
||||
*** errors-compile-0-f-f-f 2018-05-21 16:24:51.416317188 -0400
|
||||
--- errors-interpret-0-f-f-f 2018-05-21 16:02:23.564959831 -0400
|
||||
***************
|
||||
*** 1,7 ****
|
||||
primvars.mo:Expected error in mat make-parameter: "make-parameter: 2 is not a procedure".
|
||||
|
|
@ -196,7 +196,7 @@
|
|||
3.mo:Expected error in mat mrvs: "returned two values to single value return context".
|
||||
3.mo:Expected error in mat mrvs: "cdr: a is not a pair".
|
||||
***************
|
||||
*** 4039,4054 ****
|
||||
*** 4056,4071 ****
|
||||
6.mo:Expected error in mat pretty-print: "incorrect argument count in call (pretty-format (quote foo) (quote x) (quote x))".
|
||||
6.mo:Expected error in mat pretty-print: "pretty-format: 3 is not a symbol".
|
||||
6.mo:Expected error in mat pretty-print: "pretty-format: invalid format (bad 0 ... ... 0 format)".
|
||||
|
|
@ -213,9 +213,9 @@
|
|||
6.mo:Expected warning in mat cp1in-verify-format-warnings: "compile: too few arguments for control string "abc~s" in call to fprintf at line 1, char 29 of testfile.ss".
|
||||
6.mo:Expected warning in mat cp1in-verify-format-warnings: "compile: too many arguments for control string "~%~abc~adef~ag~s~~~%" in call to fprintf at line 1, char 29 of testfile.ss".
|
||||
6.mo:Expected error in mat print-parameters: "write: cycle detected; proceeding with (print-graph #t)".
|
||||
--- 4045,4054 ----
|
||||
--- 4062,4071 ----
|
||||
***************
|
||||
*** 6994,7000 ****
|
||||
*** 7011,7017 ****
|
||||
7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in include: failed for testfile-mc-1a.ss: no such file or directory
|
||||
7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in maybe-compile-library: failed for "testfile-mc-1a.ss": no such file or directory
|
||||
7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in maybe-compile-library: file "testfile-mc-1a.ss" not found in source directories
|
||||
|
|
@ -223,7 +223,7 @@
|
|||
7.mo:Expected error in mat eval: "interpret: 7 is not an environment".
|
||||
7.mo:Expected error in mat eval: "compile: 7 is not an environment".
|
||||
7.mo:Expected error in mat expand: "sc-expand: 7 is not an environment".
|
||||
--- 6994,7000 ----
|
||||
--- 7011,7017 ----
|
||||
7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in include: failed for testfile-mc-1a.ss: no such file or directory
|
||||
7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in maybe-compile-library: failed for "testfile-mc-1a.ss": no such file or directory
|
||||
7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in maybe-compile-library: file "testfile-mc-1a.ss" not found in source directories
|
||||
|
|
@ -232,7 +232,7 @@
|
|||
7.mo:Expected error in mat eval: "compile: 7 is not an environment".
|
||||
7.mo:Expected error in mat expand: "sc-expand: 7 is not an environment".
|
||||
***************
|
||||
*** 7321,7327 ****
|
||||
*** 7339,7345 ****
|
||||
record.mo:Expected error in mat record25: "invalid value #\9 for foreign type uptr".
|
||||
record.mo:Expected error in mat record25: "invalid value 10 for foreign type float".
|
||||
record.mo:Expected error in mat record25: "invalid value 11.0+0.0i for foreign type double".
|
||||
|
|
@ -240,7 +240,7 @@
|
|||
record.mo:Expected error in mat record25: "invalid value 12.0 for foreign type long-long".
|
||||
record.mo:Expected error in mat record25: "invalid value 13.0 for foreign type unsigned-long-long".
|
||||
record.mo:Expected error in mat record25: "invalid value 3.0 for foreign type int".
|
||||
--- 7321,7327 ----
|
||||
--- 7339,7345 ----
|
||||
record.mo:Expected error in mat record25: "invalid value #\9 for foreign type uptr".
|
||||
record.mo:Expected error in mat record25: "invalid value 10 for foreign type float".
|
||||
record.mo:Expected error in mat record25: "invalid value 11.0+0.0i for foreign type double".
|
||||
|
|
@ -249,7 +249,7 @@
|
|||
record.mo:Expected error in mat record25: "invalid value 13.0 for foreign type unsigned-long-long".
|
||||
record.mo:Expected error in mat record25: "invalid value 3.0 for foreign type int".
|
||||
***************
|
||||
*** 8530,8542 ****
|
||||
*** 8556,8568 ****
|
||||
fx.mo:Expected error in mat r6rs:fx-: "fx-: #f is not a fixnum".
|
||||
fx.mo:Expected error in mat r6rs:fx-: "fx-: #f is not a fixnum".
|
||||
fx.mo:Expected error in mat fx*: "fx*: (a . b) is not a fixnum".
|
||||
|
|
@ -263,7 +263,7 @@
|
|||
fx.mo:Expected error in mat r6rs:fx*: "fx*: <int> is not a fixnum".
|
||||
fx.mo:Expected error in mat r6rs:fx*: "fx*: <-int> is not a fixnum".
|
||||
fx.mo:Expected error in mat r6rs:fx*: "fx*: #f is not a fixnum".
|
||||
--- 8530,8542 ----
|
||||
--- 8556,8568 ----
|
||||
fx.mo:Expected error in mat r6rs:fx-: "fx-: #f is not a fixnum".
|
||||
fx.mo:Expected error in mat r6rs:fx-: "fx-: #f is not a fixnum".
|
||||
fx.mo:Expected error in mat fx*: "fx*: (a . b) is not a fixnum".
|
||||
|
|
@ -278,7 +278,7 @@
|
|||
fx.mo:Expected error in mat r6rs:fx*: "fx*: <-int> is not a fixnum".
|
||||
fx.mo:Expected error in mat r6rs:fx*: "fx*: #f is not a fixnum".
|
||||
***************
|
||||
*** 9297,9321 ****
|
||||
*** 9323,9347 ****
|
||||
foreign.mo:Expected error in mat foreign-procedure: "foreign-procedure: invalid foreign procedure handle foo".
|
||||
foreign.mo:Expected error in mat foreign-procedure: "foreign-procedure: invalid foreign procedure handle foo".
|
||||
foreign.mo:Expected error in mat foreign-procedure: "foreign-procedure: invalid foreign procedure handle foo".
|
||||
|
|
@ -304,7 +304,7 @@
|
|||
foreign.mo:Expected error in mat foreign-procedure: "invalid foreign-procedure argument type specifier booleen".
|
||||
foreign.mo:Expected error in mat foreign-procedure: "invalid foreign-procedure argument type specifier integer-34".
|
||||
foreign.mo:Expected error in mat foreign-procedure: "invalid foreign-procedure result type specifier chare".
|
||||
--- 9297,9321 ----
|
||||
--- 9323,9347 ----
|
||||
foreign.mo:Expected error in mat foreign-procedure: "foreign-procedure: invalid foreign procedure handle foo".
|
||||
foreign.mo:Expected error in mat foreign-procedure: "foreign-procedure: invalid foreign procedure handle foo".
|
||||
foreign.mo:Expected error in mat foreign-procedure: "foreign-procedure: invalid foreign procedure handle foo".
|
||||
|
|
@ -331,7 +331,7 @@
|
|||
foreign.mo:Expected error in mat foreign-procedure: "invalid foreign-procedure argument type specifier integer-34".
|
||||
foreign.mo:Expected error in mat foreign-procedure: "invalid foreign-procedure result type specifier chare".
|
||||
***************
|
||||
*** 9328,9359 ****
|
||||
*** 9354,9385 ****
|
||||
foreign.mo:Expected error in mat foreign-sizeof: "incorrect argument count in call (foreign-sizeof (quote int) (quote int))".
|
||||
foreign.mo:Expected error in mat foreign-sizeof: "foreign-sizeof: invalid foreign type specifier i-am-not-a-type".
|
||||
foreign.mo:Expected error in mat foreign-sizeof: "foreign-sizeof: invalid foreign type specifier 1".
|
||||
|
|
@ -364,7 +364,7 @@
|
|||
foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
|
||||
foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
|
||||
foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
|
||||
--- 9328,9359 ----
|
||||
--- 9354,9385 ----
|
||||
foreign.mo:Expected error in mat foreign-sizeof: "incorrect argument count in call (foreign-sizeof (quote int) (quote int))".
|
||||
foreign.mo:Expected error in mat foreign-sizeof: "foreign-sizeof: invalid foreign type specifier i-am-not-a-type".
|
||||
foreign.mo:Expected error in mat foreign-sizeof: "foreign-sizeof: invalid foreign type specifier 1".
|
||||
|
|
@ -398,7 +398,7 @@
|
|||
foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
|
||||
foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
|
||||
***************
|
||||
*** 9361,9386 ****
|
||||
*** 9387,9412 ****
|
||||
foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
|
||||
foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
|
||||
foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
|
||||
|
|
@ -425,7 +425,7 @@
|
|||
foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
|
||||
foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
|
||||
foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
|
||||
--- 9361,9386 ----
|
||||
--- 9387,9412 ----
|
||||
foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
|
||||
foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
|
||||
foreign.mo:Expected error in mat foreign-strings: "foreign-callable: invalid return value ("ello" 4) from #<procedure>".
|
||||
|
|
@ -453,7 +453,7 @@
|
|||
foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
|
||||
foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
|
||||
***************
|
||||
*** 9391,9425 ****
|
||||
*** 9417,9451 ****
|
||||
foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
|
||||
foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
|
||||
foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
|
||||
|
|
@ -489,7 +489,7 @@
|
|||
foreign.mo:Expected error in mat foreign-C-types: "foreign-callable: invalid return value (73 74) from #<procedure>".
|
||||
foreign.mo:Expected error in mat foreign-C-types: "foreign-callable: invalid return value (73 74) from #<procedure>".
|
||||
foreign.mo:Expected error in mat foreign-C-types: "foreign-callable: invalid return value (73 74) from #<procedure>".
|
||||
--- 9391,9425 ----
|
||||
--- 9417,9451 ----
|
||||
foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
|
||||
foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
|
||||
foreign.mo:Expected error in mat foreign-fixed-types: "foreign-callable: invalid return value (- x 7) from #<procedure>".
|
||||
|
|
@ -526,7 +526,7 @@
|
|||
foreign.mo:Expected error in mat foreign-C-types: "foreign-callable: invalid return value (73 74) from #<procedure>".
|
||||
foreign.mo:Expected error in mat foreign-C-types: "foreign-callable: invalid return value (73 74) from #<procedure>".
|
||||
***************
|
||||
*** 10012,10021 ****
|
||||
*** 10052,10061 ****
|
||||
exceptions.mo:Expected error in mat assert: "failed assertion (memq (quote b) (quote (1 2 a 3 4)))".
|
||||
exceptions.mo:Expected error in mat assert: "failed assertion (q ...)".
|
||||
exceptions.mo:Expected error in mat assert: "failed assertion (andmap symbol? (syntax (x ...)))".
|
||||
|
|
@ -537,7 +537,7 @@
|
|||
oop.mo:Expected error in mat oop: "m1: not applicable to 17".
|
||||
oop.mo:Expected error in mat oop: "variable <a>-x1 is not bound".
|
||||
oop.mo:Expected error in mat oop: "variable <a>-x1-set! is not bound".
|
||||
--- 10012,10021 ----
|
||||
--- 10052,10061 ----
|
||||
exceptions.mo:Expected error in mat assert: "failed assertion (memq (quote b) (quote (1 2 a 3 4)))".
|
||||
exceptions.mo:Expected error in mat assert: "failed assertion (q ...)".
|
||||
exceptions.mo:Expected error in mat assert: "failed assertion (andmap symbol? (syntax (x ...)))".
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
*** errors-compile-0-f-t-f 2018-01-13 16:31:53.000000000 -0500
|
||||
--- errors-interpret-0-f-t-f 2018-01-13 16:54:40.000000000 -0500
|
||||
*** errors-compile-0-f-t-f 2018-05-21 15:45:38.426922815 -0400
|
||||
--- errors-interpret-0-f-t-f 2018-05-21 16:11:21.764903593 -0400
|
||||
***************
|
||||
*** 1,7 ****
|
||||
primvars.mo:Expected error in mat make-parameter: "make-parameter: 2 is not a procedure".
|
||||
|
|
@ -169,7 +169,7 @@
|
|||
3.mo:Expected error in mat letrec: "variable f is not bound".
|
||||
3.mo:Expected error in mat letrec: "attempt to reference undefined variable a".
|
||||
***************
|
||||
*** 4039,4054 ****
|
||||
*** 4056,4071 ****
|
||||
6.mo:Expected error in mat pretty-print: "incorrect argument count in call (pretty-format (quote foo) (quote x) (quote x))".
|
||||
6.mo:Expected error in mat pretty-print: "pretty-format: 3 is not a symbol".
|
||||
6.mo:Expected error in mat pretty-print: "pretty-format: invalid format (bad 0 ... ... 0 format)".
|
||||
|
|
@ -186,9 +186,9 @@
|
|||
6.mo:Expected warning in mat cp1in-verify-format-warnings: "compile: too few arguments for control string "abc~s" in call to fprintf at line 1, char 29 of testfile.ss".
|
||||
6.mo:Expected warning in mat cp1in-verify-format-warnings: "compile: too many arguments for control string "~%~abc~adef~ag~s~~~%" in call to fprintf at line 1, char 29 of testfile.ss".
|
||||
6.mo:Expected error in mat print-parameters: "write: cycle detected; proceeding with (print-graph #t)".
|
||||
--- 4045,4054 ----
|
||||
--- 4062,4071 ----
|
||||
***************
|
||||
*** 6994,7000 ****
|
||||
*** 7011,7017 ****
|
||||
7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in include: failed for testfile-mc-1a.ss: no such file or directory
|
||||
7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in maybe-compile-library: failed for "testfile-mc-1a.ss": no such file or directory
|
||||
7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in maybe-compile-library: file "testfile-mc-1a.ss" not found in source directories
|
||||
|
|
@ -196,7 +196,7 @@
|
|||
7.mo:Expected error in mat eval: "interpret: 7 is not an environment".
|
||||
7.mo:Expected error in mat eval: "compile: 7 is not an environment".
|
||||
7.mo:Expected error in mat expand: "sc-expand: 7 is not an environment".
|
||||
--- 6994,7000 ----
|
||||
--- 7011,7017 ----
|
||||
7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in include: failed for testfile-mc-1a.ss: no such file or directory
|
||||
7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in maybe-compile-library: failed for "testfile-mc-1a.ss": no such file or directory
|
||||
7.mo:Expected error in mat maybe-compile: "separate-compile: Exception in maybe-compile-library: file "testfile-mc-1a.ss" not found in source directories
|
||||
|
|
@ -205,7 +205,7 @@
|
|||
7.mo:Expected error in mat eval: "compile: 7 is not an environment".
|
||||
7.mo:Expected error in mat expand: "sc-expand: 7 is not an environment".
|
||||
***************
|
||||
*** 7130,7137 ****
|
||||
*** 7148,7155 ****
|
||||
7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid space gnu".
|
||||
7.mo:Expected error in mat error: "a: hit me!".
|
||||
7.mo:Expected error in mat error: "f: n is 0".
|
||||
|
|
@ -214,7 +214,7 @@
|
|||
record.mo:Expected error in mat record2: "invalid value 3 for foreign type double-float".
|
||||
record.mo:Expected error in mat record2: "3 is not of type #<record type fudge>".
|
||||
record.mo:Expected error in mat record2: "make-record-type: invalid field list ((immutable double-float a) . b)".
|
||||
--- 7130,7137 ----
|
||||
--- 7148,7155 ----
|
||||
7.mo:Expected error in mat bytes-allocated: "bytes-allocated: invalid space gnu".
|
||||
7.mo:Expected error in mat error: "a: hit me!".
|
||||
7.mo:Expected error in mat error: "f: n is 0".
|
||||
|
|
@ -224,7 +224,7 @@
|
|||
record.mo:Expected error in mat record2: "3 is not of type #<record type fudge>".
|
||||
record.mo:Expected error in mat record2: "make-record-type: invalid field list ((immutable double-float a) . b)".
|
||||
***************
|
||||
*** 7139,7153 ****
|
||||
*** 7157,7171 ****
|
||||
record.mo:Expected error in mat type-descriptor: "invalid syntax (type-descriptor 3)".
|
||||
record.mo:Expected error in mat type-descriptor: "type-descriptor: unrecognized record car".
|
||||
record.mo:Expected error in mat record3: "variable set-fudge-a! is not bound".
|
||||
|
|
@ -240,7 +240,7 @@
|
|||
record.mo:Expected error in mat record9: "record-reader: invalid input #f".
|
||||
record.mo:Expected error in mat record9: "record-reader: invalid second argument fudge".
|
||||
record.mo:Expected error in mat record9: "record-reader: invalid second argument fudge".
|
||||
--- 7139,7153 ----
|
||||
--- 7157,7171 ----
|
||||
record.mo:Expected error in mat type-descriptor: "invalid syntax (type-descriptor 3)".
|
||||
record.mo:Expected error in mat type-descriptor: "type-descriptor: unrecognized record car".
|
||||
record.mo:Expected error in mat record3: "variable set-fudge-a! is not bound".
|
||||
|
|
@ -257,7 +257,7 @@
|
|||
record.mo:Expected error in mat record9: "record-reader: invalid second argument fudge".
|
||||
record.mo:Expected error in mat record9: "record-reader: invalid second argument fudge".
|
||||
***************
|
||||
*** 7160,7185 ****
|
||||
*** 7178,7203 ****
|
||||
record.mo:Expected error in mat record10: "read: unresolvable cycle constructing record of type #<record type bar> at char 3 of #<input port string>".
|
||||
record.mo:Expected error in mat record16: "read: unresolvable cycle constructing record of type #<record type bazar> at char 3 of #<input port string>".
|
||||
record.mo:Expected error in mat record16: "read: unresolvable cycle constructing record of type #<record type bazar> at char 3 of #<input port string>".
|
||||
|
|
@ -284,7 +284,7 @@
|
|||
record.mo:Expected error in mat foreign-data: "foreign-alloc: 0 is not a positive fixnum".
|
||||
record.mo:Expected error in mat foreign-data: "foreign-alloc: <int> is not a positive fixnum".
|
||||
record.mo:Expected error in mat foreign-data: "foreign-alloc: -5 is not a positive fixnum".
|
||||
--- 7160,7185 ----
|
||||
--- 7178,7203 ----
|
||||
record.mo:Expected error in mat record10: "read: unresolvable cycle constructing record of type #<record type bar> at char 3 of #<input port string>".
|
||||
record.mo:Expected error in mat record16: "read: unresolvable cycle constructing record of type #<record type bazar> at char 3 of #<input port string>".
|
||||
record.mo:Expected error in mat record16: "read: unresolvable cycle constructing record of type #<record type bazar> at char 3 of #<input port string>".
|
||||
|
|
@ -312,7 +312,7 @@
|
|||
record.mo:Expected error in mat foreign-data: "foreign-alloc: <int> is not a positive fixnum".
|
||||
record.mo:Expected error in mat foreign-data: "foreign-alloc: -5 is not a positive fixnum".
|
||||
***************
|
||||
*** 7310,7348 ****
|
||||
*** 7328,7366 ****
|
||||
record.mo:Expected error in mat record22: "invalid field specifier (immutable creepy q)".
|
||||
record.mo:Expected error in mat record22: "invalid field specifier (immutable creepy q)".
|
||||
record.mo:Expected error in mat record23: "make-record-type: cannot extend sealed record type #<record type foo>".
|
||||
|
|
@ -352,7 +352,7 @@
|
|||
record.mo:Expected error in mat record?: "record?: 4 is not a record type descriptor".
|
||||
record.mo:Expected error in mat record?: "record?: a is not a record type descriptor".
|
||||
record.mo:Expected error in mat record?: "record?: #(1) is not a record type descriptor".
|
||||
--- 7310,7348 ----
|
||||
--- 7328,7366 ----
|
||||
record.mo:Expected error in mat record22: "invalid field specifier (immutable creepy q)".
|
||||
record.mo:Expected error in mat record22: "invalid field specifier (immutable creepy q)".
|
||||
record.mo:Expected error in mat record23: "make-record-type: cannot extend sealed record type #<record type foo>".
|
||||
|
|
@ -393,7 +393,7 @@
|
|||
record.mo:Expected error in mat record?: "record?: a is not a record type descriptor".
|
||||
record.mo:Expected error in mat record?: "record?: #(1) is not a record type descriptor".
|
||||
***************
|
||||
*** 7357,7413 ****
|
||||
*** 7375,7431 ****
|
||||
record.mo:Expected error in mat r6rs-records-procedural: "make-record-constructor-descriptor: invalid protocol flimflam".
|
||||
record.mo:Expected error in mat r6rs-records-procedural: "attempt to apply non-procedure not-a-procedure".
|
||||
record.mo:Expected error in mat r6rs-records-procedural: "attempt to apply non-procedure spam".
|
||||
|
|
@ -451,7 +451,7 @@
|
|||
record.mo:Expected error in mat r6rs-records-syntactic: "define-record-type: incompatible record type cpoint - different parent".
|
||||
record.mo:Expected error in mat r6rs-records-syntactic: "define-record-type: incompatible record type cpoint - different parent".
|
||||
record.mo:Expected error in mat r6rs-records-syntactic: "cannot extend define-record-type parent fratrat".
|
||||
--- 7357,7413 ----
|
||||
--- 7375,7431 ----
|
||||
record.mo:Expected error in mat r6rs-records-procedural: "make-record-constructor-descriptor: invalid protocol flimflam".
|
||||
record.mo:Expected error in mat r6rs-records-procedural: "attempt to apply non-procedure not-a-procedure".
|
||||
record.mo:Expected error in mat r6rs-records-procedural: "attempt to apply non-procedure spam".
|
||||
|
|
@ -510,7 +510,7 @@
|
|||
record.mo:Expected error in mat r6rs-records-syntactic: "define-record-type: incompatible record type cpoint - different parent".
|
||||
record.mo:Expected error in mat r6rs-records-syntactic: "cannot extend define-record-type parent fratrat".
|
||||
***************
|
||||
*** 8530,8542 ****
|
||||
*** 8556,8568 ****
|
||||
fx.mo:Expected error in mat r6rs:fx-: "fx-: #f is not a fixnum".
|
||||
fx.mo:Expected error in mat r6rs:fx-: "fx-: #f is not a fixnum".
|
||||
fx.mo:Expected error in mat fx*: "fx*: (a . b) is not a fixnum".
|
||||
|
|
@ -524,7 +524,7 @@
|
|||
fx.mo:Expected error in mat r6rs:fx*: "fx*: <int> is not a fixnum".
|
||||
fx.mo:Expected error in mat r6rs:fx*: "fx*: <-int> is not a fixnum".
|
||||
fx.mo:Expected error in mat r6rs:fx*: "fx*: #f is not a fixnum".
|
||||
--- 8530,8542 ----
|
||||
--- 8556,8568 ----
|
||||
fx.mo:Expected error in mat r6rs:fx-: "fx-: #f is not a fixnum".
|
||||
fx.mo:Expected error in mat r6rs:fx-: "fx-: #f is not a fixnum".
|
||||
fx.mo:Expected error in mat fx*: "fx*: (a . b) is not a fixnum".
|
||||
|
|
@ -539,7 +539,7 @@
|
|||
fx.mo:Expected error in mat r6rs:fx*: "fx*: <-int> is not a fixnum".
|
||||
fx.mo:Expected error in mat r6rs:fx*: "fx*: #f is not a fixnum".
|
||||
***************
|
||||
*** 10012,10021 ****
|
||||
*** 10052,10061 ****
|
||||
exceptions.mo:Expected error in mat assert: "failed assertion (memq (quote b) (quote (1 2 a 3 4)))".
|
||||
exceptions.mo:Expected error in mat assert: "failed assertion (q ...)".
|
||||
exceptions.mo:Expected error in mat assert: "failed assertion (andmap symbol? (syntax (x ...)))".
|
||||
|
|
@ -550,7 +550,7 @@
|
|||
oop.mo:Expected error in mat oop: "m1: not applicable to 17".
|
||||
oop.mo:Expected error in mat oop: "variable <a>-x1 is not bound".
|
||||
oop.mo:Expected error in mat oop: "variable <a>-x1-set! is not bound".
|
||||
--- 10012,10021 ----
|
||||
--- 10052,10061 ----
|
||||
exceptions.mo:Expected error in mat assert: "failed assertion (memq (quote b) (quote (1 2 a 3 4)))".
|
||||
exceptions.mo:Expected error in mat assert: "failed assertion (q ...)".
|
||||
exceptions.mo:Expected error in mat assert: "failed assertion (andmap symbol? (syntax (x ...)))".
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
*** errors-compile-3-f-f-f 2018-01-13 16:28:10.000000000 -0500
|
||||
--- errors-interpret-3-f-f-f 2018-01-13 17:09:48.000000000 -0500
|
||||
*** errors-compile-3-f-f-f 2018-05-21 15:41:36.322395203 -0400
|
||||
--- errors-interpret-3-f-f-f 2018-05-21 16:32:29.625426575 -0400
|
||||
***************
|
||||
*** 1,3 ****
|
||||
--- 1,9 ----
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
*** errors-compile-3-f-t-f 2018-01-13 16:35:27.000000000 -0500
|
||||
--- errors-interpret-3-f-t-f 2018-01-13 16:58:28.000000000 -0500
|
||||
*** errors-compile-3-f-t-f 2018-05-21 15:49:28.816472990 -0400
|
||||
--- errors-interpret-3-f-t-f 2018-05-21 16:15:47.611381258 -0400
|
||||
***************
|
||||
*** 1,3 ****
|
||||
--- 1,9 ----
|
||||
|
|
|
|||
|
|
@ -7032,6 +7032,7 @@ format.mo:Expected error in mat format-dollar: "format: expected real number for
|
|||
7.mo:Expected error in mat eval-when: "invalid syntax revisit-x".
|
||||
7.mo:Expected error in mat compile-whole-program: "compile-whole-program: failed for nosuchfile.wpo: no such file or directory".
|
||||
7.mo:Expected error in mat compile-whole-program: "incorrect argument count in call (compile-whole-program "testfile-wpo-ab.wpo")".
|
||||
7.mo:Expected error in mat compile-whole-program: "separate-eval: Exception in visit: library (testfile-wpo-lib) is not visible
|
||||
7.mo:Expected error in mat compile-whole-program: "separate-eval: Exception: library (testfile-wpo-a4) not found
|
||||
7.mo:Expected error in mat compile-whole-program: "separate-eval: Exception: library (testfile-wpo-c4) not found
|
||||
7.mo:Expected error in mat compile-whole-program: "separate-eval: Exception: attempt to invoke library (testfile-wpo-c5) while it is still being loaded
|
||||
|
|
|
|||
|
|
@ -7032,6 +7032,7 @@ format.mo:Expected error in mat format-dollar: "format: expected real number for
|
|||
7.mo:Expected error in mat eval-when: "invalid syntax revisit-x".
|
||||
7.mo:Expected error in mat compile-whole-program: "compile-whole-program: failed for nosuchfile.wpo: no such file or directory".
|
||||
7.mo:Expected error in mat compile-whole-program: "incorrect argument count in call (compile-whole-program "testfile-wpo-ab.wpo")".
|
||||
7.mo:Expected error in mat compile-whole-program: "separate-eval: Exception in visit: library (testfile-wpo-lib) is not visible
|
||||
7.mo:Expected error in mat compile-whole-program: "separate-eval: Exception: library (testfile-wpo-a4) not found
|
||||
7.mo:Expected error in mat compile-whole-program: "separate-eval: Exception: library (testfile-wpo-c4) not found
|
||||
7.mo:Expected error in mat compile-whole-program: "separate-eval: Exception: attempt to invoke library (testfile-wpo-c5) while it is still being loaded
|
||||
|
|
|
|||
43
s/compile.ss
43
s/compile.ss
|
|
@ -1018,7 +1018,8 @@
|
|||
(unless (program-node-ir maybe-program) ($oops who "loading ~a did not define expected program pieces" ifn))
|
||||
(chase-program-dependencies! maybe-program))
|
||||
(for-each chase-library-dependencies! node*)
|
||||
(values maybe-program (filter library-node-visible? (vector->list (hashtable-values libs))) wpo*)))))
|
||||
(let-values ([(visible* invisible*) (partition library-node-visible? (vector->list (hashtable-values libs)))])
|
||||
(values maybe-program visible* invisible* wpo*))))))
|
||||
|
||||
(define topological-sort
|
||||
(lambda (program-entry library-entry*)
|
||||
|
|
@ -1043,12 +1044,27 @@
|
|||
(lambda (node)
|
||||
(nanopass-case (Lexpand ctLibrary) (library-node-ctir node)
|
||||
[(library/ct ,uid (,export-id* ...) ,import-code ,visit-code)
|
||||
($build-install-library/ct-code uid export-id*
|
||||
(if (library-node-visible? node) import-code void-pr)
|
||||
(if (library-node-visible? node) visit-code void-pr))])))
|
||||
(if (library-node-visible? node)
|
||||
($build-install-library/ct-code uid export-id* import-code visit-code)
|
||||
(let ([fail (gen-var 'fail)])
|
||||
(set-prelex-referenced! fail #t)
|
||||
(set-prelex-multiply-referenced! fail #t)
|
||||
(build-let
|
||||
(list fail)
|
||||
(list (build-lambda '()
|
||||
(build-primcall '$oops `(quote ,'visit)
|
||||
`(quote ,"library ~s is not visible")
|
||||
`(quote ,(library-node-path node)))))
|
||||
($build-install-library/ct-code uid export-id* `(ref #f ,fail) `(ref #f ,fail)))))])))
|
||||
|
||||
|
||||
(define build-void (let ([void-rec `(quote ,(void))]) (lambda () void-rec)))
|
||||
|
||||
(define gen-var (lambda (sym) (make-prelex sym 0 #f #f)))
|
||||
(define build-let
|
||||
(lambda (ids exprs body)
|
||||
`(call ,(make-preinfo) ,(build-lambda ids body) ,exprs ...)))
|
||||
|
||||
(define build-lambda
|
||||
(lambda (ids body)
|
||||
`(case-lambda ,(make-preinfo-lambda)
|
||||
|
|
@ -1180,10 +1196,6 @@
|
|||
|
||||
(define build-combined-library-ir
|
||||
(lambda (node*)
|
||||
(define gen-var (lambda (sym) (make-prelex sym 0 #f #f)))
|
||||
(define build-let
|
||||
(lambda (ids exprs body)
|
||||
`(call ,(make-preinfo) ,(build-lambda ids body) ,exprs ...)))
|
||||
(define build-mark-invoked!
|
||||
(lambda (node)
|
||||
(build-primcall '$mark-invoked! `(quote ,(library-node-uid node)))))
|
||||
|
|
@ -1318,10 +1330,12 @@
|
|||
body visit-lib*)))
|
||||
|
||||
(define build-program-body
|
||||
(lambda (program-entry node* visit-lib*)
|
||||
(lambda (program-entry node* visit-lib* invisible*)
|
||||
(add-library-records node* visit-lib*
|
||||
(add-visit-lib-install* visit-lib*
|
||||
`(revisit-only ,(build-combined-program-ir program-entry node*))))))
|
||||
(add-library-records node* invisible*
|
||||
(add-visit-lib-install* visit-lib*
|
||||
(add-visit-lib-install* invisible*
|
||||
`(revisit-only ,(build-combined-program-ir program-entry node*))))))))
|
||||
|
||||
(define build-library-body
|
||||
(lambda (node* visit-lib*)
|
||||
|
|
@ -1390,12 +1404,12 @@
|
|||
(unless (string? ifn) ($oops who "~s is not a string" ifn))
|
||||
(unless (string? ofn) ($oops who "~s is not a string" ofn))
|
||||
(let*-values ([(hash-bang-line ir*) (read-input-file who ifn)]
|
||||
[(program-entry lib* no-wpo*) (build-graph who ir* ifn #t #f libs-visible?)])
|
||||
[(program-entry lib* invisible* no-wpo*) (build-graph who ir* ifn #t #f libs-visible?)])
|
||||
(safe-assert program-entry)
|
||||
(safe-assert (null? no-wpo*))
|
||||
(let ([node* (topological-sort program-entry lib*)])
|
||||
(finish-compile who "whole program" ifn ofn hash-bang-line
|
||||
(build-program-body program-entry node* lib*))
|
||||
(build-program-body program-entry node* lib* invisible*))
|
||||
(build-required-library-list node* lib*)))])))
|
||||
|
||||
(set-who! compile-whole-library
|
||||
|
|
@ -1403,8 +1417,9 @@
|
|||
(unless (string? ifn) ($oops who "~s is not a string" ifn))
|
||||
(unless (string? ofn) ($oops who "~s is not a string" ofn))
|
||||
(let*-values ([(hash-bang-line ir*) (read-input-file who ifn)]
|
||||
[(no-program lib* wpo*) (build-graph who ir* ifn #f (generate-wpo-files) #t)])
|
||||
[(no-program lib* invisible* wpo*) (build-graph who ir* ifn #f (generate-wpo-files) #t)])
|
||||
(safe-assert (not no-program))
|
||||
(safe-assert (null? invisible*))
|
||||
(safe-assert (or (not (generate-wpo-files)) (not (null? wpo*))))
|
||||
(when (null? lib*) ($oops "did not find libraries in input file ~s" ifn))
|
||||
(let ([node* (topological-sort #f lib*)])
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user