move getf in functions module
Allan CORNET [Wed, 13 May 2009 08:01:58 +0000 (10:01 +0200)]
41 files changed:
scilab/CHANGES_5.2.X
scilab/modules/core/Makefile.am
scilab/modules/core/help/en_US/comp.xml [moved from scilab/modules/functions/help/en_US/comp.xml with 100% similarity]
scilab/modules/core/help/fr_FR/comp.xml [moved from scilab/modules/functions/help/fr_FR/comp.xml with 100% similarity]
scilab/modules/core/help/pt_BR/comp.xml [moved from scilab/modules/functions/help/pt_BR/comp.xml with 100% similarity]
scilab/modules/core/includes/gw_core.h
scilab/modules/core/includes/recursionFunction.h
scilab/modules/core/sci_gateway/c/gw_core.c
scilab/modules/core/sci_gateway/c/sci_comp.c [moved from scilab/modules/functions/sci_gateway/c/sci_comp.c with 96% similarity]
scilab/modules/core/sci_gateway/core_gateway.xml
scilab/modules/core/sci_gateway/fortran/sci_comp.f [moved from scilab/modules/functions/sci_gateway/fortran/sci_comp.f with 100% similarity]
scilab/modules/core/src/c/core.vcproj
scilab/modules/core/src/c/recursionFunction.c
scilab/modules/core/src/fortran/command.f
scilab/modules/core/src/fortran/core_f.vfproj
scilab/modules/core/src/fortran/core_f2c.vcproj
scilab/modules/core/tests/nonreg_tests/bug_I.dia.ref [moved from scilab/modules/functions/tests/nonreg_tests/bug_I.dia.ref with 100% similarity]
scilab/modules/core/tests/nonreg_tests/bug_I.tst [moved from scilab/modules/functions/tests/nonreg_tests/bug_I.tst with 100% similarity]
scilab/modules/core/tests/unit_tests/comp.dia.ref [moved from scilab/modules/functions/tests/unit_tests/comp.dia.ref with 100% similarity]
scilab/modules/core/tests/unit_tests/comp.tst [moved from scilab/modules/functions/tests/unit_tests/comp.tst with 100% similarity]
scilab/modules/functions/Makefile.am
scilab/modules/functions/help/en_US/getf.xml [moved from scilab/modules/io/help/fr_FR/getf.xml with 100% similarity]
scilab/modules/functions/includes/gw_functions.h
scilab/modules/functions/sci_gateway/c/gw_functions.c
scilab/modules/functions/sci_gateway/c/sci_getf.c [moved from scilab/modules/io/sci_gateway/c/sci_getf.c with 81% similarity]
scilab/modules/functions/sci_gateway/fortran/intdeff.f
scilab/modules/functions/sci_gateway/fortran/intgetf.f [moved from scilab/modules/io/sci_gateway/fortran/intgetf.f with 100% similarity]
scilab/modules/functions/sci_gateway/functions_gateway.xml
scilab/modules/functions/src/c/functions.vcproj
scilab/modules/functions/src/fortran/LibScilab_Import.def
scilab/modules/functions/src/fortran/functions_f.vfproj
scilab/modules/functions/src/fortran/functions_f2c.vcproj
scilab/modules/functions/src/fortran/io_f_Import.def [new file with mode: 0644]
scilab/modules/io/Makefile.am
scilab/modules/io/includes/gw_io.h
scilab/modules/io/sci_gateway/c/gw_io.c
scilab/modules/io/sci_gateway/io_gateway.xml
scilab/modules/io/src/c/io.vcproj
scilab/modules/io/src/c/io_f_Import.def
scilab/modules/io/src/fortran/io_f.vfproj
scilab/modules/io/src/fortran/io_f2c.vcproj

index 6a3714d..1272f54 100644 (file)
@@ -28,7 +28,7 @@ Source reorganisation:
 
 * disp moved in output_stream module.
 
-* lib,comp,deff moved in functions module.
+* lib,deff,getf moved in functions module.
 
 * oldsave, oldload functions (only used with macros of scilab 2.4) are removed
   Replaces oldsave, oldload by save and load in your code.
index cd9b0ac..8902e57 100644 (file)
@@ -259,6 +259,7 @@ sci_gateway/c/sci_librarieslist.c \
 sci_gateway/c/sci_libraryinfo.c \
 sci_gateway/c/sci_getvariablesonstack.c \
 sci_gateway/c/sci_readgateway.c \
