Updated SWIG patches and wxPython's SWIG runtime

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25319 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-01-22 22:31:34 +00:00
parent e20e6988ac
commit 1de47c7cb4
4 changed files with 210 additions and 43 deletions

View File

@@ -1,11 +1,11 @@
Index: Source/Swig/swig.h
===================================================================
RCS file: /cvsroot/SWIG/Source/Swig/swig.h,v
retrieving revision 1.76
diff -u -4 -r1.76 swig.h
--- Source/Swig/swig.h 11 Nov 2003 20:16:35 -0000 1.76
+++ Source/Swig/swig.h 18 Dec 2003 22:03:45 -0000
@@ -350,8 +350,10 @@
retrieving revision 1.79
diff -u -4 -r1.79 swig.h
--- Source/Swig/swig.h 15 Jan 2004 22:46:07 -0000 1.79
+++ Source/Swig/swig.h 22 Jan 2004 01:57:53 -0000
@@ -354,8 +354,10 @@
extern void Swig_print_tags(File *obj, Node *root);
extern void Swig_print_tree(Node *obj);
extern void Swig_print_node(Node *obj);
@@ -19,15 +19,15 @@ diff -u -4 -r1.76 swig.h
Index: Source/Modules/main.cxx
===================================================================
RCS file: /cvsroot/SWIG/Source/Modules/main.cxx,v
retrieving revision 1.27
diff -u -4 -r1.27 main.cxx
--- Source/Modules/main.cxx 16 Dec 2003 03:43:51 -0000 1.27
+++ Source/Modules/main.cxx 18 Dec 2003 22:03:45 -0000
@@ -87,15 +87,17 @@
-Wall - Enable all warning messages\n\
-Wallkw - Enable warning messages for all the languages keywords\n\
-Werror - Force to treat the warnings as errors\n\
-w<n> - Suppress warning number <n>\n\
retrieving revision 1.32
diff -u -4 -r1.32 main.cxx
--- Source/Modules/main.cxx 15 Jan 2004 22:46:05 -0000 1.32
+++ Source/Modules/main.cxx 22 Jan 2004 01:57:53 -0000
@@ -94,15 +94,17 @@
-w+321,401,-402 \n\
\n\
where code 321(+) is added, and 401(no sign) and 402(-) \n\
are suppressed. See documentation for code meanings.\n\
+ -xmlout <file> - Write an XML version of the parse tree to file after normal processing\n\
\n";
@@ -41,9 +41,9 @@ diff -u -4 -r1.27 main.cxx
// -----------------------------------------------------------------------------
// check_suffix(char *name)
//
@@ -224,8 +226,9 @@
@@ -218,8 +220,9 @@
char *includefiles[256];
int includecount = 0;
extern int check_suffix(char *);
int dump_tags = 0;
int dump_tree = 0;
+ int dump_xml = 0;
@@ -51,7 +51,7 @@ diff -u -4 -r1.27 main.cxx
int dump_typedef = 0;
int dump_classes = 0;
int werror = 0;
@@ -490,8 +493,20 @@
@@ -486,8 +489,20 @@
Swig_mark_arg(i);
} else if (strcmp(argv[i],"-dump_tree") == 0) {
dump_tree = 1;
@@ -72,7 +72,7 @@ diff -u -4 -r1.27 main.cxx
Swig_mark_arg(i);
Swig_contract_mode_set(0);
} else if (strcmp(argv[i],"-browse") == 0) {
@@ -736,8 +751,11 @@
@@ -737,8 +752,11 @@
}
}
if (dump_tree) {
@@ -87,10 +87,10 @@ diff -u -4 -r1.27 main.cxx
Index: Source/Modules/xml.cxx
===================================================================
RCS file: /cvsroot/SWIG/Source/Modules/xml.cxx,v
retrieving revision 1.8
diff -u -4 -r1.8 xml.cxx
--- Source/Modules/xml.cxx 31 Oct 2003 17:42:40 -0000 1.8
+++ Source/Modules/xml.cxx 18 Dec 2003 22:03:45 -0000
retrieving revision 1.9
diff -u -4 -r1.9 xml.cxx
--- Source/Modules/xml.cxx 28 Dec 2003 21:47:58 -0000 1.9
+++ Source/Modules/xml.cxx 22 Jan 2004 01:57:53 -0000
@@ -109,9 +109,9 @@
Printf(stderr,"*** Can't open '%s'\n", outfile);
SWIG_exit(EXIT_FAILURE);
@@ -137,11 +137,11 @@ diff -u -4 -r1.8 xml.cxx
}
indent_level -= 4;
print_indent(0);
@@ -337,5 +337,36 @@
Language * swig_xml( void )
{
return new XML();
}
@@ -334,5 +334,36 @@
extern "C" Language *
swig_xml( void ) {
return new XML();
+}
+
+