summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dimension/grammar.y104
-rw-r--r--dimension/parse.h2
-rw-r--r--dimension/realize.c5
-rwxr-xr-xtests/dimension/demo.sh12
-rwxr-xr-xtests/dimension/directives.sh4
5 files changed, 110 insertions, 17 deletions
diff --git a/dimension/grammar.y b/dimension/grammar.y
index 00bc9cb..7369300 100644
--- a/dimension/grammar.y
+++ b/dimension/grammar.y
@@ -75,6 +75,55 @@ dmnsn_new_astnode(dmnsn_astnode_type type, YYLTYPE lloc)
return astnode;
}
+/* Semi-shallow copy */
+static dmnsn_astnode
+dmnsn_copy_astnode(dmnsn_astnode astnode)
+{
+ dmnsn_astnode copy = {
+ .type = astnode.type,
+ .children = dmnsn_new_array(sizeof(dmnsn_astnode)),
+ .ptr = NULL,
+ .refcount = malloc(sizeof(unsigned int)),
+ .filename = astnode.filename,
+ .line = astnode.line,
+ .col = astnode.col
+ };
+
+ if (!copy.refcount) {
+ dmnsn_error(DMNSN_SEVERITY_HIGH, "Couldn't allocate reference count.");
+ }
+ *copy.refcount = 1;
+
+ unsigned int i;
+ for (i = 0; i < dmnsn_array_size(astnode.children); ++i) {
+ dmnsn_astnode n;
+ dmnsn_array_get(astnode.children, i, &n);
+ ++*n.refcount;
+ dmnsn_array_push(copy.children, &n);
+ }
+
+ switch (astnode.type) {
+ case DMNSN_AST_INTEGER:
+ copy.ptr = malloc(sizeof(long));
+ memcpy(copy.ptr, astnode.ptr, sizeof(long));
+ break;
+
+ case DMNSN_AST_FLOAT:
+ copy.ptr = malloc(sizeof(double));
+ memcpy(copy.ptr, astnode.ptr, sizeof(double));
+ break;
+
+ case DMNSN_AST_STRING:
+ copy.ptr = strdup(astnode.ptr);
+ break;
+
+ default:
+ break;
+ }
+
+ return copy;
+}
+
static dmnsn_astnode
dmnsn_new_astnode1(dmnsn_astnode_type type, YYLTYPE lloc, dmnsn_astnode n1)
{
@@ -147,7 +196,7 @@ yyerror(YYLTYPE *locp, const char *filename, void *yyscanner,
%name-prefix "dmnsn_yy"
-%expect 1
+%expect 18
%parse-param {const char *filename}
%parse-param {void *yyscanner}
@@ -760,7 +809,7 @@ RVALUE: ARITH_EXPR ";" {
YYERROR;
}
}
- | COLOR ";"
+ | COLOR ";"
;
IDENTIFIER: "identifier" {
@@ -1064,8 +1113,14 @@ ARITH_EXPR: FLOAT_LITERAL
/* Colors */
-COLOR: COLOR_BODY
- | "color" COLOR_BODY { $$ = $2; }
+COLOR: COLOR_BODY {
+ $$ = $1;
+ $$.type = DMNSN_AST_COLOR;
+ }
+ | "color" COLOR_BODY {
+ $$ = $2;
+ $$.type = DMNSN_AST_COLOR;
+ }
;
COLOR_BODY: COLOR_VECTOR
@@ -1083,7 +1138,6 @@ COLOR_VECTOR: "rgb" VECTOR { $$ = $2; }
dmnsn_array_set($$.children, 3, &temp);
}
| "rgbft" VECTOR { $$ = $2; }
- | VECTOR
;
COLOR_KEYWORD_GROUP: COLOR_KEYWORD_GROUP_INIT COLOR_KEYWORD_ITEM
@@ -1104,7 +1158,43 @@ COLOR_KEYWORD_GROUP_INIT: /* empty */ {
}
;
-COLOR_KEYWORD_ITEM: "red" FLOAT {
+COLOR_KEYWORD_ITEM: ARITH_EXPR {
+ if ($1.type == DMNSN_AST_IDENTIFIER) {
+ dmnsn_astnode *symbol = dmnsn_find_symbol(symtable,
+ $1.ptr);
+ if (!symbol) {
+ dmnsn_diagnostic(@1.first_filename, @1.first_line,
+ @1.first_column,
+ "unbound identifier '%s'", $1);
+ dmnsn_delete_astnode($1);
+ YYERROR;
+ } else if (symbol->type != DMNSN_AST_VECTOR
+ && symbol->type != DMNSN_AST_COLOR) {
+ dmnsn_astnode eval = dmnsn_eval_vector(*symbol,
+ symtable);
+ if (eval.type == DMNSN_AST_NONE) {
+ dmnsn_diagnostic(@1.first_filename, @1.first_line,
+ @1.first_column,
+ "expected color; found '%s'",
+ dmnsn_astnode_string(symbol->type));
+ dmnsn_delete_astnode($1);
+ YYERROR;
+ }
+
+ $<astnode>0 = dmnsn_copy_astnode(eval);
+ dmnsn_delete_astnode(eval);
+ } else {
+ $<astnode>0 = dmnsn_copy_astnode(*symbol);
+ }
+ } else {
+ dmnsn_astnode eval = dmnsn_eval_vector($1, symtable);
+ $<astnode>0 = dmnsn_copy_astnode(eval);
+ dmnsn_delete_astnode(eval);
+ }
+
+ dmnsn_delete_astnode($1);
+ }
+ | "red" FLOAT {
dmnsn_astnode old;
dmnsn_array_get($<astnode>0.children, 0, &old);
dmnsn_array_set($<astnode>0.children, 0, &$2);
@@ -1244,6 +1334,8 @@ dmnsn_astnode_string(dmnsn_astnode_type astnode_type)
dmnsn_astnode_map(DMNSN_AST_DOT_T, ".t");
dmnsn_astnode_map(DMNSN_AST_DOT_TRANSMIT, ".transmit");
+ dmnsn_astnode_map(DMNSN_AST_COLOR, "color");
+
dmnsn_astnode_map(DMNSN_AST_IDENTIFIER, "identifier");
dmnsn_astnode_map(DMNSN_AST_STRING, "string");
diff --git a/dimension/parse.h b/dimension/parse.h
index e4772e1..2b2a878 100644
--- a/dimension/parse.h
+++ b/dimension/parse.h
@@ -72,6 +72,8 @@ typedef enum {
DMNSN_AST_DOT_T,
DMNSN_AST_DOT_TRANSMIT,
+ DMNSN_AST_COLOR,
+
DMNSN_AST_IDENTIFIER,
DMNSN_AST_STRING,
diff --git a/dimension/realize.c b/dimension/realize.c
index 5a13d8b..f795d0f 100644
--- a/dimension/realize.c
+++ b/dimension/realize.c
@@ -62,11 +62,10 @@ dmnsn_realize_vector(dmnsn_astnode astnode)
static dmnsn_color
dmnsn_realize_color(dmnsn_astnode astnode)
{
- if (astnode.type != DMNSN_AST_VECTOR) {
+ if (astnode.type != DMNSN_AST_COLOR) {
dmnsn_error(DMNSN_SEVERITY_HIGH, "Expected a color.");
}
-
dmnsn_astnode rnode, gnode, bnode, fnode, tnode;
dmnsn_array_get(astnode.children, 0, &rnode);
dmnsn_array_get(astnode.children, 1, &gnode);
@@ -366,7 +365,7 @@ dmnsn_realize_pigment(dmnsn_astnode astnode, dmnsn_object *object)
case DMNSN_AST_NONE:
break;
- case DMNSN_AST_VECTOR:
+ case DMNSN_AST_COLOR:
color = dmnsn_realize_color(color_node);
object->texture->pigment = dmnsn_new_solid_pigment(color);
if (!object->texture->pigment) {
diff --git a/tests/dimension/demo.sh b/tests/dimension/demo.sh
index 8a210d4..c49e0ca 100755
--- a/tests/dimension/demo.sh
+++ b/tests/dimension/demo.sh
@@ -31,10 +31,10 @@ demo_exp=$(echo -n \
(rotate (vector (integer 0) (integer 53) (integer 0)
(integer 0) (integer 0))))
(background
- (vector (integer 0) (float 0.1) (float 0.2) (float 0.1) (integer 0)))
+ (color (integer 0) (float 0.1) (float 0.2) (float 0.1) (integer 0)))
(light_source
(vector (integer -15) (integer 20) (integer 10) (integer 0) (integer 0))
- (vector (integer 1) (integer 1) (integer 1) (integer 0) (integer 0)))
+ (color (integer 1) (integer 1) (integer 1) (integer 0) (integer 0)))
(box
(vector (integer -1) (integer -1) (integer -1) (integer 0) (integer 0))
(vector (integer 1) (integer 1) (integer 1) (integer 0) (integer 0))
@@ -42,15 +42,15 @@ demo_exp=$(echo -n \
(rotate (vector (integer 45) (integer 0) (integer 0)
(integer 0) (integer 0)))
(texture
- (pigment (vector (integer 0) (integer 0) (integer 1)
- (float 0.25) (float 0.25))))))
+ (pigment (color (integer 0) (integer 0) (integer 1)
+ (float 0.25) (float 0.25))))))
(sphere
(vector (integer 0) (integer 0) (integer 0) (integer 0) (integer 0))
(float 1.25)
(object-modifiers
(texture
- (pigment (vector (integer 0) (integer 1) (integer 0)
- (integer 0) (integer 0)))))))' \
+ (pigment (color (integer 0) (integer 1) (integer 0)
+ (integer 0) (integer 0)))))))' \
| tr '\n' ' ' | sed -r 's/[[:space:]]+/ /g')
if [ "$demo" != "$demo_exp" ]; then
diff --git a/tests/dimension/directives.sh b/tests/dimension/directives.sh
index c64cbd8..49095a9 100755
--- a/tests/dimension/directives.sh
+++ b/tests/dimension/directives.sh
@@ -39,8 +39,8 @@ $(echo -n \
(integer 1)
(object-modifiers
(texture
- (pigment (vector (integer 1) (integer 0) (integer 1)
- (integer 0) (integer 0)))))))' \
+ (pigment (color (integer 1) (integer 0) (integer 1)
+ (integer 0) (integer 0)))))))' \
| tr '\n' ' ' | sed -r 's/[[:space:]]+/ /g')"
if [ "$directives" != "$directives_exp" ]; then
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-27 15:53:44 +0000