+sci_gateway/c/sci_comp.c \
 sci_gateway/c/sci_exit.c
 
 GATEWAY_FORTRAN_SOURCES =  sci_gateway/fortran/sci_errclear.f \
@@ -285,6 +286,7 @@ sci_gateway/fortran/where.f \
 sci_gateway/fortran/sci_iserror.f \
 sci_gateway/fortran/sci_type.f \
 sci_gateway/fortran/sci_debug.f \
+sci_gateway/fortran/sci_comp.f \
 sci_gateway/fortran/sci_isglobal.f
 
 libscicore_la_CFLAGS = -I$(srcdir)/includes/ \
index 844d2ae..5200bb3 100644 (file)
@@ -74,6 +74,7 @@ int C2F(sci_getvariablesonstack)(char *fname,unsigned long fname_len);
 int C2F(sci_getdebuginfo)(char *fname,unsigned long fname_len);
 int C2F(sci_readgateway)(char *fname,unsigned long fname_len);
 int C2F(sci_exit)(char *fname,unsigned long fname_len);
+int C2F(sci_comp)(char *fname,unsigned long fname_len);
 /*--------------------------------------------------------------------------*/ 
 #endif /*  __GW_CORE__ */
 /*--------------------------------------------------------------------------*/
index 4653019..ff6824e 100644 (file)
@@ -37,6 +37,7 @@ typedef enum {
 } recursion_function_called;
 
 #define GW_IO_ID 5
+#define GW_CORE_ID 13
 #define GW_USER_ID 14
 #define GW_USER2_ID 24
 #define GW_FUNCTIONS_ID 31
index c69fc09..748b046 100644 (file)
@@ -13,6 +13,8 @@
 #include "gw_core.h"
 #include "stack-c.h"
 #include "callFunctionFromGateway.h"
+#include "recursionFunction.h"
+#include "gw_functions.h"
 /*--------------------------------------------------------------------------*/
 static gw_generic_table Tab[]=
 {
@@ -21,7 +23,7 @@ static gw_generic_table Tab[]=
 {C2F(sci_warning),"warning"},
 {C2F(sci_argn),"argn"},
 {C2F(sci_getvariablesonstack),"getvariablesonstack"},
-{C2F(sci_readgateway),"readgateway"},
+{C2F(sci_comp),"comp"},
 {C2F(sci_getscilabmode),"getscilabmode"},
 {C2F(sci_mode),"mode"},
 {C2F(sci_type),"type"},
@@ -70,12 +72,26 @@ static gw_generic_table Tab[]=
 {C2F(sci_librarieslist),"librarieslist"},
 {C2F(sci_libraryinfo),"libraryinfo"},
 {C2F(sci_getdebuginfo),"getdebuginfo"},
+{C2F(sci_readgateway),"readgateway"},
 {C2F(sci_exit),"exit"}
 };
 /*--------------------------------------------------------------------------*/
 int gw_core(void)
 {  
        Rhs = Max(0, Rhs);
+
+       /* recursion */
+       /* getf, deff, exec, execstr (functions module) call comp by "recursion" */
+    /* comp can not be in same gateway that others of functions module */
+       if ( isRecursionCallToFunction() )
+       {
+               if ( (getRecursionGatewayToCall() == GW_CORE_ID ) &&
+                        (getRecursionFunctionToCall() == RECURSION_CALL_COMP) )
+               {
+                       Fin = 6;
+               }
+       }
+       
        callFunctionFromGateway(Tab);
        return 0;
 }
@@ -9,7 +9,7 @@
  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
  *
  */
-#include "gw_functions.h"
+#include "gw_core.h"
 #include "stack-c.h"
 /*--------------------------------------------------------------------------*/
  extern int C2F(intcomp)(void); /* fortran */
index f9e4375..eb76afc 100644 (file)
@@ -33,7 +33,7 @@
   <PRIMITIVE gatewayId="13" primitiveId="3" primitiveName="warning" />
   <PRIMITIVE gatewayId="13" primitiveId="4" primitiveName="argn" />
   <PRIMITIVE gatewayId="13" primitiveId="5" primitiveName="getvariablesonstack" />
-  <PRIMITIVE gatewayId="13" primitiveId="6" primitiveName="readgateway" />
+  <PRIMITIVE gatewayId="13" primitiveId="6" primitiveName="comp" />
   <PRIMITIVE gatewayId="13" primitiveId="7" primitiveName="getscilabmode" />
   <PRIMITIVE gatewayId="13" primitiveId="8" primitiveName="mode" />
   <PRIMITIVE gatewayId="13" primitiveId="9" primitiveName="type" />
