From 2811e2a09a0e3cfbc02974402827a8d2d59affb1 Mon Sep 17 00:00:00 2001 From: Marcelo Matus Date: Thu, 20 Oct 2005 09:58:19 +0000 Subject: [PATCH] include the user's fragment file in the same place git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@7693 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Lib/python/python.swg | 36 +++++++++++++++++------------------- Lib/python/pytypemaps.swg | 2 -- Lib/ruby/ruby.swg | 34 +++++++++++++++++----------------- Lib/ruby/rubytypemaps.swg | 4 +--- Lib/tcl/tcl8.swg | 34 +++++++++++++++++----------------- Lib/tcl/tcltypemaps.swg | 2 -- 6 files changed, 52 insertions(+), 60 deletions(-) diff --git a/Lib/python/python.swg b/Lib/python/python.swg index 36fb72071..937bca393 100644 --- a/Lib/python/python.swg +++ b/Lib/python/python.swg @@ -1,38 +1,37 @@ -/* ----------------------------------------------------------------------------- +/* ------------------------------------------------------------ * python.swg * * Python configuration module. - * ----------------------------------------------------------------------------- */ + * ------------------------------------------------------------ */ -/* - bool type in python is too much generic, we invert order for proper - resolution. -*/ - -/* ----------------------------------------------------------------------------- +/* ------------------------------------------------------------ * Inner macros - * ----------------------------------------------------------------------------- */ + * ------------------------------------------------------------ */ %include -/* ----------------------------------------------------------------------------- +/* ------------------------------------------------------------ * Error manipulation - * ----------------------------------------------------------------------------- */ + * ------------------------------------------------------------ */ %include -/* ----------------------------------------------------------------------------- +/* ------------------------------------------------------------ * The runtime part - * ----------------------------------------------------------------------------- */ + * ------------------------------------------------------------ */ %include -/* ----------------------------------------------------------------------------- +/* ------------------------------------------------------------ * Special user directives - * ----------------------------------------------------------------------------- */ + * ------------------------------------------------------------ */ %include -/* ----------------------------------------------------------------------------- - * Typemap specializations - * ----------------------------------------------------------------------------- */ +/* ------------------------------------------------------------ + * Look for user fragments file. + * ------------------------------------------------------------ */ +%include "pyfragments.swg" +/* ------------------------------------------------------------ + * Typemap specializations + * ------------------------------------------------------------ */ %include /* ------------------------------------------------------------ @@ -48,7 +47,6 @@ /* ------------------------------------------------------------ * The Python autodoc support * ------------------------------------------------------------ */ - %include /* ------------------------------------------------------------ diff --git a/Lib/python/pytypemaps.swg b/Lib/python/pytypemaps.swg index ee35cadce..90e4f9633 100644 --- a/Lib/python/pytypemaps.swg +++ b/Lib/python/pytypemaps.swg @@ -30,8 +30,6 @@ * All the typemaps * ----------------------------------------------------------------------------- */ -%include "pyfragments.swg" - %include %include %include diff --git a/Lib/ruby/ruby.swg b/Lib/ruby/ruby.swg index 581c1d01d..dcfaf49e4 100644 --- a/Lib/ruby/ruby.swg +++ b/Lib/ruby/ruby.swg @@ -1,37 +1,37 @@ -/* ----------------------------------------------------------------------------- +/* ------------------------------------------------------------ * ruby.swg * * Ruby configuration module. - * ----------------------------------------------------------------------------- */ + * ------------------------------------------------------------ */ -/* ----------------------------------------------------------------------------- +/* ------------------------------------------------------------ * Inner macros - * ----------------------------------------------------------------------------- */ + * ------------------------------------------------------------ */ %include -/* ----------------------------------------------------------------------------- +/* ------------------------------------------------------------ * Error manipulation - * ----------------------------------------------------------------------------- */ + * ------------------------------------------------------------ */ %include -/* ----------------------------------------------------------------------------- +/* ------------------------------------------------------------ * The runtime part - * ----------------------------------------------------------------------------- */ + * ------------------------------------------------------------ */ %include -/* ----------------------------------------------------------------------------- +/* ------------------------------------------------------------ * Special user directives - * ----------------------------------------------------------------------------- */ + * ------------------------------------------------------------ */ %include -/* ----------------------------------------------------------------------------- - * Look for user fragments file. If not found, include empty system one. - * ----------------------------------------------------------------------------- */ +/* ------------------------------------------------------------ + * Look for user fragments file. + * ------------------------------------------------------------ */ %include "rubyfragments.swg" -/* ----------------------------------------------------------------------------- +/* ------------------------------------------------------------ * Typemap specializations - * ----------------------------------------------------------------------------- */ + * ------------------------------------------------------------ */ %include /* ------------------------------------------------------------ @@ -40,12 +40,12 @@ %include /* ------------------------------------------------------------ - * Warnings for Python keywords + * Warnings for Ruby keywords * ------------------------------------------------------------ */ %include /* ------------------------------------------------------------ - * The Python initialization function + * The Ruby initialization function * ------------------------------------------------------------ */ %include diff --git a/Lib/ruby/rubytypemaps.swg b/Lib/ruby/rubytypemaps.swg index bb5ae0a8d..c555921f3 100644 --- a/Lib/ruby/rubytypemaps.swg +++ b/Lib/ruby/rubytypemaps.swg @@ -2,7 +2,7 @@ * Typemap specializations * ----------------------------------------------------------------------------- */ -/* directors are supported in Python */ +/* directors are supported in Ruby */ #ifndef SWIG_DIRECTOR_TYPEMAPS #define SWIG_DIRECTOR_TYPEMAPS #endif @@ -25,8 +25,6 @@ * All the typemaps * ----------------------------------------------------------------------------- */ -%include "rubyfragments.swg" - %include %include %include diff --git a/Lib/tcl/tcl8.swg b/Lib/tcl/tcl8.swg index 6bdc674ca..271564383 100644 --- a/Lib/tcl/tcl8.swg +++ b/Lib/tcl/tcl8.swg @@ -1,37 +1,37 @@ -/* ----------------------------------------------------------------------------- +/* ------------------------------------------------------------ * tcl.swg * * Tcl configuration module. - * ----------------------------------------------------------------------------- */ + * ------------------------------------------------------------ */ -/* ----------------------------------------------------------------------------- +/* ------------------------------------------------------------ * Inner macros - * ----------------------------------------------------------------------------- */ + * ------------------------------------------------------------ */ %include -/* ----------------------------------------------------------------------------- +/* ------------------------------------------------------------ * Error manipulation - * ----------------------------------------------------------------------------- */ + * ------------------------------------------------------------ */ %include -/* ----------------------------------------------------------------------------- +/* ------------------------------------------------------------ * The runtime part - * ----------------------------------------------------------------------------- */ + * ------------------------------------------------------------ */ %include -/* ----------------------------------------------------------------------------- +/* ------------------------------------------------------------ * Special user directives - * ----------------------------------------------------------------------------- */ + * ------------------------------------------------------------ */ %include -/* ----------------------------------------------------------------------------- - * Look for user fragments file. If not found, include empty system one. - * ----------------------------------------------------------------------------- */ +/* ------------------------------------------------------------ + * Look for user fragments file. + * ------------------------------------------------------------ */ %include "tclfragments.swg" -/* ----------------------------------------------------------------------------- +/* ------------------------------------------------------------ * Typemap specializations - * ----------------------------------------------------------------------------- */ + * ------------------------------------------------------------ */ %include /* ------------------------------------------------------------ @@ -40,12 +40,12 @@ %include /* ------------------------------------------------------------ - * Warnings for Python keywords + * Warnings for Tcl keywords * ------------------------------------------------------------ */ %include /* ------------------------------------------------------------ - * The Python initialization function + * The Tcl initialization function * ------------------------------------------------------------ */ %include diff --git a/Lib/tcl/tcltypemaps.swg b/Lib/tcl/tcltypemaps.swg index d4f52d3ba..cdcd5c2ff 100644 --- a/Lib/tcl/tcltypemaps.swg +++ b/Lib/tcl/tcltypemaps.swg @@ -24,8 +24,6 @@ * All the typemaps * ----------------------------------------------------------------------------- */ -%include "tclfragments.swg" - %include %include %include