vstk_, stack_ and showstack_ removed 82/16782/4
Cedric Delamarre [Fri, 3 Jul 2015 14:25:51 +0000 (16:25 +0200)]
Change-Id: I2d16c631fe29ba4b785026be3e419d561c7e0142

59 files changed:
scilab/modules/arnoldi/core_Import.def
scilab/modules/cacsd/src/c/core_Import.def
scilab/modules/cacsd/src/fortran/core_Import.def
scilab/modules/console/src/c/core_Import.def
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/core/includes/stack-c.h
scilab/modules/core/includes/stack-def.h
scilab/modules/core/includes/stack.h.in
scilab/modules/core/includes/stack.h.vc
scilab/modules/core/src/c/DllmainCore.c
scilab/modules/core/src/c/core_export.def
scilab/modules/core/src/fortran/core_Import.def
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/intstr.f [deleted file]
scilab/modules/data_structures/src/c/core_Import.def
scilab/modules/differential_equations/src/fortran/core_Import.def
scilab/modules/dynamic_link/src/c/core_Import.def
scilab/modules/elementary_functions/src/c/core_Import.def
scilab/modules/elementary_functions/src/fortran/core_Import.def
scilab/modules/elementary_functions/src/fortran/slatec/core_Import.def
scilab/modules/external_objects/core_Import.def
scilab/modules/fileio/core_Import.def
scilab/modules/functions/src/c/core_Import.def
scilab/modules/graphic_export/core_Import.def
scilab/modules/graphics/core_Import.def
scilab/modules/history_manager/src/c/core_Import.def
scilab/modules/integer/src/c/core_Import.def
scilab/modules/interpolation/src/c/core_Import.def
scilab/modules/io/src/c/core_Import.def
scilab/modules/jvm/core_Import.def
scilab/modules/localization/src/core_Import.def
scilab/modules/optimization/src/fortran/core_Import.def
scilab/modules/output_stream/src/c/Core_f_Import.def
scilab/modules/output_stream/src/c/core_Import.def
scilab/modules/output_stream/src/fortran/core_Import.def
scilab/modules/parallel/src/c/core_Import.def
scilab/modules/parameters/core_Import.def
scilab/modules/polynomials/src/fortran/core_Import.def
scilab/modules/randlib/src/c/core_Import.def
scilab/modules/randlib/src/fortran/core_Import.def
scilab/modules/scicos/src/c/core_Import.def
scilab/modules/scicos/src/c/scilab5_needed_stubs.c
scilab/modules/signal_processing/src/fortran/core_Import.def
scilab/modules/sparse/src/c/core_Import.def
scilab/modules/sparse/src/fortran/core_Import.def
scilab/modules/special_functions/src/c/core_Import.def
scilab/modules/special_functions/src/fortran/core_Import.def
scilab/modules/spreadsheet/core_Import.def
scilab/modules/statistics/src/c/core_Import.def
scilab/modules/string/src/c/core_Import.def
scilab/modules/symbolic/src/fortran/core_Import.def
scilab/modules/tclsci/core_Import.def
scilab/modules/tclsci/src/c/setvar.c
scilab/modules/time/core_Import.def
scilab/modules/umfpack/src/c/core_Import.def
scilab/modules/windows_tools/src/c/core_Import.def

index 84f43a2..f1d68a4 100644 (file)
@@ -7,7 +7,6 @@ callFunctionFromGateway
 com_
 putlhsvar_
 errorinfo_
-stack_
 getrhsvar_
 checklhs_
 checkrhs_
index 5827174..992662a 100644 (file)
@@ -10,9 +10,7 @@ callFunctionFromGateway
 com_
 fortran_mex_gateway
 errorinfo_
-stack_
 GetData
-vstk_
 MyHeapAlloc
 MyHeapFree
 
index dc3c987..66b5aa0 100644 (file)
@@ -4,10 +4,8 @@ LIBRARY    core.dll
 EXPORTS
 callFunctionFromGateway
 com_
-stack_
 getrhsvar_
 gettype_
-vstk_
 createvar_
 vartype_
 with_module
index d291713..568c02d 100644 (file)
@@ -63,7 +63,6 @@ CORE_CPP_SOURCES = \
 CORE_FORTRAN_SOURCES = \
     src/fortran/clunit.f \
     src/fortran/folhp.f \
-    src/fortran/intstr.f \
     src/fortran/xerbla.f \
     src/fortran/whatln.f \
     src/fortran/expsum.f \