@@ -82,7 +82,8 @@
   <PRIMITIVE gatewayId="13" primitiveId="52" primitiveName="librarieslist" />
   <PRIMITIVE gatewayId="13" primitiveId="53" primitiveName="libraryinfo" />
   <PRIMITIVE gatewayId="13" primitiveId="54" primitiveName="getdebuginfo" />
-  <PRIMITIVE gatewayId="13" primitiveId="55" primitiveName="exit" />
+  <PRIMITIVE gatewayId="13" primitiveId="55" primitiveName="readgateway" />
+  <PRIMITIVE gatewayId="13" primitiveId="56" primitiveName="exit" />
   <PRIMITIVE gatewayId="14" primitiveId="1" primitiveName="user" />
   
 </GATEWAY>
index 0d26fd7..befce4a 100644 (file)
@@ -45,7 +45,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../string/includes;../../../dynamic_link/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../../libs/intl;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../../libs/intl;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes"
                                PreprocessorDefinitions="_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;WITH_ATLAS;__STDC__"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="3"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../string/includes;../../../dynamic_link/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../../libs/intl;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../../libs/intl;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes"
                                PreprocessorDefinitions="_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;WITH_ATLAS;__STDC__"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="3"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../string/includes;../../../dynamic_link/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../../libs/intl;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../../libs/intl;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes"
                                PreprocessorDefinitions="NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;WITH_ATLAS;__STDC__"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../string/includes;../../../dynamic_link/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../../libs/intl;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../../libs/intl;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes"
                                PreprocessorDefinitions="NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;WITH_ATLAS;__STDC__"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                >
                        </File>
                        <File
+                               RelativePath="..\..\sci_gateway\c\sci_comp.c"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\sci_gateway\c\sci_debug.c"
                                >
                        </File>
