Merge pull request #167 from swig-fortran/revert-typemap

Remove the curly brace typemap argument feature; see swig#1399 .

Author: sethrj

Examples/test-suite/common.mk

@@ -523,7 +523,6 @@ CPP_TEST_CASES += \
 	typedef_sizet \
 	typedef_struct_cpp \
 	typedef_typedef \
-	typemap_args \
 	typemap_arrays \
 	typemap_array_qualifiers \
 	typemap_delete \

Examples/test-suite/typemap_args.i

@@ -47,7 +47,7 @@
   %typemap(bindc) const CLS* = const FORTRAN_INTRINSIC_TYPE*;
 
   // Set up C type
-  %typemap(ctype, in={const CLS*}, null={SWIG_null_struct_ ## CLS()}, fragment="SWIG_null_struct"{CLS}, noblock=1) CLS {
+  %typemap(ctype, in="const " #CLS "*", null="SWIG_null_struct_" #CLS "()", fragment="SWIG_null_struct"{CLS}, noblock=1) CLS {
     CLS
   }
 

Lib/fortran/bindc.swg

@@ -42,9 +42,9 @@
  * Deferred copy of basic settings from non-SP type (i.e. Fortran will see it the same; we override the in/out/ctype below)
  */
 
-%typemap(ftype, in={$typemap(ftype:in, TYPE*)}, noblock=1) SWIGSP__, SWIGSP_PTRS__
+%typemap(ftype, in="$typemap(ftype:in, " #TYPE "*)", noblock=1) SWIGSP__, SWIGSP_PTRS__
   {$typemap(ftype, TYPE*)}
-%typemap(ftype, in={$typemap(ftype:in, const TYPE*)}, noblock=1) SWIGSP_CPTRS__
+%typemap(ftype, in="$typemap(ftype:in, const " #TYPE "*)", noblock=1) SWIGSP_CPTRS__
   {$typemap(ftype, const TYPE*)}
 
 /* -------------------------------------------------------------------------

Lib/fortran/boost_shared_ptr.i

@@ -32,7 +32,7 @@ struct SwigComplex_ ## CTYPE;
 %apply SwigComplex_ ## CTYPE ARRAY[] { CPPTYPE ARRAY[] };
 %apply SwigComplex_ ## CTYPE[ANY] { CPPTYPE[ANY] };
 
-%typemap(ctype, in="SwigComplex_" #CTYPE "*", null="SWIG_create_complex_" # CTYPE "(0, 0)", fragment="SWIG_complex_"{CTYPE}, noblock=1) CPPTYPE {
+%typemap(ctype, in="SwigComplex_" #CTYPE "*", null="SWIG_create_complex_" #CTYPE "(0, 0)", fragment="SWIG_complex_"{CTYPE}, noblock=1) CPPTYPE {
   SwigComplex_ ## CTYPE
 }
 %typemap(in, noblock=1) CPPTYPE {

Lib/fortran/complex.i

@@ -57,7 +57,7 @@ end subroutine}
   %fortran_array(CPPTYPE)
 
   // Fortran proxy code: input is target 1D array
-  %typemap(ftype, in={$typemap(imtype, VTYPE), dimension(:), target}, noblock=1) CPPTYPE {
+  %typemap(ftype, in="$typemap(imtype, " #VTYPE "), dimension(:), target", noblock=1) CPPTYPE {
     $typemap(imtype, VTYPE), dimension(:), pointer
   }
 
@@ -90,7 +90,7 @@ end subroutine}
 %define %fortran_array_handle(VTYPE, CPPTYPE...)
 
   // Input arguments for pointer-by-ref are the same
-  %typemap(ftype, in={$typemap(imtype, VTYPE), dimension(:), pointer, intent(inout)}, noblock=1) CPPTYPE& {
+  %typemap(ftype, in="$typemap(imtype, " #VTYPE "), dimension(:), pointer, intent(inout)", noblock=1) CPPTYPE& {
     $typemap(imtype, VTYPE), dimension(:), pointer
   }
   %typemap(fin, match="ftype", noblock=1) CPPTYPE& {$typemap(fin, VTYPE ARRAY[])}

Lib/fortran/fortranarray.swg

@@ -143,14 +143,14 @@ SWIGINTERN SwigArrayWrapper SwigArrayWrapper_uninitialized() {
   %fortran_apply_typemaps(FORTRAN_INTRINSIC_TYPE, CTYPE)
 
   // Regular values are passed as pointers and returned by value
-  %typemap(ctype, in={const CTYPE*}) CTYPE
+  %typemap(ctype, in="const " #CTYPE "*") CTYPE
    %{CTYPE%}
-  %typemap(imtype, in={FTYPE(FKIND), intent(in)}) CTYPE
+  %typemap(imtype, in=#FTYPE "(" #FKIND "), intent(in)") CTYPE
    %{FTYPE(FKIND)%}
-  %typemap(ftype, in={FTYPE(FKIND), intent(in)}) CTYPE
+  %typemap(ftype, in=#FTYPE "(" #FKIND "), intent(in)") CTYPE
    %{FTYPE(FKIND)%}
-  %typemap(bindc, in={FTYPE(FKIND), intent(in), value}, kind={FKIND},
-           fortranconst={FTYPE(FKIND)}) CTYPE
+  %typemap(bindc, in=#FTYPE "(" #FKIND "), intent(in), value", kind=#FKIND,
+           fortranconst=#FTYPE "(" #FKIND ")") CTYPE
    %{FTYPE(FKIND)%}
   %typemap(in) CTYPE = FORTRAN_INTRINSIC_TYPE;
   %typemap(out) CTYPE = FORTRAN_INTRINSIC_TYPE;

Lib/fortran/fundamental.swg

@@ -26,7 +26,7 @@ $2 = $input->size;
 %apply (SWIGTYPE *DATA, size_t SIZE) { (const SWIGTYPE *DATA, size_t SIZE) };
 
 /* Add 'intent(in)' for const arrays */
-%typemap(ftype, in={$typemap(imtype, $*1_ltype), dimension(:), intent(in), target}, noblock=1) (const SWIGTYPE *DATA, size_t SIZE) {
+%typemap(ftype, in="$typemap(imtype, $*1_ltype), dimension(:), intent(in), target", noblock=1) (const SWIGTYPE *DATA, size_t SIZE) {
   $typemap(imtype, $*1_ltype), dimension(:), pointer
 }
 

Lib/fortran/typemaps.i

@@ -1693,7 +1693,7 @@ static String *add_qualifier_to_declarator(SwigType *type, SwigType *qualifier)
 %type <decl>     abstract_declarator direct_abstract_declarator ctor_end;
 %type <tmap>     typemap_type;
 %type <str>      idcolon idcolontail idcolonnt idcolontailnt idtemplate idtemplatetemplate stringbrace stringbracesemi;
-%type <str>      string stringnum stringnumbrace wstring;
+%type <str>      string stringnum wstring;
 %type <tparms>   template_parms;
 %type <dtype>    cpp_end cpp_vend;
 %type <intvalue> rename_namewarn;
@@ -7327,12 +7327,12 @@ options        : LPAREN kwargs RPAREN {
 
 
 /* Keyword arguments */
-kwargs         : idstring EQUAL stringnumbrace {
+kwargs         : idstring EQUAL stringnum {
 		 $$ = NewHash();
 		 Setattr($$,"name",$1);
 		 Setattr($$,"value",$3);
                }
-               | idstring EQUAL stringnumbrace COMMA kwargs {
+               | idstring EQUAL stringnum COMMA kwargs {
 		 $$ = NewHash();
 		 Setattr($$,"name",$1);
 		 Setattr($$,"value",$3);
@@ -7366,26 +7366,6 @@ stringnum      : string {
                }
                ;
 
-stringnumbrace : string {
-		 $$ = $1;
-               }
-               | LBRACE {
-                  /* Assign exact typemap contents */
-		   String *code;
-                   skip_balanced('{','}');
-		   Delitem(scanner_ccode,0);
-		   Delitem(scanner_ccode,DOH_END);
-		   code = Copy(scanner_ccode);
-                  $$ = code;
-               }
-               | HBLOCK {
-	          $$ = $1;
-               }
-               | exprnum {
-                 $$ = Char($1.val);
-               }
-               ;
-
 empty          :   ;
 
 %%