diff options
Diffstat (limited to 'module/language/tree-il')
-rw-r--r-- | module/language/tree-il/analyze.scm | 8 | ||||
-rw-r--r-- | module/language/tree-il/compile-bytecode.scm | 4 | ||||
-rw-r--r-- | module/language/tree-il/compile-cps.scm | 10 | ||||
-rw-r--r-- | module/language/tree-il/debug.scm | 2 | ||||
-rw-r--r-- | module/language/tree-il/letrectify.scm | 4 | ||||
-rw-r--r-- | module/language/tree-il/peval.scm | 4 | ||||
-rw-r--r-- | module/language/tree-il/spec.scm | 3 |
7 files changed, 18 insertions, 17 deletions
diff --git a/module/language/tree-il/analyze.scm b/module/language/tree-il/analyze.scm index 418a7ccb0..c081c8844 100644 --- a/module/language/tree-il/analyze.scm +++ b/module/language/tree-il/analyze.scm @@ -71,7 +71,7 @@ given `tree-il' element." (cdr results)))))) ;; Extending and shrinking the location stack. - (define (extend-locs x locs) (cons (tree-il-srcv x) locs)) + (define (extend-locs x locs) (cons (tree-il-src x) locs)) (define (shrink-locs x locs) (cdr locs)) (let ((results @@ -114,7 +114,7 @@ given `tree-il' element." ;; accordingly. (let ((refs (binding-info-refs info)) (vars (binding-info-vars info)) - (src (tree-il-srcv x))) + (src (tree-il-src x))) (define (extend inner-vars inner-names) (fold (lambda (var name vars) (vhash-consq var (list name src) vars)) @@ -525,7 +525,7 @@ given `tree-il' element." (match (vhash-assq name defs) ((_ . previous-definition) (warning 'shadowed-toplevel src name - (tree-il-srcv previous-definition)) + (tree-il-src previous-definition)) defs) (#f (vhash-consq name x defs)))) @@ -926,7 +926,7 @@ given `tree-il' element." (values #f #f)))))))) (let ((args (call-args call)) - (src (tree-il-srcv call))) + (src (tree-il-src call))) (call-with-values (lambda () (arities proc)) (lambda (name arities) (define matches? diff --git a/module/language/tree-il/compile-bytecode.scm b/module/language/tree-il/compile-bytecode.scm index a581b7f6c..947715ca6 100644 --- a/module/language/tree-il/compile-bytecode.scm +++ b/module/language/tree-il/compile-bytecode.scm @@ -1,6 +1,6 @@ ;;; Lightweight compiler directly from Tree-IL to bytecode -;; Copyright (C) 2020-2021,2023 Free Software Foundation, Inc. +;; Copyright (C) 2020-2021,2023,2025 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 @@ -604,7 +604,7 @@ (() (let () (define x-thunk - (let ((src (tree-il-srcv exp))) + (let ((src (tree-il-src exp))) (make-lambda src '() (make-lambda-case src '() #f #f #f '() '() exp #f)))) (values (cons (make-closure 'init x-thunk #f '()) diff --git a/module/language/tree-il/compile-cps.scm b/module/language/tree-il/compile-cps.scm index ea5be8aa8..6dcb16963 100644 --- a/module/language/tree-il/compile-cps.scm +++ b/module/language/tree-il/compile-cps.scm @@ -1,6 +1,6 @@ ;;; Continuation-passing style (CPS) intermediate language (IL) -;; Copyright (C) 2013-2015,2017-2021,2023 Free Software Foundation, Inc. +;; Copyright (C) 2013-2015,2017-2021,2023,2025 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 @@ -1309,7 +1309,7 @@ use as the proc slot." (define (init-default-value cps name sym subst init body) (match (hashq-ref subst sym) ((orig-var subst-var box?) - (let ((src (tree-il-srcv init))) + (let ((src (tree-il-src init))) (define (maybe-box cps k make-body) (if box? (with-cps cps @@ -1964,10 +1964,10 @@ use as the proc slot." (lambda (cps thunk) (with-cps cps (letk kbody ($kargs () () - ($continue krest (tree-il-srcv body) + ($continue krest (tree-il-src body) ($primcall 'call-thunk/no-inline #f (thunk))))) - (build-term ($prompt kbody khargs (tree-il-srcv body) + (build-term ($prompt kbody khargs (tree-il-src body) #f tag))))))) (with-cps cps (letv prim vals apply) @@ -2223,7 +2223,7 @@ integer." (letk kclause ($kclause ('() '() #f '() #f) kbody #f)) ($ ((lambda (cps) (let ((init (build-cont - ($kfun (tree-il-srcv exp) '() init ktail kclause)))) + ($kfun (tree-il-src exp) '() init ktail kclause)))) (with-cps (persistent-intmap (intmap-replace! cps kinit init)) kinit)))))))) diff --git a/module/language/tree-il/debug.scm b/module/language/tree-il/debug.scm index 2dec39bd0..cf55196fb 100644 --- a/module/language/tree-il/debug.scm +++ b/module/language/tree-il/debug.scm @@ -244,7 +244,7 @@ (visit tail env)) (_ (error "unexpected tree-il" exp))) - (match (tree-il-srcv exp) + (match (tree-il-src exp) (#f #t) (#((or #f (? string?)) (? exact-integer?) (? exact-integer?)) #t) (src (error "bad src" src))) diff --git a/module/language/tree-il/letrectify.scm b/module/language/tree-il/letrectify.scm index 0f9c6aa3c..3b79d24fa 100644 --- a/module/language/tree-il/letrectify.scm +++ b/module/language/tree-il/letrectify.scm @@ -1,6 +1,6 @@ ;;; transformation of top-level bindings into letrec* -;; Copyright (C) 2019-2021,2023 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021,2023,2025 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 @@ -190,7 +190,7 @@ (cons name names) (cons var vars) (cons val vals) tail)) (_ - (make-letrec (tree-il-srcv tail) #t + (make-letrec (tree-il-src tail) #t (list name) (list var) (list val) tail)))) diff --git a/module/language/tree-il/peval.scm b/module/language/tree-il/peval.scm index 27a0acbcb..5940c00f0 100644 --- a/module/language/tree-il/peval.scm +++ b/module/language/tree-il/peval.scm @@ -1,6 +1,6 @@ ;;; Tree-IL partial evaluator -;; Copyright (C) 2011-2014,2017,2019-2024 Free Software Foundation, Inc. +;; Copyright (C) 2011-2014,2017,2019-2025 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 @@ -110,7 +110,7 @@ "Discard all but the first value of X." (if (singly-valued-expression? x) x - (make-primcall (tree-il-srcv x) 'values (list x)))) + (make-primcall (tree-il-src x) 'values (list x)))) ;; Peval will do a one-pass analysis on the source program to determine ;; the set of assigned lexicals, and to identify unreferenced and diff --git a/module/language/tree-il/spec.scm b/module/language/tree-il/spec.scm index 05decf1a9..57f67bc9b 100644 --- a/module/language/tree-il/spec.scm +++ b/module/language/tree-il/spec.scm @@ -1,6 +1,6 @@ ;;; Tree Intermediate Language -;; Copyright (C) 2009-2011,2013,2015,2020 Free Software Foundation, Inc. +;; Copyright (C) 2009-2011,2013,2015,2020,2025 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 @@ -21,6 +21,7 @@ (define-module (language tree-il spec) #:use-module (system base language) #:use-module (ice-9 match) + #:use-module (ice-9 source-properties) #:use-module (language tree-il) #:use-module ((language tree-il analyze) #:select (make-analyzer)) #:use-module ((language tree-il optimize) #:select (make-lowerer)) |