index c0649cd..e5535e2 100644 (file)
@@ -225,11 +225,11 @@ am__objects_2 = src/cpp/libscicore_algo_la-namstr.lo \
        src/cpp/libscicore_algo_la-getfunctionsname.lo \
        src/cpp/libscicore_algo_la-InitScilab.lo
 am__objects_3 = src/fortran/clunit.lo src/fortran/folhp.lo \
-       src/fortran/intstr.lo src/fortran/xerbla.lo \
-       src/fortran/whatln.lo src/fortran/expsum.lo \
-       src/fortran/putid.lo src/fortran/readinter.lo \
-       src/fortran/rewindinter.lo src/fortran/backspaceinter.lo \
-       src/fortran/write_inter.lo src/fortran/read_inter.lo
+       src/fortran/xerbla.lo src/fortran/whatln.lo \
+       src/fortran/expsum.lo src/fortran/putid.lo \
+       src/fortran/readinter.lo src/fortran/rewindinter.lo \
+       src/fortran/backspaceinter.lo src/fortran/write_inter.lo \
+       src/fortran/read_inter.lo
 am_libscicore_algo_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
        $(am__objects_3)
 libscicore_algo_la_OBJECTS = $(am_libscicore_algo_la_OBJECTS)
@@ -729,7 +729,6 @@ CORE_CPP_SOURCES = \
 CORE_FORTRAN_SOURCES = \
     src/fortran/clunit.f \
     src/fortran/folhp.f \
-    src/fortran/intstr.f \
     src/fortran/xerbla.f \
     src/fortran/whatln.f \
     src/fortran/expsum.f \
@@ -1174,8 +1173,6 @@ src/fortran/clunit.lo: src/fortran/$(am__dirstamp) \
        src/fortran/$(DEPDIR)/$(am__dirstamp)
 src/fortran/folhp.lo: src/fortran/$(am__dirstamp) \
        src/fortran/$(DEPDIR)/$(am__dirstamp)
-src/fortran/intstr.lo: src/fortran/$(am__dirstamp) \
-       src/fortran/$(DEPDIR)/$(am__dirstamp)
 src/fortran/xerbla.lo: src/fortran/$(am__dirstamp) \
        src/fortran/$(DEPDIR)/$(am__dirstamp)
 src/fortran/whatln.lo: src/fortran/$(am__dirstamp) \
index bc8fec3..5841fed 100644 (file)
@@ -116,19 +116,6 @@ static void initial_c1_local(void)
 #define Lhs C2F(com).lhs
 #define Err C2F(iop).err
 
-#define stk(x)  ( C2F(stack).Stk + x-1 )
-#define istk(x) (((int *) C2F(stack).Stk) + x-1 )
-#define sstk(x) (((float *) C2F(stack).Stk) + x-1 )
-#define cstk(x) (((char *) C2F(stack).Stk) + x-1 )
-
-#define zstk(x) (((doublecomplex *) C2F(stack).Stk) + x-1 )
-
-
-/* to retreive handles on the stack */
-#define hstk(x) (((long long *) C2F(stack).Stk) + x-1 )
-
-
-
 #define Maxvol(n,ct)  C2F(maxvol)((c_local=n,&c_local),ct,1L)
 
 #define CreateVarFromPtr(n,ct,mx,nx,lx) if ( ! C2F(createvarfromptr)((c_local=n,&c_local),ct,mx,nx,(void *)lx,1L)) \
@@ -302,20 +289,6 @@ typedef struct tagTabF
 
 int get_optionals(char *name, rhs_opts opts[]);
 
-
-/*-------------------------------------
- * get infos without being dependent
- * of stack structure !!! (! WOW !)
- *------------------------------------*/
-#define getType(il)                    *istk(il)
-#define getNumberOfLines(il)           *istk(il+1)
-#define getNumberOfColumns(il)         *istk(il+2)
-#define getPrecision(il)               ((getType(il) == sci_ints) ? (*istk(il+3)) : (0))
-#define getDoubleDataAddress(il)       sadr(il + 4)
-#define isComplex(il)                  ((getType(il) == sci_ints) ? (0) : (*istk(il+3))) == 0
-#define getElementByAddress(ea)                *stk(ea)
-
-
 /*------------------------------
  * prototypes
  *-----------------------------*/
index f347206..6f89d87 100644 (file)
 #define maxdb 100
 #define maxbpt 1000
 
-
-/**
- * @TODO : add comment
- */
-typedef struct
-{
-#ifndef _MSC_VER
-    double *Stk;
-#else
-    double Stk[vsiz];
-#endif
-} STACK_struct;
-
-IMPORT STACK_struct C2F(stack);
-
 /**
  * @TODO : add comment
  */
