diff options
author | Andy Wingo <wingo@pobox.com> | 2009-06-09 23:42:05 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2009-06-09 23:42:05 +0200 |
commit | 8f9b968329797a6a228bb18f5dddfa7444c97ff5 (patch) | |
tree | 0d52c98e9e92dc065f8ab2ced6117b22bbba6fec | |
parent | ac4d09b1647f84453175aabcf8fde7807a3b5cf9 (diff) | |
download | guile-8f9b968329797a6a228bb18f5dddfa7444c97ff5.tar.gz |
some attempts to solve the ecmascript stack overflow problem
* module/language/ecmascript/compile-ghil.scm (comp): Just use pmatch,
not ormatch. Now with syncase running over everything, it doesn't
matter.
* module/ice-9/boot-9.scm (false-if-exception): Avoid saving stacks
inside false-if-exception. There's probably a more general solution to
this, though. Fixes getting bogus backtraces sometimes.
* module/Makefile.am (ECMASCRIPT_LANG_SOURCES): Reorder things so that
spec comes last.
-rw-r--r-- | module/Makefile.am | 4 | ||||
-rw-r--r-- | module/ice-9/boot-9.scm | 8 | ||||
-rw-r--r-- | module/language/ecmascript/compile-ghil.scm | 13 |
3 files changed, 9 insertions, 16 deletions
diff --git a/module/Makefile.am b/module/Makefile.am index ca7785212..3358441b1 100644 --- a/module/Makefile.am +++ b/module/Makefile.am @@ -105,12 +105,12 @@ ECMASCRIPT_LANG_SOURCES = \ language/ecmascript/parse-lalr.scm \ language/ecmascript/tokenize.scm \ language/ecmascript/parse.scm \ - language/ecmascript/spec.scm \ language/ecmascript/impl.scm \ language/ecmascript/base.scm \ language/ecmascript/function.scm \ language/ecmascript/array.scm \ - language/ecmascript/compile-ghil.scm + language/ecmascript/compile-ghil.scm \ + language/ecmascript/spec.scm SCRIPTS_SOURCES = \ scripts/PROGRAM.scm \ diff --git a/module/ice-9/boot-9.scm b/module/ice-9/boot-9.scm index bb66ccfb6..a2600491b 100644 --- a/module/ice-9/boot-9.scm +++ b/module/ice-9/boot-9.scm @@ -382,8 +382,12 @@ (define (apply-to-args args fn) (apply fn args)) (defmacro false-if-exception (expr) - `(catch #t (lambda () ,expr) - (lambda args #f))) + `(catch #t + (lambda () + ;; avoid saving backtraces inside false-if-exception + (with-fluid* the-last-stack (fluid-ref the-last-stack) + (lambda () ,expr))) + (lambda args #f))) diff --git a/module/language/ecmascript/compile-ghil.scm b/module/language/ecmascript/compile-ghil.scm index 92d71ec16..6e4779120 100644 --- a/module/language/ecmascript/compile-ghil.scm +++ b/module/language/ecmascript/compile-ghil.scm @@ -50,17 +50,6 @@ (and (not (null? props)) props)))) -;; The purpose, you ask? To avoid non-tail recursion when expanding a -;; long pmatch sequence. -(define-macro (ormatch x . clauses) - (let ((X (gensym))) - `(let ((,X ,x)) - (or ,@(map (lambda (c) - (if (eq? (car c) 'else) - `(begin . ,(cdr c)) - `(pmatch ,X ,c (else #f)))) - clauses))))) - (define (comp x e) (let ((l (location x))) (define (let1 what proc) @@ -74,7 +63,7 @@ (-> (bind vars (list what) (-> (begin (list (proc (car vars)) (-> (ref (car vars))))))))))) - (ormatch x + (pmatch x (null ;; FIXME, null doesn't have much relation to EOL... (-> (quote '()))) |