index 6ee83fb..8c69bfa 100644 (file)
@@ -36,7 +36,7 @@ int getRecursionGatewayToCall(void)
                {
                case RECURSION_CALL_COMP:
                        /* see comp (sci_comp.f) */
-                       gw = GW_FUNCTIONS_ID; /* gw_functions */
+                       gw = GW_CORE_ID; /* gw_functions */
                        break;
                case RECURSION_CALL_EXEC1:
                        /* see exec (intexec.f) */
@@ -48,7 +48,7 @@ int getRecursionGatewayToCall(void)
                        break;
                case RECURSION_CALL_GETF:
                        /* see getf (intgetf.f) */
-                       gw = GW_IO_ID; /* gw_io */
+                       gw = GW_FUNCTIONS_ID; /* gw_functions */
                        break;
                case RECURSION_CALL_SAVE:
                        /* see save (newsave.f) */
index 8121b15..a64a7c9 100644 (file)
@@ -496,7 +496,7 @@ c     . add an third argument to deff, to notify that it is called by function
          lhs=1
 c         *call* deff
          fun=31
-         fin=3
+         fin=2
          go to 999
       endif
 
index f60849a..74ee043 100644 (file)
@@ -149,6 +149,7 @@ cd .."/></Configuration></Configurations>
                <File RelativePath="..\..\sci_gateway\fortran\sci_argn.f"/>
                <File RelativePath="..\..\sci_gateway\fortran\sci_clear.f"/>
                <File RelativePath="..\..\sci_gateway\fortran\sci_clearglobal.f"/>
+               <File RelativePath="..\..\sci_gateway\fortran\sci_comp.f"/>
                <File RelativePath="..\..\sci_gateway\fortran\sci_debug.f"/>
                <File RelativePath="..\..\sci_gateway\fortran\sci_delbpt.f"/>
                <File RelativePath="..\..\sci_gateway\fortran\sci_dispbpt.f"/>
index 254cfeb..9a1587f 100644 (file)
                                >
                        </File>
                        <File
+                               RelativePath="..\..\sci_gateway\fortran\sci_comp.c"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\sci_gateway\fortran\sci_debug.c"
                                >
                        </File>
                                >
                        </File>
                        <File
+                               RelativePath="..\..\sci_gateway\fortran\sci_comp.f"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\sci_gateway\fortran\sci_debug.f"
                                >
                        </File>
index 34567ca..39f4306 100644 (file)
@@ -9,12 +9,13 @@ FUNCTIONS__FORTRAN_SOURCES =
 
 GATEWAY_C_SOURCES = sci_gateway/c/gw_functions.c \
 sci_gateway/c/sci_lib.c \
-sci_gateway/c/sci_comp.c \
 sci_gateway/c/sci_deff.c \
+sci_gateway/c/sci_getf.c
+
 
 GATEWAY_FORTRAN_SOURCES =  sci_gateway/fortran/intlib.f \
-sci_gateway/fortran/sci_comp.f \
-sci_gateway/fortran/intdeff.f
+sci_gateway/fortran/intdeff.f \
+sci_gateway/fortran/intgetf.f \
 
 
 libscifunctions_la_CFLAGS=             -I$(srcdir)/includes/ \
index a2f450d..cf6fc2a 100644 (file)
@@ -20,8 +20,8 @@
 int gw_functions(void);
 /*--------------------------------------------------------------------------*/
 int C2F(sci_lib)(char *fname,unsigned long fname_len);
-int C2F(sci_comp)(char *fname,unsigned long fname_len);
 int C2F(sci_deff)(char *fname,unsigned long fname_len);
+int C2F(sci_getf)(char *fname,unsigned long fname_len);
 /*--------------------------------------------------------------------------*/
 #endif /* __GW_FUNCTIONS_H__ */
 /*--------------------------------------------------------------------------*/
index 1d3c8d3..d187a84 100644 (file)
 static gw_generic_table Tab[]=
 {
        {C2F(sci_lib),"lib"},
-       {C2F(sci_comp),"comp"},
-       {C2F(sci_deff),"deff"}
+       {C2F(sci_deff),"deff"},
+       {C2F(sci_getf),"getf"}
 };
 /*--------------------------------------------------------------------------*/
 int gw_functions(void)
 {  
        Rhs = Max(0, Rhs);
 
-       /**
-       * recursion from sci_deff
-       */
        if ( isRecursionCallToFunction() )
        {
-               if (getRecursionGatewayToCall() == GW_FUNCTIONS_ID )
+               switch ( getRecursionFunctionToCall() )
                {
-                       /* We call "comp" */
-                       Fin = 2;
-               }
-               else
-               {
-                       switch ( getRecursionFunctionToCall() )
-                       {
-                               case RECURSION_CALL_DEFF:
-                                       #define deff_fname "deff"
-                                       C2F(sci_deff)(deff_fname,strlen(deff_fname));
+                       case RECURSION_CALL_DEFF:
+                               #define deff_fname "deff"
+                               C2F(sci_deff)(deff_fname,strlen(deff_fname));
+                                       return 0;
+
+                               case RECURSION_CALL_GETF:
+                                       #define getf_fname "getf"
+                                       C2F(sci_getf)(deff_fname,strlen(getf_fname));
                                        return 0;
+
                                default:
                                        return 0;
                        }
                }
-       }
+       
        
        callFunctionFromGateway(Tab);
        return 0;
@@ -10,7 +10,9 @@
  *
  */
 
-#include "gw_io.h"
+#include "gw_functions.h"
+/*--------------------------------------------------------------------------*/
+extern int C2F(intgetf)(); /* fortran */
 /*--------------------------------------------------------------------------*/
 int C2F(sci_getf)(char *fname,unsigned long fname_len)
 {
index b0b0774..f48d236 100644 (file)
@@ -69,8 +69,8 @@ c
          endif
          lhs=1
 c     *call* comp
-         fun=31
-         fin=2
+         fun=13
+         fin=06
       else
          call stackp(idstk(1,top),0)
          top=top-1
index c149114..ff2465d 100644 (file)
@@ -31,6 +31,6 @@
 <!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">
 <GATEWAY name="functions">
 <PRIMITIVE gatewayId="31" primitiveId="1" primitiveName="lib" />
-<PRIMITIVE gatewayId="31" primitiveId="2" primitiveName="comp" />
-<PRIMITIVE gatewayId="31" primitiveId="3" primitiveName="deff" />
+<PRIMITIVE gatewayId="31" primitiveId="2" primitiveName="deff" />
+<PRIMITIVE gatewayId="31" primitiveId="3" primitiveName="getf" />
 </GATEWAY>
index 3509097..a7e5797 100644 (file)
                                >
                        </File>
                        <File
-                               RelativePath="..\..\sci_gateway\c\sci_comp.c"
+                               RelativePath="..\..\sci_gateway\c\sci_deff.c"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\sci_gateway\c\sci_deff.c"
+                               RelativePath="..\..\sci_gateway\c\sci_getf.c"
                                >
                        </File>
                        <File
index 544f740..5d248dc 100644 (file)
@@ -6,7 +6,7 @@
        <Configurations>
                <Configuration Name="Debug|Win32" OutputDirectory="$(InputDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
                                <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" OptimizeForProcessor="procOptimizePentiumProThruIII" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebugDLL"/>
-                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\functions_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="functions_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\functions_f.lib" LinkDLL="true" AdditionalDependencies="Libscilab.lib string.lib output_stream.lib fileio.lib"/>
+                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\functions_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="functions_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\functions_f.lib" LinkDLL="true" AdditionalDependencies="Libscilab.lib string.lib output_stream.lib fileio.lib io_f.lib"/>
                                <Tool Name="VFResourceCompilerTool"/>
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFCustomBuildTool"/>
@@ -20,11 +20,12 @@ copy functions_f_header.def+functions_f.vcdef functions_f.def &gt;nul" Descripti
                                <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL
 lib /DEF:&quot;$(InputDir)output_stream_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)output_stream.lib&quot; 1&gt;NUL 2&gt;NUL
 lib /DEF:&quot;$(InputDir)fileio_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)fileio.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)string_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)string.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
