You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Kouhei Sutou <ko...@cozmixng.org> on 2007/03/23 01:03:10 UTC

Re: svn commit: r24027 - in trunk: . build build/generator notes subversion/bindings/java/javahl/native subversion/bindings/swig subversion/bindings/swig/include subversion/bindings/swig/python/libsvn_swig_py subversion/include subversion/include/pri

Hi,

2007/3/23, dlr@tigris.org <dl...@tigris.org>:
> Author: dlr
> Date: Thu Mar 22 14:11:00 2007
> New Revision: 24027

> Log:
> Merge the merge-tracking branch to trunk.

I think that the following typemaps should be defined in
svn_containers.swg.

> Modified: trunk/subversion/bindings/swig/include/svn_types.swg
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/bindings/swig/include/svn_types.swg?pathrev=24027&r1=24026&r2=24027
> ==============================================================================
> --- trunk/subversion/bindings/swig/include/svn_types.swg        (original)
> +++ trunk/subversion/bindings/swig/include/svn_types.swg        Thu Mar 22 14:11:00 2007
> @@ -363,6 +363,51 @@
>  }
>  #endif
>
> +#ifdef SWIGPYTHON
> +%typemap(in) apr_array_header_t *RANGELIST {
> +    $1 = svn_swig_py_rangelist_to_array ($input, _global_pool);
> +    if (PyErr_Occurred()) {
> +       SWIG_fail;
> +    }
> +}
> +#endif
> +
> +#ifdef SWIGPYTHON
> +%typemap(in) apr_hash_t *MERGEINFO {
> +    $1 = svn_swig_py_mergeinfo_from_dict ($input, _global_pool);
> +    if (PyErr_Occurred()) {
> +       SWIG_fail;
> +    }
> +}
> +#endif
> +
> +#ifdef SWIGPYTHON
> +%typemap(argout) apr_hash_t **MERGEHASH
> +{
> +    $result = t_output_helper(
> +        $result,
> +        svn_swig_py_mergeinfo_to_dict(*$1,
> +                                     $descriptor(svn_merge_range_t *),
> +                                     _global_py_pool));
> +    if (PyErr_Occurred()) {
> +       SWIG_fail;
> +    }
> +}
> +#endif
> +
> +#ifdef SWIGPYTHON
> +%typemap(argout) apr_hash_t **MERGEHASHHASH
> +{
> +    $result = t_output_helper(
> +        $result,
> +        svn_swig_py_mergeinfo_hash_to_dict(*$1,
> +                                          $descriptor(svn_merge_range_t *),
> +                                       _global_py_pool));
> +    if (PyErr_Occurred()) {
> +       SWIG_fail;
> +    }
> +}
> +#endif
>  /* -----------------------------------------------------------------------
>     Define a more refined 'memberin' typemap for 'const char *' members. This
>     is used in place of the 'char *' handler defined automatically.
>

Thanks,
--
kou

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: svn commit: r24027 - in trunk: . build build/generator notes subversion/bindings/java/javahl/native subversion/bindings/swig subversion/bindings/swig/include subversion/bindings/swig/python/libsvn_swig_py subversion/include subversion/include/pri

Posted by Daniel Rall <dl...@collab.net>.
On Fri, 23 Mar 2007, Kouhei Sutou wrote:
...
> I think that the following typemaps should be defined in
> svn_containers.swg.

Okay, moved in r24062.


> >Modified: trunk/subversion/bindings/swig/include/svn_types.swg
> >URL: 
> >http://svn.collab.net/viewvc/svn/trunk/subversion/bindings/swig/include/svn_types.swg?pathrev=24027&r1=24026&r2=24027
> >==============================================================================
> >--- trunk/subversion/bindings/swig/include/svn_types.swg        (original)
> >+++ trunk/subversion/bindings/swig/include/svn_types.swg        Thu Mar 22 
> >14:11:00 2007
> >@@ -363,6 +363,51 @@
> > }
> > #endif
> >
> >+#ifdef SWIGPYTHON
> >+%typemap(in) apr_array_header_t *RANGELIST {
> >+    $1 = svn_swig_py_rangelist_to_array ($input, _global_pool);
> >+    if (PyErr_Occurred()) {
> >+       SWIG_fail;
> >+    }
> >+}
> >+#endif
> >+
> >+#ifdef SWIGPYTHON
> >+%typemap(in) apr_hash_t *MERGEINFO {
> >+    $1 = svn_swig_py_mergeinfo_from_dict ($input, _global_pool);
> >+    if (PyErr_Occurred()) {
> >+       SWIG_fail;
> >+    }
> >+}
> >+#endif
> >+
> >+#ifdef SWIGPYTHON
> >+%typemap(argout) apr_hash_t **MERGEHASH
> >+{
> >+    $result = t_output_helper(
> >+        $result,
> >+        svn_swig_py_mergeinfo_to_dict(*$1,
> >+                                     $descriptor(svn_merge_range_t *),
> >+                                     _global_py_pool));
> >+    if (PyErr_Occurred()) {
> >+       SWIG_fail;
> >+    }
> >+}
> >+#endif
...