From 7d6663eeb68bf9d0a3dff86128827c0c1d85df69 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@gmail.com>
Date: Wed, 7 Apr 2010 01:17:28 -0400
Subject: Implement CSG in front-end.

---
 dimension/common.rules | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

(limited to 'dimension/common.rules')

diff --git a/dimension/common.rules b/dimension/common.rules
index d5e8994..e477df5 100644
--- a/dimension/common.rules
+++ b/dimension/common.rules
@@ -114,6 +114,7 @@ CAMERA_MODIFIER: "angle" FLOAT {
 /* Objects */
 
 OBJECT: FINITE_SOLID_OBJECT
+      | CSG_OBJECT
       | LIGHT_SOURCE
       | "object" "{"
           IDENTIFIER
@@ -196,6 +197,56 @@ SPHERE: "sphere" "{"
       }
 ;
 
+CSG_OBJECT: UNION
+          | INTERSECTION
+          | DIFFERENCE
+          | MERGE
+;
+
+UNION: "union" "{"
+         OBJECTS
+         OBJECT_MODIFIERS
+       "}"
+     {
+       $$ = dmnsn_new_astnode2(DMNSN_AST_UNION, @$, $3, $4);
+     }
+;
+
+INTERSECTION: "intersection" "{"
+                OBJECTS
+                OBJECT_MODIFIERS
+              "}"
+            {
+              $$ = dmnsn_new_astnode2(DMNSN_AST_INTERSECTION, @$, $3, $4);
+            }
+;
+
+DIFFERENCE: "difference" "{"
+              OBJECTS
+              OBJECT_MODIFIERS
+            "}"
+          {
+            $$ = dmnsn_new_astnode2(DMNSN_AST_DIFFERENCE, @$, $3, $4);
+          }
+;
+
+MERGE: "merge" "{"
+         OBJECTS
+         OBJECT_MODIFIERS
+       "}"
+     {
+       $$ = dmnsn_new_astnode2(DMNSN_AST_MERGE, @$, $3, $4);
+     }
+;
+
+OBJECTS: OBJECT OBJECT {
+         $$ = dmnsn_new_astnode2(DMNSN_AST_ARRAY, @$, $1, $2);
+       }
+       | OBJECTS OBJECT {
+         $$ = $1;
+         dmnsn_array_push($$.children, &$2);
+       }
+
 LIGHT_SOURCE: "light_source" "{"
                 VECTOR "," COLOR
               "}"
-- 
cgit v1.2.3