jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Emit preprocessor expr error for unary + on string

Browse source 
Previously other unary operators on a string all gave an error, but
unary + was handled as a no-op and so didn't.
This commit is contained in:
Olly Betts 2022-02-24 09:50:22 +13:00
commit 4986b8793d
3 changed files with 38 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Examples/test-suite/errors/pp_expressions_bad.i
View file

@ -51,3 +51,18 @@
/* This didn't fail prior with SWIG < 4.1. Github #1384. */ /* This didn't fail prior with SWIG < 4.1. Github #1384. */
#if 1 == ("TWO") #if 1 == ("TWO")
#endif #endif
/* These should all give errors. */
#if "1"
#endif
#if -"1"
#endif
#if "1" == -"-1"
#endif
#if "1" == !"-1"
#endif
#if "1" == ~"1"
#endif
/* Unary + was a no-op and so this didn't give an error in SWIG < 4.1.0. */
#if "1" == +"1"
#endif

10
Examples/test-suite/errors/pp_expressions_bad.stderr
View file

@ -21,3 +21,13 @@ pp_expressions_bad.i:48: Warning 202: Could not evaluate expression '"TWO" == 1'
pp_expressions_bad.i:48: Warning 202: Can't mix strings and integers in expression pp_expressions_bad.i:48: Warning 202: Can't mix strings and integers in expression
pp_expressions_bad.i:52: Warning 202: Could not evaluate expression '1 == ("TWO")' pp_expressions_bad.i:52: Warning 202: Could not evaluate expression '1 == ("TWO")'
pp_expressions_bad.i:52: Warning 202: Can't mix strings and integers in expression pp_expressions_bad.i:52: Warning 202: Can't mix strings and integers in expression
pp_expressions_bad.i:58: Warning 202: Could not evaluate expression '-"1"'
pp_expressions_bad.i:58: Warning 202: Syntax error: attempt to apply unary operator to string
pp_expressions_bad.i:60: Warning 202: Could not evaluate expression '"1" == -"-1"'
pp_expressions_bad.i:60: Warning 202: Syntax error: attempt to apply unary operator to string
pp_expressions_bad.i:62: Warning 202: Could not evaluate expression '"1" == !"-1"'
pp_expressions_bad.i:62: Warning 202: Syntax error: attempt to apply unary operator to string
pp_expressions_bad.i:64: Warning 202: Could not evaluate expression '"1" == ~"1"'
pp_expressions_bad.i:64: Warning 202: Syntax error: attempt to apply unary operator to string
pp_expressions_bad.i:67: Warning 202: Could not evaluate expression '"1" == +"1"'
pp_expressions_bad.i:67: Warning 202: Syntax error: attempt to apply unary operator to string

18
Source/Preprocessor/expr.c
View file

@ -39,10 +39,11 @@ typedef struct {
#define EXPR_OP 3 #define EXPR_OP 3
#define EXPR_GROUP 4 #define EXPR_GROUP 4
/* Special token value used here to distinguish from SWIG_TOKEN_MINUS /* Special token values used here to distinguish from SWIG_TOKEN_MINUS
* (which we use here for a two argument minus). * and SWIG_TOKEN_PLUS (which we use here for a two argument versions).
*/ */
#define OP_UMINUS 100 #define OP_UMINUS 100
#define OP_UPLUS 101
static exprval stack[256]; /* Parsing stack */ static exprval stack[256]; /* Parsing stack */
static int sp = 0; /* Stack pointer */ static int sp = 0; /* Stack pointer */
@ -54,6 +55,7 @@ static const char *errmsg = 0; /* Parsing error */
static void init_precedence() { static void init_precedence() {
prec[SWIG_TOKEN_NOT] = 10; prec[SWIG_TOKEN_NOT] = 10;
prec[OP_UMINUS] = 10; prec[OP_UMINUS] = 10;
prec[OP_UPLUS] = 10;
prec[SWIG_TOKEN_STAR] = 20; prec[SWIG_TOKEN_STAR] = 20;
prec[SWIG_TOKEN_SLASH] = 20; prec[SWIG_TOKEN_SLASH] = 20;
prec[SWIG_TOKEN_PERCENT] = 20; prec[SWIG_TOKEN_PERCENT] = 20;
@ -78,7 +80,8 @@ static void init_precedence() {
#define UNARY_OP(token) (((token) == SWIG_TOKEN_NOT) || \ #define UNARY_OP(token) (((token) == SWIG_TOKEN_NOT) || \
((token) == SWIG_TOKEN_LNOT) || \ ((token) == SWIG_TOKEN_LNOT) || \
((token) == OP_UMINUS)) ((token) == OP_UMINUS) || \
((token) == OP_UPLUS))
/* Reduce a single operator on the stack */ /* Reduce a single operator on the stack */
/* return 0 on failure, 1 on success */ /* return 0 on failure, 1 on success */
@ -202,6 +205,10 @@ static int reduce_op() {
stack[sp - 1].value = -stack[sp].value; stack[sp - 1].value = -stack[sp].value;
sp--; sp--;
break; break;
case OP_UPLUS:
stack[sp - 1].value = stack[sp].value;
sp--;
break;
case SWIG_TOKEN_SLASH: case SWIG_TOKEN_SLASH:
if (stack[sp].value != 0) { if (stack[sp].value != 0) {
stack[sp - 2].value = stack[sp - 2].value / stack[sp].value; stack[sp - 2].value = stack[sp - 2].value / stack[sp].value;
@ -314,10 +321,11 @@ int Preprocessor_expr(DOH *s, int *error) {
stack[sp].value = (long) strtol(c, 0, 0); stack[sp].value = (long) strtol(c, 0, 0);
stack[sp].svalue = 0; stack[sp].svalue = 0;
stack[sp].op = EXPR_VALUE; stack[sp].op = EXPR_VALUE;
} else if (token == SWIG_TOKEN_PLUS) { } else if ((token == SWIG_TOKEN_MINUS) || (token == SWIG_TOKEN_PLUS) || (token == SWIG_TOKEN_LNOT) || (token == SWIG_TOKEN_NOT)) {
} else if ((token == SWIG_TOKEN_MINUS) || (token == SWIG_TOKEN_LNOT) || (token == SWIG_TOKEN_NOT)) {
if (token == SWIG_TOKEN_MINUS) if (token == SWIG_TOKEN_MINUS)
token = OP_UMINUS; token = OP_UMINUS;
else if (token == SWIG_TOKEN_PLUS)
token = OP_UPLUS;
stack[sp].value = token; stack[sp].value = token;
stack[sp].op = EXPR_OP; stack[sp].op = EXPR_OP;
sp++; sp++;