+lib /DEF:&quot;$(InputDir)string_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)string.lib&quot; 1&gt;NUL 2&gt;NUL
+lib /DEF:&quot;$(InputDir)io_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)io_f.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
                                <Tool Name="VFPostBuildEventTool"/></Configuration>
                <Configuration Name="Release|Win32" OutputDirectory="$(InputDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
                                <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" OptimizeForProcessor="procOptimizePentiumProThruIII" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL"/>
-                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\functions_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="functions_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\functions_f.lib" LinkDLL="true" AdditionalDependencies="Libscilab.lib string.lib output_stream.lib fileio.lib"/>
+                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\functions_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="functions_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\functions_f.lib" LinkDLL="true" AdditionalDependencies="Libscilab.lib string.lib output_stream.lib fileio.lib io_f.lib"/>
                                <Tool Name="VFResourceCompilerTool"/>
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFCustomBuildTool"/>
@@ -38,11 +39,12 @@ copy functions_f_header.def+functions_f.vcdef functions_f.def &gt;nul" Descripti
                                <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL
 lib /DEF:&quot;$(InputDir)output_stream_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)output_stream.lib&quot; 1&gt;NUL 2&gt;NUL
 lib /DEF:&quot;$(InputDir)fileio_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)fileio.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)string_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)string.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
+lib /DEF:&quot;$(InputDir)string_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)string.lib&quot; 1&gt;NUL 2&gt;NUL
+lib /DEF:&quot;$(InputDir)io_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)io_f.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
                                <Tool Name="VFPostBuildEventTool"/></Configuration>
                <Configuration Name="Debug|x64" OutputDirectory="$(InputDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
                                <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebugDLL"/>
-                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\functions_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="functions_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\functions_f.lib" LinkDLL="true" AdditionalDependencies="Libscilab.lib string.lib output_stream.lib fileio.lib"/>
+                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\functions_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="functions_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\functions_f.lib" LinkDLL="true" AdditionalDependencies="Libscilab.lib string.lib output_stream.lib fileio.lib io_f.lib"/>
                                <Tool Name="VFResourceCompilerTool"/>
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFCustomBuildTool"/>
@@ -56,11 +58,12 @@ copy functions_f_header.def+functions_f.vcdef functions_f.def &gt;nul" Descripti
                                <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL
 lib /DEF:&quot;$(InputDir)output_stream_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)output_stream.lib&quot; 1&gt;NUL 2&gt;NUL
 lib /DEF:&quot;$(InputDir)fileio_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)fileio.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)string_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)string.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
+lib /DEF:&quot;$(InputDir)string_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)string.lib&quot; 1&gt;NUL 2&gt;NUL
+lib /DEF:&quot;$(InputDir)io_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)io_f.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
                                <Tool Name="VFPostBuildEventTool"/></Configuration>
                <Configuration Name="Release|x64" OutputDirectory="$(InputDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
                                <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL"/>
