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.

1 files changed, 4 insertions, 3 deletions

diff --git a/tests/test/cpp/cpp-environment.scm b/tests/test/cpp/cpp-environment.scm
index e59940da..d38aafe3 100644
--- a/tests/test/cpp/cpp-environment.scm
+++ b/tests/test/cpp/cpp-environment.scm
@@ -3,9 +3,10 @@
   :use-module (srfi srfi-88)
   :use-module (c cpp-environment)
   :use-module ((c lex2) :select (lex))
-  :use-module (c cpp-environment object-like-macro)
   )
 
+(define cpp-if-status (@@ (c cpp-environment) cpp-if-status))
+
 (let ((e (make-environment)))
   (test-equal '(outside) (cpp-if-status e))
   (let ((e* (enter-into-if e (if-status active))))
@@ -29,8 +30,8 @@
 
 (let ((e (make-environment)))
   (let ((e* (add-identifier
-             e "key"
-             (object-like-macro
+             e
+             (object-macro
               identifier: "key"
               body: (lex "value")))))
     (let ((result (get-identifier e* "key")))