summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTavian Barnes <tavianator@gmail.com>2009-11-25 01:43:26 -0500
committerTavian Barnes <tavianator@gmail.com>2009-11-25 01:43:26 -0500
commit1d427193ffd38b85489b5e997faf72051305ec7a (patch)
tree10f0dbfb7c2354c409c8b23110d8cf230d88b6d6
parent9af188db64514fd5dd6db0a0bf82920b9b661758 (diff)
downloaddimension-1d427193ffd38b85489b5e997faf72051305ec7a.tar.xz
Use FLOAT_EXPR in VECTOR_LITERAL rather than FLOAT.
This is to future-proof lazily-evaluated vector expressions.
-rw-r--r--dimension/grammar.y10
1 files changed, 6 insertions, 4 deletions
diff --git a/dimension/grammar.y b/dimension/grammar.y
index 91d3852..2b83511 100644
--- a/dimension/grammar.y
+++ b/dimension/grammar.y
@@ -920,16 +920,18 @@ VECTOR_EXPR: VECTOR_LITERAL
| "(" VECTOR_EXPR ")" { $$ = $2; }
;
-VECTOR_LITERAL: "<" FLOAT "," FLOAT ">" {
+VECTOR_LITERAL: "<" FLOAT_EXPR "," FLOAT_EXPR ">" {
$$ = dmnsn_new_astnode2(DMNSN_AST_VECTOR, @$, $2, $4);
}
- | "<" FLOAT "," FLOAT "," FLOAT ">" {
+ | "<" FLOAT_EXPR "," FLOAT_EXPR "," FLOAT_EXPR ">" {
$$ = dmnsn_new_astnode3(DMNSN_AST_VECTOR, @$, $2, $4, $6);
}
- | "<" FLOAT "," FLOAT "," FLOAT "," FLOAT ">" {
+ | "<" FLOAT_EXPR "," FLOAT_EXPR "," FLOAT_EXPR ","
+ FLOAT_EXPR ">" {
$$ = dmnsn_new_astnode4(DMNSN_AST_VECTOR, @$, $2, $4, $6, $8);
}
- | "<" FLOAT "," FLOAT "," FLOAT "," FLOAT "," FLOAT ">" {
+ | "<" FLOAT_EXPR "," FLOAT_EXPR "," FLOAT_EXPR ","
+ FLOAT_EXPR "," FLOAT_EXPR ">" {
$$ = dmnsn_new_astnode5(DMNSN_AST_VECTOR, @$,
$2, $4, $6, $8, $10);
}