* Bug #4177 fixed - Move 'find' function 24/13424/5
Paul Bignier [Fri, 10 Jan 2014 09:26:32 +0000 (10:26 +0100)]
Function 'find' moved from "boolean" module to "elementary_functions".

Change-Id: I540a45729ba08b78444811ec9a5feb13f91cc069

32 files changed:
scilab/CHANGES_5.5.X
scilab/modules/boolean/Makefile.am
scilab/modules/boolean/Makefile.in
scilab/modules/boolean/includes/gw_boolean.h
scilab/modules/boolean/sci_gateway/boolean_gateway.xml
scilab/modules/boolean/sci_gateway/c/gw_boolean.c
scilab/modules/boolean/src/c/boolean.vcxproj
scilab/modules/boolean/src/c/boolean.vcxproj.filters
scilab/modules/boolean/src/fortran/boolean_f.vfproj
scilab/modules/elementary_functions/Makefile.am
scilab/modules/elementary_functions/Makefile.in
scilab/modules/elementary_functions/help/en_US/searchandsort/find.xml [moved from scilab/modules/boolean/help/en_US/find.xml with 100% similarity]
scilab/modules/elementary_functions/help/fr_FR/searchandsort/find.xml [moved from scilab/modules/boolean/help/fr_FR/find.xml with 100% similarity]
scilab/modules/elementary_functions/help/ja_JP/searchandsort/find.xml [moved from scilab/modules/boolean/help/ja_JP/find.xml with 100% similarity]
scilab/modules/elementary_functions/help/pt_BR/searchandsort/find.xml [moved from scilab/modules/boolean/help/pt_BR/find.xml with 100% similarity]
scilab/modules/elementary_functions/includes/gw_elementary_functions.h
scilab/modules/elementary_functions/sci_gateway/c/gw_elementary_functions.c
scilab/modules/elementary_functions/sci_gateway/c/sci_find.c [moved from scilab/modules/boolean/sci_gateway/c/sci_find.c with 95% similarity]
scilab/modules/elementary_functions/sci_gateway/elementary_functions_gateway.xml
scilab/modules/elementary_functions/sci_gateway/fortran/sci_f_find.f [moved from scilab/modules/boolean/sci_gateway/fortran/sci_f_find.f with 100% similarity]
scilab/modules/elementary_functions/src/c/elementary_functions.vcxproj
scilab/modules/elementary_functions/src/c/elementary_functions.vcxproj.filters
scilab/modules/elementary_functions/src/c/elementary_functions_f_Import.def
scilab/modules/elementary_functions/src/fortran/Core_f_Import.def
scilab/modules/elementary_functions/src/fortran/elementary_functions_f.vfproj
scilab/modules/elementary_functions/src/fortran/find.f [moved from scilab/modules/boolean/src/fortran/find.f with 100% similarity]
scilab/modules/elementary_functions/tests/nonreg_tests/bug_476.dia.ref [moved from scilab/modules/boolean/tests/nonreg_tests/bug_476.dia.ref with 100% similarity]
scilab/modules/elementary_functions/tests/nonreg_tests/bug_476.tst [moved from scilab/modules/boolean/tests/nonreg_tests/bug_476.tst with 100% similarity]
scilab/modules/elementary_functions/tests/nonreg_tests/bug_8412.dia.ref [moved from scilab/modules/boolean/tests/nonreg_tests/bug_8412.dia.ref with 100% similarity]
scilab/modules/elementary_functions/tests/nonreg_tests/bug_8412.tst [moved from scilab/modules/boolean/tests/nonreg_tests/bug_8412.tst with 100% similarity]
scilab/modules/elementary_functions/tests/unit_tests/find.dia.ref [moved from scilab/modules/boolean/tests/unit_tests/find.dia.ref with 100% similarity]
scilab/modules/elementary_functions/tests/unit_tests/find.tst [moved from scilab/modules/boolean/tests/unit_tests/find.tst with 100% similarity]

index 50c2d9a..b39cf47 100644 (file)
@@ -69,6 +69,8 @@ Scilab Bug Fixes
 
 * Bug #2802 fixed - convstr did not convert non ascii chars.
 
+* Bug #4177 fixed - find function moved to the "elementary_functions" module.
+
 * Bug #4401 fixed - isnum did not recognize all constants or some complex numbers.
 
 * Bug #4490 fixed - Input argument of sinc function must be in rad: help page updated.
index 86b725a..2c57b47 100644 (file)
@@ -8,17 +8,14 @@ BOOLEAN_C_SOURCES = src/c/matboolean.c \
 src/c/vect_or.c \
 src/c/vect_and.c
 
-BOOLEAN_FORTRAN_SOURCES = src/fortran/logic.f \
-src/fortran/find.f
+BOOLEAN_FORTRAN_SOURCES = src/fortran/logic.f
 
 GATEWAY_C_SOURCES = sci_gateway/c/sci_and.c \
 sci_gateway/c/sci_or.c \