index 754719d..aa5ebb8 100644 (file)
@@ -22,7 +22,7 @@ c intersiz used in interfaces
 c*-------------------------------------------------------------------
 Cc (DLL Digital Visual Fortran)
 cDEC$ IF DEFINED (FORDLL)
-cDEC$ ATTRIBUTES DLLIMPORT:: /stack/, /recu/, /iop/
+cDEC$ ATTRIBUTES DLLIMPORT:: /recu/, /iop/
 cDEC$ ATTRIBUTES DLLIMPORT:: /errgst/, /com/, /adre/
 cDEC$ ATTRIBUTES DLLIMPORT:: /cha1/, /dbg/
 cDEC$ ENDIF
@@ -37,13 +37,11 @@ C     ---------------------------------------------------------------
       integer intersiz
       parameter (intersiz=1024)
 c
-      integer, pointer :: stack_reserved_for_c__
       double precision, pointer, dimension(:) ::  stk
       integer,          pointer, dimension(:) :: istk
       real,             pointer, dimension(:) :: sstk
       character,        pointer               :: cstk*(4*vsiz)
       complex*16,       pointer, dimension(:) :: zstk
-      common /stack/ stack_reserved_for_c__, stk,
      $  istk, sstk, cstk, zstk
 
       integer ids(nsiz,psiz),pstk(psiz),rstk(psiz),pt,niv,macr,paus
index 58d6cc1..b605d60 100644 (file)
@@ -22,7 +22,7 @@ c intersiz used in interfaces
 c*-------------------------------------------------------------------
 Cc (DLL Digital Visual Fortran)     
 cDEC$ IF DEFINED (FORDLL)
-cDEC$ ATTRIBUTES DLLIMPORT:: /stack/, /recu/, /iop/
+cDEC$ ATTRIBUTES DLLIMPORT:: /recu/, /iop/
 cDEC$ ATTRIBUTES DLLIMPORT:: /errgst/, /com/, /adre/
 cDEC$ ATTRIBUTES DLLIMPORT:: /cha1/, /dbg/
 cDEC$ ATTRIBUTES DLLIMPORT:: /ierode/
@@ -39,7 +39,6 @@ C     ---------------------------------------------------------------
       parameter (intersiz=1024)
 c
       double precision stk(vsiz)
-      common /stack/ stk
       integer istk(2*vsiz)
       equivalence (istk(1),stk(1))
 
index b609022..169015b 100644 (file)
@@ -62,7 +62,6 @@ COM_struct C2F(com);
 ERRGST_struct C2F(errgst);
 IOP_struct C2F(iop);
 MTLBC_struct C2F(mtlbc);
-STACK_struct C2F(stack);
 DBG_struct C2F(dbg);
 MPROT_struct C2F(mprot);
 
index ebc16dc..aded0a4 100644 (file)
@@ -2,7 +2,6 @@
 ; forced exports (Commons fortran) in core
 ;
 ;used by core
-    stack_
     iop_
     errgst_
     com_
index 65ed41e..b5f4924 100644 (file)
@@ -44,4 +44,3 @@ freestacklastmemory_
 freeglobalstacklastmemory_
 freeStackCurrentMemory
 freeGlobalStackCurrentmemory
-stack_
index 5abd763..14de373 100644 (file)
@@ -70,7 +70,6 @@
                <File RelativePath="clunit.f"/>
                <File RelativePath="expsum.f"/>
                <File RelativePath="folhp.f"/>
-               <File RelativePath="intstr.f"/>
                <File RelativePath="putid.f"/>
                <File RelativePath=".\read_inter.f"/>
                <File RelativePath=".\readinter.f"/>
index a4db306..f5d2ca2 100644 (file)
@@ -317,7 +317,6 @@ cd ..
     <ClCompile Include="clunit.c" />
     <ClCompile Include="expsum.c" />
     <ClCompile Include="folhp.c" />
-    <ClCompile Include="intstr.c" />
     <ClCompile Include="putid.c" />
     <ClCompile Include="readinter.c" />
     <ClCompile Include="read_inter.c" />
@@ -334,7 +333,6 @@ cd ..
     <f2c_rule Include="clunit.f" />
     <f2c_rule Include="expsum.f" />
     <f2c_rule Include="folhp.f" />
-    <f2c_rule Include="intstr.f" />
     <f2c_rule Include="putid.f" />
     <f2c_rule Include="readinter.f" />
     <f2c_rule Include="read_inter.f" />
@@ -374,4 +372,4 @@ cd ..
   <ImportGroup Label="ExtensionTargets">
     <Import Project="..\..\..\..\Visual-Studio-settings\f2c.targets" />
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
index db2bdfd..073f2b2 100644 (file)
@@ -30,9 +30,6 @@
     <ClCompile Include="folhp.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="intstr.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="putid.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -76,9 +73,6 @@
     <f2c_rule Include="folhp.f">
       <Filter>Fortran Files</Filter>
     </f2c_rule>
