Mercurial > octave-nkf
diff src/lex.l @ 661:9ccf86647203
[project @ 1994-08-30 04:41:56 by jwe]
| author | jwe |
|---|---|
| date | Tue, 30 Aug 1994 04:46:17 +0000 |
| parents | 739d16c30481 |
| children | 6182de8cb3b7 |
line wrap: on
line diff
--- a/src/lex.l Mon Aug 29 23:32:17 1994 +0000 +++ b/src/lex.l Tue Aug 30 04:46:17 1994 +0000 @@ -540,18 +540,18 @@ } \" { BEGIN DQSTRING; } -".**" { BIN_OP_RETURN (EPOW, 0); } ".*" { BIN_OP_RETURN (EMUL, 0); } "./" { BIN_OP_RETURN (EDIV, 0); } ".\\" { BIN_OP_RETURN (ELEFTDIV, 0); } +".**" | ".^" { BIN_OP_RETURN (EPOW, 0); } ".'" { do_comma_insert_check (); BIN_OP_RETURN (TRANSPOSE, 1); } "++" { do_comma_insert_check (); BIN_OP_RETURN (PLUS_PLUS, 1); } "--" { do_comma_insert_check (); BIN_OP_RETURN (MINUS_MINUS, 1); } "<=" { BIN_OP_RETURN (EXPR_LE, 0); } "==" { BIN_OP_RETURN (EXPR_EQ, 0); } -"~=" { BIN_OP_RETURN (EXPR_NE, 0); } -"!=" { BIN_OP_RETURN (EXPR_NE, 0); } +"~=" | +"!=" | "<>" { BIN_OP_RETURN (EXPR_NE, 0); } ">=" { BIN_OP_RETURN (EXPR_GE, 0); } "||" { @@ -570,11 +570,7 @@ } "|" { BIN_OP_RETURN (EXPR_OR, 0); } "&" { BIN_OP_RETURN (EXPR_AND, 0); } -"!" { - if (plotting && ! in_plot_range) - past_plot_range = 1; - BIN_OP_RETURN (EXPR_NOT, 1); - } +"!" | "~" { if (plotting && ! in_plot_range) past_plot_range = 1; @@ -582,22 +578,24 @@ } "<" { BIN_OP_RETURN (EXPR_LT, 0); } ">" { BIN_OP_RETURN (EXPR_GT, 0); } -"+" { +"+" | +".+" { if (plotting && ! in_plot_range) past_plot_range = 1; BIN_OP_RETURN ('+', 0); } -"-" { +"-" | +".-" { if (plotting && ! in_plot_range) past_plot_range = 1; BIN_OP_RETURN ('-', 0); } -"**" { BIN_OP_RETURN (POW, 0); } "*" { BIN_OP_RETURN ('*', 0); } "/" { BIN_OP_RETURN ('/', 0); } "\\" { BIN_OP_RETURN (LEFTDIV, 0); } ";" { BIN_OP_RETURN (';', 1); } "," { BIN_OP_RETURN (',', 1); } +"**" | "^" { BIN_OP_RETURN (POW, 0); } "=" { BIN_OP_RETURN ('=', 1); } "(" {