From 0e1c3677c825def2000cd3f0382b2434f18d4838 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Mon, 23 Mar 2015 18:30:00 +0100 Subject: Drop vectors --- parser.y | 29 ++++------------------------- 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/parser.y b/parser.y index 694e35f..2d08c73 100644 --- a/parser.y +++ b/parser.y @@ -6,13 +6,9 @@ import "fmt" %union { sval S - sv []S ival I - iv []I fval F - fv []F cval C - cv []C any interface{} } @@ -31,35 +27,18 @@ import "fmt" %token ENCLOSE DISCLOSE DECODE ENCODE MAGNITUDE SCAN REDUCE %type value -%type ivector -%type fvector -%type cvector %% line : /* empty */ - | value { fmt.Println($1) } + | value { fmt.Println($1) } value : STRING { $$ = $1 } | QUOTED { $$ = $1 } - | ivector { $$ = $1 } - | fvector { $$ = $1 } - | cvector { $$ = $1 } + | INTEGER { $$ = $1 } + | FLOAT { $$ = $1 } + | COMPLEX { $$ = $1 } -ivector - : INTEGER { $$ = append($$, $1) } - | ivector INTEGER { $$ = append($1, $2) } - -fvector - : FLOAT { $$ = append($$, $1) } - | fvector FLOAT { $$ = append($1, $2) } - | fvector INTEGER { $$ = append($1, F($2)) } - -cvector - : COMPLEX { $$ = append($$, $1) } - | cvector COMPLEX { $$ = append($1, $2) } - | cvector FLOAT { $$ = append($1, C(complex($2, 0))) } - | cvector INTEGER { $$ = append($1, C(complex(F($2), 0))) } %% -- cgit v1.2.3