Mercurial > hg > octave-lyh
diff src/lex.l @ 428:fa0453b25410
[project @ 1994-05-25 01:06:28 by jwe]
| author | jwe |
|---|---|
| date | Wed, 25 May 1994 01:06:28 +0000 |
| parents | 116ab89ce023 |
| children | 8464d5778a09 |
line wrap: on
line diff
--- a/src/lex.l +++ b/src/lex.l @@ -29,6 +29,7 @@ %s MATRIX %{ +#define SHORT_CIRCUIT_LOGICALS 1 #ifdef HAVE_CONFIG_H #include "config.h" @@ -543,8 +544,20 @@ "!=" { BIN_OP_RETURN (EXPR_NE, 0); } "<>" { BIN_OP_RETURN (EXPR_NE, 0); } ">=" { BIN_OP_RETURN (EXPR_GE, 0); } -"||" { BIN_OP_RETURN (EXPR_OR, 0); } -"&&" { BIN_OP_RETURN (EXPR_AND, 0); } +"||" { +#ifdef SHORT_CIRCUIT_LOGICALS + BIN_OP_RETURN (EXPR_OR_OR, 0); +#else + BIN_OP_RETURN (EXPR_OR, 0); +#endif + } +"&&" { +#ifdef SHORT_CIRCUIT_LOGICALS + BIN_OP_RETURN (EXPR_AND_AND, 0); +#else + BIN_OP_RETURN (EXPR_AND, 0); +#endif + } "|" { BIN_OP_RETURN (EXPR_OR, 0); } "&" { BIN_OP_RETURN (EXPR_AND, 0); } "!" {