-sci_gateway/c/sci_find.c \
 sci_gateway/c/sci_bool2s.c \
 sci_gateway/c/gw_boolean.c
 
-GATEWAY_FORTRAN_SOURCES =  sci_gateway/fortran/sci_f_bool2s.f \
-sci_gateway/fortran/sci_f_find.f
+GATEWAY_FORTRAN_SOURCES =  sci_gateway/fortran/sci_f_bool2s.f
 
 libsciboolean_la_CPPFLAGS= -I$(srcdir)/includes/ \
                                -I$(srcdir)/src/c/ \
@@ -50,7 +47,7 @@ modulename=boolean
 
 #### boolean : Conf files ####
 libsciboolean_la_rootdir = $(mydatadir)
-libsciboolean_la_root_DATA =  license.txt 
+libsciboolean_la_root_DATA =  license.txt
 
 
 #### boolean : init scripts ####
index a4f0b48..688eefe 100644 (file)
@@ -166,7 +166,7 @@ am__dirstamp = $(am__leading_dot)dirstamp
 am__objects_1 = src/c/libsciboolean_algo_la-matboolean.lo \
        src/c/libsciboolean_algo_la-vect_or.lo \
        src/c/libsciboolean_algo_la-vect_and.lo
-am__objects_2 = src/fortran/logic.lo src/fortran/find.lo
+am__objects_2 = src/fortran/logic.lo
 am_libsciboolean_algo_la_OBJECTS = $(am__objects_1) $(am__objects_2)
 libsciboolean_algo_la_OBJECTS = $(am_libsciboolean_algo_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
@@ -178,11 +178,9 @@ am__v_lt_1 =
 libsciboolean_la_DEPENDENCIES = libsciboolean-algo.la
 am__objects_3 = sci_gateway/c/libsciboolean_la-sci_and.lo \
        sci_gateway/c/libsciboolean_la-sci_or.lo \
-       sci_gateway/c/libsciboolean_la-sci_find.lo \
        sci_gateway/c/libsciboolean_la-sci_bool2s.lo \
        sci_gateway/c/libsciboolean_la-gw_boolean.lo
-am__objects_4 = sci_gateway/fortran/sci_f_bool2s.lo \
-       sci_gateway/fortran/sci_f_find.lo
+am__objects_4 = sci_gateway/fortran/sci_f_bool2s.lo
 am_libsciboolean_la_OBJECTS = $(am__objects_3) $(am__objects_4)
 libsciboolean_la_OBJECTS = $(am_libsciboolean_la_OBJECTS)
 @MAINTAINER_MODE_FALSE@am_libsciboolean_la_rpath =
@@ -541,18 +539,13 @@ BOOLEAN_C_SOURCES = src/c/matboolean.c \
 src/c/vect_or.c \
 src/c/vect_and.c
 
-BOOLEAN_FORTRAN_SOURCES = src/fortran/logic.f \
-src/fortran/find.f
-
+BOOLEAN_FORTRAN_SOURCES = src/fortran/logic.f
 GATEWAY_C_SOURCES = sci_gateway/c/sci_and.c \
 sci_gateway/c/sci_or.c \
-sci_gateway/c/sci_find.c \
 sci_gateway/c/sci_bool2s.c \
 sci_gateway/c/gw_boolean.c
 
-GATEWAY_FORTRAN_SOURCES = sci_gateway/fortran/sci_f_bool2s.f \
-sci_gateway/fortran/sci_f_find.f
-
+GATEWAY_FORTRAN_SOURCES = sci_gateway/fortran/sci_f_bool2s.f
 libsciboolean_la_CPPFLAGS = -I$(srcdir)/includes/ \
                                -I$(srcdir)/src/c/ \
                                -I$(top_srcdir)/modules/api_scilab/includes/ \
@@ -575,7 +568,7 @@ modulename = boolean
 
 #### boolean : Conf files ####
 libsciboolean_la_rootdir = $(mydatadir)
-libsciboolean_la_root_DATA = license.txt 
+libsciboolean_la_root_DATA = license.txt
 
 #### boolean : init scripts ####
 libsciboolean_la_etcdir = $(mydatadir)/etc
@@ -758,8 +751,6 @@ src/fortran/$(DEPDIR)/$(am__dirstamp):
        @: > src/fortran/$(DEPDIR)/$(am__dirstamp)
 src/fortran/logic.lo: src/fortran/$(am__dirstamp) \
        src/fortran/$(DEPDIR)/$(am__dirstamp)
-src/fortran/find.lo: src/fortran/$(am__dirstamp) \
-       src/fortran/$(DEPDIR)/$(am__dirstamp)
 
 libsciboolean-algo.la: $(libsciboolean_algo_la_OBJECTS) $(libsciboolean_algo_la_DEPENDENCIES) $(EXTRA_libsciboolean_algo_la_DEPENDENCIES) 
        $(AM_V_F77LD)$(F77LINK) $(am_libsciboolean_algo_la_rpath) $(libsciboolean_algo_la_OBJECTS) $(libsciboolean_algo_la_LIBADD) $(LIBS)
@@ -775,9 +766,6 @@ sci_gateway/c/libsciboolean_la-sci_and.lo:  \
 sci_gateway/c/libsciboolean_la-sci_or.lo:  \
        sci_gateway/c/$(am__dirstamp) \
        sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/c/libsciboolean_la-sci_find.lo:  \
-       sci_gateway/c/$(am__dirstamp) \
-       sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
 sci_gateway/c/libsciboolean_la-sci_bool2s.lo:  \
        sci_gateway/c/$(am__dirstamp) \
        sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
@@ -793,9 +781,6 @@ sci_gateway/fortran/$(DEPDIR)/$(am__dirstamp):
 sci_gateway/fortran/sci_f_bool2s.lo:  \
        sci_gateway/fortran/$(am__dirstamp) \
        sci_gateway/fortran/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/fortran/sci_f_find.lo:  \
-       sci_gateway/fortran/$(am__dirstamp) \
-       sci_gateway/fortran/$(DEPDIR)/$(am__dirstamp)
 
 libsciboolean.la: $(libsciboolean_la_OBJECTS) $(libsciboolean_la_DEPENDENCIES) $(EXTRA_libsciboolean_la_DEPENDENCIES) 
        $(AM_V_F77LD)$(F77LINK) $(am_libsciboolean_la_rpath) $(libsciboolean_la_OBJECTS) $(libsciboolean_la_LIBADD) $(LIBS)
@@ -817,7 +802,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciboolean_la-gw_boolean.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciboolean_la-sci_and.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciboolean_la-sci_bool2s.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciboolean_la-sci_find.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libsciboolean_la-sci_or.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/$(DEPDIR)/libsciboolean_algo_la-matboolean.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/$(DEPDIR)/libsciboolean_algo_la-vect_and.Plo@am__quote@
@@ -882,13 +866,6 @@ sci_gateway/c/libsciboolean_la-sci_or.lo: sci_gateway/c/sci_or.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciboolean_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libsciboolean_la-sci_or.lo `test -f 'sci_gateway/c/sci_or.c' || echo '$(srcdir)/'`sci_gateway/c/sci_or.c
 
-sci_gateway/c/libsciboolean_la-sci_find.lo: sci_gateway/c/sci_find.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciboolean_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libsciboolean_la-sci_find.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libsciboolean_la-sci_find.Tpo -c -o sci_gateway/c/libsciboolean_la-sci_find.lo `test -f 'sci_gateway/c/sci_find.c' || echo '$(srcdir)/'`sci_gateway/c/sci_find.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libsciboolean_la-sci_find.Tpo sci_gateway/c/$(DEPDIR)/libsciboolean_la-sci_find.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='sci_gateway/c/sci_find.c' object='sci_gateway/c/libsciboolean_la-sci_find.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciboolean_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libsciboolean_la-sci_find.lo `test -f 'sci_gateway/c/sci_find.c' || echo '$(srcdir)/'`sci_gateway/c/sci_find.c
-
 sci_gateway/c/libsciboolean_la-sci_bool2s.lo: sci_gateway/c/sci_bool2s.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciboolean_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libsciboolean_la-sci_bool2s.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libsciboolean_la-sci_bool2s.Tpo -c -o sci_gateway/c/libsciboolean_la-sci_bool2s.lo `test -f 'sci_gateway/c/sci_bool2s.c' || echo '$(srcdir)/'`sci_gateway/c/sci_bool2s.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libsciboolean_la-sci_bool2s.Tpo sci_gateway/c/$(DEPDIR)/libsciboolean_la-sci_bool2s.Plo
index 4feb2c8..a7a5283 100644 (file)
@@ -20,7 +20,6 @@ int gw_boolean(void);
 /*--------------------------------------------------------------------------*/
 int sci_or(char *fname, unsigned long fname_len);
 int sci_and(char *fname, unsigned long fname_len);
-int C2F(sci_find)(char *fname, unsigned long fname_len);
 int C2F(sci_bool2s)(char *fname, unsigned long fname_len);
 /*--------------------------------------------------------------------------*/
 #endif /*  __GW_BOOLEAN__ */
index 4d5b66f..936fb4a 100644 (file)
  ===================
  Don't touch if you do not know what you are doing
 -->
-    
+
     <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) INRIA - Allan CORNET , Sylvestre LEDRU
