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

fix bug #1435090

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@8858 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Marcelo Matus 2006-02-21 18:04:59 +00:00
commit fdb5c5ccd5
2 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

5
SWIG/Examples/test-suite/char_constant.i
View file

@ -13,3 +13,8 @@
#define NULL_CONST '\0' #define NULL_CONST '\0'
#define SPECIALCHAR 'á' #define SPECIALCHAR 'á'
%inline
{
const int ia = (int)'a';
const int ib = 'b';
}

37
SWIG/Source/CParse/parser.y
View file

@ -5182,7 +5182,7 @@ definetype : { /* scanner_check_typedef(); */ } expr {
$$ = $2; $$ = $2;
if ($$.type == T_STRING) { if ($$.type == T_STRING) {
$$.rawval = NewStringf("\"%(escape)s\"",$$.val); $$.rawval = NewStringf("\"%(escape)s\"",$$.val);
} else { } else if ($$.type != T_CHAR) {
$$.rawval = 0; $$.rawval = 0;
} }
$$.bitfield = 0; $$.bitfield = 0;
@ -5190,7 +5190,8 @@ definetype : { /* scanner_check_typedef(); */ } expr {
$$.throwf = 0; $$.throwf = 0;
scanner_ignore_typedef(); scanner_ignore_typedef();
} }
/* | string { /*
| string {
$$.val = NewString($1); $$.val = NewString($1);
$$.rawval = NewStringf("\"%(escape)s\"",$$.val); $$.rawval = NewStringf("\"%(escape)s\"",$$.val);
$$.type = T_STRING; $$.type = T_STRING;
@ -5199,20 +5200,6 @@ definetype : { /* scanner_check_typedef(); */ } expr {
$$.throwf = 0; $$.throwf = 0;
} }
*/ */
| CHARCONST {
$$.val = NewString($1);
/* $$.rawval = NewStringf("\'%(escape)s\'",$$.val); */
/* Printf(stdout,"rawval = '%s'\n", $$.rawval); */
if (Len($$.val)) {
$$.rawval = NewStringf("\'%(escape)s\'", $$.val);
} else {
$$.rawval = NewString("\'\\0'");
}
$$.type = T_CHAR;
$$.bitfield = 0;
$$.throws = 0;
$$.throwf = 0;
}
; ;
/* Some stuff for handling enums */ /* Some stuff for handling enums */
@ -5279,11 +5266,7 @@ etype : expr {
Swig_error(cparse_file,cparse_line,"Type error. Expecting an int\n"); Swig_error(cparse_file,cparse_line,"Type error. Expecting an int\n");
} }
} }
| CHARCONST { ;
$$.val = NewString($1);
$$.type = T_INT;
}
;
/* Arithmetic expressions. Used for constants and other cool stuff. /* Arithmetic expressions. Used for constants and other cool stuff.
Really, we're not doing anything except string concatenation, but Really, we're not doing anything except string concatenation, but
@ -5301,6 +5284,18 @@ expr : exprnum { $$ = $1; }
$$.type = T_INT; $$.type = T_INT;
} }
| exprcompound { $$ = $1; } | exprcompound { $$ = $1; }
| CHARCONST {
$$.val = NewString($1);
if (Len($$.val)) {
$$.rawval = NewStringf("\'%(escape)s\'", $$.val);
} else {
$$.rawval = NewString("\'\\0'");
}
$$.type = T_CHAR;
$$.bitfield = 0;
$$.throws = 0;
$$.throwf = 0;
}
| type { | type {
Node *n; Node *n;
$$.val = $1; $$.val = $1;