summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2024-11-19 14:30:49 +0100
committerAndy Wingo <wingo@pobox.com>2024-11-19 14:30:49 +0100
commita14948be2f5a80d0c0fbecad6302ce4590e1fa76 (patch)
tree063e990a397c3f44f4a24d70525872a7fb778917
parent2f684989e1c42638fe64e12669b9f18129e4dd06 (diff)
downloadguile-a14948be2f5a80d0c0fbecad6302ce4590e1fa76.tar.gz
psyntax: Clean up sourcev/src namings
* module/ice-9/psyntax.scm: Look forward to the all-sourcev world by just naming things "src". * module/ice-9/psyntax-pp.scm: Regenerate.
-rw-r--r--module/ice-9/psyntax-pp.scm17
-rw-r--r--module/ice-9/psyntax.scm20
2 files changed, 18 insertions, 19 deletions
diff --git a/module/ice-9/psyntax-pp.scm b/module/ice-9/psyntax-pp.scm
index 858b9ec2a..9c4b22e74 100644
--- a/module/ice-9/psyntax-pp.scm
+++ b/module/ice-9/psyntax-pp.scm
@@ -127,7 +127,7 @@
(build-conditional make-conditional)
(build-lexical-reference make-lexical-ref)
(build-lexical-assignment
- (lambda (sourcev name var exp) (make-lexical-set sourcev name var (maybe-name-value name exp))))
+ (lambda (src name var exp) (make-lexical-set src name var (maybe-name-value name exp))))
(analyze-variable
(lambda (mod var modref-cont bare-cont)
(let* ((v mod)
@@ -161,23 +161,22 @@
(fk))))))
(if (eq? v #f) (bare-cont #f var) (fk)))))
(build-global-reference
- (lambda (sourcev var mod)
+ (lambda (src var mod)
(analyze-variable
mod
var
- (lambda (mod var public?) (make-module-ref sourcev mod var public?))
- (lambda (mod var) (make-toplevel-ref sourcev mod var)))))
+ (lambda (mod var public?) (make-module-ref src mod var public?))
+ (lambda (mod var) (make-toplevel-ref src mod var)))))
(build-global-assignment
- (lambda (sourcev var exp mod)
+ (lambda (src var exp mod)
(let ((exp (maybe-name-value var exp)))
(analyze-variable
mod
var
- (lambda (mod var public?) (make-module-set sourcev mod var public? exp))
- (lambda (mod var) (make-toplevel-set sourcev mod var exp))))))
+ (lambda (mod var public?) (make-module-set src mod var public? exp))
+ (lambda (mod var) (make-toplevel-set src mod var exp))))))
(build-global-definition
- (lambda (sourcev mod var exp)
- (make-toplevel-define sourcev (and mod (cdr mod)) var (maybe-name-value var exp))))
+ (lambda (src mod var exp) (make-toplevel-define src (and mod (cdr mod)) var (maybe-name-value var exp))))
(build-simple-lambda
(lambda (src req rest vars meta exp)
(make-lambda src meta (make-lambda-case src req #f rest #f '() vars exp #f))))
diff --git a/module/ice-9/psyntax.scm b/module/ice-9/psyntax.scm
index b24e889f7..f127bae96 100644
--- a/module/ice-9/psyntax.scm
+++ b/module/ice-9/psyntax.scm
@@ -232,8 +232,8 @@
(define build-call make-call)
(define build-conditional make-conditional)
(define build-lexical-reference make-lexical-ref)
- (define (build-lexical-assignment sourcev name var exp)
- (make-lexical-set sourcev name var (maybe-name-value name exp)))
+ (define (build-lexical-assignment src name var exp)
+ (make-lexical-set src name var (maybe-name-value name exp)))
(define (analyze-variable mod var modref-cont bare-cont)
(match mod
@@ -246,25 +246,25 @@
(('primitive . _)
(syntax-violation #f "primitive not in operator position" var))))
- (define (build-global-reference sourcev var mod)
+ (define (build-global-reference src var mod)
(analyze-variable
mod var
(lambda (mod var public?)
- (make-module-ref sourcev mod var public?))
+ (make-module-ref src mod var public?))
(lambda (mod var)
- (make-toplevel-ref sourcev mod var))))
+ (make-toplevel-ref src mod var))))
- (define (build-global-assignment sourcev var exp mod)
+ (define (build-global-assignment src var exp mod)
(let ((exp (maybe-name-value var exp)))
(analyze-variable
mod var
(lambda (mod var public?)
- (make-module-set sourcev mod var public? exp))
+ (make-module-set src mod var public? exp))
(lambda (mod var)
- (make-toplevel-set sourcev mod var exp)))))
+ (make-toplevel-set src mod var exp)))))
- (define (build-global-definition sourcev mod var exp)
- (make-toplevel-define sourcev (and mod (cdr mod)) var
+ (define (build-global-definition src mod var exp)
+ (make-toplevel-define src (and mod (cdr mod)) var
(maybe-name-value var exp)))
(define (build-simple-lambda src req rest vars meta exp)