Merge pull request #43 from YungLee/gsoc2012-scilab

Gsoc2012 scilab

Examples/scilab/contract/runme.sci

@@ -23,6 +23,12 @@ Foo_set (3.1415926);
 // See if the change took effect
 printf("Foo = %f\n", Foo_get());
 
+// Check error message if violate contract
+g = gcd(-42,105); 
+fact(-4); 
+
+
+
 exit
 
 

Examples/scilab/matrix2/matrixlib.c

@@ -1,3 +1,4 @@
+#include <stdlib.h>
 double sumitems(double *first, int nbRow, int nbCol) {
 	int i;
 	double total;
@@ -14,14 +15,16 @@ void sumitems_argoutput(double *first, int nbRow, int nbCol,double** result,int*
 	*result=malloc(nbRow*nbCol*sizeof(double));
 	for (i=0; i<(nbRow*nbCol); i++) {
 		(*result)[i]=first[i]+first[i];
-	}
+ 	}
 	return;
 }
 
 double* getValues(int *numberOfRow, int *numberOfCol) {
-	*numberOfRow=23; *numberOfCol=3;
+	double *tempMatrix ;
-	double *tempMatrix = (double*)malloc(sizeof(double) * *numberOfRow * *numberOfCol);
 	int i;
+	*numberOfRow=23; *numberOfCol=3;
+   tempMatrix= (double*)malloc(sizeof(double )* *numberOfRow * *numberOfCol);
+
 	for (i=0; i<((*numberOfRow)*(*numberOfCol)); i++) {
 		tempMatrix[i]=i*2;
 	}

Examples/scilab/matrix2/matrixlib.i

@@ -2,12 +2,41 @@
 %include matrix.i
 
 
-
-
 %apply (double* matrixAsInput,int rows,int cols){(double *first, int nbRow, int nbCol)}
 %apply (double** matrixAsArgOutput,int* rows,int* cols){(double **result,int* nbRowOut,int* nbColOut)}
-%inline {
+
-extern void sumitems_argoutput(double *first, int nbRow, int nbCol,double **result,int* nbRowOut,int* nbColOut);
+%typemap(out) (double*)(int *nRow, int *nCol) 
-extern double* getValues(int *numberOfRow, int *numberOfCol);
+{
+  SciErr sciErr;
+  sciErr = createMatrixOfDouble(pvApiCtx, Rhs+$result, *nRow, *nCol, (double *)$1);
+  if (sciErr.iErr) {
+    printError(&sciErr, 0);
+    return 0;
+  }
+   AssignOutputVariable(pvApiCtx, outputPosition) = Rhs+$result;
+   free($1);
+}
+%typemap (in,numinputs=0) (int *numberOfRow, int *numberOfCol) 
+{
+}
+%typemap(arginit) (int *numberOfRow, int *numberOfCol) 
+{
+  $1 =(int*)malloc(sizeof(int));
+  $2 =(int*)malloc(sizeof(int)); 
+  nRow =$1;
+  nCol =$2;
+}
+
+%typemap(freearg) (int *numberOfRow, int *numberOfCol) 
+{
+  free($1);
+  free($2);
+}
+
+
+
+%inline {
+ extern void sumitems_argoutput(double *first, int nbRow, int nbCol,double **result,int* nbRowOut,int* nbColOut);
+ extern double* getValues(int *numberOfRow, int *numberOfCol);
 }
 

Examples/scilab/matrix2/runme.sci

@@ -2,8 +2,7 @@
 exec loader.sce
 
 myMatrix=[ 103 3 1    12;0   0 2043 1];
-sumitems(myMatrix)
+m=sumitems_argoutput(myMatrix)
-
 myOtherMatrix=getValues();
 size(myOtherMatrix)
 disp(myOtherMatrix);

Lib/scilab/matrix.i

@@ -1,5 +1,6 @@
 %typemap(in) (double* matrixAsInput, int rows, int cols) {
   int *piAddr = NULL;
+  SciErr sciErr;
   sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddr);
   if (sciErr.iErr) {
     printError(&sciErr, 0);
@@ -12,9 +13,9 @@
   }
 }
 
+
 %typemap(in,numinputs=0) (double** matrixAsArgOutput,int* rows, int* cols)
 {
-
 }
 
 %typemap(arginit) (double** matrixAsArgOutput,int* rows, int* cols)
@@ -34,15 +35,14 @@
 
 %typemap(argout) (double** matrixAsArgOutput,int* rows, int* cols)
 {
-  sciErr = createMatrixOfDouble(pvApiCtx, iVarOut, *$2, *$3, (double *)*$1);
+  SciErr sciErr;
+  sciErr = createMatrixOfDouble(pvApiCtx,  Rhs +$result, *$2, *$3, (double *)*$1);
   if (sciErr.iErr) {
     printError(&sciErr, 0);
     return 0;
   }
+  AssignOutputVariable(pvApiCtx, outputPosition) = Rhs +$result;
 
-  AssignOutputVariable(pvApiCtx, iOutNum) = iVarOut;
-  iOutNum++;
-  iVarOut++;
 }
 
 

Lib/scilab/scichar.swg

@@ -32,7 +32,7 @@ SwigScilabStringToChar(void *_pvApiCtx, int _iVar, char *_pcValue, char *_fname)
     return SWIG_ERROR;
   }
 