-                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\functions_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="functions_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\functions_f.lib" LinkDLL="true" AdditionalDependencies="Libscilab.lib string.lib output_stream.lib fileio.lib"/>
+                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\functions_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="functions_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\functions_f.lib" LinkDLL="true" AdditionalDependencies="Libscilab.lib string.lib output_stream.lib fileio.lib io_f.lib"/>
                                <Tool Name="VFResourceCompilerTool"/>
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFCustomBuildTool"/>
@@ -74,15 +77,16 @@ copy functions_f_header.def+functions_f.vcdef functions_f.def &gt;nul" Descripti
                                <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL
 lib /DEF:&quot;$(InputDir)output_stream_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)output_stream.lib&quot; 1&gt;NUL 2&gt;NUL
 lib /DEF:&quot;$(InputDir)fileio_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)fileio.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)string_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)string.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
+lib /DEF:&quot;$(InputDir)string_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)string.lib&quot; 1&gt;NUL 2&gt;NUL
+lib /DEF:&quot;$(InputDir)io_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)io_f.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
                                <Tool Name="VFPostBuildEventTool"/></Configuration></Configurations>
        <Files>
                <Filter Name="Header Files" Filter="fi;fd"/>
                <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"/>
                <Filter Name="Source Files" Filter="f90;for;f;fpp;ftn;def;odl;idl">
                <File RelativePath="..\..\sci_gateway\fortran\intdeff.f"/>
-               <File RelativePath="..\..\sci_gateway\fortran\intlib.f"/>
-               <File RelativePath="..\..\sci_gateway\fortran\sci_comp.f"/></Filter>
+               <File RelativePath="..\..\sci_gateway\fortran\intgetf.f"/>
+               <File RelativePath="..\..\sci_gateway\fortran\intlib.f"/></Filter>
                <File RelativePath="..\..\..\..\bin\blasplus.lib"/>
                <File RelativePath="..\..\sci_gateway\functions_gateway.xml"/>
                <File RelativePath="..\..\Makefile.am"/></Files>
index 4cd66fb..1e8d601 100644 (file)
@@ -36,7 +36,7 @@
                        <Tool
                                Name="VCPreBuildEventTool"
                                Description="Build Dependencies"
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)output_stream_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)output_stream.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)fileio_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)fileio.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)string_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)string.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;&#x0D;&#x0A;"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)output_stream_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)output_stream.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)fileio_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)fileio.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)string_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)string.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)io_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)io_f.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;&#x0D;&#x0A;"
                                ExecutionBucket="2"
                        />
                        <Tool
@@ -85,7 +85,7 @@
                                Name="VCLinkerTool"
                                ExecutionBucket="10"
                                AdditionalOptions="/fixed:no"
-                               AdditionalDependencies="Libscilab.lib string.lib output_stream.lib fileio.lib"
+                               AdditionalDependencies="Libscilab.lib string.lib output_stream.lib fileio.lib io_f.lib"
                                OutputFile="$(SolutionDir)bin\functions_f.dll"
                                LinkIncremental="2"
                                ModuleDefinitionFile="functions_f.def"
                        <Tool
                                Name="VCPreBuildEventTool"
                                Description="Build Dependencies"
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)output_stream_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)output_stream.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)fileio_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)fileio.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)string_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)string.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;&#x0D;&#x0A;"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)output_stream_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)output_stream.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)fileio_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)fileio.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)string_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)string.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)io_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)io_f.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCCustomBuildTool"
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalOptions="/fixed:no"
-                               AdditionalDependencies="Libscilab.lib string.lib output_stream.lib fileio.lib"
+                               AdditionalDependencies="Libscilab.lib string.lib output_stream.lib fileio.lib io_f.lib"
                                OutputFile="$(SolutionDir)bin\functions_f.dll"
                                LinkIncremental="2"
                                ModuleDefinitionFile="functions_f.def"
                        <Tool
                                Name="VCPreBuildEventTool"
                                Description="Build Dependencies"
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)output_stream_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)output_stream.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)fileio_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)fileio.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)string_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)string.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;&#x0D;&#x0A;"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)output_stream_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)output_stream.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)fileio_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)fileio.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)string_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)string.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)io_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)io_f.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCCustomBuildTool"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="Libscilab.lib string.lib output_stream.lib fileio.lib"
+                               AdditionalDependencies="Libscilab.lib string.lib output_stream.lib fileio.lib io_f.lib"
                                OutputFile="$(SolutionDir)bin\functions_f.dll"
                                LinkIncremental="1"
                                ModuleDefinitionFile="functions_f.def"
                        <Tool
                                Name="VCPreBuildEventTool"
                                Description="Build Dependencies"
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)output_stream_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)output_stream.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)fileio_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)fileio.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)string_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)string.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;&#x0D;&#x0A;"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)output_stream_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)output_stream.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)fileio_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)fileio.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)string_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)string.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)io_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)io_f.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCCustomBuildTool"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="Libscilab.lib string.lib output_stream.lib fileio.lib"
+                               AdditionalDependencies="Libscilab.lib string.lib output_stream.lib fileio.lib io_f.lib"
                                OutputFile="$(SolutionDir)bin\functions_f.dll"
                                LinkIncremental="1"
                                ModuleDefinitionFile="functions_f.def"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\sci_gateway\fortran\intlib.c"