- * 
+ *
  * This file must be used under the terms of the CeCILL.
  * This source file is licensed as described in the file COPYING, which
  * you should have received as part of this distribution.  The terms
- * are also available at    
+ * are also available at
  * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
  *
  -->
-    
-    
+
+
     <!-- =================== -->
-    
-    <PRIMITIVE gatewayId="23" primitiveId="1" primitiveName="find" />
-    <PRIMITIVE gatewayId="23" primitiveId="2" primitiveName="bool2s" />
-    <PRIMITIVE gatewayId="23" primitiveId="3" primitiveName="or" />
-    <PRIMITIVE gatewayId="23" primitiveId="4" primitiveName="and" />
+
+    <PRIMITIVE gatewayId="23" primitiveId="1" primitiveName="bool2s" />
+    <PRIMITIVE gatewayId="23" primitiveId="2" primitiveName="or" />
+    <PRIMITIVE gatewayId="23" primitiveId="3" primitiveName="and" />
 </GATEWAY>
index 6af8ec8..f0ff726 100644 (file)
@@ -20,7 +20,6 @@
 /*--------------------------------------------------------------------------*/
 static gw_generic_table Tab[] =
 {
-    {C2F(sci_find), "find"},
     {C2F(sci_bool2s), "bool2s"},
     {sci_or, "or"},
     {sci_and, "and"}
index 65cd69f..25e83e5 100644 (file)
@@ -255,7 +255,6 @@ lib /DEF:"$(ProjectDir)boolean_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platf
     <ClCompile Include="matboolean.c" />
     <ClCompile Include="..\..\sci_gateway\c\sci_and.c" />
     <ClCompile Include="..\..\sci_gateway\c\sci_bool2s.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_find.c" />
     <ClCompile Include="..\..\sci_gateway\c\sci_or.c" />
     <ClCompile Include="vect_and.c" />
     <ClCompile Include="vect_or.c" />
index a5e8196..6f8971f 100644 (file)
@@ -38,9 +38,6 @@
     <ClCompile Include="..\..\sci_gateway\c\sci_bool2s.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_find.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\sci_gateway\c\sci_or.c">
       <Filter>Source Files</Filter>
     </ClCompile>
index e7e7bf3..ff42f5e 100644 (file)
                                <Tool Name="VFResourceCompilerTool"/>
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFCustomBuildTool"/>
-                               <Tool Name="VFPreLinkEventTool" CommandLine="setlocal EnableDelayedExpansion
-cd $(ConfigurationName)
-set LIST_OBJ=
-for %%f in (*.obj) do set LIST_OBJ=!LIST_OBJ! %%f
-&quot;$(SolutionDir)bin\dumpexts&quot; -o $(ProjectName).def $(ProjectName).dll %LIST_OBJ%
-copy $(ProjectName).def ..\$(ProjectName).def &gt;nul
-del *.def &gt;nul
-cd .." Description="Build $(ProjectName).def"/>
-                               <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)core_import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)core.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)Elementary_functions_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)Elementary_functions.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)Elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)Elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)linpack_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)linpack_f.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)core_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)core_f.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
+                               <Tool Name="VFPreLinkEventTool" CommandLine="setlocal EnableDelayedExpansion&#xA;cd $(ConfigurationName)&#xA;set LIST_OBJ=&#xA;for %%f in (*.obj) do set LIST_OBJ=!LIST_OBJ! %%f&#xA;&quot;$(SolutionDir)bin\dumpexts&quot; -o $(ProjectName).def $(ProjectName).dll %LIST_OBJ%&#xA;copy $(ProjectName).def ..\$(ProjectName).def &gt;nul&#xA;del *.def &gt;nul&#xA;cd .." Description="Build $(ProjectName).def"/>
+                               <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)core_import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)core.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;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&#xA;lib /DEF:&quot;$(InputDir)Elementary_functions_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)Elementary_functions.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(InputDir)Elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)Elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(InputDir)linpack_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)linpack_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(InputDir)core_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)core_f.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
                                <Tool Name="VFPostBuildEventTool"/>
                                <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
                <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
