mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-24 20:30:28 +02:00
178a40928a
* module/language/tree-il.scm (<prompt>): Change to have the body and
handler be lambdas, and add an "escape-only?" field. This will make
generic prompts work better in CPS or ANF with the RTL VM, as it
doesn't make sense in that context to capture only part of a frame.
Escape-only prompts can still be fully inlined.
(parse-tree-il, unparse-tree-il): Add escape-only? to the
serialization.
(make-tree-il-folder, pre-post-order): Deal with escape-only?.
* module/language/tree-il/analyze.scm (analyze-lexicals): Handle
escape-only?, and the new expectations for the body and handler.
* module/language/tree-il/canonicalize.scm (canonicalize): Ensure that
the body of an escape-only continuation is a thunk, and that the
handler is always a lambda.
* module/language/tree-il/debug.scm (verify-tree-il): Assert that
escape-only? is a boolean.
* module/language/tree-il/cse.scm (cse):
* module/language/tree-il/effects.scm (make-effects-analyzer):
* module/language/tree-il/peval.scm (peval):
* module/language/tree-il/primitives.scm (*primitive-expand-table*):
* test-suite/tests/peval.test ("partial evaluation"):
* module/language/tree-il/compile-glil.scm (flatten-lambda-case): Adapt
to <prompt> change.
102 lines
3.7 KiB
Scheme
102 lines
3.7 KiB
Scheme
;;; Tree-il canonicalizer
|
|
|
|
;; Copyright (C) 2011, 2012, 2013 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
|
|
|
|
;;; Code:
|
|
|
|
(define-module (language tree-il canonicalize)
|
|
#:use-module (language tree-il)
|
|
#:use-module (ice-9 match)
|
|
#:use-module (srfi srfi-1)
|
|
#:export (canonicalize))
|
|
|
|
(define (tree-il-any proc exp)
|
|
(tree-il-fold (lambda (exp res)
|
|
(or res (proc exp)))
|
|
(lambda (exp res) res)
|
|
#f exp))
|
|
|
|
(define (canonicalize x)
|
|
(post-order
|
|
(lambda (x)
|
|
(match x
|
|
(($ <let> src () () () body)
|
|
body)
|
|
(($ <letrec> src _ () () () body)
|
|
body)
|
|
(($ <fix> src () () () body)
|
|
body)
|
|
(($ <lambda> src meta #f)
|
|
;; Give a body to case-lambda with no clauses.
|
|
(make-lambda
|
|
src meta
|
|
(make-lambda-case
|
|
#f '() #f #f #f '() '()
|
|
(make-primcall
|
|
#f
|
|
'throw
|
|
(list (make-const #f 'wrong-number-of-args)
|
|
(make-const #f #f)
|
|
(make-const #f "Wrong number of arguments")
|
|
(make-const #f '())
|
|
(make-const #f #f)))
|
|
#f)))
|
|
(($ <prompt> src)
|
|
(define (ensure-lambda-body prompt)
|
|
;; If the prompt is escape-only, the body should be a thunk.
|
|
(match prompt
|
|
(($ <prompt> _ escape-only? tag body handler)
|
|
(match body
|
|
((or ($ <lambda> _ _ ($ <lambda-case> _ () #f #f #f))
|
|
(? (lambda _ (not escape-only?))))
|
|
prompt)
|
|
(else
|
|
(make-prompt
|
|
src escape-only? tag
|
|
(make-lambda #f '()
|
|
(make-lambda-case #f '() #f #f #f '() '()
|
|
(make-call #f body '())
|
|
#f))
|
|
handler))))))
|
|
(define (ensure-lambda-handler prompt)
|
|
(match prompt
|
|
(($ <prompt> _ escape-only? tag body handler)
|
|
;; The prompt handler should be a simple lambda, so that we
|
|
;; can inline it.
|
|
(match handler
|
|
(($ <lambda> _ _
|
|
($ <lambda-case> _ req #f rest #f () syms body #f))
|
|
prompt)
|
|
(else
|
|
(let ((handler-sym (gensym))
|
|
(args-sym (gensym)))
|
|
(make-let
|
|
#f (list 'handler) (list handler-sym) (list handler)
|
|
(make-prompt
|
|
src escape-only? tag body
|
|
(make-lambda
|
|
#f '()
|
|
(make-lambda-case
|
|
#f '() #f 'args #f '() (list args-sym)
|
|
(make-primcall
|
|
#f 'apply
|
|
(list (make-lexical-ref #f 'handler handler-sym)
|
|
(make-lexical-ref #f 'args args-sym)))
|
|
#f))))))))))
|
|
(ensure-lambda-handler (ensure-lambda-body x)))
|
|
(_ x)))
|
|
x))
|