+                               RelativePath="..\..\sci_gateway\fortran\intgetf.c"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\sci_gateway\fortran\sci_comp.c"
+                               RelativePath="..\..\sci_gateway\fortran\intlib.c"
                                >
                        </File>
                </Filter>
                                >
                        </File>
                        <File
-                               RelativePath="..\..\sci_gateway\fortran\intlib.f"
+                               RelativePath="..\..\sci_gateway\fortran\intgetf.f"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\sci_gateway\fortran\sci_comp.f"
+                               RelativePath="..\..\sci_gateway\fortran\intlib.f"
                                >
                        </File>
                </Filter>
diff --git a/scilab/modules/functions/src/fortran/io_f_Import.def b/scilab/modules/functions/src/fortran/io_f_Import.def
new file mode 100644 (file)
index 0000000..1a8c4ae
--- /dev/null
@@ -0,0 +1,6 @@
+       LIBRARY    io_f.dll
+
+
+EXPORTS
+; io_f
+v2cunit_
\ No newline at end of file
index c2637fc..a395275 100644 (file)
@@ -35,7 +35,6 @@ sci_gateway/c/sci_getpid.c \
 sci_gateway/c/sci_write4b.c \
 sci_gateway/c/sci_load.c \
 sci_gateway/c/sci_unix.c \
-sci_gateway/c/sci_getf.c \
 sci_gateway/c/sci_save.c
 
 
@@ -43,7 +42,6 @@ GATEWAY_CPP_SOURCES = sci_gateway/cpp/sci_export_to_hdf5.cpp
 
 GATEWAY_FORTRAN_SOURCES =  sci_gateway/fortran/intwrite4b.f \
 sci_gateway/fortran/intexec.f \
-sci_gateway/fortran/intgetf.f \
 sci_gateway/fortran/intrat.f \
 sci_gateway/fortran/intwritb.f \
 sci_gateway/fortran/intwrite.f \
index cc2c2b9..cb1c33d 100644 (file)
@@ -18,7 +18,6 @@
 int gw_io(void);
 /*--------------------------------------------------------------------------*/
 int C2F(sci_read)(char *fname,unsigned long fname_len);
-int C2F(sci_getf)(char *fname,unsigned long fname_len);
 int C2F(sci_exec)(char *fname,unsigned long fname_len);
 int C2F(sci_diary)(char *fname,unsigned long fname_len);
 int C2F(sci_oldsave)(char *fname,unsigned long fname_len);
@@ -43,7 +42,6 @@ int C2F(intexecstr)(char *fname,unsigned long fname_len);
 int C2F(intgetenv)(char *fname,unsigned long fname_len);
 int C2F(intload) (int *id1, int *k1); /* FORTRAN subroutine */
 int C2F(intexec) (char *fname,unsigned long fname_len);
-int C2F(intgetf)(void);
 int C2F(intsave)(void);
 int C2F(intdiary)(void);
 int C2F(intfile)(void);
index 9e06b26..e9457f1 100644 (file)
@@ -19,7 +19,7 @@ static gw_generic_table Tab[]=
 {
 {C2F(sci_setenv),"setenv"},
 {C2F(sci_read),"read"},
-{C2F(sci_getf),"getf"},
+{C2F(sci_getenv),"getenv"},
 {C2F(sci_exec),"exec"},
 {C2F(sci_getio),"getio"},
 {C2F(sci_diary),"diary"},
@@ -34,7 +34,6 @@ static gw_generic_table Tab[]=
 {C2F(sci_writb),"writb"},
 {C2F(sci_execstr),"execstr"},
 {C2F(sci_getpid),"getpid"},
-{C2F(sci_getenv),"getenv"},
 {C2F(sci_read4b),"read4b"},
 {C2F(sci_write4b),"write4b"},
 {C2F(sci_save),"save"},
@@ -60,12 +59,6 @@ int gw_io(void)
                                        return 0;
                                }
                                break;