@@ -32,20 +20,8 @@ lib /DEF:&quot;$(InputDir)core_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X8
                                <Tool Name="VFResourceCompilerTool"/>
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFCustomBuildTool"/>
-                               <Tool Name="VFPreLinkEventTool" CommandLine="setlocal EnableDelayedExpansion
-cd $(ConfigurationName)
-set LIST_OBJ=
-for %%f in (*.obj) do set LIST_OBJ=!LIST_OBJ! %%f
-&quot;$(SolutionDir)bin\dumpexts&quot; -o $(ProjectName).def $(ProjectName).dll %LIST_OBJ%
-copy $(ProjectName).def ..\$(ProjectName).def &gt;nul
-del *.def &gt;nul
-cd .." Description="Build $(ProjectName).def"/>
-                               <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)core_import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)core.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)Elementary_functions_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)Elementary_functions.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)Elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)Elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)linpack_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)linpack_f.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)core_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)core_f.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
+                               <Tool Name="VFPreLinkEventTool" CommandLine="setlocal EnableDelayedExpansion&#xA;cd $(ConfigurationName)&#xA;set LIST_OBJ=&#xA;for %%f in (*.obj) do set LIST_OBJ=!LIST_OBJ! %%f&#xA;&quot;$(SolutionDir)bin\dumpexts&quot; -o $(ProjectName).def $(ProjectName).dll %LIST_OBJ%&#xA;copy $(ProjectName).def ..\$(ProjectName).def &gt;nul&#xA;del *.def &gt;nul&#xA;cd .." Description="Build $(ProjectName).def"/>
+                               <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)core_import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)core.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;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&#xA;lib /DEF:&quot;$(InputDir)Elementary_functions_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)Elementary_functions.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(InputDir)Elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)Elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(InputDir)linpack_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)linpack_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(InputDir)core_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)core_f.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
                                <Tool Name="VFPostBuildEventTool"/>
                                <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
                <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