-  _pstStrings = (char *)MALLOC(sizeof(char));
+  _pstStrings = (char *)malloc(sizeof(char));
   sciErr = getMatrixOfString(pvApiCtx, piAddrVar, &iRows, &iCols, &_piLength, (char **)&_pstStrings);
   if (sciErr.iErr) {
     printError(&sciErr, 0);
@@ -44,7 +44,7 @@ SwigScilabStringToChar(void *_pvApiCtx, int _iVar, char *_pcValue, char *_fname)
   }
   *_pcValue = _pstStrings[0];
 
-  FREE(_pstStrings);
+  free(_pstStrings);
 
   return SWIG_OK;
 }
@@ -58,7 +58,7 @@ SWIGINTERN int
 SwigScilabStringFromChar(void *_pvApiCtx, int _iVarOut, char _chValue) {
   SciErr sciErr;
 
-  char *pchValue = (char*)MALLOC(sizeof(char) * 2);
+  char *pchValue = (char*)malloc(sizeof(char) * 2);
   pchValue[0] = _chValue;
   pchValue[1] = '\0';
 
@@ -68,7 +68,7 @@ SwigScilabStringFromChar(void *_pvApiCtx, int _iVarOut, char _chValue) {
     return SWIG_ERROR;
   }
 
-  FREE(pchValue);
+  free(pchValue);
 
   return Rhs + _iVarOut;
 }
@@ -126,7 +126,7 @@ SwigScilabStringToCharPtr(void *_pvApiCtx, int _iVar, char *_pcValue, int _iLeng
     return SWIG_ERROR;
   }
 