-    <f2c_rule Include="intstr.f">
-      <Filter>Fortran Files</Filter>
-    </f2c_rule>
     <f2c_rule Include="putid.f">
       <Filter>Fortran Files</Filter>
     </f2c_rule>
       <Filter>Libraries Dependencies</Filter>
     </None>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/scilab/modules/core/src/fortran/intstr.f b/scilab/modules/core/src/fortran/intstr.f
deleted file mode 100644 (file)
index fbb9ac1..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-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.1-en.txt
-
-      subroutine intstr(n,istk,ni,job)
-c!but
-c     convertit la representation decimale d'un entier en une chaine 
-c     de caracteres scilab
-c!
-      parameter (nc=20)
-      character*(nc) buf
-      integer istk(*)
-c
-      write(buf,'(i20)') n
-      i=0
- 10   i=i+1
-      if(buf(i:i).eq.' ') goto 10
-      ni=nc+1-i
-      call cvstr(ni,istk,buf(i:nc),0)
-      end
-
index 14e6d05..0cd0d73 100644 (file)
@@ -15,9 +15,7 @@ checklhs_
 checkrhs_
 createvar_
 createvarfromptr_
-stack_
 gettype_
-vstk_
 MyHeapAlloc
 MyHeapFree
 MyHeapRealloc
index 9555c25..8f1a15e 100644 (file)
@@ -8,8 +8,6 @@ EXPORTS
 callFunctionFromGateway
 com_
 backtrace_print
-stack_
-vstk_
 iop_
 scistring_
 str2name_
index 0e75f3d..25a391d 100644 (file)
@@ -10,12 +10,10 @@ islittleendian
 mkmlistfromvars_
 createvarfromptr_
 putlhsvar_
-stack_
 createvar_
 freeArrayOfWideString
 getrhsvar_
 gettype_
-vstk_
 checklhs_
 checkrhs_
 transposeMatrixDouble
index cf39c63..853f7c0 100644 (file)
@@ -8,8 +8,6 @@ getLocalVariablesName
 callFunctionFromGateway
 com_
 funtab_
-stack_
-vstk_
 MyHeapAlloc
 MyHeapFree
 MyHeapRealloc
index ce5aba5..6101c20 100644 (file)
@@ -5,8 +5,6 @@ EXPORTS
 
 ; core
 com_
-stack_
-vstk_
 getrhsvar_
 putlhsvar_
 gettype_
index e084e64..4da3d3e 100644 (file)
@@ -5,7 +5,6 @@ EXPORTS
 ;--------------------------
 ; core
 ;--------------------------
-vstk_
 callFunctionFromGateway
 com_
 elementtype_
@@ -14,9 +13,7 @@ firstopt_
 freeArrayOfString
 iop_
 numopt_
-stack_
 vartype_
-vstk_
 GetDataSize
 GetData
 MyHeapAlloc
index c1f533d..74cf294 100644 (file)
@@ -9,11 +9,9 @@ com_
 putlhsvar_
 getrhsvar_
 gettype_
-vstk_
 checklhs_
 checkrhs_
 createvarfromptr_
-stack_
 createvar_
 MyHeapAlloc
 MyHeapFree
index 817f571..3fe928a 100644 (file)
@@ -5,8 +5,6 @@ EXPORTS
 
 ; core
 callFunctionFromGateway
-vstk_
-stack_
 com_
 BuildWithVS8ExpressF2C
 MyHeapAlloc
index 729b6e5..8c33054 100644 (file)
@@ -5,8 +5,6 @@ EXPORTS
 ;core
 callFunctionFromGateway
 com_
-stack_
-vstk_
 putlhsvar_
 createvar_
 getlistrhsvar_
index 9767001..fef6e5e 100644 (file)
@@ -13,7 +13,6 @@ checklhs_
 checkrhs_
 createvarfromptr_
 iop_
-stack_
 createvar_
 getrhsvar_
 vartype_
index 8b6a55d..f07bf2d 100644 (file)
@@ -4,13 +4,11 @@ LIBRARY    core.dll
 EXPORTS
 ; from core
 createvar_
-stack_
 checkrhs_
 checklhs_
 createvarfromptr_
 putlhsvar_
 freeArrayOfString
-vstk_
 gettype_
 getrhsvar_
 com_
index 243c5b5..7258c3a 100644 (file)
@@ -7,10 +7,8 @@ com_
 getSCIpath
 putlhsvar_
 createvarfromptr_
