Revert "Remove a dead function (iseye)" 70/10570/2
Vincent COUVERT [Thu, 21 Feb 2013 22:29:38 +0000 (23:29 +0100)]
This reverts commit d81a8d39c6e5987bec56b9fdde5de0928bf08bd7

Used in symbolic module.

scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/core/src/fortran/core_f.vfproj
scilab/modules/core/src/fortran/core_f2c.vcxproj
scilab/modules/core/src/fortran/core_f2c.vcxproj.filters
scilab/modules/core/src/fortran/elementary_functions_f.vfproj
scilab/modules/core/src/fortran/iseye.f [new file with mode: 0644]

index 0f0c667..76ec2d1 100644 (file)
@@ -117,6 +117,7 @@ src/fortran/nextj.f \
 src/fortran/setgetmode.f \
 src/fortran/showstack.f \
 src/fortran/misops.f \
+src/fortran/iseye.f \
 src/fortran/setippty.f \
 src/fortran/compil.f \
 src/fortran/funnam.f \
index 5c14b7a..bd85446 100644 (file)
@@ -187,20 +187,21 @@ am__libscicore_algo_la_SOURCES_DIST = src/c/inffic.c src/c/cs2st.c \
        src/fortran/getlin.f src/fortran/allowptr.f \
        src/fortran/isany.f src/fortran/hmcreate.f src/fortran/nextj.f \
        src/fortran/setgetmode.f src/fortran/showstack.f \
-       src/fortran/misops.f src/fortran/setippty.f \
-       src/fortran/compil.f src/fortran/funnam.f src/fortran/isnum.f \
-       src/fortran/cmdstr.f src/fortran/hndlops.f \
-       src/fortran/cmplxt.f src/fortran/skpins.f src/fortran/folhp.f \
-       src/fortran/cvname.f src/fortran/funs.f src/fortran/fact.f \
-       src/fortran/typ2cod.f src/fortran/prompt.f \
-       src/fortran/intstr.f src/fortran/createref.f \
-       src/fortran/btof.f src/fortran/getnum.f src/fortran/btofm.f \
-       src/fortran/getsym.f src/fortran/findequal.f \
-       src/fortran/stackg.f src/fortran/find.f src/fortran/setlnb.f \
-       src/fortran/mrknmd.f src/fortran/stackgl.f \
-       src/fortran/allops.f src/fortran/mname.f src/fortran/command.f \
-       src/fortran/ref2val.f src/fortran/stack.f src/fortran/isbrk.f \
-       src/fortran/xerbla.f src/fortran/dtosci.f src/fortran/bexec.f \
+       src/fortran/misops.f src/fortran/iseye.f \
+       src/fortran/setippty.f src/fortran/compil.f \
+       src/fortran/funnam.f src/fortran/isnum.f src/fortran/cmdstr.f \
+       src/fortran/hndlops.f src/fortran/cmplxt.f \
+       src/fortran/skpins.f src/fortran/folhp.f src/fortran/cvname.f \
+       src/fortran/funs.f src/fortran/fact.f src/fortran/typ2cod.f \
+       src/fortran/prompt.f src/fortran/intstr.f \
+       src/fortran/createref.f src/fortran/btof.f \
+       src/fortran/getnum.f src/fortran/btofm.f src/fortran/getsym.f \
+       src/fortran/findequal.f src/fortran/stackg.f \
+       src/fortran/find.f src/fortran/setlnb.f src/fortran/mrknmd.f \
+       src/fortran/stackgl.f src/fortran/allops.f src/fortran/mname.f \
+       src/fortran/command.f src/fortran/ref2val.f \
+       src/fortran/stack.f src/fortran/isbrk.f src/fortran/xerbla.f \
+       src/fortran/dtosci.f src/fortran/bexec.f \
        src/fortran/varfunptr.f src/fortran/getfun.f \
        src/fortran/savlod.f src/fortran/error.f src/fortran/cvdm.f \
        src/fortran/tradsl.f src/fortran/mkindx.f src/fortran/whatln.f \
@@ -296,17 +297,17 @@ am__objects_3 = libscicore_algo_la-hashtable_core.lo \
        libscicore_algo_la-backtrace_print.lo
 @USE_DYNAMIC_STACK_TRUE@am__objects_4 = relocstack.lo
 am__objects_5 = clunit.lo getlin.lo allowptr.lo isany.lo hmcreate.lo \