@@ -54,20 +30,8 @@ lib /DEF:&quot;$(InputDir)core_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X8
                                <Tool Name="VFResourceCompilerTool"/>
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFCustomBuildTool"/>
-                               <Tool Name="VFPreLinkEventTool" CommandLine="setlocal EnableDelayedExpansion
-cd $(ConfigurationName)
-set LIST_OBJ=
-for %%f in (*.obj) do set LIST_OBJ=!LIST_OBJ! %%f
-&quot;$(SolutionDir)bin\dumpexts&quot; -o $(ProjectName).def $(ProjectName).dll %LIST_OBJ%
-copy $(ProjectName).def ..\$(ProjectName).def &gt;nul
-del *.def &gt;nul
-cd .." Description="Build $(ProjectName).def"/>
-                               <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)core_import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)core.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)Elementary_functions_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)Elementary_functions.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)Elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)Elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)linpack_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)linpack_f.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)core_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)core_f.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
+                               <Tool Name="VFPreLinkEventTool" CommandLine="setlocal EnableDelayedExpansion&#xA;cd $(ConfigurationName)&#xA;set LIST_OBJ=&#xA;for %%f in (*.obj) do set LIST_OBJ=!LIST_OBJ! %%f&#xA;&quot;$(SolutionDir)bin\dumpexts&quot; -o $(ProjectName).def $(ProjectName).dll %LIST_OBJ%&#xA;copy $(ProjectName).def ..\$(ProjectName).def &gt;nul&#xA;del *.def &gt;nul&#xA;cd .." Description="Build $(ProjectName).def"/>
+                               <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)core_import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)core.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;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&#xA;lib /DEF:&quot;$(InputDir)Elementary_functions_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)Elementary_functions.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(InputDir)Elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)Elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(InputDir)linpack_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)linpack_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(InputDir)core_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)core_f.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
                                <Tool Name="VFPostBuildEventTool"/>
                                <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
                <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
@@ -76,20 +40,8 @@ lib /DEF:&quot;$(InputDir)core_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X6
                                <Tool Name="VFResourceCompilerTool"/>
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFCustomBuildTool"/>
-                               <Tool Name="VFPreLinkEventTool" CommandLine="setlocal EnableDelayedExpansion
-cd $(ConfigurationName)
-set LIST_OBJ=
-for %%f in (*.obj) do set LIST_OBJ=!LIST_OBJ! %%f
-&quot;$(SolutionDir)bin\dumpexts&quot; -o $(ProjectName).def $(ProjectName).dll %LIST_OBJ%
-copy $(ProjectName).def ..\$(ProjectName).def &gt;nul
-del *.def &gt;nul
-cd .." Description="Build $(ProjectName).def"/>
-                               <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)core_import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)core.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)Elementary_functions_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)Elementary_functions.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)Elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)Elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)linpack_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)linpack_f.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)core_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)core_f.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
+                               <Tool Name="VFPreLinkEventTool" CommandLine="setlocal EnableDelayedExpansion&#xA;cd $(ConfigurationName)&#xA;set LIST_OBJ=&#xA;for %%f in (*.obj) do set LIST_OBJ=!LIST_OBJ! %%f&#xA;&quot;$(SolutionDir)bin\dumpexts&quot; -o $(ProjectName).def $(ProjectName).dll %LIST_OBJ%&#xA;copy $(ProjectName).def ..\$(ProjectName).def &gt;nul&#xA;del *.def &gt;nul&#xA;cd .." Description="Build $(ProjectName).def"/>
+                               <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)core_import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)core.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;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&#xA;lib /DEF:&quot;$(InputDir)Elementary_functions_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)Elementary_functions.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(InputDir)Elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)Elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(InputDir)linpack_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)linpack_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(InputDir)core_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)core_f.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
                                <Tool Name="VFPostBuildEventTool"/>
                                <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration></Configurations>
        <Files>
@@ -104,9 +56,7 @@ lib /DEF:&quot;$(InputDir)core_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X6
                <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
                <File RelativePath=".\boolean_f.rc"/></Filter>
                <Filter Name="Source Files" Filter="f90;for;f;fpp;ftn;def;odl;idl">
