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

Fixed bug in preprocessor expression evaluator. (backslash).

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@5632 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Dave Beazley 2004-01-15 00:58:13 +00:00
commit acee037c44
1 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Source/Preprocessor/expr.c
View file

@ -200,6 +200,19 @@ Preprocessor_expr_init (void) {
if (!scan) scan = NewSwigScanner();
}
/* -----------------------------------------------------------------------------
* Tokenizer
* ----------------------------------------------------------------------------- */
static int expr_token(SwigScanner *s) {
int t;
while(1) {
t = SwigScanner_token(s);
if (!((t == SWIG_TOKEN_BACKSLASH) || (t == SWIG_TOKEN_ENDLINE))) break;
}
return t;
}
/* -----------------------------------------------------------------------------
* Preprocessor_expr()
*
@ -216,7 +229,7 @@ Preprocessor_expr(DOH *s, int *error) {
assert(scan);
Seek(s,0,SEEK_SET);
/* Printf(stdout,"evaluating : '%s'\n", s); */
/* Printf(stdout,"evaluating : '%s'\n", s); */
*error = 0;
SwigScanner_clear(scan);
SwigScanner_push(scan,s);
@ -230,7 +243,7 @@ Preprocessor_expr(DOH *s, int *error) {
switch(stack[sp].op) {
case EXPR_TOP:
/* An expression. Can be a number or another expression enclosed in parens */
token = SwigScanner_token(scan);
token = expr_token(scan);
if (!token) {
errmsg = "Expected an expression";
*error = 1;
@ -267,7 +280,7 @@ Preprocessor_expr(DOH *s, int *error) {
break;
case EXPR_VALUE:
/* A value is on the stack. We may reduce or evaluate depending on what the next token is */
token = SwigScanner_token(scan);
token = expr_token(scan);
if (!token) {
/* End of input. Might have to reduce if an operator is on stack */
while (sp > 0) {