summaryrefslogtreecommitdiffstats
path: root/dimension/common.nonterminals
diff options
context:
space:
mode:
authorTavian Barnes <tavianator@gmail.com>2010-04-07 01:17:28 -0400
committerTavian Barnes <tavianator@gmail.com>2010-04-07 01:17:28 -0400
commit7d6663eeb68bf9d0a3dff86128827c0c1d85df69 (patch)
tree7e9c5775d78e0868bf315eeadcfcadacec784707 /dimension/common.nonterminals
parent2a6bb6c6e0c7d5019e484ab4393941b8801d63ea (diff)
downloaddimension-7d6663eeb68bf9d0a3dff86128827c0c1d85df69.tar.xz
Implement CSG in front-end.
Diffstat (limited to 'dimension/common.nonterminals')
-rw-r--r--dimension/common.nonterminals8
1 files changed, 7 insertions, 1 deletions
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