-  pstStrings = (char *)MALLOC(sizeof(char) * (piLength + 1));
+  pstStrings = (char *)malloc(sizeof(char) * (piLength + 1));
   sciErr = getMatrixOfString(pvApiCtx, piAddrVar, &iRows, &iCols, &piLength, (char **)&pstStrings);
   if (sciErr.iErr) {
     printError(&sciErr, 0);
@@ -135,7 +135,7 @@ SwigScilabStringToCharPtr(void *_pvApiCtx, int _iVar, char *_pcValue, int _iLeng
 
   strcpy(_pcValue, pstStrings);
 
-  FREE(pstStrings);
+  free(pstStrings);
 
   return SWIG_OK;
 }
@@ -177,7 +177,7 @@ SwigScilabStringToCharPtrAndSize(void *_pvApiCtx, int _iVar, char **_pcValue, si
     return SWIG_ERROR;
   }
 
-  _pstStrings = (char *)MALLOC(sizeof(char) * (piLength + 1));
+  _pstStrings = (char *)malloc(sizeof(char) * (piLength + 1));
   sciErr = getMatrixOfString(pvApiCtx, piAddrVar, &iRows, &iCols, &piLength, (char **)&_pstStrings);
   if (sciErr.iErr) {
     printError(&sciErr, 0);
@@ -191,7 +191,7 @@ SwigScilabStringToCharPtrAndSize(void *_pvApiCtx, int _iVar, char **_pcValue, si
     *_pcValue = _pstStrings;
   }
 
-  FREE(_pstStrings);
+  free(_pstStrings);
 
   if (_piLength != NULL) {
     *_piLength = (size_t) piLength;
@@ -206,7 +206,7 @@ SwigScilabStringFromCharPtr(void *_pvApiCtx, int _iVarOut, const char *_pchValue
   SciErr sciErr;
   char **pstData = NULL;
 
-  pstData = (char **)MALLOC(sizeof(char *));
+  pstData = (char **)malloc(sizeof(char *));
   pstData[0] = strdup(_pchValue);
 
   sciErr = createMatrixOfString(_pvApiCtx, Rhs + _iVarOut, 1, 1, (char **)pstData);
@@ -215,7 +215,7 @@ SwigScilabStringFromCharPtr(void *_pvApiCtx, int _iVarOut, const char *_pchValue
     return SWIG_ERROR;
   }
 
-  freeArrayOfString(pstData, 1);
+  free(pstData[0]);
 
   return Rhs + _iVarOut;
 }
@@ -226,7 +226,7 @@ SwigScilabStringFromCharPtrAndSize(void *_pvApiCtx, int _iVarOut, const char *_p
   SciErr sciErr;
   char **pstData = NULL;
 
-  pstData = (char **)MALLOC(sizeof(char *));
+  pstData = (char **)malloc(sizeof(char *));
   pstData[0] = strdup(_pchValue);
 
   sciErr = createMatrixOfString(_pvApiCtx, Rhs + _iVarOut, 1, 1, (char **)pstData);
@@ -235,7 +235,7 @@ SwigScilabStringFromCharPtrAndSize(void *_pvApiCtx, int _iVarOut, const char *_p
     return SWIG_ERROR;
   }
 
-  FREE(pstData);
+  free(pstData[0]);
 
   return Rhs + _iVarOut;
 }

Lib/scilab/scirun.swg

@@ -27,9 +27,11 @@ static void SWIG_Scilab_SetOutputPosition(int _outputPosition) {
 #define Scilab_Error_Occurred() 0
 #define SWIG_Scilab_AddErrorMsg(msg) {;}
 
+#ifdef __cplusplus
 namespace std {
     class SciObject {
     public:
         SciObject();
     };
 }
+#endif

Lib/scilab/sciruntime.swg

@@ -4,9 +4,6 @@
 
 #define %scilabcode %insert("scilab")
 
-// Error message will be displayed inside Scilab fragment functions
-// and the following line Will not work because code is not an int
-//#define SWIG_Error(code, msg)   Scierror(code, _("%s\n"), msg);
 
 %insert(runtime) %{
 /* Scilab standard headers */
@@ -28,8 +25,52 @@ extern "C" {
 
 typedef int SciObject;
 
+
+/* -----------------------------------------------------------------------------
+ * error manipulation
+ * ----------------------------------------------------------------------------- */
+
+SWIGINTERN const char*
+SWIG_Scilab_ErrorType(int code) {
+  switch(code) {
+  case SWIG_MemoryError:
+    return "MemoryError";
+  case SWIG_IOError:
+    return "IOError";
+  case SWIG_RuntimeError:
+    return "RuntimeError";
+  case SWIG_IndexError:
+    return "IndexError";
+  case SWIG_TypeError:
+    return "TypeError";
+  case SWIG_DivisionByZero:
+    return "ZeroDivisionError";
+  case SWIG_OverflowError:
+    return "OverflowError";
+  case SWIG_SyntaxError:
+    return "SyntaxError";
+  case SWIG_ValueError:
+    return "ValueError";
+  case SWIG_SystemError:
+    return "SystemError";
+  case SWIG_AttributeError:
+    return "AttributeError";
+  default:
+    return "RuntimeError";
+  }
+}
+
+SWIGINTERN void
+SWIG_Scilab_ErrorMsg(int code, const char *mesg)
+{
+   sciprint(_("SWIG/Scilab Error : %s\n%s"),SWIG_Scilab_ErrorType(code),mesg);
+}
+
+
+
 #define SWIG_fail                 return SWIG_ERROR;
-#define SWIG_Error                return SWIG_ERROR;
+#define SWIG_ErrorType(code)      SWIG_Scilab_ErrorType(code)                                      
+#define SWIG_Error(code, msg)     SWIG_Scilab_ErrorMsg(code,msg)
 
 /* Used for C++ enums */
 //#define SWIG_AsVal_int(scilabValue, valuePointer) SWIG_SciDouble_AsInt(pvApiCtx, scilabValue, valuePointer, fname)
@@ -153,7 +194,7 @@ SWIG_Scilab_NewMemberObj(void *_pvApiCtx, int _iVarOut, void *_ptr, int _sz, swi
   r = SWIG_PackData(r, _ptr, _sz);
   strcpy(r, _type->name);
 
-  pstData = (char **)MALLOC(sizeof(char *));
+  pstData = (char **)malloc(sizeof(char *));
   pstData[0] = strdup(r);
 
   sciErr = createMatrixOfString(_pvApiCtx, Rhs + _iVarOut, 1, 1, (char **)pstData);
@@ -162,7 +203,7 @@ SWIG_Scilab_NewMemberObj(void *_pvApiCtx, int _iVarOut, void *_ptr, int _sz, swi
     return SWIG_ERROR;
   }
 
-  freeArrayOfString(pstData, 1);
+  free(pstData[0]);
 
   return Rhs + _iVarOut;
 }

Source/Modules/d.cxx

@@ -3760,7 +3760,7 @@ private:
       String *nspace = getNSpace();
       if (nspace) {
 	// Check the root package/outermost namespace (a class A in module
-	// A.B leads to problems if another module A.C is also imported)…
+	// A.B leads to problems if another module A.C is also imported)
 	if (Len(package) > 0) {
 	  String *dotless_package = NewStringWithSize(package, Len(package) - 1);
 	  if (Cmp(class_name, dotless_package) == 0) {

Source/Modules/scilab.cxx

@@ -357,6 +357,20 @@ public:
       }
     }
     /* Add cleanup code */
+    for (param = functionParamsList; param;) {
+      String *tm;
+      if ((tm = Getattr(param, "tmap:freearg"))) {
+		if (tm && (Len(tm) != 0)) {
+		  Replaceall(tm, "$source", Getattr(param, "lname"));
+          Printf(wrapper->code, "%s\n", tm);
+	      Delete(tm);
+		}
+		param= Getattr(param, "tmap:freearg:next");
+      } else {
+		param = nextSibling(param);
+      }
+    }
+
 
     /* Close the function(ok) */
     Printv(wrapper->code, "return SWIG_OK;\n", NIL);

swigwin/.gitignore

@@ -0,0 +1,5 @@
+/Debug/
+/swigwin.opensdf
+/swigwin.sdf
+/swigwin.vcxproj.user
+/ipch/

swigwin/swigwin.sln

@@ -1,7 +1,7 @@
 
-Microsoft Visual Studio Solution File, Format Version 10.00
+Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual C++ Express 2008
+# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "swigwin", "swigwin.vcproj", "{17B964BB-4EB7-40AC-A9EB-37D9A12524A2}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "swigwin", "swigwin.vcxproj", "{17B964BB-4EB7-40AC-A9EB-37D9A12524A2}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

swigwin/swigwin.vcxproj

@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{17B964BB-4EB7-40AC-A9EB-37D9A12524A2}</ProjectGuid>
+    <RootNamespace>swigwin</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)\..\Source\CParse;$(SolutionDir)\..\Source\DOH;$(SolutionDir)\..\Source\Include;$(SolutionDir)\..\Source\Modules;$(SolutionDir)\..\Source\Preprocessor;$(SolutionDir)\..\Source\Swig;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(SolutionDir)\..\swig.exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>$(SolutionDir)\..\Source\CParse;$(SolutionDir)\..\Source\DOH;$(SolutionDir)\..\Source\Include;$(SolutionDir)\..\Source\Modules;$(SolutionDir)\..\Source\Preprocessor;$(SolutionDir)\..\Source\Swig;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(SolutionDir)\..\swig.exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\Source\CParse\cscanner.c" />
+    <ClCompile Include="..\Source\CParse\parser.c" />
+    <ClCompile Include="..\Source\CParse\templ.c" />
+    <ClCompile Include="..\Source\CParse\util.c" />
+    <ClCompile Include="..\Source\DOH\base.c" />
+    <ClCompile Include="..\Source\DOH\file.c" />
+    <ClCompile Include="..\Source\DOH\fio.c" />
+    <ClCompile Include="..\Source\DOH\hash.c" />
+    <ClCompile Include="..\Source\DOH\list.c" />
+    <ClCompile Include="..\Source\DOH\memory.c" />
+    <ClCompile Include="..\Source\DOH\string.c" />
+    <ClCompile Include="..\Source\DOH\void.c" />
+    <ClCompile Include="..\Source\Modules\allegrocl.cxx" />
+    <ClCompile Include="..\Source\Modules\allocate.cxx" />
+    <ClCompile Include="..\Source\Modules\browser.cxx" />
+    <ClCompile Include="..\Source\Modules\cffi.cxx" />
+    <ClCompile Include="..\Source\Modules\chicken.cxx" />
+    <ClCompile Include="..\Source\Modules\clisp.cxx" />
+    <ClCompile Include="..\Source\Modules\contract.cxx" />
+    <ClCompile Include="..\Source\Modules\csharp.cxx" />
+    <ClCompile Include="..\Source\Modules\d.cxx" />
+    <ClCompile Include="..\Source\Modules\directors.cxx" />
+    <ClCompile Include="..\Source\Modules\emit.cxx" />
+    <ClCompile Include="..\Source\Modules\go.cxx" />
+    <ClCompile Include="..\Source\Modules\guile.cxx" />
+    <ClCompile Include="..\Source\Modules\java.cxx" />
+    <ClCompile Include="..\Source\Modules\lang.cxx" />
+    <ClCompile Include="..\Source\Modules\lua.cxx" />
+    <ClCompile Include="..\Source\Modules\main.cxx" />
+    <ClCompile Include="..\Source\Modules\modula3.cxx" />
+    <ClCompile Include="..\Source\Modules\module.cxx" />
+    <ClCompile Include="..\Source\Modules\mzscheme.cxx" />
+    <ClCompile Include="..\Source\Modules\ocaml.cxx" />
+    <ClCompile Include="..\Source\Modules\octave.cxx" />
+    <ClCompile Include="..\Source\Modules\overload.cxx" />
+    <ClCompile Include="..\Source\Modules\perl5.cxx" />
+    <ClCompile Include="..\Source\Modules\php.cxx" />
+    <ClCompile Include="..\Source\Modules\pike.cxx" />
+    <ClCompile Include="..\Source\Modules\python.cxx" />
+    <ClCompile Include="..\Source\Modules\r.cxx" />
+    <ClCompile Include="..\Source\Modules\ruby.cxx" />
+    <ClCompile Include="..\Source\Modules\s-exp.cxx" />
+    <ClCompile Include="..\Source\Modules\scilab.cxx" />
+    <ClCompile Include="..\Source\Modules\swigmain.cxx" />
+    <ClCompile Include="..\Source\Modules\tcl8.cxx" />
+    <ClCompile Include="..\Source\Modules\typepass.cxx" />
+    <ClCompile Include="..\Source\Modules\uffi.cxx" />
+    <ClCompile Include="..\Source\Modules\utils.cxx" />
+    <ClCompile Include="..\Source\Modules\xml.cxx" />
+    <ClCompile Include="..\Source\Preprocessor\cpp.c" />
+    <ClCompile Include="..\Source\Preprocessor\expr.c" />
+    <ClCompile Include="..\Source\Swig\cwrap.c" />
+    <ClCompile Include="..\Source\Swig\deprecate.c" />
+    <ClCompile Include="..\Source\Swig\error.c" />
+    <ClCompile Include="..\Source\Swig\fragment.c" />
+    <ClCompile Include="..\Source\Swig\getopt.c" />
+    <ClCompile Include="..\Source\Swig\include.c" />
+    <ClCompile Include="..\Source\Swig\misc.c" />
+    <ClCompile Include="..\Source\Swig\naming.c" />
+    <ClCompile Include="..\Source\Swig\parms.c" />
+    <ClCompile Include="..\Source\Swig\scanner.c" />
+    <ClCompile Include="..\Source\Swig\stype.c" />
+    <ClCompile Include="..\Source\Swig\symbol.c" />
+    <ClCompile Include="..\Source\Swig\tree.c" />
+    <ClCompile Include="..\Source\Swig\typemap.c" />
+    <ClCompile Include="..\Source\Swig\typeobj.c" />
+    <ClCompile Include="..\Source\Swig\typesys.c" />
+    <ClCompile Include="..\Source\Swig\wrapfunc.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\Source\CParse\cparse.h" />
+    <ClInclude Include="..\Source\CParse\parser.h" />
+    <ClInclude Include="..\Source\Include\swigconfig.h" />
+    <ClInclude Include="..\Source\Include\swigwarn.h" />
+    <ClInclude Include="..\Source\Modules\swigmod.h" />
+    <ClInclude Include="..\Source\Preprocessor\preprocessor.h" />
+    <ClInclude Include="..\Source\Swig\swig.h" />
+    <ClInclude Include="..\Source\Swig\swigfile.h" />
+    <ClInclude Include="..\Source\Swig\swigopt.h" />
+    <ClInclude Include="..\Source\Swig\swigparm.h" />
+    <ClInclude Include="..\Source\Swig\swigscan.h" />
+    <ClInclude Include="..\Source\Swig\swigtree.h" />
+    <ClInclude Include="..\Source\Swig\swigwrap.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

swigwin/swigwin.vcxproj.filters

@@ -0,0 +1,294 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Source Files\CParse">
+      <UniqueIdentifier>{6c8c01a5-b725-4444-80dc-b476178ee32e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\DOH">
+      <UniqueIdentifier>{84503f23-0f9a-4bab-8f2b-8b2f53916fb5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Modules">
+      <UniqueIdentifier>{48861cd6-1a86-43be-8a39-2a3bc46f6275}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Preprocessor">
+      <UniqueIdentifier>{d9ad935a-165c-42b0-b6cb-ae11e40c071c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Swig">
+      <UniqueIdentifier>{7becc999-74b2-4e3f-bc72-ea8ac6d88978}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Header Files\CParse">
+      <UniqueIdentifier>{86301afa-b9c9-420b-aee0-8ec2e847b3c3}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Include">
+      <UniqueIdentifier>{af02c6e0-8eef-4e1b-b073-5f25c7f6ffd2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Modules">
+      <UniqueIdentifier>{baf68414-15e6-49d4-9712-fae4f56f7590}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Preprocessor">
+      <UniqueIdentifier>{3f7b42df-af3d-4eaf-8d9a-9e74e0a8ba31}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Swig">
+      <UniqueIdentifier>{6318c071-b035-4175-abfd-bc2f2255e7d4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\Source\CParse\cscanner.c">
+      <Filter>Source Files\CParse</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\CParse\parser.c">
+      <Filter>Source Files\CParse</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\CParse\templ.c">
+      <Filter>Source Files\CParse</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\CParse\util.c">
+      <Filter>Source Files\CParse</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\DOH\base.c">
+      <Filter>Source Files\DOH</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\DOH\file.c">
+      <Filter>Source Files\DOH</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\DOH\fio.c">
+      <Filter>Source Files\DOH</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\DOH\hash.c">
+      <Filter>Source Files\DOH</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\DOH\list.c">
+      <Filter>Source Files\DOH</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\DOH\memory.c">
+      <Filter>Source Files\DOH</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\DOH\string.c">
+      <Filter>Source Files\DOH</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\DOH\void.c">
+      <Filter>Source Files\DOH</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Modules\allegrocl.cxx">
+      <Filter>Source Files\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Modules\allocate.cxx">
+      <Filter>Source Files\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Modules\browser.cxx">
+      <Filter>Source Files\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Modules\cffi.cxx">
+      <Filter>Source Files\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Modules\chicken.cxx">
+      <Filter>Source Files\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Modules\clisp.cxx">
+      <Filter>Source Files\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Modules\contract.cxx">
+      <Filter>Source Files\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Modules\csharp.cxx">
+      <Filter>Source Files\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Modules\directors.cxx">
+      <Filter>Source Files\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Modules\emit.cxx">
+      <Filter>Source Files\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Modules\go.cxx">
+      <Filter>Source Files\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Modules\guile.cxx">
+      <Filter>Source Files\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Modules\java.cxx">
+      <Filter>Source Files\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Modules\lang.cxx">
+      <Filter>Source Files\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Modules\lua.cxx">
+      <Filter>Source Files\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Modules\main.cxx">
+      <Filter>Source Files\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Modules\modula3.cxx">
+      <Filter>Source Files\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Modules\module.cxx">
+      <Filter>Source Files\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Modules\mzscheme.cxx">
+      <Filter>Source Files\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Modules\ocaml.cxx">
+      <Filter>Source Files\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Modules\octave.cxx">
+      <Filter>Source Files\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Modules\overload.cxx">
+      <Filter>Source Files\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Modules\perl5.cxx">
+      <Filter>Source Files\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Modules\php.cxx">
+      <Filter>Source Files\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Modules\pike.cxx">
+      <Filter>Source Files\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Modules\python.cxx">
+      <Filter>Source Files\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Modules\r.cxx">
+      <Filter>Source Files\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Modules\ruby.cxx">
+      <Filter>Source Files\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Modules\s-exp.cxx">
+      <Filter>Source Files\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Modules\scilab.cxx">
+      <Filter>Source Files\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Modules\swigmain.cxx">
+      <Filter>Source Files\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Modules\tcl8.cxx">
+      <Filter>Source Files\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Modules\typepass.cxx">
+      <Filter>Source Files\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Modules\uffi.cxx">
+      <Filter>Source Files\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Modules\utils.cxx">
+      <Filter>Source Files\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Modules\xml.cxx">
+      <Filter>Source Files\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Preprocessor\cpp.c">
+      <Filter>Source Files\Preprocessor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Preprocessor\expr.c">
+      <Filter>Source Files\Preprocessor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Swig\cwrap.c">
+      <Filter>Source Files\Swig</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Swig\deprecate.c">
+      <Filter>Source Files\Swig</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Swig\error.c">
+      <Filter>Source Files\Swig</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Swig\fragment.c">
+      <Filter>Source Files\Swig</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Swig\getopt.c">
+      <Filter>Source Files\Swig</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Swig\include.c">
+      <Filter>Source Files\Swig</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Swig\misc.c">
+      <Filter>Source Files\Swig</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Swig\naming.c">
+      <Filter>Source Files\Swig</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Swig\parms.c">
+      <Filter>Source Files\Swig</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Swig\scanner.c">
+      <Filter>Source Files\Swig</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Swig\stype.c">
+      <Filter>Source Files\Swig</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Swig\symbol.c">
+      <Filter>Source Files\Swig</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Swig\tree.c">
+      <Filter>Source Files\Swig</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Swig\typemap.c">
+      <Filter>Source Files\Swig</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Swig\typeobj.c">
+      <Filter>Source Files\Swig</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Swig\typesys.c">
+      <Filter>Source Files\Swig</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Swig\wrapfunc.c">
+      <Filter>Source Files\Swig</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\Modules\d.cxx">
+      <Filter>Source Files\Modules</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\Source\CParse\cparse.h">
+      <Filter>Header Files\CParse</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Source\CParse\parser.h">
+      <Filter>Header Files\CParse</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Source\Include\swigconfig.h">
+      <Filter>Header Files\Include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Source\Include\swigwarn.h">
+      <Filter>Header Files\Include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Source\Modules\swigmod.h">
+      <Filter>Header Files\Modules</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Source\Preprocessor\preprocessor.h">
+      <Filter>Header Files\Preprocessor</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Source\Swig\swig.h">
+      <Filter>Header Files\Swig</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Source\Swig\swigfile.h">
+      <Filter>Header Files\Swig</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Source\Swig\swigopt.h">
+      <Filter>Header Files\Swig</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Source\Swig\swigparm.h">
+      <Filter>Header Files\Swig</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Source\Swig\swigscan.h">
+      <Filter>Header Files\Swig</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Source\Swig\swigtree.h">
+      <Filter>Header Files\Swig</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Source\Swig\swigwrap.h">
+      <Filter>Header Files\Swig</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>