Merge remote-tracking branch 'origin/master' into yasp 24/12024/2
Antoine ELIAS [Fri, 12 Jul 2013 14:00:09 +0000 (16:00 +0200)]
Conflicts:
scilab/etc/scilab.start
scilab/modules/completion/tests/nonreg_tests/bug_3051.tst
scilab/modules/console/src/c/cmdLine/cliPrompt.c
scilab/modules/core/sci_gateway/c/sci_getscilabmode.c
scilab/modules/core/sci_gateway/fortran/sci_f_exists.f
scilab/modules/core/src/c/expr.c
scilab/modules/core/src/c/getval.c
scilab/modules/core/src/c/stack1.c
scilab/modules/core/src/c/stack2.c
scilab/modules/data_structures/src/c/hmops.c
scilab/modules/differential_equations/tests/unit_tests/dae.dia.ref
scilab/modules/double/Makefile.am
scilab/modules/double/Makefile.in
scilab/modules/double/sci_gateway/c/gw_double.c
scilab/modules/double/sci_gateway/fortran/matsubt.f
scilab/modules/double/src/c/double_f_Import.def
scilab/modules/double/src/fortran/double_f.vfproj
scilab/modules/double/src/fortran/double_f2c.vcxproj
scilab/modules/double/src/fortran/double_f2c.vcxproj.filters
scilab/modules/elementary_functions/sci_gateway/fortran/sci_f_number_properties.f
scilab/modules/fftw/src/c/fftw_utilities.c
scilab/modules/fileio/sci_gateway/c/sci_fileparts.c
scilab/modules/functions/macros/genlib.sci
scilab/modules/graphics/sci_gateway/c/gw_graphics.c
scilab/modules/integer/src/fortran/i_s_i.f
scilab/modules/integer/src/fortran/i_t.f
scilab/modules/integer/src/fortran/intops.f
scilab/modules/io/src/fortran/newsave.f
scilab/modules/output_stream/src/c/errorTable.c
scilab/modules/output_stream/src/c/set_xxprintf.c
scilab/modules/output_stream/src/fortran/print.f
scilab/modules/signal_processing/sci_gateway/fortran/sci_f_delip.f
scilab/modules/string/sci_gateway/c/sci_strtod.c
scilab/modules/string/src/c/stringToComplex.c

Change-Id: I19407c3261db8aa092e699a3707f74e5f4d126d4

37 files changed:
1  2 
scilab/bin/scilab
scilab/modules/cacsd/sci_gateway/c/sci_linmeq.c
scilab/modules/console/src/c/cmdLine/cliPrompt.c
scilab/modules/core/src/c/signal_mgmt.c
scilab/modules/core/src/c/texmacs.c
scilab/modules/data_structures/includes/gw_data_structures1.h
scilab/modules/data_structures/sci_gateway/c/sci_rlist.c
scilab/modules/data_structures/src/c/core_Import.def
scilab/modules/development_tools/macros/test_run.sci
scilab/modules/fileio/src/c/dlManager.c
scilab/modules/graphics/sci_gateway/c/sci_is_handle_valid.c
scilab/modules/graphics/sci_gateway/c/sci_xget.c
scilab/modules/hdf5/sci_gateway/cpp/sci_import_from_hdf5.cpp
scilab/modules/hdf5/sci_gateway/cpp/sci_listvar_in_hdf5.cpp
scilab/modules/hdf5/src/c/h5_readDataFromFile.c
scilab/modules/interpolation/sci_gateway/c/sci_splin2d.c
scilab/modules/optimization/sci_gateway/c/sci_qld.c
scilab/modules/overloading/macros/generic_i_h.sci
scilab/modules/polynomials/src/fortran/dpsimp.f
scilab/modules/scicos/Makefile.am
scilab/modules/scicos/Makefile.in
scilab/modules/scicos/src/c/scicos.c
scilab/modules/scicos/src/c/scicos.vcxproj
scilab/modules/scicos/src/c/scicos.vcxproj.filters
scilab/modules/sparse/tests/unit_tests/sparse.dia.ref
scilab/modules/sparse/tests/unit_tests/sparse.tst
scilab/modules/special_functions/sci_gateway/c/sci_legendre.c
scilab/modules/string/src/c/pcre_private.c
scilab/modules/string/src/c/stringToComplex.c
scilab/modules/ui_data/sci_gateway/cpp/sci_editvar.cpp
scilab/modules/umfpack/sci_gateway/c/gw_umfpack.c
scilab/modules/umfpack/sci_gateway/c/sci_taucs_chget.c
scilab/modules/umfpack/sci_gateway/c/sci_taucs_chsolve.c
scilab/modules/umfpack/sci_gateway/c/sci_umf_lufact.c
scilab/modules/umfpack/sci_gateway/c/sci_umf_luget.c
scilab/modules/umfpack/sci_gateway/c/sci_umf_lusolve.c
scilab/modules/umfpack/src/c/common_umfpack.c

