aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2015-03-23 18:30:00 +0100
committerDimitri Sokolyuk <demon@dim13.org>2015-03-23 18:30:00 +0100
commit0e1c3677c825def2000cd3f0382b2434f18d4838 (patch)
tree7e598351713f952a514eda427bfa327bfe159c2c
parentf2c361d91c3eef42943e07cdd110b23e87f9d7ed (diff)
Drop vectors
-rw-r--r--parser.y29
1 files 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 <any> value
-%type <iv> ivector
-%type <fv> fvector
-%type <cv> 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))) }
%%