-       nextj.lo setgetmode.lo showstack.lo misops.lo setippty.lo \
-       compil.lo funnam.lo isnum.lo cmdstr.lo hndlops.lo cmplxt.lo \
-       skpins.lo folhp.lo cvname.lo funs.lo fact.lo typ2cod.lo \
-       prompt.lo intstr.lo createref.lo btof.lo getnum.lo btofm.lo \
-       getsym.lo findequal.lo stackg.lo find.lo setlnb.lo mrknmd.lo \
-       stackgl.lo allops.lo mname.lo command.lo ref2val.lo stack.lo \
-       isbrk.lo xerbla.lo dtosci.lo bexec.lo varfunptr.lo getfun.lo \
-       savlod.lo error.lo cvdm.lo tradsl.lo mkindx.lo whatln.lo \
-       errmgr.lo defmat.lo mklist.lo sigbas.lo indxg.lo istrue.lo \
-       inisci.lo ptover.lo getfunction.lo stackp.lo dbasin.lo \
-       macro.lo extlarg.lo getstr.lo cvwm.lo storeglobal.lo \
+       nextj.lo setgetmode.lo showstack.lo misops.lo iseye.lo \
+       setippty.lo compil.lo funnam.lo isnum.lo cmdstr.lo hndlops.lo \
+       cmplxt.lo skpins.lo folhp.lo cvname.lo funs.lo fact.lo \
+       typ2cod.lo prompt.lo intstr.lo createref.lo btof.lo getnum.lo \
+       btofm.lo getsym.lo findequal.lo stackg.lo find.lo setlnb.lo \
+       mrknmd.lo stackgl.lo allops.lo mname.lo command.lo ref2val.lo \
+       stack.lo isbrk.lo xerbla.lo dtosci.lo bexec.lo varfunptr.lo \
+       getfun.lo savlod.lo error.lo cvdm.lo tradsl.lo mkindx.lo \
+       whatln.lo errmgr.lo defmat.lo mklist.lo sigbas.lo indxg.lo \
+       istrue.lo inisci.lo ptover.lo getfunction.lo stackp.lo \
+       dbasin.lo macro.lo extlarg.lo getstr.lo cvwm.lo storeglobal.lo \
        lst2vars.lo basnms.lo ptrback.lo getch.lo ftob.lo seteol.lo \
        basin.lo clause.lo compcl.lo termf.lo expsum.lo copyvar.lo \
        putid.lo itosci.lo stackr2d.lo stacki2d.lo stackc2i.lo \
@@ -701,20 +702,21 @@ CORE_FORTRAN_SOURCES = src/fortran/clunit.f src/fortran/getlin.f \
        src/fortran/allowptr.f src/fortran/isany.f \
        src/fortran/hmcreate.f src/fortran/nextj.f \
        src/fortran/setgetmode.f src/fortran/showstack.f \
-       src/fortran/misops.f src/fortran/setippty.f \
-       src/fortran/compil.f src/fortran/funnam.f src/fortran/isnum.f \
-       src/fortran/cmdstr.f src/fortran/hndlops.f \
-       src/fortran/cmplxt.f src/fortran/skpins.f src/fortran/folhp.f \
-       src/fortran/cvname.f src/fortran/funs.f src/fortran/fact.f \
-       src/fortran/typ2cod.f src/fortran/prompt.f \
-       src/fortran/intstr.f src/fortran/createref.f \
-       src/fortran/btof.f src/fortran/getnum.f src/fortran/btofm.f \
-       src/fortran/getsym.f src/fortran/findequal.f \
-       src/fortran/stackg.f src/fortran/find.f src/fortran/setlnb.f \
-       src/fortran/mrknmd.f src/fortran/stackgl.f \
-       src/fortran/allops.f src/fortran/mname.f src/fortran/command.f \
-       src/fortran/ref2val.f src/fortran/stack.f src/fortran/isbrk.f \
-       src/fortran/xerbla.f src/fortran/dtosci.f src/fortran/bexec.f \
+       src/fortran/misops.f src/fortran/iseye.f \
+       src/fortran/setippty.f src/fortran/compil.f \
+       src/fortran/funnam.f src/fortran/isnum.f src/fortran/cmdstr.f \
+       src/fortran/hndlops.f src/fortran/cmplxt.f \
+       src/fortran/skpins.f src/fortran/folhp.f src/fortran/cvname.f \
+       src/fortran/funs.f src/fortran/fact.f src/fortran/typ2cod.f \
+       src/fortran/prompt.f src/fortran/intstr.f \
+       src/fortran/createref.f src/fortran/btof.f \
+       src/fortran/getnum.f src/fortran/btofm.f src/fortran/getsym.f \
+       src/fortran/findequal.f src/fortran/stackg.f \
+       src/fortran/find.f src/fortran/setlnb.f src/fortran/mrknmd.f \
+       src/fortran/stackgl.f src/fortran/allops.f src/fortran/mname.f \
+       src/fortran/command.f src/fortran/ref2val.f \
+       src/fortran/stack.f src/fortran/isbrk.f src/fortran/xerbla.f \
+       src/fortran/dtosci.f src/fortran/bexec.f \
        src/fortran/varfunptr.f src/fortran/getfun.f \
        src/fortran/savlod.f src/fortran/error.f src/fortran/cvdm.f \
        src/fortran/tradsl.f src/fortran/mkindx.f src/fortran/whatln.f \