-               <File RelativePath=".\find.f"/>
                <File RelativePath=".\logic.f"/>
-               <File RelativePath="..\..\sci_gateway\fortran\sci_f_bool2s.f"/>
-               <File RelativePath="..\..\sci_gateway\fortran\sci_f_find.f"/></Filter>
+               <File RelativePath="..\..\sci_gateway\fortran\sci_f_bool2s.f"/></Filter>
                <File RelativePath="..\..\Makefile.am"/></Files>
        <Globals/></VisualStudioProject>
index 743c75d..b79b286 100644 (file)
@@ -250,7 +250,8 @@ src/fortran/wvmul.f \
 src/fortran/dmmul.f \
 src/fortran/wsqrt.f \
 src/fortran/israt.f \
-src/fortran/rat.f
+src/fortran/rat.f \
+src/fortran/find.f
 
 GATEWAY_C_SOURCES = sci_gateway/c/sci_isequal.c \
 sci_gateway/c/sci_matrix.c \
@@ -303,7 +304,8 @@ sci_gateway/c/sci_maxi.c \
 sci_gateway/c/sci_gsort.c \
 sci_gateway/c/sci_isequalbitwise.c \
 sci_gateway/c/sci_base2dec.c \
-sci_gateway/c/sci_dec2base.c
+sci_gateway/c/sci_dec2base.c \
+sci_gateway/c/sci_find.c
 
 GATEWAY_FORTRAN_SOURCES =  sci_gateway/fortran/sci_f_isequal.f \
 sci_gateway/fortran/sci_f_maxi.f \
@@ -351,7 +353,8 @@ sci_gateway/fortran/sci_f_round.f \
 sci_gateway/fortran/sci_f_conj.f \
 sci_gateway/fortran/sci_f_int.f \
 sci_gateway/fortran/sci_f_imult.f \
-sci_gateway/fortran/sci_f_exp.f
+sci_gateway/fortran/sci_f_exp.f \
+sci_gateway/fortran/sci_f_find.f
 
 EISPACK_SOURCES = src/fortran/eispack/balbak.f
 
index e3d1574..6e5cf7b 100644 (file)
@@ -300,7 +300,8 @@ am__objects_5 = src/fortran/wasum.lo src/fortran/dexpm1.lo \
        src/fortran/dtild.lo src/fortran/i1mach.lo \
        src/fortran/dclmat.lo src/fortran/ortran.lo \
        src/fortran/bdiag.lo src/fortran/wvmul.lo src/fortran/dmmul.lo \
-       src/fortran/wsqrt.lo src/fortran/israt.lo src/fortran/rat.lo
+       src/fortran/wsqrt.lo src/fortran/israt.lo src/fortran/rat.lo \
+       src/fortran/find.lo
 am__objects_6 =
 am_libscielementary_functions_algo_la_OBJECTS = $(am__objects_1) \
        $(am__objects_2) $(am__objects_3) $(am__objects_4) \
@@ -364,7 +365,8 @@ am__objects_7 =  \
        sci_gateway/c/libscielementary_functions_la-sci_gsort.lo \
        sci_gateway/c/libscielementary_functions_la-sci_isequalbitwise.lo \
        sci_gateway/c/libscielementary_functions_la-sci_base2dec.lo \
-       sci_gateway/c/libscielementary_functions_la-sci_dec2base.lo
+       sci_gateway/c/libscielementary_functions_la-sci_dec2base.lo \
+       sci_gateway/c/libscielementary_functions_la-sci_find.lo
 am__objects_8 = sci_gateway/fortran/sci_f_isequal.lo \
        sci_gateway/fortran/sci_f_maxi.lo \
        sci_gateway/fortran/sci_f_testmatrix.lo \
@@ -411,7 +413,8 @@ am__objects_8 = sci_gateway/fortran/sci_f_isequal.lo \
        sci_gateway/fortran/sci_f_conj.lo \
        sci_gateway/fortran/sci_f_int.lo \
        sci_gateway/fortran/sci_f_imult.lo \
-       sci_gateway/fortran/sci_f_exp.lo
+       sci_gateway/fortran/sci_f_exp.lo \
+       sci_gateway/fortran/sci_f_find.lo
 am_libscielementary_functions_la_OBJECTS = $(am__objects_7) \
        $(am__objects_8)
 libscielementary_functions_la_OBJECTS =  \
@@ -1018,7 +1021,8 @@ src/fortran/wvmul.f \
 src/fortran/dmmul.f \
 src/fortran/wsqrt.f \
 src/fortran/israt.f \
-src/fortran/rat.f
+src/fortran/rat.f \
+src/fortran/find.f
 
 GATEWAY_C_SOURCES = sci_gateway/c/sci_isequal.c \
 sci_gateway/c/sci_matrix.c \
