summaryrefslogtreecommitdiffstats
path: root/dimension/grammar.y
diff options
context:
space:
mode:
authorTavian Barnes <tavianator@gmail.com>2009-11-25 14:09:06 -0500
committerTavian Barnes <tavianator@gmail.com>2009-11-25 14:09:06 -0500
commit32f46ae1ccdb01533ea61265e4c977b9307c710d (patch)
tree79e0137ea2a30fa65f9fc2b0a8c441094ec22050 /dimension/grammar.y
parentaa6106d8f1d60077aea53f216d9098a686e170f1 (diff)
downloaddimension-32f46ae1ccdb01533ea61265e4c977b9307c710d.tar.xz
Support solid-color pigments.
Diffstat (limited to 'dimension/grammar.y')
-rw-r--r--dimension/grammar.y12
1 files changed, 5 insertions, 7 deletions
diff --git a/dimension/grammar.y b/dimension/grammar.y
index 2950941..5a271cc 100644
--- a/dimension/grammar.y
+++ b/dimension/grammar.y
@@ -505,7 +505,7 @@ yyerror(YYLTYPE *locp, dmnsn_array *astree, dmnsn_token_iterator *iterator,
%token DMNSN_T_PHONG_SIZE
%token DMNSN_T_PHOTONS
%token DMNSN_T_PI
-%token DMNSN_T_PIGMENT
+%token DMNSN_T_PIGMENT "pigment"
%token DMNSN_T_PIGMENT_MAP
%token DMNSN_T_PIGMENT_PATTERN
%token DMNSN_T_PLANAR
@@ -547,10 +547,10 @@ yyerror(YYLTYPE *locp, dmnsn_array *astree, dmnsn_token_iterator *iterator,
%token DMNSN_T_REFLECTION_EXPONENT
%token DMNSN_T_REFRACTION
%token DMNSN_T_REPEAT
-%token DMNSN_T_RGB
-%token DMNSN_T_RGBF
-%token DMNSN_T_RGBFT
-%token DMNSN_T_RGBT
+%token DMNSN_T_RGB "rgb"
+%token DMNSN_T_RGBF "rgbf"
+%token DMNSN_T_RGBFT "rgbft"
+%token DMNSN_T_RGBT "rgbt"
%token DMNSN_T_RIGHT
%token DMNSN_T_RIPPLES
%token DMNSN_T_ROTATE "rotate"
@@ -1464,8 +1464,6 @@ dmnsn_astnode_string(dmnsn_astnode_type astnode_type)
dmnsn_astnode_map(DMNSN_AST_VECTOR, "vector");
- dmnsn_astnode_map(DMNSN_AST_COLOR, "color");
-
dmnsn_astnode_map(DMNSN_AST_NEGATE, "-");
dmnsn_astnode_map(DMNSN_AST_ADD, "+");
dmnsn_astnode_map(DMNSN_AST_SUB, "-");