From 9dcaf88375ef6bc32e12f1b3d3b8da5772cb8f15 Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Wed, 25 Nov 2009 13:06:17 -0500 Subject: Add textures and pigments to grammar. Also remove a shift-reduce conflict caused by not giving a precedence to ".". --- dimension/parse.h | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) (limited to 'dimension/parse.h') diff --git a/dimension/parse.h b/dimension/parse.h index dc90e6d..f9d1dc9 100644 --- a/dimension/parse.h +++ b/dimension/parse.h @@ -23,20 +23,32 @@ #include "../libdimension/dimension.h" typedef enum { + DMNSN_AST_NONE, + + DMNSN_AST_ROTATION, + DMNSN_AST_SCALE, + DMNSN_AST_TRANSLATION, + + DMNSN_AST_BOX, + DMNSN_AST_SPHERE, + + DMNSN_AST_OBJECT_MODIFIERS, + + DMNSN_AST_TEXTURE, + DMNSN_AST_PIGMENT, + DMNSN_AST_FLOAT, DMNSN_AST_INTEGER, + + DMNSN_AST_VECTOR, + + DMNSN_AST_COLOR, + DMNSN_AST_NEGATE, DMNSN_AST_ADD, DMNSN_AST_SUB, DMNSN_AST_MUL, DMNSN_AST_DIV, - DMNSN_AST_VECTOR, - DMNSN_AST_BOX, - DMNSN_AST_SPHERE, - DMNSN_AST_ROTATION, - DMNSN_AST_SCALE, - DMNSN_AST_TRANSLATION, - DMNSN_AST_OBJECT_MODIFIERS, } dmnsn_astnode_type; typedef struct dmnsn_astnode dmnsn_astnode; -- cgit v1.2.3