@@ -2338,6 +2340,9 @@ showstack.lo: src/fortran/showstack.f
 misops.lo: src/fortran/misops.f
        $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o misops.lo `test -f 'src/fortran/misops.f' || echo '$(srcdir)/'`src/fortran/misops.f
 
+iseye.lo: src/fortran/iseye.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o iseye.lo `test -f 'src/fortran/iseye.f' || echo '$(srcdir)/'`src/fortran/iseye.f
+
 setippty.lo: src/fortran/setippty.f
        $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o setippty.lo `test -f 'src/fortran/setippty.f' || echo '$(srcdir)/'`src/fortran/setippty.f
 
index fcf8d6b..44f28ef 100644 (file)
@@ -222,6 +222,7 @@ lib /DEF:"$(ProjectDir)io_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X6
                <File RelativePath="intstr.f"/>
                <File RelativePath="isany.f"/>
                <File RelativePath="isbrk.f"/>
+               <File RelativePath="iseye.f"/>
                <File RelativePath=".\isinstring.f"/>
                <File RelativePath="isnum.f"/>
                <File RelativePath="istrue.f"/>
index 7658095..ed7f962 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -385,6 +385,7 @@ cd ..
     <ClCompile Include="intstr.c" />
     <ClCompile Include="isany.c" />
     <ClCompile Include="isbrk.c" />
+    <ClCompile Include="iseye.c" />
     <ClCompile Include="isinstring.c" />
     <ClCompile Include="isnum.c" />
     <ClCompile Include="istrue.c" />
@@ -495,6 +496,7 @@ cd ..
     <f2c_rule Include="intstr.f" />
     <f2c_rule Include="isany.f" />
     <f2c_rule Include="isbrk.f" />
+    <f2c_rule Include="iseye.f" />
     <f2c_rule Include="isinstring.f" />
     <f2c_rule Include="isnum.f" />
     <f2c_rule Include="istrue.f" />
@@ -570,4 +572,4 @@ cd ..
   <ImportGroup Label="ExtensionTargets">
     <Import Project="..\..\..\..\Visual-Studio-settings\f2c.targets" />
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
index 48263cc..bb33837 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
     <ClCompile Include="isbrk.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="iseye.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="isinstring.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <f2c_rule Include="isbrk.f">
       <Filter>Fortran Files</Filter>
     </f2c_rule>
+    <f2c_rule Include="iseye.f">
+      <Filter>Fortran Files</Filter>
+    </f2c_rule>
     <f2c_rule Include="isinstring.f">
       <Filter>Fortran Files</Filter>
     </f2c_rule>
       <Filter>Libraries Dependencies</Filter>
     </None>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
index 01a001a..d788255 100644 (file)
@@ -167,6 +167,7 @@ lib /DEF:&quot;$(InputDir)slatec_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:
                <File RelativePath="intstr.f"/>
                <File RelativePath="isany.f"/>
                <File RelativePath="isbrk.f"/>
+               <File RelativePath="iseye.f"/>
                <File RelativePath=".\isinstring.f"/>
                <File RelativePath="isnum.f"/>
                <File RelativePath="istrue.f"/>
diff --git a/scilab/modules/core/src/fortran/iseye.f b/scilab/modules/core/src/fortran/iseye.f
new file mode 100644 (file)
index 0000000..f27cd00
--- /dev/null
@@ -0,0 +1,20 @@
+c Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+c Copyright (C) INRIA
+c 
+c This file must be used under the terms of the CeCILL.
+c This source file is licensed as described in the file COPYING, which
+c you should have received as part of this distribution.  The terms
+c are also available at    
+c http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+C/MEMBR ADD NAME=ISEYE,SSI=0
+      logical function iseye(ib)
+      integer ib(5),eye(5)
+      data eye/14,34,14,41,42/
+      iseye=.false.
+      do 10 i=1,5
+      if (ib(i).ne.eye(i)) return
+ 10   continue
+      iseye=.true.
+      return
+      end