Back out fix for #1474463 since the problems the fix causes are worse than
the problem fixed. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@9398 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
1b89128bf5
commit
07c40f5f75
2 changed files with 2 additions and 10 deletions
|
|
@ -5304,15 +5304,7 @@ etype : expr {
|
||||||
|
|
||||||
/* Arithmetic expressions. Used for constants, C++ templates, and other cool stuff. */
|
/* Arithmetic expressions. Used for constants, C++ templates, and other cool stuff. */
|
||||||
|
|
||||||
expr : valexpr {
|
expr : valexpr { $$ = $1; }
|
||||||
$$ = $1;
|
|
||||||
/* We want the rawval for a character constant (e.g. 'x'
|
|
||||||
* not just x) since we use it in C code. */
|
|
||||||
if ($$.type == T_CHAR && $$.rawval) {
|
|
||||||
$$.val = $$.rawval;
|
|
||||||
$$.rawval = 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
| type {
|
| type {
|
||||||
Node *n;
|
Node *n;
|
||||||
$$.val = $1;
|
$$.val = $1;
|
||||||
|
|
|
||||||
|
|
@ -495,7 +495,7 @@ int Language::constantDirective(Node *n) {
|
||||||
value = NewStringf("%(escape)s", value);
|
value = NewStringf("%(escape)s", value);
|
||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
Setattr(n,"rawval",value);
|
Setattr(n,"rawvalue",value);
|
||||||
value = NewStringf("%(escape)s", value);
|
value = NewStringf("%(escape)s", value);
|
||||||
if (!Len(value)) Append(value,"\\0");
|
if (!Len(value)) Append(value,"\\0");
|
||||||
/* Printf(stdout,"'%s' = '%s'\n", name, value); */
|
/* Printf(stdout,"'%s' = '%s'\n", name, value); */
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue