Remove -xmllang option used with -xml

which had no effect on the output.

CHANGES.current

@@ -7,6 +7,9 @@ the issue number to the end of the URL: https://github.com/swig/swig/issues/
 Version 4.3.0 (in progress)
 ===========================
 
+2024-10-09: wsfulton
+            Remove -xmllang option used with -xml, which had no effect on the output.
+
 2024-10-06: wsfulton
             [PHP] #2907 Fix returning NULL from functions with output
             parameters.

Source/CParse/parser.y

@@ -223,8 +223,6 @@ static void set_comment(Node *n, String *comment) {
  *                              Variables
  * ----------------------------------------------------------------------------- */
 
-static char  *typemap_lang = 0;    /* Current language setting */
-
 static int cplus_mode  = 0;
 
 /* C++ modes */
@@ -279,10 +277,6 @@ static const char* storage_class_string(int c) {
 /* include types */
 static int   import_mode = 0;
 
-void SWIG_typemap_lang(const char *tm_lang) {
-  typemap_lang = Swig_copy_string(tm_lang);
-}
-
 void SWIG_cparse_set_compact_default_args(int defargs) {
   compact_default_args = defargs;
 }
@@ -2899,7 +2893,7 @@ typemap_directive :  TYPEMAP LPAREN typemap_type RPAREN tm_list stringbrace {
 	       }
                ;
 
-/* typemap method type (lang,method) or (method) */
+/* typemap method and optional kwargs */
 
 typemap_type   : kwargs {
 		 String *name = Getattr($kwargs, "name");

Source/Modules/c.cxx

@@ -1795,8 +1795,6 @@ public:
 
     SWIG_library_directory("c");
 
-    // add typemap definitions
-    SWIG_typemap_lang("c");
     SWIG_config_file("c.swg");
 
     String* const ns_prefix_ = ns_prefix ? NewStringf("%s_", ns_prefix) : NewString("");

Source/Modules/csharp.cxx

@@ -301,8 +301,6 @@ public:
     // Add a symbol to the parser for conditional compilation
     Preprocessor_define("SWIGCSHARP 1", 0);
 
-    // Add typemap definitions
-    SWIG_typemap_lang("csharp");
     SWIG_config_file("csharp.swg");
 
     allow_overloading();

Source/Modules/d.cxx

@@ -335,8 +335,6 @@ public:
     // use in our library files.
     Preprocessor_define("SWIG_D_VERSION 2", 0);
 
-    // Add typemap definitions
-    SWIG_typemap_lang("d");
     SWIG_config_file("d.swg");
 
     allow_overloading();

Source/Modules/go.cxx

@@ -361,8 +361,6 @@ private:
       Preprocessor_define("SWIGGO_INTGO_SIZE 0", 0);
     }
 
-    // Add typemap definitions.
-    SWIG_typemap_lang("go");
     SWIG_config_file("go.swg");
 
     allow_overloading();

Source/Modules/guile.cxx

@@ -121,7 +121,6 @@ public:
     int i;
 
      SWIG_library_directory("guile");
-     SWIG_typemap_lang("guile");
 
     // Look for certain command line options
     for (i = 1; i < argc; i++) {

Source/Modules/java.cxx

@@ -319,8 +319,6 @@ public:
     // Add a symbol to the parser for conditional compilation
     Preprocessor_define("SWIGJAVA 1", 0);
 
-    // Add typemap definitions
-    SWIG_typemap_lang("java");
     SWIG_config_file("java.swg");
 
     allow_overloading();

Source/Modules/javascript.cxx

@@ -638,9 +638,6 @@ void JAVASCRIPT::main(int argc, char *argv[]) {
   // Add a symbol to the parser for conditional compilation
   Preprocessor_define("SWIGJAVASCRIPT 1", 0);
 
-  // Add typemap definitions
-  SWIG_typemap_lang("javascript");
-
   // Set configuration file
   SWIG_config_file("javascript.swg");
 

Source/Modules/lua.cxx

@@ -269,9 +269,6 @@ public:
     /* Set language-specific configuration file */
     SWIG_config_file("lua.swg");
 
-    /* Set typemap language */
-    SWIG_typemap_lang("lua");
-
     /* Enable overloaded methods support */
     allow_overloading();
   }

Source/Modules/mzscheme.cxx

@@ -107,10 +107,6 @@ public:
 
     Preprocessor_define("SWIGMZSCHEME 1", 0);
 
-    // Set name of typemaps
-
-    SWIG_typemap_lang("mzscheme");
-
     // Read in default typemaps */
     SWIG_config_file("mzscheme.swg");
     allow_overloading();

Source/Modules/ocaml.cxx

@@ -128,9 +128,6 @@ public:
     // Add a symbol for this module
 
     Preprocessor_define("SWIGOCAML 1", 0);
-    // Set name of typemaps
-
-    SWIG_typemap_lang("ocaml");
 
     // Read in default typemaps */
     SWIG_config_file("ocaml.i");

Source/Modules/octave.cxx

@@ -132,7 +132,6 @@ public:
     SWIG_library_directory("octave");
     Preprocessor_define("SWIGOCTAVE 1", 0);
     SWIG_config_file("octave.swg");
-    SWIG_typemap_lang("octave");
     allow_overloading();
 
     // Octave API is C++, so output must be C++ compatible even when wrapping C code

Source/Modules/perl5.cxx

@@ -205,7 +205,6 @@ public:
     Preprocessor_define("SWIGPERL 1", 0);
     // SWIGPERL5 is deprecated, and no longer documented.
     Preprocessor_define("SWIGPERL5 1", 0);
-    SWIG_typemap_lang("perl5");
     SWIG_config_file("perl5.swg");
     allow_overloading();
   }

Source/Modules/php.cxx

@@ -542,7 +542,6 @@ public:
 
     Preprocessor_define("SWIGPHP 1", 0);
     Preprocessor_define("SWIGPHP7 1", 0);
-    SWIG_typemap_lang("php");
     SWIG_config_file("php.swg");
     allow_overloading();
   }

Source/Modules/python.cxx

@@ -472,7 +472,6 @@ public:
     if (!global_name)
       global_name = NewString("cvar");
     Preprocessor_define("SWIGPYTHON 1", 0);
-    SWIG_typemap_lang("python");
     SWIG_config_file("python.swg");
     allow_overloading();
   }

Source/Modules/ruby.cxx

@@ -908,8 +908,6 @@ public:
     /* Add a symbol to the parser for conditional compilation */
     Preprocessor_define("SWIGRUBY 1", 0);
 
-    /* Add typemap definitions */
-    SWIG_typemap_lang("ruby");
     SWIG_config_file("ruby.swg");
     allow_overloading();
   }

Source/Modules/scilab.cxx

@@ -170,9 +170,6 @@ public:
     /* Set scilab configuration file */
     SWIG_config_file("scilab.swg");
 
-    /* Set typemap for scilab */
-    SWIG_typemap_lang("scilab");
-
     allow_overloading();
   }
 

Source/Modules/swigmod.h

@@ -355,7 +355,6 @@ private:
 };
 
 extern "C" {
-  void SWIG_typemap_lang(const char *);
   typedef Language *(*ModuleFactory) (void);
 }
 

Source/Modules/tcl8.cxx

@@ -121,7 +121,6 @@ public:
     Preprocessor_define("SWIGTCL 1", 0);
     // SWIGTCL8 is deprecated, and no longer documented.
     Preprocessor_define("SWIGTCL8 1", 0);
-    SWIG_typemap_lang("tcl8");
     SWIG_config_file("tcl8.swg");
     allow_overloading();
   }

Source/Modules/xml.cxx

@@ -15,7 +15,6 @@
 
 static const char *usage = "\
 XML Options (available with -xml)\n\
-     -xmllang <lang> - Typedef language\n\
      -xmllite        - More lightweight version of XML\n";
 
 static File *out = 0;
@@ -35,15 +34,7 @@ public:
   }
 
   virtual void main(int argc, char *argv[]) {
-    SWIG_typemap_lang("xml");
     for (int iX = 0; iX < argc; iX++) {
-      if (strcmp(argv[iX], "-xmllang") == 0) {
-	Swig_mark_arg(iX);
-	iX++;
-	SWIG_typemap_lang(argv[iX]);
-	Swig_mark_arg(iX);
-	continue;
-      }
       if (strcmp(argv[iX], "-help") == 0) {
 	fputs(usage, stdout);
       }