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.nonterminals | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'dimension/common.nonterminals')

diff --git a/dimension/common.nonterminals b/dimension/common.nonterminals
index 164440a..768e075 100644
--- a/dimension/common.nonterminals
+++ b/dimension/common.nonterminals
@@ -38,8 +38,14 @@
 %type <astnode> OBJECT
 %type <astnode> FINITE_SOLID_OBJECT
 %type <astnode> BOX
-%type <astnode> LIGHT_SOURCE
 %type <astnode> SPHERE
+%type <astnode> CSG_OBJECT
+%type <astnode> UNION
+%type <astnode> INTERSECTION
+%type <astnode> DIFFERENCE
+%type <astnode> MERGE
+%type <astnode> OBJECTS
+%type <astnode> LIGHT_SOURCE
 
 /* Object modifiers */
 %type <astnode> OBJECT_MODIFIERS
-- 
cgit v1.2.3