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

Fix reporting of filenames in errors after %include (patch from

Browse source 
Leigh Smith in #1731040; also reported as #1699940).


git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@9847 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Olly Betts 2007-06-05 17:48:16 +00:00
commit fc66fff262
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES.current
View file

@ -1,6 +1,10 @@
Version 1.3.32 (in progress) Version 1.3.32 (in progress)
============================ ============================
06/05/2007: olly
Fix reporting of filenames in errors after %include (patch from
Leigh Smith in #1731040; also reported as #1699940).
05/31/2007: olly 05/31/2007: olly
[Python] [Python]
Fix "missing initialiser" warning when compiling generated C/C++ Fix "missing initialiser" warning when compiling generated C/C++

6
Source/CParse/parser.y
View file

@ -1360,7 +1360,7 @@ static void tag_nodes(Node *n, const String_or_char *attrname, DOH *value) {
} dtype; } dtype;
struct { struct {
char *type; char *type;
char *filename; String *filename;
int line; int line;
} loc; } loc;
struct { struct {
@ -1863,9 +1863,9 @@ fragment_directive: FRAGMENT LPAREN fname COMMA kwargs RPAREN HBLOCK {
------------------------------------------------------------ */ ------------------------------------------------------------ */
include_directive: includetype options string LBRACKET { include_directive: includetype options string LBRACKET {
$1.filename = Swig_copy_string(cparse_file); $1.filename = Copy(cparse_file);
$1.line = cparse_line; $1.line = cparse_line;
scanner_set_location($3,1); scanner_set_location(NewString($3),1);
} interface RBRACKET { } interface RBRACKET {
String *mname = 0; String *mname = 0;
$$ = $6; $$ = $6;