mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 03:40:34 +02:00
Code Activity

psyntax: Clean up sourcev/src namings

Browse source 
* module/ice-9/psyntax.scm: Look forward to the all-sourcev world by
just naming things "src".
* module/ice-9/psyntax-pp.scm: Regenerate.
This commit is contained in:
Andy Wingo 2024-11-19 14:30:49 +01:00
parent 2f684989e1
commit a14948be2f
2 changed files with 18 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

17
module/ice-9/psyntax-pp.scm
View file

@ -127,7 +127,7 @@
(build-conditional make-conditional) (build-conditional make-conditional)
(build-lexical-reference make-lexical-ref) (build-lexical-reference make-lexical-ref)
(build-lexical-assignment (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 (analyze-variable
(lambda (mod var modref-cont bare-cont) (lambda (mod var modref-cont bare-cont)
(let* ((v mod) (let* ((v mod)
@ -161,23 +161,22 @@
(fk)))))) (fk))))))
(if (eq? v #f) (bare-cont #f var) (fk))))) (if (eq? v #f) (bare-cont #f var) (fk)))))
(build-global-reference (build-global-reference
(lambda (sourcev var mod) (lambda (src var mod)
(analyze-variable (analyze-variable
mod mod
var var
(lambda (mod var public?) (make-module-ref sourcev mod var public?)) (lambda (mod var public?) (make-module-ref src mod var public?))
(lambda (mod var) (make-toplevel-ref sourcev mod var))))) (lambda (mod var) (make-toplevel-ref src mod var)))))
(build-global-assignment (build-global-assignment
(lambda (sourcev var exp mod) (lambda (src var exp mod)
(let ((exp (maybe-name-value var exp))) (let ((exp (maybe-name-value var exp)))
(analyze-variable (analyze-variable
mod mod
var var
(lambda (mod var public?) (make-module-set sourcev mod var public? exp)) (lambda (mod var public?) (make-module-set src mod var public? exp))
(lambda (mod var) (make-toplevel-set sourcev mod var exp)))))) (lambda (mod var) (make-toplevel-set src mod var exp))))))
(build-global-definition (build-global-definition
(lambda (sourcev mod var exp) (lambda (src mod var exp) (make-toplevel-define src (and mod (cdr mod)) var (maybe-name-value var exp))))
(make-toplevel-define sourcev (and mod (cdr mod)) var (maybe-name-value var exp))))
(build-simple-lambda (build-simple-lambda
(lambda (src req rest vars meta exp) (lambda (src req rest vars meta exp)
(make-lambda src meta (make-lambda-case src req #f rest #f '() vars exp #f)))) (make-lambda src meta (make-lambda-case src req #f rest #f '() vars exp #f))))

20
module/ice-9/psyntax.scm
View file

@ -232,8 +232,8 @@
(define build-call make-call) (define build-call make-call)
(define build-conditional make-conditional) (define build-conditional make-conditional)
(define build-lexical-reference make-lexical-ref) (define build-lexical-reference make-lexical-ref)
(define (build-lexical-assignment sourcev name var exp) (define (build-lexical-assignment src name var exp)
(make-lexical-set sourcev name var (maybe-name-value name exp))) (make-lexical-set src name var (maybe-name-value name exp)))
(define (analyze-variable mod var modref-cont bare-cont) (define (analyze-variable mod var modref-cont bare-cont)
(match mod (match mod
@ -246,25 +246,25 @@
(('primitive . _) (('primitive . _)
(syntax-violation #f "primitive not in operator position" var)))) (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 (analyze-variable
mod var mod var
(lambda (mod var public?) (lambda (mod var public?)
(make-module-ref sourcev mod var public?)) (make-module-ref src mod var public?))
(lambda (mod var) (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))) (let ((exp (maybe-name-value var exp)))
(analyze-variable (analyze-variable
mod var mod var
(lambda (mod var public?) (lambda (mod var public?)
(make-module-set sourcev mod var public? exp)) (make-module-set src mod var public? exp))
(lambda (mod var) (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) (define (build-global-definition src mod var exp)
(make-toplevel-define sourcev (and mod (cdr mod)) var (make-toplevel-define src (and mod (cdr mod)) var
(maybe-name-value var exp))) (maybe-name-value var exp)))
(define (build-simple-lambda src req rest vars meta exp) (define (build-simple-lambda src req rest vars meta exp)