* 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.
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 \
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/ \
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__ */
/*--------------------------------------------------------------------------*/
} 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
#include "gw_core.h"
#include "stack-c.h"
#include "callFunctionFromGateway.h"
+#include "recursionFunction.h"
+#include "gw_functions.h"
/*--------------------------------------------------------------------------*/
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"},
{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;
}
* 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 */
<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" />
<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>
<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>
{
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) */
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) */
lhs=1
c *call* deff
fun=31
- fin=3
+ fin=2
go to 999
endif
<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"/>
>
</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>
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/ \
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__ */
/*--------------------------------------------------------------------------*/
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;
*
*/
-#include "gw_io.h"
+#include "gw_functions.h"
+/*--------------------------------------------------------------------------*/
+extern int C2F(intgetf)(); /* fortran */
/*--------------------------------------------------------------------------*/
int C2F(sci_getf)(char *fname,unsigned long fname_len)
{
endif
lhs=1
c *call* comp
- fun=31
- fin=2
+ fun=13
+ fin=06
else
call stackp(idstk(1,top),0)
top=top-1
<!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>
>
</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
getscalar_
getfun_
cremat_
+eptover_
; elementary_functions
isort_
iset_
<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"/>
<Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:"$(InputDir)LibScilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:"$(InputDir)LibScilab.lib" 1>NUL 2>NUL
lib /DEF:"$(InputDir)output_stream_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:"$(InputDir)output_stream.lib" 1>NUL 2>NUL
lib /DEF:"$(InputDir)fileio_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:"$(InputDir)fileio.lib" 1>NUL 2>NUL
-lib /DEF:"$(InputDir)string_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:"$(InputDir)string.lib" 1>NUL 2>NUL" Description="Build Dependencies"/>
+lib /DEF:"$(InputDir)string_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:"$(InputDir)string.lib" 1>NUL 2>NUL
+lib /DEF:"$(InputDir)io_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:"$(InputDir)io_f.lib" 1>NUL 2>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"/>
<Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:"$(InputDir)LibScilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:"$(InputDir)LibScilab.lib" 1>NUL 2>NUL
lib /DEF:"$(InputDir)output_stream_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:"$(InputDir)output_stream.lib" 1>NUL 2>NUL
lib /DEF:"$(InputDir)fileio_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:"$(InputDir)fileio.lib" 1>NUL 2>NUL
-lib /DEF:"$(InputDir)string_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:"$(InputDir)string.lib" 1>NUL 2>NUL" Description="Build Dependencies"/>
+lib /DEF:"$(InputDir)string_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:"$(InputDir)string.lib" 1>NUL 2>NUL
+lib /DEF:"$(InputDir)io_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:"$(InputDir)io_f.lib" 1>NUL 2>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"/>
<Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:"$(InputDir)LibScilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:"$(InputDir)LibScilab.lib" 1>NUL 2>NUL
lib /DEF:"$(InputDir)output_stream_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:"$(InputDir)output_stream.lib" 1>NUL 2>NUL
lib /DEF:"$(InputDir)fileio_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:"$(InputDir)fileio.lib" 1>NUL 2>NUL
-lib /DEF:"$(InputDir)string_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:"$(InputDir)string.lib" 1>NUL 2>NUL" Description="Build Dependencies"/>
+lib /DEF:"$(InputDir)string_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:"$(InputDir)string.lib" 1>NUL 2>NUL
+lib /DEF:"$(InputDir)io_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:"$(InputDir)io_f.lib" 1>NUL 2>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"/>
<Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:"$(InputDir)LibScilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:"$(InputDir)LibScilab.lib" 1>NUL 2>NUL
lib /DEF:"$(InputDir)output_stream_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:"$(InputDir)output_stream.lib" 1>NUL 2>NUL
lib /DEF:"$(InputDir)fileio_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:"$(InputDir)fileio.lib" 1>NUL 2>NUL
-lib /DEF:"$(InputDir)string_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:"$(InputDir)string.lib" 1>NUL 2>NUL" Description="Build Dependencies"/>
+lib /DEF:"$(InputDir)string_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:"$(InputDir)string.lib" 1>NUL 2>NUL
+lib /DEF:"$(InputDir)io_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:"$(InputDir)io_f.lib" 1>NUL 2>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>
<Tool
Name="VCPreBuildEventTool"
Description="Build Dependencies"
- CommandLine="lib /DEF:"$(InputDir)LibScilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:"$(InputDir)LibScilab.lib" 1>NUL 2>NUL
lib /DEF:"$(InputDir)output_stream_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:"$(InputDir)output_stream.lib" 1>NUL 2>NUL
lib /DEF:"$(InputDir)fileio_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:"$(InputDir)fileio.lib" 1>NUL 2>NUL
lib /DEF:"$(InputDir)string_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:"$(InputDir)string.lib" 1>NUL 2>NUL

"
+ CommandLine="lib /DEF:"$(InputDir)LibScilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:"$(InputDir)LibScilab.lib" 1>NUL 2>NUL
lib /DEF:"$(InputDir)output_stream_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:"$(InputDir)output_stream.lib" 1>NUL 2>NUL
lib /DEF:"$(InputDir)fileio_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:"$(InputDir)fileio.lib" 1>NUL 2>NUL
lib /DEF:"$(InputDir)string_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:"$(InputDir)string.lib" 1>NUL 2>NUL
lib /DEF:"$(InputDir)io_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:"$(InputDir)io_f.lib" 1>NUL 2>NUL

"
ExecutionBucket="2"
/>
<Tool
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:"$(InputDir)LibScilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:"$(InputDir)LibScilab.lib" 1>NUL 2>NUL
lib /DEF:"$(InputDir)output_stream_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:"$(InputDir)output_stream.lib" 1>NUL 2>NUL
lib /DEF:"$(InputDir)fileio_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:"$(InputDir)fileio.lib" 1>NUL 2>NUL
lib /DEF:"$(InputDir)string_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:"$(InputDir)string.lib" 1>NUL 2>NUL

"
+ CommandLine="lib /DEF:"$(InputDir)LibScilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:"$(InputDir)LibScilab.lib" 1>NUL 2>NUL
lib /DEF:"$(InputDir)output_stream_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:"$(InputDir)output_stream.lib" 1>NUL 2>NUL
lib /DEF:"$(InputDir)fileio_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:"$(InputDir)fileio.lib" 1>NUL 2>NUL
lib /DEF:"$(InputDir)string_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:"$(InputDir)string.lib" 1>NUL 2>NUL
lib /DEF:"$(InputDir)io_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:"$(InputDir)io_f.lib" 1>NUL 2>NUL
"
/>
<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:"$(InputDir)LibScilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:"$(InputDir)LibScilab.lib" 1>NUL 2>NUL
lib /DEF:"$(InputDir)output_stream_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:"$(InputDir)output_stream.lib" 1>NUL 2>NUL
lib /DEF:"$(InputDir)fileio_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:"$(InputDir)fileio.lib" 1>NUL 2>NUL
lib /DEF:"$(InputDir)string_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:"$(InputDir)string.lib" 1>NUL 2>NUL

"
+ CommandLine="lib /DEF:"$(InputDir)LibScilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:"$(InputDir)LibScilab.lib" 1>NUL 2>NUL
lib /DEF:"$(InputDir)output_stream_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:"$(InputDir)output_stream.lib" 1>NUL 2>NUL
lib /DEF:"$(InputDir)fileio_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:"$(InputDir)fileio.lib" 1>NUL 2>NUL
lib /DEF:"$(InputDir)string_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:"$(InputDir)string.lib" 1>NUL 2>NUL
lib /DEF:"$(InputDir)io_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:"$(InputDir)io_f.lib" 1>NUL 2>NUL

"
/>
<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:"$(InputDir)LibScilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:"$(InputDir)LibScilab.lib" 1>NUL 2>NUL
lib /DEF:"$(InputDir)output_stream_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:"$(InputDir)output_stream.lib" 1>NUL 2>NUL
lib /DEF:"$(InputDir)fileio_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:"$(InputDir)fileio.lib" 1>NUL 2>NUL
lib /DEF:"$(InputDir)string_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:"$(InputDir)string.lib" 1>NUL 2>NUL

"
+ CommandLine="lib /DEF:"$(InputDir)LibScilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:"$(InputDir)LibScilab.lib" 1>NUL 2>NUL
lib /DEF:"$(InputDir)output_stream_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:"$(InputDir)output_stream.lib" 1>NUL 2>NUL
lib /DEF:"$(InputDir)fileio_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:"$(InputDir)fileio.lib" 1>NUL 2>NUL
lib /DEF:"$(InputDir)string_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:"$(InputDir)string.lib" 1>NUL 2>NUL
lib /DEF:"$(InputDir)io_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:"$(InputDir)io_f.lib" 1>NUL 2>NUL
"
/>
<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>
--- /dev/null
+ LIBRARY io_f.dll
+
+
+EXPORTS
+; io_f
+v2cunit_
\ No newline at end of file
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
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 \
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);
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);
{
{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"},
{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"},
return 0;
}
break;
- case RECURSION_CALL_GETF:
- {
- C2F(intgetf)();
- return 0;
- }
- break;
case RECURSION_CALL_SAVE:
{
C2F(intsave)();
<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
>
</File>
<File
- RelativePath="..\..\sci_gateway\c\sci_getf.c"
- >
- </File>
- <File
RelativePath="..\..\sci_gateway\c\sci_getio.c"
>
</File>
; ---------------------------------------
intload_
intsave_
-intgetf_
intexecstr_
intexec_
intfile_
<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"/>
>
</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>
projects / scilab.git / commitdiff