Simple merge
@@@ -50,9 -50,8 +50,9 @@@ int printPrompt(int token
          setCharDisplay(DISP_LAST_SET);
          fflush(stdout);
      }
 +
-     len = strlen(prompt);
+     promptLen = strlen(prompt);
      free(prompt);
-     return len;
+     return promptLen;
  }
Simple merge
@@@ -24,7 -24,7 +24,7 @@@ DATA_STRUCTURES_IMPEXP int gw_data_stru
  int sci_glist(char *fname, unsigned long fname_len);
  int sci_scilist(char *fname, unsigned long fname_len);
  int sci_lsslist(char *fname, unsigned long fname_len);
--int sci_rlist(char *fname, unsigned long fname_len);
++int sci_rlist(char *fname, void *pvApiCtx);
  int sci_scitlist(char *fname, unsigned long fname_len);
  int sci_lstcat(char *fname, unsigned long fname_len);
  int sci_scimlist(char *fname, unsigned long fname_len);
   */
  
  /*--------------------------------------------------------------------------*/
++#include <string.h>
  #include "gw_data_structures1.h"
 -#include <api_scilab.h>
++#include "api_scilab.h"
  /*--------------------------------------------------------------------------*/
  extern int C2F(rattyp)(); /* fortran */
  extern int C2F(mtlist)(); /* fortran */
  /*--------------------------------------------------------------------------*/
--int sci_rlist(char *fname, unsigned long fname_len)
++int sci_rlist(char *fname, void* pvApiCtx)
  {
-     C2F(mtlist)(C2F(rattyp));
-     return 0;
+     if (nbInputArgument(pvApiCtx) == 2)
+     {
 -        int lw = 0;
 -        C2F(overload)(&lw, fname, fname_len);
++        callOverloadFunction(pvApiCtx, 0, fname, (unsigned int)strlen(fname));
+         return 0;
+     }
+     else
+     {
+         C2F(mtlist)(C2F(rattyp));
+         return 0;
+     }
  }
  /*--------------------------------------------------------------------------*/
@@@ -9,7 -9,17 +9,8 @@@ iop
  callFunctionFromGateway
  stack_
  vstk_
 -createcvar_
 -putlhsvar_
  intersci_
 -createvar_
  com_
 -getrhsvar_
 -gettype_
 -createlistcvarfrom_
 -createlistvarfrom_
 -createlistvarfromptr_
 -creimati_
  MyHeapAlloc
  MyHeapFree
+ overload_
@@@ -24,7 -24,9 +24,8 @@@ extern "C
  #include "h5_fileManagement.h"
  #include "h5_readDataFromFile.h"
  #include "h5_attributeConstants.h"
 -#include "intmacr2tree.h"
  #include "expandPathVariable.h"
+ #include "stdlib.h"
  }
  
  #include "import_from_hdf5_v1.hxx"
Simple merge
Simple merge
Simple merge
  
  extern CellAdr *ListNumeric;
  
 -int sci_umf_luget(char* fname, unsigned long l)
 +int sci_umf_luget(char* fname, void* pvApiCtx)
  {
      /*
-      *  LU_ptr is (a pointer to) a factorisation of A, we have:
+      *  LU_ptr is (a pointer to) a factorization of A, we have:
       *             -1
       *          P R  A Q = L U
       *