mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-30 20:00:19 +02:00
* libguile/eval.c: So, ladies & gents, a new evaluator. It's similar to the old one, in that we memoize and then evaluate, but in this incarnation, memoization of an expression happens before evaluation, not lazily as the expression is evaluated. This makes the evaluation itself much cleaner, in addition to being threadsafe. In addition, since this C evaluator will in the future just serve to bootstrap the Scheme evaluator, we don't have to pay much concern for debugging conveniences. So the environment is just a list of values, and the memoizer pre-computes where it's going to find each individual value in the environment. Interface changes are commented below, with eval.h. (scm_evaluator_traps): No need to reset the debug mode after rnning te traps thing. But really, the whole traps system needs some love. * libguile/memoize.h: * libguile/memoize.c: New memoizer, which runs before evaluation, checking all syntax before evaluation begins. Significantly, no debugging information is left for lexical variables, which is not so great for interactive debugging; perhaps we should change this to have a var list in the future as per the classic interpreters. But it's quite fast, and the resulting code is quite good. Also note that it doesn't produce ilocs, memoized code is a smob whose type is in the first word of the smob itself. * libguile/eval.h (scm_sym_and, scm_sym_begin, scm_sym_case) (scm_sym_cond, scm_sym_define, scm_sym_do, scm_sym_if, scm_sym_lambda) (scm_sym_let, scm_sym_letstar, scm_sym_letrec, scm_sym_quote) (scm_sym_quasiquote, scm_sym_unquote, scm_sym_uq_splicing, scm_sym_at) (scm_sym_atat, scm_sym_atapply, scm_sym_atcall_cc) (scm_sym_at_call_with_values, scm_sym_delay, scm_sym_eval_when) (scm_sym_arrow, scm_sym_else, scm_sym_apply, scm_sym_set_x) (scm_sym_args): Remove public declaration of these symbols. (scm_ilookup, scm_lookupcar, scm_eval_car, scm_eval_body) (scm_eval_args, scm_i_eval_x, scm_i_eval): Remove public declaration of these functions. (scm_ceval, scm_deval, scm_ceval_ptr): Remove declarations of these deprecated functions. (scm_i_print_iloc, scm_i_print_isym, scm_i_unmemocopy_expr) (scm_i_unmemocopy_body): Remove declarations of these internal functions. (scm_primitive_eval_x, scm_eval_x): Redefine as macros for their less destructive siblings. * libguile/Makefile.am: Add memoize.[ch] to the build. * libguile/debug.h (scm_debug_mode_p, scm_check_entry_p) (scm_check_apply_p, scm_check_exit_p, scm_check_memoize_p) (scm_debug_eframe_size): Remove these vars that were tied to the old evaluator's execution model. (SCM_RESET_DEBUG_MODE): Remove, no more need for this. (SCM_MEMOIZEDP, SCM_MEMOIZED_EXP, SCM_MEMOIZED_ENV): Remove macros referring to old memoized code representation. (scm_local_eval, scm_procedure_environment, scm_memoized_environment) (scm_make_memoized, scm_memoized_p): Remove functions operating on old memoized code representation. (scm_memcons, scm_mem_to_proc, scm_proc_to_mem): Remove debug-only code for old evaluator. * libguile/debug.c: Remove code to correspond with debug.h removals. (scm_debug_options): No need to set the debug mode or frame limit here, as we don't have C stack limits any more. Perhaps this is a bug, but as long as we can compile eval.scm, we should be fine. * libguile/init.c (scm_i_init_guile): Init memoize.c. * libguile/modules.c (scm_top_level_env, scm_env_top_level) (scm_env_module, scm_system_module_env_p): Remove these functions. * libguile/print.c (iprin1): No more need to handle isyms. Adapt to new form of interpreted procedures. * libguile/procprop.c (scm_i_procedure_arity): Adapt to new form of interpreted procedures. * libguile/procs.c (scm_thunk_p): Adapt to new form of interpreted procedures. * libguile/procs.h (SCM_CLOSURE_FORMALS): Removed, this exists no more. (SCM_CLOSURE_NUM_REQUIRED_ARGS, SCM_CLOSURE_HAS_REST_ARGS): New accessors. * libguile/srcprop.c (scm_source_properties, scm_source_property) (scm_set_source_property_x): Remove special cases for memoized code. * libguile/stacks.c (read_frame): Remove a source-property case for interpreted code. (NEXT_FRAME): Remove a case that I don't fully understand, that seems to be designed to skip over apply frames. Will be obsolete in the futures. (read_frames): Default source value for interpreted frames to #f. (narrow_stack): Don't pay attention to the system_module thing. * libguile/tags.h: Remove isyms and ilocs. Whee! * libguile/validate.h (SCM_VALIDATE_MEMOIZED): Fix to use the new MEMOIZED_P formulation. * module/ice-9/psyntax-pp.scm (do, quasiquote, case): Adapt for these no longer being primitive macros. * module/ice-9/boot-9.scm: Whitespace change, but just a poke to force a rebuild due to and/or/cond/... not being primitives any more. * module/ice-9/deprecated.scm (unmemoize-expr): Deprecate, it's unmemoize-expression now. * test-suite/tests/eval.test ("define set procedure-name"): XFAIL a couple of tests here; I don't know what to do about them. I reckon the expander should ensure that defined values are named. * test-suite/tests/chars.test ("basic char handling"): Fix expected exception when trying to apply a char.
209 lines
6.9 KiB
Scheme
209 lines
6.9 KiB
Scheme
;;;; Copyright (C) 2003, 2005, 2006, 2009 Free Software Foundation, Inc.
|
|
;;;;
|
|
;;;; This library is free software; you can redistribute it and/or
|
|
;;;; modify it under the terms of the GNU Lesser General Public
|
|
;;;; License as published by the Free Software Foundation; either
|
|
;;;; version 3 of the License, or (at your option) any later version.
|
|
;;;;
|
|
;;;; This library is distributed in the hope that it will be useful,
|
|
;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
;;;; Lesser General Public License for more details.
|
|
;;;;
|
|
;;;; You should have received a copy of the GNU Lesser General Public
|
|
;;;; License along with this library; if not, write to the Free Software
|
|
;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
;;;;
|
|
|
|
;;;; Deprecated definitions.
|
|
|
|
(define substring-move-left! substring-move!)
|
|
(define substring-move-right! substring-move!)
|
|
|
|
;; This method of dynamically linking Guile Extensions is deprecated.
|
|
;; Use `load-extension' explicitly from Scheme code instead.
|
|
|
|
(define (split-c-module-name str)
|
|
(let loop ((rev '())
|
|
(start 0)
|
|
(pos 0)
|
|
(end (string-length str)))
|
|
(cond
|
|
((= pos end)
|
|
(reverse (cons (string->symbol (substring str start pos)) rev)))
|
|
((eq? (string-ref str pos) #\space)
|
|
(loop (cons (string->symbol (substring str start pos)) rev)
|
|
(+ pos 1)
|
|
(+ pos 1)
|
|
end))
|
|
(else
|
|
(loop rev start (+ pos 1) end)))))
|
|
|
|
(define (convert-c-registered-modules dynobj)
|
|
(let ((res (map (lambda (c)
|
|
(list (split-c-module-name (car c)) (cdr c) dynobj))
|
|
(c-registered-modules))))
|
|
(c-clear-registered-modules)
|
|
res))
|
|
|
|
(define registered-modules '())
|
|
|
|
(define (register-modules dynobj)
|
|
(set! registered-modules
|
|
(append! (convert-c-registered-modules dynobj)
|
|
registered-modules)))
|
|
|
|
(define (warn-autoload-deprecation modname)
|
|
(issue-deprecation-warning
|
|
"Autoloading of compiled code modules is deprecated."
|
|
"Write a Scheme file instead that uses `load-extension'.")
|
|
(issue-deprecation-warning
|
|
(simple-format #f "(You just autoloaded module ~S.)" modname)))
|
|
|
|
(define (init-dynamic-module modname)
|
|
;; Register any linked modules which have been registered on the C level
|
|
(register-modules #f)
|
|
(or-map (lambda (modinfo)
|
|
(if (equal? (car modinfo) modname)
|
|
(begin
|
|
(warn-autoload-deprecation modname)
|
|
(set! registered-modules (delq! modinfo registered-modules))
|
|
(let ((mod (resolve-module modname #f)))
|
|
(save-module-excursion
|
|
(lambda ()
|
|
(set-current-module mod)
|
|
(set-module-public-interface! mod mod)
|
|
(dynamic-call (cadr modinfo) (caddr modinfo))
|
|
))
|
|
#t))
|
|
#f))
|
|
registered-modules))
|
|
|
|
(define (dynamic-maybe-call name dynobj)
|
|
(catch #t ; could use false-if-exception here
|
|
(lambda ()
|
|
(dynamic-call name dynobj))
|
|
(lambda args
|
|
#f)))
|
|
|
|
(define (dynamic-maybe-link filename)
|
|
(catch #t ; could use false-if-exception here
|
|
(lambda ()
|
|
(dynamic-link filename))
|
|
(lambda args
|
|
#f)))
|
|
|
|
(define (find-and-link-dynamic-module module-name)
|
|
(define (make-init-name mod-name)
|
|
(string-append "scm_init"
|
|
(list->string (map (lambda (c)
|
|
(if (or (char-alphabetic? c)
|
|
(char-numeric? c))
|
|
c
|
|
#\_))
|
|
(string->list mod-name)))
|
|
"_module"))
|
|
|
|
;; Put the subdirectory for this module in the car of SUBDIR-AND-LIBNAME,
|
|
;; and the `libname' (the name of the module prepended by `lib') in the cdr
|
|
;; field. For example, if MODULE-NAME is the list (inet tcp-ip udp), then
|
|
;; SUBDIR-AND-LIBNAME will be the pair ("inet/tcp-ip" . "libudp").
|
|
(let ((subdir-and-libname
|
|
(let loop ((dirs "")
|
|
(syms module-name))
|
|
(if (null? (cdr syms))
|
|
(cons dirs (string-append "lib" (symbol->string (car syms))))
|
|
(loop (string-append dirs (symbol->string (car syms)) "/")
|
|
(cdr syms)))))
|
|
(init (make-init-name (apply string-append
|
|
(map (lambda (s)
|
|
(string-append "_"
|
|
(symbol->string s)))
|
|
module-name)))))
|
|
(let ((subdir (car subdir-and-libname))
|
|
(libname (cdr subdir-and-libname)))
|
|
|
|
;; Now look in each dir in %LOAD-PATH for `subdir/libfoo.la'. If that
|
|
;; file exists, fetch the dlname from that file and attempt to link
|
|
;; against it. If `subdir/libfoo.la' does not exist, or does not seem
|
|
;; to name any shared library, look for `subdir/libfoo.so' instead and
|
|
;; link against that.
|
|
(let check-dirs ((dir-list %load-path))
|
|
(if (null? dir-list)
|
|
#f
|
|
(let* ((dir (in-vicinity (car dir-list) subdir))
|
|
(sharlib-full
|
|
(or (try-using-libtool-name dir libname)
|
|
(try-using-sharlib-name dir libname))))
|
|
(if (and sharlib-full (file-exists? sharlib-full))
|
|
(link-dynamic-module sharlib-full init)
|
|
(check-dirs (cdr dir-list)))))))))
|
|
|
|
(define (try-using-libtool-name libdir libname)
|
|
(let ((libtool-filename (in-vicinity libdir
|
|
(string-append libname ".la"))))
|
|
(and (file-exists? libtool-filename)
|
|
libtool-filename)))
|
|
|
|
(define (try-using-sharlib-name libdir libname)
|
|
(in-vicinity libdir (string-append libname ".so")))
|
|
|
|
(define (link-dynamic-module filename initname)
|
|
;; Register any linked modules which have been registered on the C level
|
|
(register-modules #f)
|
|
(let ((dynobj (dynamic-link filename)))
|
|
(dynamic-call initname dynobj)
|
|
(register-modules dynobj)))
|
|
|
|
(define (try-module-linked module-name)
|
|
(init-dynamic-module module-name))
|
|
|
|
(define (try-module-dynamic-link module-name)
|
|
(and (find-and-link-dynamic-module module-name)
|
|
(init-dynamic-module module-name)))
|
|
|
|
(define (list* . args)
|
|
(issue-deprecation-warning "'list*' is deprecated. Use 'cons*' instead.")
|
|
(apply cons* args))
|
|
|
|
;; The strange prototype system for uniform arrays has been
|
|
;; deprecated.
|
|
|
|
(define-macro (eval-case . clauses)
|
|
(issue-deprecation-warning
|
|
"`eval-case' is deprecated. Use `eval-when' instead.")
|
|
;; Practically speaking, eval-case only had load-toplevel and else as
|
|
;; conditions.
|
|
(cond
|
|
((assoc-ref clauses '(load-toplevel))
|
|
=> (lambda (exps)
|
|
;; the *unspecified so that non-toplevel definitions will be
|
|
;; caught
|
|
`(begin *unspecified* . ,exps)))
|
|
((assoc-ref clauses 'else)
|
|
=> (lambda (exps)
|
|
`(begin *unspecified* . ,exps)))
|
|
(else
|
|
`(begin))))
|
|
|
|
(read-hash-extend
|
|
#\y
|
|
(lambda (c port)
|
|
(issue-deprecation-warning
|
|
"The `#y' bitvector syntax is deprecated. Use `#*' instead.")
|
|
(let ((x (read port)))
|
|
(cond
|
|
((list? x)
|
|
(list->bitvector
|
|
(map (lambda (x)
|
|
(cond ((zero? x) #f)
|
|
((eqv? x 1) #t)
|
|
(else (error "invalid #y element" x))))
|
|
x)))
|
|
(else
|
|
(error "#y needs to be followed by a list" x))))))
|
|
|
|
(define (unmemoize-expr . args)
|
|
(issue-deprecation-warning
|
|
"`unmemoize-expr' is deprecated. Use `unmemoize-expression' instead.")
|
|
(apply unmemoize-expression args))
|