-stack_
 getrhsvar_
 gettype_
-vstk_
 checklhs_
 checkrhs_
 createvar_
index 2ad6d55..836bfdc 100644 (file)
@@ -4,7 +4,6 @@ LIBRARY    core.dll
 EXPORTS
 callFunctionFromGateway
 com_
-vstk_
 getrhsvar_
 scifunction_
 scistring_
index b66d68e..f27dfbc 100644 (file)
@@ -2,10 +2,8 @@ LIBRARY    core.dll
 
 
 EXPORTS
-vstk_
 iop_
 com_
-stack_
 freeArrayOfString
 MyHeapAlloc
 MyHeapFree
index f15e6bd..d852a09 100644 (file)
@@ -8,10 +8,8 @@ com_
 createvarfromptr_
 putlhsvar_
 createvar_
-stack_
 getrhsvar_
 gettype_
-vstk_
 checklhs_
 checkrhs_
 MyHeapAlloc
index 6d25db8..2d08fa9 100644 (file)
@@ -10,9 +10,7 @@ iop_
 ;
 ; explicit imports (COMMON) to fix warning LNK4049: locally defined symbol
 ;
-stack_
 adre_
-vstk_
 errgst_
 com_
 ;
index b2bc22f..0a52a3d 100644 (file)
@@ -4,9 +4,7 @@ LIBRARY    core.dll
 EXPORTS
 ;
 ; core
-stack_
 com_
-vstk_
 MyHeapAlloc
 MyHeapFree
 MyHeapRealloc
index c2aa36c..007aa2c 100644 (file)
@@ -110,14 +110,6 @@ SCICOS_IMPEXP void F2C(cha1)()
 }
 
 #ifndef _MSC_VER
-SCICOS_IMPEXP void F2C(vstk)()
-{
-    abort();
-}
-SCICOS_IMPEXP void F2C(stack)()
-{
-    abort();
-}
 SCICOS_IMPEXP void F2C(ierode)()
 {
     abort();
index 63ac4f9..7a719a2 100644 (file)
@@ -4,9 +4,7 @@ LIBRARY    core.dll
 EXPORTS
 ;core
 com_
-stack_
 iop_
-vstk_
 MyHeapAlloc
 MyHeapFree
 MyHeapRealloc
index a21a565..5a38484 100644 (file)
@@ -5,12 +5,10 @@ EXPORTS
 ;core
 callFunctionFromGateway
 com_
-vstk_
 putlhsvar_
 checklhs_
 checkrhs_
 getrhsvar_
-stack_
 getrhscvar_
 createvar_
 errgst_
index 80a0a5a..7792b96 100644 (file)
@@ -4,7 +4,6 @@ LIBRARY    core.dll
 EXPORTS
  putlhsvar_
  createvar_
- stack_
  com_
  getrhsvar_
  checklhs_
index 4a7a889..e828fcf 100644 (file)
@@ -7,7 +7,6 @@ checkrhs_
 checklhs_
 getrhsvar_
 com_
-stack_
 putlhsvar_
 createvar_
 callFunctionFromGateway
index e7e3e86..137b274 100644 (file)
@@ -8,11 +8,9 @@ freeArrayOfString
 freeArrayOfWideString
 gettype_
 com_
-vstk_
 checklhs_
 checkrhs_
 iop_
-stack_
 putlhsvar_
 createvar_
 getrhsvar_
index 16acd32..6c62e5f 100644 (file)
@@ -4,8 +4,6 @@ LIBRARY    core.dll
 EXPORTS
 callFunctionFromGateway
 com_
-stack_
-vstk_
 iop_
 StoreCommand
 GetCommand
index a7b488f..3841e22 100644 (file)
@@ -27,7 +27,7 @@ BOOL SetVarMatrix(Tcl_Interp *TCLinterpreter, char *VarName, int ptrValues, int
 
     for (i = 0; i < m * n; i++)
     {
-        MatrixDouble[i] = *stk(ptrValues++);
+        //MatrixDouble[i] = *stk(ptrValues++);
     }
 
 
index 0df436d..22e04be 100644 (file)
@@ -6,7 +6,6 @@ transposeMatrixDouble
 transposeMatrixInt
 callFunctionFromGateway
 com_
-stack_
 putlhsvar_
 getrhsvar_
 createvarfromptr_
index 2627cba..a30989b 100644 (file)
@@ -4,10 +4,8 @@ LIBRARY    core.dll
 EXPORTS
 ;core
 
-stack_
 createvar_
 com_
-vstk_
 callFunctionFromGateway
 putlhsvar_
 createcvar_