@@ -1071,7 +1075,8 @@ sci_gateway/c/sci_maxi.c \
 sci_gateway/c/sci_gsort.c \
 sci_gateway/c/sci_isequalbitwise.c \
 sci_gateway/c/sci_base2dec.c \
-sci_gateway/c/sci_dec2base.c
+sci_gateway/c/sci_dec2base.c \
+sci_gateway/c/sci_find.c
 
 GATEWAY_FORTRAN_SOURCES = sci_gateway/fortran/sci_f_isequal.f \
 sci_gateway/fortran/sci_f_maxi.f \
@@ -1119,7 +1124,8 @@ sci_gateway/fortran/sci_f_round.f \
 sci_gateway/fortran/sci_f_conj.f \
 sci_gateway/fortran/sci_f_int.f \
 sci_gateway/fortran/sci_f_imult.f \
-sci_gateway/fortran/sci_f_exp.f
+sci_gateway/fortran/sci_f_exp.f \
+sci_gateway/fortran/sci_f_find.f
 
 EISPACK_SOURCES = src/fortran/eispack/balbak.f
 
@@ -1847,6 +1853,8 @@ src/fortran/israt.lo: src/fortran/$(am__dirstamp) \
        src/fortran/$(DEPDIR)/$(am__dirstamp)
 src/fortran/rat.lo: src/fortran/$(am__dirstamp) \
        src/fortran/$(DEPDIR)/$(am__dirstamp)
+src/fortran/find.lo: src/fortran/$(am__dirstamp) \
+       src/fortran/$(DEPDIR)/$(am__dirstamp)
 
 libscielementary_functions-algo.la: $(libscielementary_functions_algo_la_OBJECTS) $(libscielementary_functions_algo_la_DEPENDENCIES) $(EXTRA_libscielementary_functions_algo_la_DEPENDENCIES) 
        $(AM_V_F77LD)$(F77LINK) $(am_libscielementary_functions_algo_la_rpath) $(libscielementary_functions_algo_la_OBJECTS) $(libscielementary_functions_algo_la_LIBADD) $(LIBS)
@@ -2012,6 +2020,9 @@ sci_gateway/c/libscielementary_functions_la-sci_base2dec.lo:  \
 sci_gateway/c/libscielementary_functions_la-sci_dec2base.lo:  \
        sci_gateway/c/$(am__dirstamp) \
        sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
+sci_gateway/c/libscielementary_functions_la-sci_find.lo:  \
+       sci_gateway/c/$(am__dirstamp) \
+       sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
 sci_gateway/fortran/$(am__dirstamp):
        @$(MKDIR_P) sci_gateway/fortran
        @: > sci_gateway/fortran/$(am__dirstamp)
@@ -2149,6 +2160,9 @@ sci_gateway/fortran/sci_f_imult.lo:  \
        sci_gateway/fortran/$(DEPDIR)/$(am__dirstamp)
 sci_gateway/fortran/sci_f_exp.lo: sci_gateway/fortran/$(am__dirstamp) \
        sci_gateway/fortran/$(DEPDIR)/$(am__dirstamp)
+sci_gateway/fortran/sci_f_find.lo:  \
+       sci_gateway/fortran/$(am__dirstamp) \
+       sci_gateway/fortran/$(DEPDIR)/$(am__dirstamp)
 
 libscielementary_functions.la: $(libscielementary_functions_la_OBJECTS) $(libscielementary_functions_la_DEPENDENCIES) $(EXTRA_libscielementary_functions_la_DEPENDENCIES) 
        $(AM_V_F77LD)$(F77LINK) $(am_libscielementary_functions_la_rpath) $(libscielementary_functions_la_OBJECTS) $(libscielementary_functions_la_LIBADD) $(LIBS)
@@ -2192,6 +2206,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscielementary_functions_la-sci_exp.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscielementary_functions_la-sci_expm.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscielementary_functions_la-sci_eye.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscielementary_functions_la-sci_find.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscielementary_functions_la-sci_floor.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscielementary_functions_la-sci_frexp.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscielementary_functions_la-sci_gsort.Plo@am__quote@
@@ -2790,6 +2805,13 @@ sci_gateway/c/libscielementary_functions_la-sci_dec2base.lo: sci_gateway/c/sci_d
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscielementary_functions_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libscielementary_functions_la-sci_dec2base.lo `test -f 'sci_gateway/c/sci_dec2base.c' || echo '$(srcdir)/'`sci_gateway/c/sci_dec2base.c
 
+sci_gateway/c/libscielementary_functions_la-sci_find.lo: sci_gateway/c/sci_find.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscielementary_functions_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libscielementary_functions_la-sci_find.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libscielementary_functions_la-sci_find.Tpo -c -o sci_gateway/c/libscielementary_functions_la-sci_find.lo `test -f 'sci_gateway/c/sci_find.c' || echo '$(srcdir)/'`sci_gateway/c/sci_find.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libscielementary_functions_la-sci_find.Tpo sci_gateway/c/$(DEPDIR)/libscielementary_functions_la-sci_find.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='sci_gateway/c/sci_find.c' object='sci_gateway/c/libscielementary_functions_la-sci_find.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscielementary_functions_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libscielementary_functions_la-sci_find.lo `test -f 'sci_gateway/c/sci_find.c' || echo '$(srcdir)/'`sci_gateway/c/sci_find.c
+
 .f.o:
        $(AM_V_F77)$(F77COMPILE) -c -o $@ $<
 
