Mercurial > octave
diff src/parse.y @ 1276:cbdf7db98554
[project @ 1995-04-24 15:31:24 by jwe]
| author | jwe |
|---|---|
| date | Mon, 24 Apr 1995 15:31:24 +0000 |
| parents | e1ddfb12566d |
| children | 611d403c7f3d |
line wrap: on
line diff
--- a/src/parse.y Fri Apr 21 19:59:03 1995 +0000 +++ b/src/parse.y Mon Apr 24 15:31:24 1995 +0000 @@ -213,7 +213,8 @@ %token <tok_val> EXPR_AND_AND EXPR_OR_OR %token <tok_val> EXPR_AND EXPR_OR EXPR_NOT %token <tok_val> EXPR_LT EXPR_LE EXPR_EQ EXPR_NE EXPR_GE EXPR_GT -%token <tok_val> LEFTDIV EMUL EDIV ELEFTDIV QUOTE TRANSPOSE +%token <tok_val> LEFTDIV EMUL EDIV ELEFTDIV EPLUS EMINUS +%token <tok_val> QUOTE TRANSPOSE %token <tok_val> PLUS_PLUS MINUS_MINUS POW EPOW %token <tok_val> NUM IMAG_NUM %token <tok_val> NAME SCREW @@ -271,7 +272,7 @@ %left EXPR_AND EXPR_OR %left EXPR_LT EXPR_LE EXPR_EQ EXPR_NE EXPR_GE EXPR_GT %left ':' -%left '-' '+' +%left '-' '+' EPLUS EMINUS %left '*' '/' LEFTDIV EMUL EDIV ELEFTDIV %left QUOTE TRANSPOSE %left UNARY PLUS_PLUS MINUS_MINUS EXPR_NOT @@ -767,6 +768,10 @@ { $$ = make_binary_op ('*', $1, $2, $3); } | simple_expr '/' simple_expr { $$ = make_binary_op ('/', $1, $2, $3); } + | simple_expr EPLUS simple_expr + { $$ = make_binary_op ('+', $1, $2, $3); } + | simple_expr EMINUS simple_expr + { $$ = make_binary_op ('-', $1, $2, $3); } | simple_expr EMUL simple_expr { $$ = make_binary_op (EMUL, $1, $2, $3); } | simple_expr EDIV simple_expr