From 08b84c6b42312aa2bb4d854367b4a17cafcf28c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= Date: Sat, 23 Jul 2022 20:44:05 +0200 Subject: Merge cpp-environment sub-modules into main module. The modules where sepparate before to allow multiple objects to share keys for the constructor. This is not needed any more since the introduction of key: to define-type. --- tests/test/cpp/preprocessor2.scm | 62 ++++++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 31 deletions(-) (limited to 'tests/test/cpp/preprocessor2.scm') diff --git a/tests/test/cpp/preprocessor2.scm b/tests/test/cpp/preprocessor2.scm index f79ece15..fd18ddce 100644 --- a/tests/test/cpp/preprocessor2.scm +++ b/tests/test/cpp/preprocessor2.scm @@ -18,9 +18,9 @@ in-environment? macro-identifier-list macro-body - cpp-file-stack)) - :use-module ((c cpp-environment function-like-macro) :select (function-like-macro)) - :use-module ((c cpp-environment object-like-macro) :select (object-like-macro)) + cpp-file-stack + function-macro + object-macro)) :use-module ((c cpp-util) :select (drop-whitespace-both tokens-until-eol @@ -232,11 +232,11 @@ (let ((e (join-file-line (make-environment)))) (test-equal "__FILE__ default value" - (object-like-macro identifier: "__FILE__" + (object-macro identifier: "__FILE__" body: (lex "\"*outside*\"")) (get-identifier e "__FILE__")) (test-equal "__LINE__ default value" - (object-like-macro identifier: "__LINE__" + (object-macro identifier: "__LINE__" body: (lex "1")) (get-identifier e "__LINE__"))) @@ -257,7 +257,7 @@ (lex "10") (-> (make-environment) (extend-environment - (list (object-like-macro + (list (object-macro identifier: "x" body: (lex "10")))) (resolve-token-stream (lex "x")) @@ -268,7 +268,7 @@ (lex "10 1") (-> (make-environment) (extend-environment - (list (object-like-macro + (list (object-macro identifier: "x" body: (lex "10")))) (resolve-token-stream (lex "x 1")) @@ -279,10 +279,10 @@ (lex "10 20") (-> (make-environment) (extend-environment - (list (object-like-macro + (list (object-macro identifier: "x" body: (lex "10")) - (object-like-macro + (object-macro identifier: "y" body: (lex "20")))) (resolve-token-stream (lex "x y")) @@ -298,7 +298,7 @@ (test-group "Object like macros" (call-with-values (lambda () (expand-macro (make-environment) - (object-like-macro + (object-macro identifier: "x" body: (lex "1 + 2")) '() '())) @@ -306,7 +306,7 @@ (call-with-values (lambda () (expand-macro (make-environment) - (object-like-macro + (object-macro identifier: "x" body: (lex "1+2")) '() (cdr (lex "x something else")))) @@ -337,7 +337,7 @@ (lex "1 + 2") (-> (make-environment) (extend-environment - (list (object-like-macro + (list (object-macro identifier: "x" body: (lex "1 + 2")))) (maybe-extend-identifier "x" '() '()) @@ -348,7 +348,7 @@ (append (lex "1 + 2") (lex "after")) (-> (make-environment) (extend-environment - (list (object-like-macro + (list (object-macro identifier: "x" body: (lex "1 + 2")))) (maybe-extend-identifier "x" '() (lex "after")) @@ -360,7 +360,7 @@ (lex "1") (remove-noexpand (apply-macro (make-environment) - (function-like-macro identifier: "f" + (function-macro identifier: "f" identifier-list: '() body: (lex "1")) '()))) @@ -371,7 +371,7 @@ parse-parameter-list (value-refx 0) (apply-macro (make-environment) - (function-like-macro identifier: "f" + (function-macro identifier: "f" identifier-list: '("x") body: (lex "x"))) remove-noexpand)) @@ -382,7 +382,7 @@ parse-parameter-list (value-refx 0) (apply-macro (make-environment) - (function-like-macro identifier: "f" + (function-macro identifier: "f" identifier-list: '("x" "y") body: (lex "x + y"))) remove-noexpand))) @@ -390,7 +390,7 @@ (test-group "Expand macro part 2" (test-group "Function like macros" (let ((e (make-environment))) - (let ((m (function-like-macro + (let ((m (function-macro identifier: "f" identifier-list: '() body: (lex "1")))) @@ -399,7 +399,7 @@ (test-error "Arity error for to many args" 'cpp-arity-error (expand-macro e m '() (lex "(10)")))) - (let ((m (function-like-macro + (let ((m (function-macro identifier: "f" identifier-list: '("x") variadic?: #t @@ -421,7 +421,7 @@ (lex "0") (-> e (extend-environment - (list (function-like-macro identifier: "f" + (list (function-macro identifier: "f" identifier-list: '("x") body: (lex "x")))) (resolve-token-stream (lex "f(0)")) @@ -432,7 +432,7 @@ (lex "(2) * (2)") (-> e (extend-environment - (list (function-like-macro identifier: "f" + (list (function-macro identifier: "f" identifier-list: '("x") body: (lex "(x) * (x)")))) (resolve-token-stream (lex "f(2)")) @@ -443,9 +443,9 @@ (lex "z") (-> e (extend-environment - (list (object-like-macro identifier: "x" + (list (object-macro identifier: "x" body: (lex "y")) - (object-like-macro identifier: "y" + (object-macro identifier: "y" body: (lex "z")))) (resolve-token-stream (lex "x")) (value-ref 1) @@ -455,10 +455,10 @@ (lex "10") (-> e (extend-environment - (list (function-like-macro identifier: "f" + (list (function-macro identifier: "f" identifier-list: '("x") body: (lex "g(x)")) - (function-like-macro identifier: "g" + (function-macro identifier: "g" identifier-list: '("y") body: (lex "y")))) (resolve-token-stream (lex "f(10)")) @@ -470,10 +470,10 @@ (lex "10") (-> e (extend-environment - (list (function-like-macro identifier: "f" + (list (function-macro identifier: "f" identifier-list: '("x") body: (lex "g(x)")) - (function-like-macro identifier: "g" + (function-macro identifier: "g" identifier-list: '("x") body: (lex "x")))) (resolve-token-stream (lex "f(10)")) @@ -486,10 +486,10 @@ (lex "10 * 2 + 20 * 2 + 30") (-> e (extend-environment - (list (function-like-macro identifier: "f" + (list (function-macro identifier: "f" identifier-list: '("x" "y") body: (lex "g(x) + g(y)")) - (function-like-macro identifier: "g" + (function-macro identifier: "g" identifier-list: '("x") body: (lex "x * 2")))) (resolve-token-stream (lex "f(10, 20) + 30")) @@ -865,12 +865,12 @@ f(g)(5)")) ;; (expand-macro ;; (extend-environment ;; (make-environment) -;; (list (object-like-macro identifier: "g" +;; (list (object-macro identifier: "g" ;; body: (lex "h")) -;; (function-like-macro identifier: "h" +;; (function-macro identifier: "h" ;; identifier:-list '("x") ;; body: (lex "(x + 10)")))) -;; (function-like-macro identifier: "f" +;; (function-macro identifier: "f" ;; identifier:-list '("a") ;; body: (lex "a")) ;; '() -- cgit v1.2.3