From 5263ab1126adfc65e66104b50c618abea8c99772 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= Date: Tue, 12 Jul 2022 02:46:12 +0200 Subject: s/macro?/cpp-macro?/g Guile cried way to much about me overriding a core identifier. --- module/c/preprocessor2.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'module/c/preprocessor2.scm') diff --git a/module/c/preprocessor2.scm b/module/c/preprocessor2.scm index 44931b68..3cb5913f 100644 --- a/module/c/preprocessor2.scm +++ b/module/c/preprocessor2.scm @@ -35,7 +35,7 @@ ;; parameters is a lexeme list, as returned by parse-parameter-list (define (build-parameter-map macro parameters) - (typecheck macro macro?) + (typecheck macro cpp-macro?) (typecheck parameters (list-of (list-of lexeme?))) (map (lambda (pair) (modify pair cdr* drop-whitespace-both)) (if (macro-variadic? macro) @@ -49,7 +49,7 @@ parameters)))) (define (expand# macro parameter-map) - (typecheck macro macro?) + (typecheck macro cpp-macro?) (typecheck parameter-map parameter-map?) (let loop ((tokens (macro-body macro))) (cond ((null? tokens) '()) @@ -126,7 +126,7 @@ (typecheck environment cpp-environment?) ;; Each element should be the lexeme list for that argument (typecheck parameters (list-of (list-of lexeme?))) - (typecheck macro macro?) + (typecheck macro cpp-macro?) (check-arity macro parameters) (let () @@ -176,7 +176,7 @@ ;; remaining-tokens should be the token stream just after the name of the macro (define (expand-macro environment macro noexpand-list remaining-tokens) (typecheck environment cpp-environment?) - (typecheck macro macro?) + (typecheck macro cpp-macro?) (typecheck remaining-tokens (list-of lexeme?)) (typecheck noexpand-list (list-of string?)) -- cgit v1.2.3