Abstract syntax tree improvements.

Keep objects in a single DMNSN_AST_OBJECT node type.

1 files changed, 13 insertions, 10 deletions

diff --git a/tests/dimension/directives.sh b/tests/dimension/directives.sh
index 9bd4c24..3e0233c 100755
--- a/tests/dimension/directives.sh
+++ b/tests/dimension/directives.sh
@@ -73,23 +73,26 @@ directives_exp="$(echo -n \
   })' \
 | tr '\n' ' ' | sed -r 's/[[:space:]]+/ /g')
 $(echo -n \
-'((sphere
-    (vector (integer 0) (integer 0) (integer 0) (integer 0) (integer 0))
-    (integer 1)
+'((object
+    (sphere
+      (vector (integer 0) (integer 0) (integer 0) (integer 0) (integer 0))
+      (integer 1))
     (object-modifiers
       (pigment
         (vector (integer 1) (integer 1) (integer 1) (integer 0) (integer 0))
         pigment-modifiers)))
-  (sphere
-    (vector (integer 0) (integer 1) (integer 0) (integer 0) (integer 0))
-    (integer 1)
+  (object
+    (sphere
+      (vector (integer 0) (integer 1) (integer 0) (integer 0) (integer 0))
+      (integer 1))
     (object-modifiers
       (pigment
         (vector (integer 1) (integer 1) (integer 1) (integer 0) (integer 0))
-        pigment-modifiers)))
-  (box
-    (vector (integer -1) (integer -1) (integer -1) (integer 0) (integer 0))
-    (vector (integer 1) (integer 1) (integer 1) (integer 0) (integer 0))
+         pigment-modifiers)))
+  (object
+    (box
+      (vector (integer -1) (integer -1) (integer -1) (integer 0) (integer 0))
+      (vector (integer 1) (integer 1) (integer 1) (integer 0) (integer 0)))
     (object-modifiers
       (pigment
         (vector (integer 1) (integer 1) (integer 1) (integer 0) (integer 0))