diff options
| author | William S Fulton <wsf@fultondesigns.co.uk> | 2012-04-13 06:18:21 +0000 |
|---|---|---|
| committer | William S Fulton <wsf@fultondesigns.co.uk> | 2012-04-13 06:18:21 +0000 |
| commit | 39d8882a8234296fe94b55e070c9599c94d1789b (patch) | |
| tree | 308f707b8ecb4a972c4f4620845bb1840795d6f0 | |
| parent | faa6be3bd9f30722f4f46aba17e20928ad8ef6b0 (diff) | |
| download | swig-39d8882a8234296fe94b55e070c9599c94d1789b.tar.gz | |
Apply #3513569 which adds a catchlist to the xml output
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@12977 626c5289-ae23-0410-ae9c-e8d60b6d4f22
| -rw-r--r-- | CHANGES.current | 3 | ||||
| -rw-r--r-- | Source/Modules/xml.cxx | 8 |
2 files changed, 8 insertions, 3 deletions
diff --git a/CHANGES.current b/CHANGES.current index aaadbad7c..24319515e 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -5,6 +5,9 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.5 (in progress) =========================== +2012-04-13: wsfulton + [Xml] Apply #3513569 which adds a catchlist to the xml output. + 2012-04-05: olly [Lua] Add support for Lua 5.2 (patch SF#3514593 from Miles Bader) diff --git a/Source/Modules/xml.cxx b/Source/Modules/xml.cxx index bcfac1acc..438205f68 100644 --- a/Source/Modules/xml.cxx +++ b/Source/Modules/xml.cxx @@ -144,6 +144,8 @@ public: Xml_print_kwargs(Getattr(obj, k)); } else if (Cmp(k, "parms") == 0 || Cmp(k, "pattern") == 0) { Xml_print_parmlist(Getattr(obj, k)); + } else if (Cmp(k, "catchlist") == 0) { + Xml_print_parmlist(Getattr(obj, k), "catchlist"); } else { DOH *o; print_indent(0); @@ -198,10 +200,10 @@ public: } - void Xml_print_parmlist(ParmList *p) { + void Xml_print_parmlist(ParmList *p, const char* markup = "parmlist") { print_indent(0); - Printf(out, "<parmlist id=\"%ld\" addr=\"%x\" >\n", ++id, p); + Printf(out, "<%s id=\"%ld\" addr=\"%x\" >\n", markup, ++id, p); indent_level += 4; while (p) { print_indent(0); @@ -213,7 +215,7 @@ public: } indent_level -= 4; print_indent(0); - Printf(out, "</parmlist >\n"); + Printf(out, "</%s >\n", markup); } void Xml_print_baselist(List *p) { |