index fc3e754..438d811 100644 (file)
@@ -69,6 +69,7 @@ int sci_isequalbitwise(char *fname, unsigned long fname_len);
 int sci_rat(char *fname, unsigned long fname_len);
 int sci_base2dec(char *fname, unsigned long fname_len);
 int sci_dec2base(char *fname, unsigned long fname_len);
+int C2F(sci_find)(char *fname, unsigned long fname_len);
 #endif /*  __GW_ELEMENTARIES_FUNCTIONS__ */
 /*--------------------------------------------------------------------------*/
 
index 6885c79..a2d81bd 100644 (file)
@@ -72,7 +72,8 @@ static gw_generic_table Tab[] =
     {sci_isequalbitwise, "isequalbitwise"},
     {sci_rat, "rat"},
     {sci_base2dec, "base2dec"},
-    {sci_dec2base, "dec2base"}
+    {sci_dec2base, "dec2base"},
+    {C2F(sci_find), "find"}
 };
 /*--------------------------------------------------------------------------*/
 int gw_elementary_functions(void)
@@ -10,7 +10,7 @@
  *
  */
 
-#include "gw_boolean.h"
+#include "gw_elementary_functions.h"
 /*--------------------------------------------------------------------------*/
 extern int C2F(intfind)();
 /*--------------------------------------------------------------------------*/
index 504181b..302516f 100644 (file)
@@ -3,11 +3,11 @@
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2007 - INRIA - Allan CORNET
  * Copyright (C) 2007 - INRIA - Sylvestre LEDRU
- * 
+ *
  * This file must be used under the terms of the CeCILL.
  * This source file is licensed as described in the file COPYING, which
  * you should have received as part of this distribution.  The terms
- * are also available at    
+ * are also available at
  * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
  *
  -->
@@ -34,7 +34,7 @@
  Don't touch if you do not know what you are doing
 -->
     <!-- =================== -->
-    
+
     <PRIMITIVE gatewayId="6" primitiveId="1" primitiveName="abs" />
     <PRIMITIVE gatewayId="6" primitiveId="2" primitiveName="real" />
     <PRIMITIVE gatewayId="6" primitiveId="3" primitiveName="imag" />
@@ -86,4 +86,5 @@
     <PRIMITIVE gatewayId="6" primitiveId="52" primitiveName="rat" />
     <PRIMITIVE gatewayId="6" primitiveId="53" primitiveName="base2dec" />
     <PRIMITIVE gatewayId="6" primitiveId="54" primitiveName="dec2base" />
+    <PRIMITIVE gatewayId="6" primitiveId="55" primitiveName="find" />
 </GATEWAY>
index a0606dc..29707b0 100644 (file)
@@ -196,6 +196,7 @@ lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
   <ItemGroup>
     <ClCompile Include="..\..\sci_gateway\c\sci_base2dec.c" />
     <ClCompile Include="..\..\sci_gateway\c\sci_dec2base.c" />
+    <ClCompile Include="..\..\sci_gateway\c\sci_find.c" />
     <ClCompile Include="cmp.c" />
     <ClCompile Include="convertbase.c" />
     <ClCompile Include="DllmainElementary_functions.c" />
index 9ceb6a6..94d554b 100644 (file)
     <ClCompile Include="..\..\sci_gateway\c\sci_dec2base.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\sci_gateway\c\sci_find.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\includes\dynlib_elementary_functions.h">
index dd61915..5d62721 100644 (file)
                <File RelativePath=".\dwrdiv.f"/>
                <File RelativePath=".\entier.f"/>
                <File RelativePath=".\exch.f"/>
+               <File RelativePath=".\find.f"/>
                <File RelativePath=".\franck.f"/>
                <File RelativePath=".\gdcp2i.f"/>
                <File RelativePath=".\getdimfromvar.f"/>
                <File RelativePath="..\..\sci_gateway\fortran\sci_f_exp.f"/>
                <File RelativePath="..\..\sci_gateway\fortran\sci_f_expm.f"/>
                <File RelativePath="..\..\sci_gateway\fortran\sci_f_eye.f"/>
+               <File RelativePath="..\..\sci_gateway\fortran\sci_f_find.f"/>
                <File RelativePath="..\..\sci_gateway\fortran\sci_f_floor.f"/>
                <File RelativePath="..\..\sci_gateway\fortran\sci_f_frexp.f"/>
                <File RelativePath="..\..\sci_gateway\fortran\sci_f_imag.f"/>