-                       case RECURSION_CALL_GETF:
-                               {
-                                       C2F(intgetf)(); 
-                                       return 0;
-                               }
-                               break;
                        case RECURSION_CALL_SAVE:
                                {
                                        C2F(intsave)(); 
index afce936..1ce4ac6 100644 (file)
@@ -37,7 +37,7 @@
 
 <PRIMITIVE gatewayId="5" primitiveId="1" primitiveName="setenv" />
 <PRIMITIVE gatewayId="5" primitiveId="2" primitiveName="read" />
-<PRIMITIVE gatewayId="5" primitiveId="3" primitiveName="getf" />
+<PRIMITIVE gatewayId="5" primitiveId="3" primitiveName="getenv" />
 <PRIMITIVE gatewayId="5" primitiveId="4" primitiveName="exec" />
 <PRIMITIVE gatewayId="5" primitiveId="5" primitiveName="getio" />
 <PRIMITIVE gatewayId="5" primitiveId="6" primitiveName="diary" />
 <PRIMITIVE gatewayId="5" primitiveId="15" primitiveName="writb" />
 <PRIMITIVE gatewayId="5" primitiveId="16" primitiveName="execstr" />
 <PRIMITIVE gatewayId="5" primitiveId="17" primitiveName="getpid" />
-<PRIMITIVE gatewayId="5" primitiveId="18" primitiveName="getenv" />
-<PRIMITIVE gatewayId="5" primitiveId="19" primitiveName="read4b" />
-<PRIMITIVE gatewayId="5" primitiveId="20" primitiveName="write4b" />
-<PRIMITIVE gatewayId="5" primitiveId="21" primitiveName="save" />
-<PRIMITIVE gatewayId="5" primitiveId="22" primitiveName="load" />
+<PRIMITIVE gatewayId="5" primitiveId="18" primitiveName="read4b" />
+<PRIMITIVE gatewayId="5" primitiveId="19" primitiveName="write4b" />
+<PRIMITIVE gatewayId="5" primitiveId="20" primitiveName="save" />
+<PRIMITIVE gatewayId="5" primitiveId="21" primitiveName="load" />
 
 </GATEWAY>
\ No newline at end of file
index f14a503..5cf1c2e 100644 (file)
                                >
                        </File>
                        <File
-                               RelativePath="..\..\sci_gateway\c\sci_getf.c"
-                               >
-                       </File>
-                       <File
                                RelativePath="..\..\sci_gateway\c\sci_getio.c"
                                >
                        </File>
index 6e786e6..98d2f8f 100644 (file)
@@ -7,7 +7,6 @@ EXPORTS
 ; --------------------------------------- 
 intload_
 intsave_
-intgetf_
 intexecstr_
 intexec_
 intfile_
index c4bb0a5..b4a6018 100644 (file)
@@ -79,7 +79,6 @@ lib /DEF:&quot;$(InputDir)output_stream_f_Import.def&quot; /SUBSYSTEM:WINDOWS /M
                <File RelativePath="..\..\sci_gateway\fortran\intexec.f"/>
                <File RelativePath="..\..\sci_gateway\fortran\intexecstr.f"/>
                <File RelativePath="..\..\sci_gateway\fortran\intfile.f"/>
-               <File RelativePath="..\..\sci_gateway\fortran\intgetf.f"/>
                <File RelativePath="..\..\sci_gateway\fortran\intmgetl.f"/>
                <File RelativePath="..\..\sci_gateway\fortran\intrat.f"/>
                <File RelativePath="..\..\sci_gateway\fortran\intread.f"/>
index 06ba955..c8b4ace 100644 (file)
                                >
                        </File>
                        <File
-                               RelativePath="..\..\sci_gateway\fortran\intgetf.c"
-                               >
-                       </File>
-                       <File
                                RelativePath="..\..\sci_gateway\fortran\intmgetl.c"
                                >
                        </File>
                                >
                        </File>
                        <File
-                               RelativePath="..\..\sci_gateway\fortran\intgetf.f"
-                               >
-                       </File>
-                       <File
                                RelativePath="..\..\sci_gateway\fortran\intmgetl.f"
                                >
                        </File>