typemap name changes:

inv => directorin
outv => directorout
argoutv => directorargout


git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@5137 626c5289-ae23-0410-ae9c-e8d60b6d4f22

Lib/ocaml/carray.i

@@ -35,11 +35,11 @@ type _value = c_obj
 %define %make_simple_array_typemap(type,out_f,in_f)
 %array_tmap_out(out,type,out_f);
 %array_tmap_out(varout,type,out_f);
-%array_tmap_out(inv,type,out_f);
+%array_tmap_out(directorin,type,out_f);
 
 %array_tmap_in(in,type,in_f);
 %array_tmap_in(varin,type,in_f);
-%array_tmap_in(outv,type,in_f);
+%array_tmap_in(directorout,type,in_f);
 %enddef
 
 %make_simple_array_typemap(bool,caml_val_bool,caml_long_val);

Lib/ocaml/director.swg

@@ -49,33 +49,33 @@ private:
   /* reset the _up flag once the routing direction has been determined */
 #ifdef __PTHREAD__
     void __clear_up() const { 
-	__DIRECTOR__::_up = 0; 
-	__DIRECTOR__::_mutex_active = 0;
-	pthread_mutex_unlock(&_mutex_up);
+        __DIRECTOR__::_up = 0; 
+        __DIRECTOR__::_mutex_active = 0;
+        pthread_mutex_unlock(&_mutex_up);
     }
 #else
     void __clear_up() const { 
-	__DIRECTOR__::_up = 0; 
+        __DIRECTOR__::_up = 0; 
     }
 #endif
 
 public:
     /* wrap a ocaml object, optionally taking ownership */
     __DIRECTOR__(CAML_VALUE self, int disown): _self(self), _disown(disown) {
-	register_global_root(&_self);
+        register_global_root(&_self);
     }
     
     /* discard our reference at destruction */
     virtual ~__DIRECTOR__() {
-	remove_global_root(&_self);
-	__disown(); 
+        remove_global_root(&_self);
+        __disown(); 
         // Disown is safe here because we're just divorcing a reference that
-	// points to us.  
+        // points to us.  
     }
     
     /* return a pointer to the wrapped ocaml object */
     CAML_VALUE __get_self() const { 
-	return callback(*caml_named_value("caml_director_get_self"),_self); 
+        return callback(*caml_named_value("caml_director_get_self"),_self); 
     }
 
     /* get the _up flag to determine if the method call should be routed
@@ -83,20 +83,20 @@ public:
      */
 #ifdef __PTHREAD__
     int __get_up() const { 
-	if (__DIRECTOR__::_mutex_active) {
-	    if (pthread_equal(__DIRECTOR__::_mutex_thread, pthread_self())) {
-		int up = _up;
-		__clear_up();
-		return up;
-	    }
-	}
-	return 0;
+        if (__DIRECTOR__::_mutex_active) {
+            if (pthread_equal(__DIRECTOR__::_mutex_thread, pthread_self())) {
+                int up = _up;
+                __clear_up();
+                return up;
+            }
+        }
+        return 0;
     }
 #else 
     int __get_up() const { 
-	int up = _up;
-	_up = 0;
-	return up;
+        int up = _up;
+        _up = 0;
+        return up;
     }
 #endif
     
@@ -105,24 +105,24 @@ public:
      */
 #ifdef __PTHREAD__
     void __set_up() const { 
-	pthread_mutex_lock(&__DIRECTOR__::_mutex_up);
-	__DIRECTOR__::_mutex_thread = pthread_self();
-	__DIRECTOR__::_mutex_active = 1;
-	__DIRECTOR__::_up = 1; 
+        pthread_mutex_lock(&__DIRECTOR__::_mutex_up);
+        __DIRECTOR__::_mutex_thread = pthread_self();
+        __DIRECTOR__::_mutex_active = 1;
+        __DIRECTOR__::_up = 1; 
     }
 #else 
     void __set_up() const { 
-	__DIRECTOR__::_up = 1; 
+        __DIRECTOR__::_up = 1; 
     }
 #endif
     
     /* acquire ownership of the wrapped ocaml object (the sense of "disown"
      * is from ocaml) */
     void __disown() const { 
-	if (!_disown) { 
-	    _disown=1;
-	    callback(*caml_named_value("caml_obj_disown"),_self);
-	} 
+        if (!_disown) { 
+            _disown=1;
+            callback(*caml_named_value("caml_obj_disown"),_self);
+        } 
     }
 };
 
@@ -140,9 +140,9 @@ int __DIRECTOR__::_mutex_active = 0;
 
 %insert(mli) %{
     val new_derived_object: 
-	(c_obj -> c_obj) ->
-	(c_obj -> string -> c_obj -> c_obj) ->
-	c_obj -> c_obj
+        (c_obj -> c_obj) ->
+        (c_obj -> string -> c_obj -> c_obj) ->
+        c_obj -> c_obj
 %}
 
 %insert(ml) %{
@@ -160,9 +160,9 @@ let new_derived_object cfun x_class args =
     let obj =
     cfun (match args with
                 C_list argl ->
-	  (C_list ((C_director_core (C_obj new_class,ob_ref)) :: argl))
-	  | a -> (C_list [ C_director_core 
-			   (C_obj new_class,ob_ref)  ; a ])) in
+          (C_list ((C_director_core (C_obj new_class,ob_ref)) :: argl))
+          | a -> (C_list [ C_director_core 
+                           (C_obj new_class,ob_ref)  ; a ])) in
     ob_ref := Some obj ;
       obj
   end

Lib/ocaml/typemaps.i

@@ -126,7 +126,7 @@
 %typemap(varin) C_NAME & {
     $1 = MZ_TO_C($input);
 }
-%typemap(outv) C_NAME {
+%typemap(directorout) C_NAME {
     $1 = MZ_TO_C($input);
 }
 %typemap(in) C_NAME *INPUT ($*1_ltype temp) {
@@ -157,7 +157,7 @@
 %typemap(argout) C_NAME & {
     swig_result = caml_list_append(swig_result,C_TO_MZ((long)*$1));
 }
-%typemap(inv) C_NAME {
+%typemap(directorin) C_NAME {
     args = caml_list_append(args,C_TO_MZ($1_name));
 }
 %enddef
@@ -225,7 +225,7 @@ SIMPLE_MAP(unsigned long long,caml_val_ulong,caml_long_val);
 
 %char_ptr_in(in);
 %char_ptr_in(varin);
-%char_ptr_in(outv);
+%char_ptr_in(directorout);
 
 %define %char_ptr_out(how) 
 %typemap(how) 
@@ -242,7 +242,7 @@ SIMPLE_MAP(unsigned long long,caml_val_ulong,caml_long_val);
 
 %char_ptr_out(out);
 %char_ptr_out(varout);
-%char_ptr_out(invv);
+%char_ptr_out(directorin);
 
 %define %swigtype_ptr_in(how)
 %typemap(how) SWIGTYPE * {
@@ -276,10 +276,10 @@ SIMPLE_MAP(unsigned long long,caml_val_ulong,caml_long_val);
 
 %swigtype_ptr_in(in);
 %swigtype_ptr_in(varin);
-%swigtype_ptr_in(outv);
+%swigtype_ptr_in(directorout);
 %swigtype_ptr_out(out);
 %swigtype_ptr_out(varout);
-%swigtype_ptr_out(inv);
+%swigtype_ptr_out(directorin);
 
 /* C++ References */