Revert "Remove a dead function (isnum)" 68/10568/2
Vincent COUVERT [Thu, 21 Feb 2013 22:28:29 +0000 (23:28 +0100)]
This reverts commit 4cfc2ca1ba1ae669707a0ecf00c8878b411a22f9

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/isnum.f [new file with mode: 0644]

index be8a56c..0af6c82 100644 (file)
@@ -120,6 +120,7 @@ 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 \
index f7d6737..dd4f3d7 100644 (file)
@@ -188,19 +188,19 @@ am__libscicore_algo_la_SOURCES_DIST = src/c/inffic.c src/c/cs2st.c \
        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/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/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 \
@@ -297,19 +297,19 @@ am__objects_3 = libscicore_algo_la-hashtable_core.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 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 expsum.lo copyvar.lo putid.lo itosci.lo \
-       stackr2d.lo stacki2d.lo stackc2i.lo isinstring.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 expsum.lo copyvar.lo putid.lo \
+       itosci.lo stackr2d.lo stacki2d.lo stackc2i.lo isinstring.lo \
        $(am__objects_4)
 am_libscicore_algo_la_OBJECTS = $(am__objects_2) $(am__objects_3) \
        $(am__objects_5)
@@ -702,19 +702,19 @@ CORE_FORTRAN_SOURCES = src/fortran/clunit.f src/fortran/getlin.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/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/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 \
@@ -2347,6 +2347,9 @@ compil.lo: src/fortran/compil.f
 funnam.lo: src/fortran/funnam.f
        $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o funnam.lo `test -f 'src/fortran/funnam.f' || echo '$(srcdir)/'`src/fortran/funnam.f
 
+isnum.lo: src/fortran/isnum.f
+       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o isnum.lo `test -f 'src/fortran/isnum.f' || echo '$(srcdir)/'`src/fortran/isnum.f
+
 cmdstr.lo: src/fortran/cmdstr.f
        $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o cmdstr.lo `test -f 'src/fortran/cmdstr.f' || echo '$(srcdir)/'`src/fortran/cmdstr.f
 
index eacc58c..8d0ae07 100644 (file)
@@ -223,6 +223,7 @@ lib /DEF:"$(ProjectDir)io_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X6
                <File RelativePath="isany.f"/>
                <File RelativePath="isbrk.f"/>
                <File RelativePath=".\isinstring.f"/>
+               <File RelativePath="isnum.f"/>
                <File RelativePath="istrue.f"/>
                <File RelativePath="itosci.f"/>
                <File RelativePath="lst2vars.f"/>
index f6eb245..b09ced5 100644 (file)
@@ -386,6 +386,7 @@ cd ..
     <ClCompile Include="isany.c" />
     <ClCompile Include="isbrk.c" />
     <ClCompile Include="isinstring.c" />
+    <ClCompile Include="isnum.c" />
     <ClCompile Include="istrue.c" />
     <ClCompile Include="itosci.c" />
     <ClCompile Include="lst2vars.c" />
@@ -494,6 +495,7 @@ cd ..
     <f2c_rule Include="isany.f" />
     <f2c_rule Include="isbrk.f" />
     <f2c_rule Include="isinstring.f" />
+    <f2c_rule Include="isnum.f" />
     <f2c_rule Include="istrue.f" />
     <f2c_rule Include="itosci.f" />
     <f2c_rule Include="lst2vars.f" />
index cd8b723..a2b7fa6 100644 (file)
     <ClCompile Include="isinstring.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="isnum.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="istrue.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <f2c_rule Include="isinstring.f">
       <Filter>Fortran Files</Filter>
     </f2c_rule>
+    <f2c_rule Include="isnum.f">
+      <Filter>Fortran Files</Filter>
+    </f2c_rule>
     <f2c_rule Include="istrue.f">
       <Filter>Fortran Files</Filter>
     </f2c_rule>
index 3282147..fdc2a13 100644 (file)
@@ -168,6 +168,7 @@ lib /DEF:&quot;$(InputDir)slatec_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:
                <File RelativePath="isany.f"/>
                <File RelativePath="isbrk.f"/>
                <File RelativePath=".\isinstring.f"/>
+               <File RelativePath="isnum.f"/>
                <File RelativePath="istrue.f"/>
                <File RelativePath="itosci.f"/>
                <File RelativePath="logops.f"/>
diff --git a/scilab/modules/core/src/fortran/isnum.f b/scilab/modules/core/src/fortran/isnum.f
new file mode 100644 (file)
index 0000000..e658bce
--- /dev/null
@@ -0,0 +1,30 @@
+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
+
+      logical function isnum(s,n,ival)
+c!but
+c     cette fonction teste si la chaine de caractere codee donnee 
+c     dans les n premiers entiers de s represente un nombre entier et si oui 
+c     retourne sa valeur ival
+c!
+      integer s(n),ival
+c
+      ival=0
+      k=0
+ 10   k=k+1
+      if(k.gt.n) goto 20
+      if(abs(s(k)).gt.9) goto 30
+      ival=10*ival+s(k)
+      goto 10
+c
+ 20   isnum=.true.
+      return
+ 30   isnum=.false.
+      return
+      end