1 Index: Source/Swig/swig.h
2 ===================================================================
3 RCS file: /cvsroot/SWIG/Source/Swig/swig.h,v
4 retrieving revision 1.79
5 diff -u -4 -r1.79 swig.h
6 --- Source/Swig/swig.h 15 Jan 2004 22:46:07 -0000 1.79
7 +++ Source/Swig/swig.h 22 Jan 2004 01:57:53 -0000
9 extern void Swig_print_tags(File *obj, Node *root);
10 extern void Swig_print_tree(Node *obj);
11 extern void Swig_print_node(Node *obj);
13 +extern void Swig_print_xml(Node *obj, String* filename);
15 /* -- Wrapper function Object */
19 Index: Source/Modules/main.cxx
20 ===================================================================
21 RCS file: /cvsroot/SWIG/Source/Modules/main.cxx,v
22 retrieving revision 1.32
23 diff -u -4 -r1.32 main.cxx
24 --- Source/Modules/main.cxx 15 Jan 2004 22:46:05 -0000 1.32
25 +++ Source/Modules/main.cxx 22 Jan 2004 01:57:53 -0000
29 where code 321(+) is added, and 401(no sign) and 402(-) \n\
30 are suppressed. See documentation for code meanings.\n\
31 + -xmlout <file> - Write an XML version of the parse tree to file after normal processing\n\
35 static int freeze = 0;
36 static String *lang_config = 0;
37 static char *cpp_extension = (char *) "cxx";
38 static String *outdir = 0;
39 +static String *xmlout = 0;
41 // -----------------------------------------------------------------------------
42 // check_suffix(char *name)
45 char *includefiles[256];
56 } else if (strcmp(argv[i],"-dump_tree") == 0) {
59 + } else if (strcmp(argv[i],"-dump_xml") == 0) {
62 + } else if (strcmp(argv[i],"-xmlout") == 0) {
66 + xmlout = NewString(argv[i+1]);
71 } else if (strcmp(argv[i],"-nocontract") == 0) {
73 Swig_contract_mode_set(0);
74 } else if (strcmp(argv[i],"-browse") == 0) {
82 + Swig_print_xml(top, xmlout);
85 if (tm_debug) Swig_typemap_debug();
86 if (memory_debug) DohMemoryDebug();
87 Index: Source/Modules/xml.cxx
88 ===================================================================
89 RCS file: /cvsroot/SWIG/Source/Modules/xml.cxx,v
90 retrieving revision 1.9
91 diff -u -4 -r1.9 xml.cxx
92 --- Source/Modules/xml.cxx 28 Dec 2003 21:47:58 -0000 1.9
93 +++ Source/Modules/xml.cxx 22 Jan 2004 01:57:53 -0000
95 Printf(stderr,"*** Can't open '%s'\n", outfile);
96 SWIG_exit(EXIT_FAILURE);
99 - Printf( out, "<?xml version=\"1.0\" ?> \n" );
100 + Printf( out, "<?xml version=\"1.0\" ?> \n" );
105 @@ -197,18 +197,19 @@
106 Replaceall( o, "&", "&" );
107 Replaceall( o, "<", "<" );
108 Replaceall( o, "\"", """ );
109 Replaceall( o, "\\", "\\\\" );
110 - Printf(out,"<attribute name=\"%s\" value=\"%s\" id=\"%ld\" addr=\"%x\" />\n", ck, o, ++id, o );
111 + Replaceall( o, "\n", " " );
112 + Printf(out,"<attribute name=\"%s\" value=\"%s\" id=\"%ld\" addr=\"%x\" />\n", ck, o, ++id, o );
119 String *ck = NewString(k);
120 Replaceall( ck, ":", "_" );
121 - Printf(out,"<attribute name=\"%s\" value=\"%x\" id=\"%ld\" addr=\"%x\" />\n", ck, o, ++id, o );
122 + Printf(out,"<attribute name=\"%s\" value=\"%x\" id=\"%ld\" addr=\"%x\" />\n", ck, o, ++id, o );
127 @@ -318,11 +319,10 @@
130 Printf( out, "<%ssitem id=\"%ld\" addr=\"%x\" >\n", markup, ++id, n.item );
131 Xml_print_attributes( n.item );
132 - Printf( out, "</%ssitem >\n", markup );
134 - Printf( out, " />\n" );
135 + Printf( out, "</%ssitem >\n", markup );
142 extern "C" Language *
148 +/* -----------------------------------------------------------------------------
151 + * Dump an XML version of the parse tree. This is different from using the -xml
152 + * language module normally as it allows the real language module to process the
153 + * tree first, possibly stuffing in new attributes, so the XML that is output ends
154 + * up being a post-processing version of the tree.
155 + * ----------------------------------------------------------------------------- */
158 +Swig_print_xml(DOH *obj, String* filename)
167 + out = NewFile(filename, "w");
169 + Printf(stderr,"*** Can't open '%s'\n", filename);
170 + SWIG_exit(EXIT_FAILURE);
174 + Printf( out, "<?xml version=\"1.0\" ?> \n" );
175 + xml.Xml_print_tree(obj);