Merge remote branch 'origin/master' into YaSp 24/2524/1
Bruno JOFRET [Fri, 19 Nov 2010 10:14:04 +0000 (11:14 +0100)]
Conflicts:
scilab/Makefile.am
scilab/Makefile.in
scilab/configure
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/api_scilab/includes/api_common.h
scilab/modules/api_scilab/includes/api_int.h
scilab/modules/api_scilab/src/cpp/api_common.cpp
scilab/modules/api_scilab/src/cpp/api_double.cpp
scilab/modules/api_scilab/src/cpp/api_int.cpp
scilab/modules/api_scilab/src/cpp/api_list.cpp
scilab/modules/api_scilab/src/cpp/api_string.cpp
scilab/modules/call_scilab/src/c/call_scilab.c
scilab/modules/completion/src/c/getCommonPart.c
scilab/modules/completion/src/jni/Completion_wrap.c
scilab/modules/console/src/jni/DropFiles_wrap.c
scilab/modules/core/includes/stack3.h
scilab/modules/core/includes/version.h
scilab/modules/core/src/c/stack3.c
scilab/modules/core/src/c/tmpdir.c
scilab/modules/development_tools/macros/test_run.sci
scilab/modules/elementary_functions/sci_gateway/c/sci_size.c
scilab/modules/fileio/sci_gateway/c/sci_fscanfMat.c
scilab/modules/fileio/src/c/filesmanagement.c
scilab/modules/fileio/src/c/removedir.c
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/etc/main_menubar.xml
scilab/modules/gui/sci_gateway/c/sci_ClipBoard.c
scilab/modules/helptools/sci_gateway/cpp/sci_buildDoc.cpp
scilab/modules/helptools/src/c/helptools.vcproj
scilab/modules/history_manager/src/cpp/HistoryFile.cpp
scilab/modules/history_manager/src/cpp/HistoryManager.cpp
scilab/modules/history_manager/src/jni/HistoryManagement_wrap.c
scilab/modules/javasci/src/c/javasci2_helper.c
scilab/modules/javasci/src/java/org/scilab/modules/javasci/Scilab.java
scilab/modules/output_stream/macros/prettyprint.sci
scilab/modules/output_stream/sci_gateway/c/sci_msprintf.c
scilab/modules/parameters/src/c/parameters.c
scilab/modules/scicos/demos/control_systems.dem.gateway.sce
scilab/modules/scicos/demos/electrical_systems.dem.gateway.sce
scilab/modules/scicos/demos/live.dem.gateway.sce
scilab/modules/scicos/demos/mechanical_systems.dem.gateway.sce
scilab/modules/scicos/demos/modelica_demos.dem.gateway.sce
scilab/modules/scicos/demos/old_demos.dem.gateway.sce
scilab/modules/scicos/demos/scicos.dem.gateway.sce
scilab/modules/scicos/demos/standard.dem.gateway.sce
scilab/modules/scicos/locales/fr_FR/scicos.po
scilab/modules/scicos/locales/it_IT/scicos.po
scilab/modules/scicos_blocks/Makefile.am
scilab/modules/scicos_blocks/Makefile.in
scilab/modules/scinotes/src/c/ScilabKeywords.c
scilab/modules/shell/src/c/windows/TermCompletion.c
scilab/modules/statistics/sci_gateway/c/sci_cdfgam.c
scilab/modules/string/src/c/string.vcproj
scilab/modules/windows_tools/src/c/scilab_windows/FilesAssociations.c
scilab/modules/xcos/Makefile.am
scilab/modules/xcos/Makefile.in
scilab/modules/xcos/sci_gateway/c/gw_xcos.c
scilab/modules/xcos/sci_gateway/cpp/sci_xcosConfigureXmlFile.cpp
scilab/modules/xcos/sci_gateway/cpp/sci_xcosPalCategoryAdd.cpp
scilab/modules/xcos/sci_gateway/cpp/sci_xcosPalDelete.cpp
scilab/modules/xcos/sci_gateway/cpp/sci_xcosPalDisable.cpp
scilab/modules/xcos/sci_gateway/cpp/sci_xcosPalEnable.cpp
scilab/modules/xcos/sci_gateway/cpp/sci_xcosPalGenerateIcon.cpp
scilab/modules/xcos/sci_gateway/cpp/sci_xcosPalLoad.cpp
scilab/modules/xcos/sci_gateway/cpp/sci_xcosPalMove.cpp
scilab/modules/xcos/src/cpp/xcosUtilities.cpp

Change-Id: I430ca110131b9cef06e9e6fda4035f48da254781

180 files changed:
1  2 
scilab/.gitignore
scilab/Makefile.am
scilab/Makefile.in
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/bin/bin.iss
scilab/bin/scilab
scilab/configure
scilab/configure.ac
scilab/contrib/Makefile.in
scilab/libs/MALLOC/Makefile.in
scilab/libs/Makefile.in
scilab/libs/doublylinkedlist/Makefile.in
scilab/libs/dynamiclibrary/Makefile.in
scilab/libs/hashtable/Makefile.in
scilab/libs/libst/Makefile.in
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/abstractSyntaxTree/Makefile.in
scilab/modules/action_binding/Makefile.in
scilab/modules/api_scilab/Makefile.in
scilab/modules/api_scilab/includes/api_boolean.h
scilab/modules/api_scilab/includes/api_boolean_sparse.h
scilab/modules/api_scilab/includes/api_common.h
scilab/modules/api_scilab/includes/api_double.h
scilab/modules/api_scilab/includes/api_int.h
scilab/modules/api_scilab/includes/api_list.h
scilab/modules/api_scilab/includes/api_pointer.h
scilab/modules/api_scilab/includes/api_poly.h
scilab/modules/api_scilab/includes/api_sparse.h
scilab/modules/api_scilab/includes/api_string.h
scilab/modules/api_scilab/src/cpp/api_boolean.cpp
scilab/modules/api_scilab/src/cpp/api_common.cpp
scilab/modules/api_scilab/src/cpp/api_double.cpp
scilab/modules/api_scilab/src/cpp/api_int.cpp
scilab/modules/api_scilab/src/cpp/api_internal_double.h
scilab/modules/api_scilab/src/cpp/api_list.cpp
scilab/modules/api_scilab/src/cpp/api_poly.cpp
scilab/modules/api_scilab/src/cpp/api_string.cpp
scilab/modules/arnoldi/Makefile.in
scilab/modules/atoms/Makefile.in
scilab/modules/boolean/Makefile.in
scilab/modules/cacsd/Makefile.in
scilab/modules/call_scilab/Makefile.in
scilab/modules/call_scilab/src/c/call_scilab.c
scilab/modules/commons/Makefile.in
scilab/modules/compatibility_functions/Makefile.in
scilab/modules/completion/Makefile.am
scilab/modules/completion/Makefile.in
scilab/modules/completion/src/c/completeLine.c
scilab/modules/completion/src/c/completion.vcproj
scilab/modules/completion/src/c/getCommonPart.c
scilab/modules/completion/src/c/getfieldsdictionary.c
scilab/modules/console/Makefile.in
scilab/modules/console/src/c/dropFiles.c
scilab/modules/core/Makefile.in
scilab/modules/core/includes/sci_types.h
scilab/modules/core/includes/stack3.h
scilab/modules/core/src/c/stack3.c
scilab/modules/data_structures/Makefile.in
scilab/modules/demo_tools/Makefile.in
scilab/modules/development_tools/Makefile.in
scilab/modules/development_tools/src/fake/Makefile.in
scilab/modules/differential_equations/Makefile.in
scilab/modules/double/Makefile.in
scilab/modules/dynamic_link/Makefile.in
scilab/modules/elementary_functions/Makefile.in
scilab/modules/elementary_functions/sci_gateway/c/sci_size.c
scilab/modules/fftw/Makefile.in
scilab/modules/fileio/Makefile.in
scilab/modules/fileio/sci_gateway/c/sci_fscanfMat.c
scilab/modules/fileio/src/c/filesmanagement.c
scilab/modules/fileio/src/c/fscanfMat.c
scilab/modules/fileio/src/c/removedir.c
scilab/modules/functions/Makefile.in
scilab/modules/functions_manager/Makefile.in
scilab/modules/genetic_algorithms/Makefile.in
scilab/modules/graph/Makefile.in
scilab/modules/graphic_export/Makefile.in
scilab/modules/graphics/Makefile.in
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/etc/main_menubar.xml
scilab/modules/gui/sci_gateway/c/sci_ClipBoard.c
scilab/modules/gui/src/c/gui.vcproj
scilab/modules/hdf5/Makefile.in
scilab/modules/helptools/Makefile.am
scilab/modules/helptools/Makefile.in
scilab/modules/helptools/helptools.iss
scilab/modules/helptools/sci_gateway/c/gw_helptools.c
scilab/modules/helptools/sci_gateway/cpp/sci_buildDoc.cpp
scilab/modules/helptools/sci_gateway/cpp/sci_buildDocv2.cpp
scilab/modules/helptools/src/c/helptools.vcproj
scilab/modules/history_browser/Makefile.in
scilab/modules/history_manager/Makefile.in
scilab/modules/history_manager/src/cpp/HistoryFile.cpp
scilab/modules/history_manager/src/cpp/HistoryManager.cpp
scilab/modules/integer/Makefile.in
scilab/modules/interpolation/Makefile.in
scilab/modules/intersci/Makefile.in
scilab/modules/io/Makefile.am
scilab/modules/io/Makefile.in
scilab/modules/javasci/Makefile.in
scilab/modules/javasci/src/c/javasci2_helper.c
scilab/modules/javasci/src/java/org/scilab/modules/javasci/Scilab.java
scilab/modules/javasci/src/jni/call_scilab.i
scilab/modules/javasci/src/jni/call_scilab_wrap.c
scilab/modules/jvm/Makefile.in
scilab/modules/linear_algebra/Makefile.in
scilab/modules/linear_algebra/help/en_US/lsq.xml
scilab/modules/linear_algebra/help/en_US/schur.xml
scilab/modules/localization/Makefile.in
scilab/modules/m2sci/Makefile.in
scilab/modules/maple2scilab/Makefile.in
scilab/modules/matio/Makefile.in
scilab/modules/mexlib/Makefile.in
scilab/modules/modules_manager/Makefile.in
scilab/modules/operations/Makefile.in
scilab/modules/operations/includes/doublecomplex.h
scilab/modules/operations/src/c/doublecomplex.c
scilab/modules/optimization/Makefile.in
scilab/modules/output_stream/Makefile.in
scilab/modules/overloading/Makefile.in
scilab/modules/parallel/Makefile.in
scilab/modules/parameters/Makefile.in
scilab/modules/parameters/src/c/parameters.c
scilab/modules/parse/Makefile.in
scilab/modules/polynomials/Makefile.in
scilab/modules/pvm/Makefile.in
scilab/modules/randlib/Makefile.in
scilab/modules/renderer/Makefile.in
scilab/modules/scicos/Makefile.in
scilab/modules/scicos_blocks/Makefile.am
scilab/modules/scicos_blocks/Makefile.in
scilab/modules/scinotes/Makefile.am
scilab/modules/scinotes/Makefile.in
scilab/modules/scinotes/src/c/ScilabKeywords.c
scilab/modules/shell/Makefile.in
scilab/modules/shell/src/c/others/zzledt.c
scilab/modules/shell/src/c/windows/TermCompletion.c
scilab/modules/signal_processing/Makefile.in
scilab/modules/simulated_annealing/Makefile.in
scilab/modules/sound/Makefile.in
scilab/modules/sparse/Makefile.in
scilab/modules/special_functions/Makefile.in
scilab/modules/spreadsheet/Makefile.in
scilab/modules/statistics/Makefile.in
scilab/modules/statistics/sci_gateway/c/sci_cdfgam.c
scilab/modules/string/Makefile.in
scilab/modules/string/src/c/string.vcproj
scilab/modules/symbol/Makefile.in
scilab/modules/symbolic/Makefile.in
scilab/modules/system_env/Makefile.in
scilab/modules/tclsci/Makefile.in
scilab/modules/texmacs/Makefile.in
scilab/modules/time/Makefile.in
scilab/modules/types/Makefile.in
scilab/modules/types/includes/double.hxx
scilab/modules/types/includes/matrixpoly.hxx
scilab/modules/types/src/cpp/double.cpp
scilab/modules/types/src/cpp/matrixpoly.cpp
scilab/modules/ui_data/Makefile.am
scilab/modules/ui_data/Makefile.in
scilab/modules/umfpack/Makefile.in
scilab/modules/windows_tools/Makefile.in
scilab/modules/windows_tools/src/c/scilab_windows/FilesAssociations.c
scilab/modules/xcos/Makefile.am
scilab/modules/xcos/Makefile.in
scilab/modules/xcos/sci_gateway/c/gw_xcos.c
scilab/modules/xcos/sci_gateway/cpp/sci_xcosConfigureXmlFile.cpp
scilab/modules/xcos/sci_gateway/cpp/sci_xcosPalCategoryAdd.cpp
scilab/modules/xcos/sci_gateway/cpp/sci_xcosPalDelete.cpp
scilab/modules/xcos/sci_gateway/cpp/sci_xcosPalDisable.cpp
scilab/modules/xcos/sci_gateway/cpp/sci_xcosPalEnable.cpp
scilab/modules/xcos/sci_gateway/cpp/sci_xcosPalGenerateIcon.cpp
scilab/modules/xcos/sci_gateway/cpp/sci_xcosPalLoad.cpp
scilab/modules/xcos/sci_gateway/cpp/sci_xcosPalMove.cpp
scilab/modules/xcos/src/c/xcos.vcproj
scilab/modules/xcos/src/cpp/xcosUtilities.cpp
scilab/tools/innosetup/base.iss

Simple merge
@@@ -119,12 -97,12 +119,15 @@@ all-local: $(TARGETS_ALL
  rootdir=$(pkgdatadir)/etc/
  root_DATA = $(top_srcdir)/etc/scilab.start \
  $(top_srcdir)/etc/scilab.quit \
 +$(top_srcdir)/etc/modules.xml \
 +$(top_srcdir)/etc/classpath.xml \
 +$(top_srcdir)/etc/librarypath.xml \
  $(top_srcdir)/etc/toolboxes.xml \
  $(top_builddir)/etc/jvm_options.xml \
- $(top_srcdir)/etc/yasp_modules.xml
+ $(top_builddir)/etc/modules.xml \
+ $(top_builddir)/etc/classpath.xml \
+ $(top_builddir)/etc/logging.properties \
+ $(top_builddir)/etc/librarypath.xml
  
  
  infofilesdir=$(pkgdatadir)/
@@@ -164,23 -145,22 +170,22 @@@ macros:$(top_builddir)/scilab-cli-bin $
        echo "$(top_builddir)/bin/scilab-cli -ns -f modules/functions/scripts/buildmacros/buildmacros.sce" ; \
        $(top_builddir)/bin/scilab-cli -ns -f modules/functions/scripts/buildmacros/buildmacros.sce)
  
- doc:
- #$(top_builddir)/scilab-bin $(top_builddir)/bin/scilab-adv-cli
+ doc:$(top_builddir)/scilab-bin $(top_builddir)/bin/scilab-adv-cli
 -if BUILD_HELP
 -      -@if test -x $(top_builddir)/scilab-bin; then \
 -              cd $(top_builddir);\
 -              echo "-- Building documentation (English) --"; \
 -              echo "LANG=C SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 $(top_builddir)/bin/scilab-adv-cli -nb -nouserstartup -e \"xmltojar([],[],'en_US');exit;\"";\
 -              LANG=C SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 $(top_builddir)/bin/scilab-adv-cli -nb -l en_US -nouserstartup -e "xmltojar([],[],'en_US');exit;";\
 -              echo "-- Building documentation (French) --"; \
 -              echo "SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 $(top_builddir)/bin/scilab-adv-cli -nb -nouserstartup -e \"xmltojar([],[],'fr_FR');exit;\""; \
 -              SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 $(top_builddir)/bin/scilab-adv-cli -nb -nouserstartup -e "xmltojar([],[],'fr_FR');exit;"; \
 -      else \
 -              echo "Cannot find Scilab-adv-cli binary"; \
 -      fi
 -else
 -      @echo "Cannot buid help. Add --enable-build-help to the ./configure if you want to build it."
 -endif
 +#if BUILD_HELP
 +#     -@if test -x $(top_builddir)/scilab-bin; then \
 +#             cd $(top_builddir);\
 +#             echo "-- Building documentation (English) --"; \
- #             echo "LANG=C SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab-adv-cli -nb -nouserstartup -e \"xmltojar([],[],'en_US');exit;\"";\
- #             LANG=C SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab-adv-cli -nb -l en_US -nouserstartup -e "xmltojar([],[],'en_US');exit;";\
++#             echo "LANG=C SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 $(top_builddir)/bin/scilab-adv-cli -nb -nouserstartup -e \"xmltojar([],[],'en_US');exit;\"";\
++#             LANG=C SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 $(top_builddir)/bin/scilab-adv-cli -nb -l en_US -nouserstartup -e "xmltojar([],[],'en_US');exit;";\
 +#             echo "-- Building documentation (French) --"; \
- #             echo "SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab-adv-cli -nb -nouserstartup -e \"xmltojar([],[],'fr_FR');exit;\""; \
- #             SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab-adv-cli -nb -nouserstartup -e "xmltojar([],[],'fr_FR');exit;"; \
++#             echo "SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 $(top_builddir)/bin/scilab-adv-cli -nb -nouserstartup -e \"xmltojar([],[],'fr_FR');exit;\""; \
++#             SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 $(top_builddir)/bin/scilab-adv-cli -nb -nouserstartup -e "xmltojar([],[],'fr_FR');exit;"; \
 +#     else \
 +#             echo "Cannot find Scilab-adv-cli binary"; \
 +#     fi
 +#else
 +#     @echo "Cannot buid help. Add --enable-build-help to the ./configure if you want to build it."
 +#endif
  
  check-help:$(top_builddir)/scilab-cli-bin $(top_builddir)/bin/scilab-cli
        @if test -x $(top_builddir)/scilab-cli-bin; then \
@@@ -651,12 -609,12 +652,15 @@@ TARGETS_ALL = macros $(am__append_3
  rootdir = $(pkgdatadir)/etc/
  root_DATA = $(top_srcdir)/etc/scilab.start \
  $(top_srcdir)/etc/scilab.quit \
 +$(top_srcdir)/etc/modules.xml \
 +$(top_srcdir)/etc/classpath.xml \
 +$(top_srcdir)/etc/librarypath.xml \
  $(top_srcdir)/etc/toolboxes.xml \
  $(top_builddir)/etc/jvm_options.xml \
- $(top_srcdir)/etc/yasp_modules.xml
+ $(top_builddir)/etc/modules.xml \
+ $(top_builddir)/etc/classpath.xml \
+ $(top_builddir)/etc/logging.properties \
+ $(top_builddir)/etc/librarypath.xml
  
  infofilesdir = $(pkgdatadir)/
  infofiles_DATA = $(top_srcdir)/CHANGES \
@@@ -1757,23 -1652,19 +1764,22 @@@ macros:$(top_builddir)/scilab-cli-bin $
        echo "$(top_builddir)/bin/scilab-cli -ns -f modules/functions/scripts/buildmacros/buildmacros.sce" ; \
        $(top_builddir)/bin/scilab-cli -ns -f modules/functions/scripts/buildmacros/buildmacros.sce)
  
- doc:
- #$(top_builddir)/scilab-bin $(top_builddir)/bin/scilab-adv-cli
+ doc:$(top_builddir)/scilab-bin $(top_builddir)/bin/scilab-adv-cli
 -@BUILD_HELP_TRUE@     -@if test -x $(top_builddir)/scilab-bin; then \
 -@BUILD_HELP_TRUE@             cd $(top_builddir);\
 -@BUILD_HELP_TRUE@             echo "-- Building documentation (English) --"; \
 -@BUILD_HELP_TRUE@             echo "LANG=C SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 $(top_builddir)/bin/scilab-adv-cli -nb -nouserstartup -e \"xmltojar([],[],'en_US');exit;\"";\
 -@BUILD_HELP_TRUE@             LANG=C SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 $(top_builddir)/bin/scilab-adv-cli -nb -l en_US -nouserstartup -e "xmltojar([],[],'en_US');exit;";\
 -@BUILD_HELP_TRUE@             echo "-- Building documentation (French) --"; \
 -@BUILD_HELP_TRUE@             echo "SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 $(top_builddir)/bin/scilab-adv-cli -nb -nouserstartup -e \"xmltojar([],[],'fr_FR');exit;\""; \
 -@BUILD_HELP_TRUE@             SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 $(top_builddir)/bin/scilab-adv-cli -nb -nouserstartup -e "xmltojar([],[],'fr_FR');exit;"; \
 -@BUILD_HELP_TRUE@     else \
 -@BUILD_HELP_TRUE@             echo "Cannot find Scilab-adv-cli binary"; \
 -@BUILD_HELP_TRUE@     fi
 -@BUILD_HELP_FALSE@    @echo "Cannot buid help. Add --enable-build-help to the ./configure if you want to build it."
 +#if BUILD_HELP
 +#     -@if test -x $(top_builddir)/scilab-bin; then \
 +#             cd $(top_builddir);\
 +#             echo "-- Building documentation (English) --"; \
- #             echo "LANG=C SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab-adv-cli -nb -nouserstartup -e \"xmltojar([],[],'en_US');exit;\"";\
- #             LANG=C SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab-adv-cli -nb -l en_US -nouserstartup -e "xmltojar([],[],'en_US');exit;";\
++#             echo "LANG=C SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 $(top_builddir)/bin/scilab-adv-cli -nb -nouserstartup -e \"xmltojar([],[],'en_US');exit;\"";\
++#             LANG=C SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 $(top_builddir)/bin/scilab-adv-cli -nb -l en_US -nouserstartup -e "xmltojar([],[],'en_US');exit;";\
 +#             echo "-- Building documentation (French) --"; \
- #             echo "SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab-adv-cli -nb -nouserstartup -e \"xmltojar([],[],'fr_FR');exit;\""; \
- #             SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab-adv-cli -nb -nouserstartup -e "xmltojar([],[],'fr_FR');exit;"; \
++#             echo "SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 $(top_builddir)/bin/scilab-adv-cli -nb -nouserstartup -e \"xmltojar([],[],'fr_FR');exit;\""; \
++#             SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 $(top_builddir)/bin/scilab-adv-cli -nb -nouserstartup -e "xmltojar([],[],'fr_FR');exit;"; \
 +#     else \
 +#             echo "Cannot find Scilab-adv-cli binary"; \
 +#     fi
 +#else
 +#     @echo "Cannot buid help. Add --enable-build-help to the ./configure if you want to build it."
 +#endif
  
  check-help:$(top_builddir)/scilab-cli-bin $(top_builddir)/bin/scilab-cli
        @if test -x $(top_builddir)/scilab-cli-bin; then \
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -10186,7 -9916,7 +10208,7 @@@ $as_echo "$ac_java_classpath" >&6; 
  $as_echo_n "checking to see if the java compiler works... " >&6; }
  
      cat << \EOF > conftest.java
- // #line 10189 "configure"
 -// #line 9919 "configure"
++// #line 10211 "configure"
  
  
  public class conftest {
@@@ -10252,7 -9982,7 +10274,7 @@@ $as_echo_n "checking type of jvm... " >
      if test "x$ac_java_jvm_name" = "x" ; then
  
      cat << \EOF > conftest.java
- // #line 10255 "configure"
 -// #line 9985 "configure"
++// #line 10277 "configure"
  import gnu.java.io.EncodingManager;
  
  public class conftest {
@@@ -10316,7 -10046,7 +10338,7 @@@ $as_echo_n "checking java API version..
  
  
      cat << \EOF > conftest.java
- // #line 10319 "configure"
 -// #line 10049 "configure"
++// #line 10341 "configure"
  import java.nio.charset.Charset;
  
  public class conftest {
  
  
      cat << \EOF > conftest.java
- // #line 10364 "configure"
 -// #line 10094 "configure"
++// #line 10386 "configure"
  import java.lang.StringBuilder;
  
  public class conftest {
@@@ -11620,7 -11366,7 +11658,7 @@@ $as_echo_n "checking jgraphx... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 11623 "configure"
 -// #line 11369 "configure"
++// #line 11661 "configure"
  import com.mxgraph.model.mxCell;
  
  public class conftest {
@@@ -11714,7 -11460,7 +11752,7 @@@ $as_echo_n "checking minimal version (1
     if test "x=" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 11717 "configure"
 -// #line 11463 "configure"
++// #line 11755 "configure"
  import com.mxgraph.view.mxGraph;
  
  public class conftest {
     else
  
      cat << \EOF > conftest.java
- // #line 11768 "configure"
 -// #line 11514 "configure"
++// #line 11806 "configure"
  import com.mxgraph.view.mxGraph;
  
  public class conftest {
@@@ -11838,7 -11584,7 +11876,7 @@@ $as_echo_n "checking flexdock... " >&6
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 11841 "configure"
 -// #line 11587 "configure"
++// #line 11879 "configure"
  import org.flexdock.docking.DockingManager;
  
  public class conftest {
@@@ -11932,7 -11678,7 +11970,7 @@@ $as_echo_n "checking minimal version (0
     if test "x" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 11935 "configure"
 -// #line 11681 "configure"
++// #line 11973 "configure"
  import org.flexdock.util.Utilities;
  
  public class conftest {
     else
  
      cat << \EOF > conftest.java
- // #line 11986 "configure"
 -// #line 11732 "configure"
++// #line 12024 "configure"
  import org.flexdock.util.Utilities;
  
  public class conftest {
@@@ -12056,7 -11802,7 +12094,7 @@@ $as_echo_n "checking looks... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12059 "configure"
 -// #line 11805 "configure"
++// #line 12097 "configure"
  import com.jgoodies.looks.common.RenderingUtils;
  
  public class conftest {
@@@ -12163,7 -11909,7 +12201,7 @@@ $as_echo_n "checking jgoodies-looks... 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12166 "configure"
 -// #line 11912 "configure"
++// #line 12204 "configure"
  import com.jgoodies.looks.common.RenderingUtils;
  
  public class conftest {
@@@ -12271,7 -12017,7 +12309,7 @@@ $as_echo_n "checking skinlf... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12274 "configure"
 -// #line 12020 "configure"
++// #line 12312 "configure"
  import com.l2fprod.util.AccessUtils;
  
  public class conftest {
@@@ -12378,7 -12124,7 +12416,7 @@@ $as_echo_n "checking jogl... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12381 "configure"
 -// #line 12127 "configure"
++// #line 12419 "configure"
  import javax.media.opengl.glu.GLUnurbs;
  
  public class conftest {
@@@ -12588,7 -12334,7 +12626,7 @@@ $as_echo_n "checking gluegen-rt... " >&
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12591 "configure"
 -// #line 12337 "configure"
++// #line 12629 "configure"
  import com.sun.gluegen.runtime.CPU;
  
  public class conftest {
@@@ -12750,7 -12496,7 +12788,7 @@@ $as_echo_n "checking jhall... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12753 "configure"
 -// #line 12499 "configure"
++// #line 12791 "configure"
  import javax.help.JHelp;
  
  public class conftest {
@@@ -12857,7 -12603,7 +12895,7 @@@ $as_echo_n "checking javahelp2... " >&6
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12860 "configure"
 -// #line 12606 "configure"
++// #line 12898 "configure"
  import javax.help.JHelp;
  
  public class conftest {
@@@ -12965,7 -12711,7 +13003,7 @@@ $as_echo_n "checking jrosetta-API... " 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12968 "configure"
 -// #line 12714 "configure"
++// #line 13006 "configure"
  import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
  
  public class conftest {
@@@ -13072,7 -12818,7 +13110,7 @@@ $as_echo_n "checking jrosetta-engine..
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13075 "configure"
 -// #line 12821 "configure"
++// #line 13113 "configure"
  import com.artenum.rosetta.core.action.AbstractConsoleAction;
  
  public class conftest {
@@@ -13181,7 -12927,7 +13219,7 @@@ $as_echo_n "checking jeuclid-core... " 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13184 "configure"
 -// #line 12930 "configure"
++// #line 13222 "configure"
  import net.sourceforge.jeuclid.LayoutContext;
  
  public class conftest {
@@@ -13290,7 -13036,7 +13328,7 @@@ $as_echo_n "checking fop... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13293 "configure"
 -// #line 13039 "configure"
++// #line 13331 "configure"
  import org.apache.fop.pdf.PDFInfo;
  
  public class conftest {
@@@ -13397,7 -13143,7 +13435,7 @@@ $as_echo_n "checking batik-all... " >&6
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13400 "configure"
 -// #line 13146 "configure"
++// #line 13438 "configure"
  import org.apache.batik.parser.Parser;
  
  public class conftest {
@@@ -13504,7 -13250,7 +13542,7 @@@ $as_echo_n "checking batik... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13507 "configure"
 -// #line 13253 "configure"
++// #line 13545 "configure"
  import org.apache.batik.parser.Parser;
  
  public class conftest {
@@@ -13598,7 -13344,7 +13636,7 @@@ $as_echo_n "checking minimal version (1
     if test "x" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 13601 "configure"
 -// #line 13347 "configure"
++// #line 13639 "configure"
  import org.apache.batik.Version;
  
  public class conftest {
     else
  
      cat << \EOF > conftest.java
- // #line 13652 "configure"
 -// #line 13398 "configure"
++// #line 13690 "configure"
  import org.apache.batik.Version;
  
  public class conftest {
@@@ -13722,7 -13468,7 +13760,7 @@@ $as_echo_n "checking commons-io... " >&
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13725 "configure"
 -// #line 13471 "configure"
++// #line 13763 "configure"
  import org.apache.commons.io.output.CountingOutputStream;
  
  public class conftest {
@@@ -13829,7 -13575,7 +13867,7 @@@ $as_echo_n "checking xmlgraphics-common
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13832 "configure"
 -// #line 13578 "configure"
++// #line 13870 "configure"
  import org.apache.xmlgraphics.util.Service;
  
  public class conftest {
@@@ -13936,7 -13682,7 +13974,7 @@@ $as_echo_n "checking avalon-framework..
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13939 "configure"
 -// #line 13685 "configure"
++// #line 13977 "configure"
  import org.apache.avalon.framework.configuration.ConfigurationException;
  
  public class conftest {
@@@ -14043,7 -13789,7 +14081,7 @@@ $as_echo_n "checking xml-apis-ext... " 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14046 "configure"
 -// #line 13792 "configure"
++// #line 14084 "configure"
  import org.w3c.dom.svg.SVGDocument;
  
  public class conftest {
@@@ -14150,7 -13896,7 +14188,7 @@@ $as_echo_n "checking xml-commons-apis-e
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14153 "configure"
 -// #line 13899 "configure"
++// #line 14191 "configure"
  import org.w3c.dom.svg.SVGDocument;
  
  public class conftest {
@@@ -14261,7 -14007,7 +14299,7 @@@ $as_echo_n "checking commons-logging..
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14264 "configure"
 -// #line 14010 "configure"
++// #line 14302 "configure"
  import org.apache.commons.logging.LogFactory;
  
  public class conftest {
@@@ -14368,7 -14114,7 +14406,7 @@@ $as_echo_n "checking jlatexmath... " >&
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14371 "configure"
 -// #line 14117 "configure"
++// #line 14409 "configure"
  import org.scilab.forge.jlatexmath.TeXFormula;
  
  public class conftest {
@@@ -14462,7 -14208,7 +14500,7 @@@ $as_echo_n "checking minimal version (0
     if test "x" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 14465 "configure"
 -// #line 14211 "configure"
++// #line 14503 "configure"
  import org.scilab.forge.jlatexmath.TeXFormula;
  
  public class conftest {
     else
  
      cat << \EOF > conftest.java
- // #line 14516 "configure"
 -// #line 14262 "configure"
++// #line 14554 "configure"
  import org.scilab.forge.jlatexmath.TeXFormula;
  
  public class conftest {
@@@ -14592,7 -14338,7 +14630,7 @@@ $as_echo_n "checking checkstyle... " >&
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14595 "configure"
 -// #line 14341 "configure"
++// #line 14633 "configure"
  import com.puppycrawl.tools.checkstyle.CheckStyleTask;
  
  public class conftest {
@@@ -14699,7 -14445,7 +14737,7 @@@ $as_echo_n "checking commons-beanutils.
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14702 "configure"
 -// #line 14448 "configure"
++// #line 14740 "configure"
  import org.apache.commons.beanutils.Converter;
  
  public class conftest {
@@@ -14806,7 -14552,7 +14844,7 @@@ $as_echo_n "checking antlr... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14809 "configure"
 -// #line 14555 "configure"
++// #line 14847 "configure"
  import antlr.TokenStreamException;
  
  public class conftest {
@@@ -14913,7 -14659,7 +14951,7 @@@ $as_echo_n "checking testng... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14916 "configure"
 -// #line 14662 "configure"
++// #line 14954 "configure"
  import org.testng.TestNG;
  
  public class conftest {
@@@ -15020,7 -14766,7 +15058,7 @@@ $as_echo_n "checking qdox... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15023 "configure"
 -// #line 14769 "configure"
++// #line 15061 "configure"
  import com.thoughtworks.qdox.tools.QDoxTester;
  
  public class conftest {
@@@ -15127,7 -14873,7 +15165,7 @@@ $as_echo_n "checking bsh... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15130 "configure"
 -// #line 14876 "configure"
++// #line 15168 "configure"
  import bsh.Console;
  
  public class conftest {
@@@ -15234,7 -14980,7 +15272,7 @@@ $as_echo_n "checking junit... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15237 "configure"
 -// #line 14983 "configure"
++// #line 15275 "configure"
  import junit.framework.Assert;
  
  public class conftest {
@@@ -19147,7 -18893,7 +19185,7 @@@ $as_echo_n "checking jhdf5... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 19150 "configure"
 -// #line 18896 "configure"
++// #line 19188 "configure"
  import ncsa.hdf.hdf5lib.HDF5Constants;
  
  public class conftest {
@@@ -19296,7 -19042,7 +19334,7 @@@ $as_echo_n "checking minimal version (1
     if test "x" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 19299 "configure"
 -// #line 19045 "configure"
++// #line 19337 "configure"
  import ncsa.hdf.hdf5lib.H5;
  
  public class conftest {
     else
  
      cat << \EOF > conftest.java
- // #line 19354 "configure"
 -// #line 19100 "configure"
++// #line 19392 "configure"
  import ncsa.hdf.hdf5lib.H5;
  
  public class conftest {
@@@ -23937,7 -23682,7 +23975,7 @@@ CPPFLAGS="$CPPFLAGS -I$CHK_TCL_INCLUDE_
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5
  $as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; }
  cat > conftest.$ac_ext <<EOF
- #line 23940 "configure"
 -#line 23685 "configure"
++#line 23978 "configure"
  #include "confdefs.h"
  
  #include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
@@@ -24249,7 -23994,7 +24287,7 @@@ CPPFLAGS="$CPPFLAGS $TCL_INC_PATH -I$CH
  $as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; }
  
  cat > conftest.$ac_ext <<EOF
- #line 24252 "configure"
 -#line 23997 "configure"
++#line 24290 "configure"
  #include "confdefs.h"
  
  #include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
@@@ -24833,7 -24578,7 +24871,7 @@@ $as_echo_n "checking saxon... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 24836 "configure"
 -// #line 24581 "configure"
++// #line 24874 "configure"
  import com.icl.saxon.Loader;
  
  public class conftest {
@@@ -24940,7 -24685,7 +24978,7 @@@ $as_echo_n "checking jlatexmath-fop... 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 24943 "configure"
 -// #line 24688 "configure"
++// #line 24981 "configure"
  import org.scilab.forge.jlatexmath.fop.JLaTeXMathObj;
  
  public class conftest {
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
- #line 31244 "configure"
 -#line 30989 "configure"
++#line 31282 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
- #line 31350 "configure"
 -#line 31095 "configure"
++#line 31388 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -199,16 -191,11 +197,18 @@@ ENGINE_LIBS =   $(top_builddir)/modules/f
        $(top_builddir)/modules/history_manager/libscihistory_manager.la \
        $(top_builddir)/modules/output_stream/libscioutput_stream.la \
        $(top_builddir)/modules/string/libscistring.la \
 -      $(top_builddir)/modules/functions/libscifunctions.la \
 +      $(top_builddir)/modules/fftw/libscifftw.la \
        $(top_builddir)/modules/hdf5/libscihdf5.la \
 -      $(top_builddir)/modules/pvm/libscipvm.la \
 -      $(top_builddir)/modules/fftw/libscifftw.la
 -      
 +      $(top_builddir)/modules/abstractSyntaxTree/libsciabstractSyntaxTree.la \
 +      $(top_builddir)/modules/symbol/libscisymbol.la \
 +      $(top_builddir)/modules/parse/libsciparse.la \
 +      $(top_builddir)/modules/types/libscitypes.la \
 +      $(top_builddir)/modules/system_env/libscisystem_env.la \
 +      $(top_builddir)/modules/functions_manager/libscifunctions_manager.la \
 +      $(top_builddir)/modules/functions/libscifunctions.la \
-       $(top_builddir)/modules/parallel/libsciparallel.la
++      $(top_builddir)/modules/parallel/libsciparallel.la \
++      $(top_builddir)/modules/pvm/libscipvm.la
++
  
  # These libraries are loaded dynamically from Scilab.
  ENGINE_LIBS_DYNAMIC_LOAD = \
@@@ -534,16 -524,10 +532,17 @@@ ENGINE_LIBS = $(top_builddir)/modules/f
        $(top_builddir)/modules/history_manager/libscihistory_manager.la \
        $(top_builddir)/modules/output_stream/libscioutput_stream.la \
        $(top_builddir)/modules/string/libscistring.la \
 -      $(top_builddir)/modules/functions/libscifunctions.la \
 +      $(top_builddir)/modules/fftw/libscifftw.la \
        $(top_builddir)/modules/hdf5/libscihdf5.la \
 -      $(top_builddir)/modules/pvm/libscipvm.la \
 -      $(top_builddir)/modules/fftw/libscifftw.la
 +      $(top_builddir)/modules/abstractSyntaxTree/libsciabstractSyntaxTree.la \
 +      $(top_builddir)/modules/symbol/libscisymbol.la \
 +      $(top_builddir)/modules/parse/libsciparse.la \
 +      $(top_builddir)/modules/types/libscitypes.la \
 +      $(top_builddir)/modules/system_env/libscisystem_env.la \
 +      $(top_builddir)/modules/functions_manager/libscifunctions_manager.la \
 +      $(top_builddir)/modules/functions/libscifunctions.la \
-       $(top_builddir)/modules/parallel/libsciparallel.la
++      $(top_builddir)/modules/parallel/libsciparallel.la \
++      $(top_builddir)/modules/pvm/libscipvm.la
  
  
  # These libraries are loaded dynamically from Scilab.
index 006c5b0,0000000..3fdcbc9
mode 100644,000000..100644
--- /dev/null
@@@ -1,986 -1,0 +1,987 @@@
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
 +# @configure_input@
 +
 +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
 +# This Makefile.in is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
 +# with or without modifications, as long as this notice is preserved.
 +
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
 +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 +# PARTICULAR PURPOSE.
 +
 +@SET_MAKE@
 +
 +
 +VPATH = @srcdir@
 +pkgdatadir = $(datadir)/@PACKAGE@
 +pkgincludedir = $(includedir)/@PACKAGE@
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
 +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 +install_sh_DATA = $(install_sh) -c -m 644
 +install_sh_PROGRAM = $(install_sh) -c
 +install_sh_SCRIPT = $(install_sh) -c
 +INSTALL_HEADER = $(INSTALL_DATA)
 +transform = $(program_transform_name)
 +NORMAL_INSTALL = :
 +PRE_INSTALL = :
 +POST_INSTALL = :
 +NORMAL_UNINSTALL = :
 +PRE_UNINSTALL = :
 +POST_UNINSTALL = :
 +build_triplet = @build@
 +host_triplet = @host@
 +check_PROGRAMS = testConstExp$(EXEEXT) testVarExp$(EXEEXT) \
 +      testControlExp$(EXEEXT)
 +TESTS = testConstExp$(EXEEXT) testVarExp$(EXEEXT) \
 +      testControlExp$(EXEEXT)
 +subdir = modules/abstractSyntaxTree
 +DIST_COMMON = $(libsciabstractSyntaxTree_la_include_HEADERS) \
 +      $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 +am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
 +      $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
 +      $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
 +      $(top_srcdir)/m4/intel_compiler.m4 \
 +      $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
 +      $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
 +      $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
 +      $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 +      $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
++      $(top_srcdir)/m4/macosx.m4 $(top_srcdir)/m4/ocaml.m4 \
++      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
++      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
++      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
++      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
++      $(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +      $(ACLOCAL_M4)
 +mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 +CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h
 +CONFIG_CLEAN_FILES =
 +CONFIG_CLEAN_VPATH_FILES =
 +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 +am__vpath_adj = case $$p in \
 +    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
 +    *) f=$$p;; \
 +  esac;
 +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
 +am__install_max = 40
 +am__nobase_strip_setup = \
 +  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
 +am__nobase_strip = \
 +  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
 +am__nobase_list = $(am__nobase_strip_setup); \
 +  for p in $$list; do echo "$$p $$p"; done | \
 +  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
 +  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
 +    if (++n[$$2] == $(am__install_max)) \
 +      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
 +    END { for (dir in files) print dir, files[dir] }'
 +am__base_list = \
 +  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
 +  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 +am__installdirs = "$(DESTDIR)$(pkglibdir)" \
 +      "$(DESTDIR)$(libsciabstractSyntaxTree_la_includedir)"
 +LTLIBRARIES = $(pkglib_LTLIBRARIES)
 +libsciabstractSyntaxTree_la_LIBADD =
 +am_libsciabstractSyntaxTree_la_OBJECTS =  \
 +      libsciabstractSyntaxTree_la-libAst.lo \
 +      libsciabstractSyntaxTree_la-visitor_common.lo \
 +      libsciabstractSyntaxTree_la-printvisitor.lo \
 +      libsciabstractSyntaxTree_la-debugvisitor.lo \
 +      libsciabstractSyntaxTree_la-mutevisitor.lo \
 +      libsciabstractSyntaxTree_la-shortcutvisitor.lo \
 +      libsciabstractSyntaxTree_la-scilabexception.lo
 +libsciabstractSyntaxTree_la_OBJECTS =  \
 +      $(am_libsciabstractSyntaxTree_la_OBJECTS)
 +libsciabstractSyntaxTree_la_LINK = $(LIBTOOL) --tag=CXX \
 +      $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
 +      $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) \
 +      $(AM_LDFLAGS) $(LDFLAGS) -o $@
 +am_testConstExp_OBJECTS = testConstExp-testConstExp.$(OBJEXT)
 +testConstExp_OBJECTS = $(am_testConstExp_OBJECTS)
 +testConstExp_DEPENDENCIES = $(check_LDADD)
 +testConstExp_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
 +      $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(testConstExp_CXXFLAGS) \
 +      $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 +am_testControlExp_OBJECTS = testControlExp-testControlExp.$(OBJEXT)
 +testControlExp_OBJECTS = $(am_testControlExp_OBJECTS)
 +testControlExp_DEPENDENCIES = $(check_LDADD)
 +testControlExp_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
 +      $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
 +      $(testControlExp_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
 +      $(LDFLAGS) -o $@
 +am_testVarExp_OBJECTS = testVarExp-testVarExp.$(OBJEXT)
 +testVarExp_OBJECTS = $(am_testVarExp_OBJECTS)
 +testVarExp_DEPENDENCIES = $(check_LDADD)
 +testVarExp_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
 +      $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(testVarExp_CXXFLAGS) \
 +      $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
 +depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 +am__depfiles_maybe = depfiles
 +am__mv = mv -f
 +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 +      $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 +LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +      --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 +      $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 +CXXLD = $(CXX)
 +CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +      --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
 +      $(LDFLAGS) -o $@
 +SOURCES = $(libsciabstractSyntaxTree_la_SOURCES) \
 +      $(testConstExp_SOURCES) $(testControlExp_SOURCES) \
 +      $(testVarExp_SOURCES)
 +DIST_SOURCES = $(libsciabstractSyntaxTree_la_SOURCES) \
 +      $(testConstExp_SOURCES) $(testControlExp_SOURCES) \
 +      $(testVarExp_SOURCES)
 +HEADERS = $(libsciabstractSyntaxTree_la_include_HEADERS)
 +ETAGS = etags
 +CTAGS = ctags
 +am__tty_colors = \
 +red=; grn=; lgn=; blu=; std=
 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 +ACLOCAL = @ACLOCAL@
 +ALL_LINGUAS = @ALL_LINGUAS@
 +AMTAR = @AMTAR@
 +ANT = @ANT@
 +ANTLR = @ANTLR@
 +AR = @AR@
 +AUTOCONF = @AUTOCONF@
 +AUTOHEADER = @AUTOHEADER@
 +AUTOMAKE = @AUTOMAKE@
 +AVALON_FRAMEWORK = @AVALON_FRAMEWORK@
 +AWK = @AWK@
 +BATIK = @BATIK@
 +BLAS_LIBS = @BLAS_LIBS@
 +BSH = @BSH@
 +CC = @CC@
 +CCDEPMODE = @CCDEPMODE@
 +CFLAGS = @CFLAGS@
 +CHECKSTYLE = @CHECKSTYLE@
 +COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
 +COMMONS_IO = @COMMONS_IO@
 +COMMONS_LOGGING = @COMMONS_LOGGING@
 +CPP = @CPP@
 +CPPFLAGS = @CPPFLAGS@
 +CXX = @CXX@
 +CXXCPP = @CXXCPP@
 +CXXDEPMODE = @CXXDEPMODE@
 +CXXFLAGS = @CXXFLAGS@
 +CYGPATH_W = @CYGPATH_W@
 +DEFS = @DEFS@
 +DEMOTOOLS_ENABLE = @DEMOTOOLS_ENABLE@
 +DEPDIR = @DEPDIR@
 +DOCBOOK_ROOT = @DOCBOOK_ROOT@
 +DSYMUTIL = @DSYMUTIL@
 +DUMPBIN = @DUMPBIN@
 +ECHO_C = @ECHO_C@
 +ECHO_N = @ECHO_N@
 +ECHO_T = @ECHO_T@
 +EGREP = @EGREP@
 +EXEEXT = @EXEEXT@
 +F77 = @F77@
 +FFLAGS = @FFLAGS@
 +FFTW3_LIB = @FFTW3_LIB@
 +FFTW_ENABLE = @FFTW_ENABLE@
 +FGREP = @FGREP@
 +FLEXDOCK = @FLEXDOCK@
 +FLIBS = @FLIBS@
 +FOP = @FOP@
 +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 +GIWS_BIN = @GIWS_BIN@
 +GLUEGEN_RT = @GLUEGEN_RT@
 +GMSGFMT = @GMSGFMT@
 +GMSGFMT_015 = @GMSGFMT_015@
 +GRAPHICS_ENABLE = @GRAPHICS_ENABLE@
 +GREP = @GREP@
 +GUI_ENABLE = @GUI_ENABLE@
 +HDF5_CFLAGS = @HDF5_CFLAGS@
 +HDF5_ENABLE = @HDF5_ENABLE@
 +HDF5_LIBS = @HDF5_LIBS@
 +HELP_ENABLE = @HELP_ENABLE@
 +INSTALL = @INSTALL@
 +INSTALL_DATA = @INSTALL_DATA@
 +INSTALL_PROGRAM = @INSTALL_PROGRAM@
 +INSTALL_SCRIPT = @INSTALL_SCRIPT@
 +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 +INTLLIBS = @INTLLIBS@
 +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 +JAR = @JAR@
 +JAVA = @JAVA@
 +JAVAC = @JAVAC@
 +JAVAH = @JAVAH@
 +JAVASCI_ENABLE = @JAVASCI_ENABLE@
 +JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
 +JAVA_ENABLE = @JAVA_ENABLE@
 +JAVA_G = @JAVA_G@
 +JAVA_HOME = @JAVA_HOME@
 +JAVA_JNI_INCLUDE = @JAVA_JNI_INCLUDE@
 +JAVA_JNI_LIBS = @JAVA_JNI_LIBS@
 +JDB = @JDB@
 +JEUCLID_CORE = @JEUCLID_CORE@
 +JGRAPHX = @JGRAPHX@
 +JHALL = @JHALL@
 +JHDF5 = @JHDF5@
 +JLATEXMATH = @JLATEXMATH@
 +JLATEXMATH_FOP = @JLATEXMATH_FOP@
 +JOGL = @JOGL@
 +JROSETTA_API = @JROSETTA_API@
 +JROSETTA_ENGINE = @JROSETTA_ENGINE@
 +JUNIT = @JUNIT@
 +LAPACK_LIBS = @LAPACK_LIBS@
 +LD = @LD@
 +LDFLAGS = @LDFLAGS@
 +LEX = @LEX@
 +LEXLIB = @LEXLIB@
 +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 +LIBICONV = @LIBICONV@
 +LIBINTL = @LIBINTL@
 +LIBM = @LIBM@
 +LIBOBJS = @LIBOBJS@
 +LIBS = @LIBS@
 +LIBTOOL = @LIBTOOL@
 +LIPO = @LIPO@
 +LN_S = @LN_S@
 +LOOKS = @LOOKS@
 +LTLIBICONV = @LTLIBICONV@
 +LTLIBINTL = @LTLIBINTL@
 +LTLIBOBJS = @LTLIBOBJS@
 +MAINT = @MAINT@
 +MAKEINFO = @MAKEINFO@
 +MATIO_CFLAGS = @MATIO_CFLAGS@
 +MATIO_ENABLE = @MATIO_ENABLE@
 +MATIO_LIBS = @MATIO_LIBS@
 +MKDIR_P = @MKDIR_P@
 +MSGCAT = @MSGCAT@
 +MSGFMT = @MSGFMT@
 +MSGFMT_015 = @MSGFMT_015@
 +MSGMERGE = @MSGMERGE@
 +NM = @NM@
 +NMEDIT = @NMEDIT@
 +OBJDUMP = @OBJDUMP@
 +OBJEXT = @OBJEXT@
 +OCAMLC = @OCAMLC@
 +OCAMLDEP = @OCAMLDEP@
 +OCAMLLEX = @OCAMLLEX@
 +OCAMLOPT = @OCAMLOPT@
 +OCAMLYACC = @OCAMLYACC@
 +OPENMP_CFLAGS = @OPENMP_CFLAGS@
 +OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
 +OPENMP_ENABLE = @OPENMP_ENABLE@
 +OPENMP_LIBS = @OPENMP_LIBS@
 +OTOOL = @OTOOL@
 +OTOOL64 = @OTOOL64@
 +PACKAGE = @PACKAGE@
 +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 +PACKAGE_NAME = @PACKAGE_NAME@
 +PACKAGE_STRING = @PACKAGE_STRING@
 +PACKAGE_TARNAME = @PACKAGE_TARNAME@
 +PACKAGE_URL = @PACKAGE_URL@
 +PACKAGE_VERSION = @PACKAGE_VERSION@
 +PATH_SEPARATOR = @PATH_SEPARATOR@
 +PCRE_CFLAGS = @PCRE_CFLAGS@
 +PCRE_CONFIG = @PCRE_CONFIG@
 +PCRE_LIBS = @PCRE_LIBS@
 +PCRE_VERSION = @PCRE_VERSION@
 +PKG_CONFIG = @PKG_CONFIG@
 +POSUB = @POSUB@
 +POW_LIB = @POW_LIB@
 +PVMGETARCH = @PVMGETARCH@
 +PVM_ARCH = @PVM_ARCH@
 +PVM_ENABLE = @PVM_ENABLE@
 +PVM_INCLUDE = @PVM_INCLUDE@
 +PVM_LIB = @PVM_LIB@
 +PYTHON = @PYTHON@
 +QDOX = @QDOX@
 +RANLIB = @RANLIB@
 +RELOCATABLE = @RELOCATABLE@
 +RT_LIB = @RT_LIB@
 +SAXON = @SAXON@
 +SCICOS_ENABLE = @SCICOS_ENABLE@
 +SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
 +SED = @SED@
 +SET_MAKE = @SET_MAKE@
 +SET_RELOCATABLE = @SET_RELOCATABLE@
 +SHELL = @SHELL@
 +SKINLF = @SKINLF@
 +SPLINT = @SPLINT@
 +STRIP = @STRIP@
 +SWIG_BIN = @SWIG_BIN@
 +SWIG_JAVA = @SWIG_JAVA@
 +SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
 +TCLTK_LIBS = @TCLTK_LIBS@
 +TCL_INC_PATH = @TCL_INC_PATH@
 +TESTNG = @TESTNG@
 +TK_INC_PATH = @TK_INC_PATH@
 +UMFPACK_ENABLE = @UMFPACK_ENABLE@
 +UMFPACK_LIB = @UMFPACK_LIB@
 +USE_NLS = @USE_NLS@
 +VERSION = @VERSION@
 +WITH_OCAML = @WITH_OCAML@
 +WITH_TKSCI = @WITH_TKSCI@
 +XGETTEXT = @XGETTEXT@
 +XGETTEXT_015 = @XGETTEXT_015@
 +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 +XMKMF = @XMKMF@
 +XMLGRAPHICS_COMMONS = @XMLGRAPHICS_COMMONS@
 +XML_APIS_EXT = @XML_APIS_EXT@
 +XML_CONFIG = @XML_CONFIG@
 +XML_FLAGS = @XML_FLAGS@
 +XML_LIBS = @XML_LIBS@
 +XML_VERSION = @XML_VERSION@
 +X_CFLAGS = @X_CFLAGS@
 +X_EXTRA_LIBS = @X_EXTRA_LIBS@
 +X_LIBS = @X_LIBS@
 +X_PRE_LIBS = @X_PRE_LIBS@
 +YACC = @YACC@
 +YFLAGS = @YFLAGS@
 +abs_builddir = @abs_builddir@
 +abs_srcdir = @abs_srcdir@
 +abs_top_builddir = @abs_top_builddir@
 +abs_top_srcdir = @abs_top_srcdir@
 +ac_ct_CC = @ac_ct_CC@
 +ac_ct_CXX = @ac_ct_CXX@
 +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 +ac_ct_F77 = @ac_ct_F77@
 +am__include = @am__include@
 +am__leading_dot = @am__leading_dot@
 +am__quote = @am__quote@
 +am__tar = @am__tar@
 +am__untar = @am__untar@
 +bindir = @bindir@
 +build = @build@
 +build_alias = @build_alias@
 +build_cpu = @build_cpu@
 +build_os = @build_os@
 +build_vendor = @build_vendor@
 +builddir = @builddir@
 +cxx_present = @cxx_present@
 +datadir = @datadir@
 +datarootdir = @datarootdir@
 +docdir = @docdir@
 +dvidir = @dvidir@
 +exec_prefix = @exec_prefix@
 +host = @host@
 +host_alias = @host_alias@
 +host_cpu = @host_cpu@
 +host_os = @host_os@
 +host_vendor = @host_vendor@
 +htmldir = @htmldir@
 +includedir = @includedir@
 +infodir = @infodir@
 +install_sh = @install_sh@
 +libdir = @libdir@
 +libexecdir = @libexecdir@
 +localedir = @localedir@
 +localstatedir = @localstatedir@
 +mandir = @mandir@
 +mkdir_p = @mkdir_p@
 +oldincludedir = @oldincludedir@
 +pdfdir = @pdfdir@
 +prefix = @prefix@
 +program_transform_name = @program_transform_name@
 +psdir = @psdir@
 +sbindir = @sbindir@
 +sharedstatedir = @sharedstatedir@
 +srcdir = @srcdir@
 +sysconfdir = @sysconfdir@
 +target_alias = @target_alias@
 +top_build_prefix = @top_build_prefix@
 +top_builddir = @top_builddir@
 +top_srcdir = @top_srcdir@
 +yacc_present = @yacc_present@
 +pkglib_LTLIBRARIES = libsciabstractSyntaxTree.la
 +libsciabstractSyntaxTree_la_SOURCES = \
 +                              src/cpp/libAst.cpp \
 +                              src/cpp/visitor_common.cpp \
 +                              src/cpp/printvisitor.cpp \
 +                              src/cpp/debugvisitor.cpp \
 +                              src/cpp/mutevisitor.cpp \
 +                              src/cpp/shortcutvisitor.cpp \
 +                              src/cpp/scilabexception.cpp
 +
 +libsciabstractSyntaxTree_la_CXXFLAGS = \
 +                      -I $(top_srcdir)/modules/symbol/includes \
 +                      -I $(top_srcdir)/modules/types/includes \
 +                      -I $(top_srcdir)/modules/functions_manager/includes \
 +                      -I $(top_srcdir)/modules/elementary_functions/includes \
 +                      -I $(top_srcdir)/modules/operations/includes \
 +                      -I $(top_srcdir)/modules/output_stream/includes \
 +                      -I includes \
 +                      -I src/cpp \
 +                      -I $(top_srcdir)/modules/system_env/includes
 +
 +libsciabstractSyntaxTree_la_includedir = $(pkgincludedir)/abstractSyntaxTree
 +libsciabstractSyntaxTree_la_include_HEADERS = 
 +
 +####################
 +####################
 +check_INCLUDES = -I$(top_srcdir)/modules/symbol/includes \
 +                      -Iincludes/ \
 +                      -Isrc/cpp
 +
 +check_LDADD = $(top_builddir)/modules/symbol/libsciSymbol.la \
 +                      $(top_builddir)/modules/abstractSyntaxTree/libsciabstractSyntaxTree.la \
 +                      $(top_builddir)/modules/types/libsciTypes.la
 +
 +testConstExp_SOURCES = src/cpp/testConstExp.cpp
 +testConstExp_CXXFLAGS = $(check_INCLUDES)
 +testConstExp_LDADD = $(check_LDADD)
 +testVarExp_SOURCES = src/cpp/testVarExp.cpp
 +testVarExp_CXXFLAGS = $(check_INCLUDES)
 +testVarExp_LDADD = $(check_LDADD)
 +testControlExp_SOURCES = src/cpp/testControlExp.cpp
 +testControlExp_CXXFLAGS = $(check_INCLUDES)
 +testControlExp_LDADD = $(check_LDADD)
 +all: all-am
 +
 +.SUFFIXES:
 +.SUFFIXES: .cpp .lo .o .obj
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 +      @for dep in $?; do \
 +        case '$(am__configure_deps)' in \
 +          *$$dep*) \
 +            ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
 +              && { if test -f $@; then exit 0; else break; fi; }; \
 +            exit 1;; \
 +        esac; \
 +      done; \
 +      echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign modules/abstractSyntaxTree/Makefile'; \
 +      $(am__cd) $(top_srcdir) && \
 +        $(AUTOMAKE) --foreign modules/abstractSyntaxTree/Makefile
 +.PRECIOUS: Makefile
 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +      @case '$?' in \
 +        *config.status*) \
 +          cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 +        *) \
 +          echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 +          cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 +      esac;
 +
 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 +      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 +      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 +      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(am__aclocal_m4_deps):
 +install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 +      @$(NORMAL_INSTALL)
 +      test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)"
 +      @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
 +      list2=; for p in $$list; do \
 +        if test -f $$p; then \
 +          list2="$$list2 $$p"; \
 +        else :; fi; \
 +      done; \
 +      test -z "$$list2" || { \
 +        echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \
 +        $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \
 +      }
 +
 +uninstall-pkglibLTLIBRARIES:
 +      @$(NORMAL_UNINSTALL)
 +      @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
 +      for p in $$list; do \
 +        $(am__strip_dir) \
 +        echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
 +        $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
 +      done
 +
 +clean-pkglibLTLIBRARIES:
 +      -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
 +      @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
 +        dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
 +        test "$$dir" != "$$p" || dir=.; \
 +        echo "rm -f \"$${dir}/so_locations\""; \
 +        rm -f "$${dir}/so_locations"; \
 +      done
 +libsciabstractSyntaxTree.la: $(libsciabstractSyntaxTree_la_OBJECTS) $(libsciabstractSyntaxTree_la_DEPENDENCIES) 
 +      $(libsciabstractSyntaxTree_la_LINK) -rpath $(pkglibdir) $(libsciabstractSyntaxTree_la_OBJECTS) $(libsciabstractSyntaxTree_la_LIBADD) $(LIBS)
 +
 +clean-checkPROGRAMS:
 +      @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
 +      echo " rm -f" $$list; \
 +      rm -f $$list || exit $$?; \
 +      test -n "$(EXEEXT)" || exit 0; \
 +      list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 +      echo " rm -f" $$list; \
 +      rm -f $$list
 +testConstExp$(EXEEXT): $(testConstExp_OBJECTS) $(testConstExp_DEPENDENCIES) 
 +      @rm -f testConstExp$(EXEEXT)
 +      $(testConstExp_LINK) $(testConstExp_OBJECTS) $(testConstExp_LDADD) $(LIBS)
 +testControlExp$(EXEEXT): $(testControlExp_OBJECTS) $(testControlExp_DEPENDENCIES) 
 +      @rm -f testControlExp$(EXEEXT)
 +      $(testControlExp_LINK) $(testControlExp_OBJECTS) $(testControlExp_LDADD) $(LIBS)
 +testVarExp$(EXEEXT): $(testVarExp_OBJECTS) $(testVarExp_DEPENDENCIES) 
 +      @rm -f testVarExp$(EXEEXT)
 +      $(testVarExp_LINK) $(testVarExp_OBJECTS) $(testVarExp_LDADD) $(LIBS)
 +
 +mostlyclean-compile:
 +      -rm -f *.$(OBJEXT)
 +
 +distclean-compile:
 +      -rm -f *.tab.c
 +
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciabstractSyntaxTree_la-debugvisitor.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciabstractSyntaxTree_la-libAst.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciabstractSyntaxTree_la-mutevisitor.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciabstractSyntaxTree_la-printvisitor.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciabstractSyntaxTree_la-scilabexception.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciabstractSyntaxTree_la-shortcutvisitor.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciabstractSyntaxTree_la-visitor_common.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testConstExp-testConstExp.Po@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testControlExp-testControlExp.Po@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testVarExp-testVarExp.Po@am__quote@
 +
 +.cpp.o:
 +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXXCOMPILE) -c -o $@ $<
 +
 +.cpp.obj:
 +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 +
 +.cpp.lo:
 +@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LTCXXCOMPILE) -c -o $@ $<
 +
 +libsciabstractSyntaxTree_la-libAst.lo: src/cpp/libAst.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) -MT libsciabstractSyntaxTree_la-libAst.lo -MD -MP -MF $(DEPDIR)/libsciabstractSyntaxTree_la-libAst.Tpo -c -o libsciabstractSyntaxTree_la-libAst.lo `test -f 'src/cpp/libAst.cpp' || echo '$(srcdir)/'`src/cpp/libAst.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libsciabstractSyntaxTree_la-libAst.Tpo $(DEPDIR)/libsciabstractSyntaxTree_la-libAst.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/libAst.cpp' object='libsciabstractSyntaxTree_la-libAst.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) -c -o libsciabstractSyntaxTree_la-libAst.lo `test -f 'src/cpp/libAst.cpp' || echo '$(srcdir)/'`src/cpp/libAst.cpp
 +
 +libsciabstractSyntaxTree_la-visitor_common.lo: src/cpp/visitor_common.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) -MT libsciabstractSyntaxTree_la-visitor_common.lo -MD -MP -MF $(DEPDIR)/libsciabstractSyntaxTree_la-visitor_common.Tpo -c -o libsciabstractSyntaxTree_la-visitor_common.lo `test -f 'src/cpp/visitor_common.cpp' || echo '$(srcdir)/'`src/cpp/visitor_common.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libsciabstractSyntaxTree_la-visitor_common.Tpo $(DEPDIR)/libsciabstractSyntaxTree_la-visitor_common.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/visitor_common.cpp' object='libsciabstractSyntaxTree_la-visitor_common.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) -c -o libsciabstractSyntaxTree_la-visitor_common.lo `test -f 'src/cpp/visitor_common.cpp' || echo '$(srcdir)/'`src/cpp/visitor_common.cpp
 +
 +libsciabstractSyntaxTree_la-printvisitor.lo: src/cpp/printvisitor.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) -MT libsciabstractSyntaxTree_la-printvisitor.lo -MD -MP -MF $(DEPDIR)/libsciabstractSyntaxTree_la-printvisitor.Tpo -c -o libsciabstractSyntaxTree_la-printvisitor.lo `test -f 'src/cpp/printvisitor.cpp' || echo '$(srcdir)/'`src/cpp/printvisitor.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libsciabstractSyntaxTree_la-printvisitor.Tpo $(DEPDIR)/libsciabstractSyntaxTree_la-printvisitor.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/printvisitor.cpp' object='libsciabstractSyntaxTree_la-printvisitor.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) -c -o libsciabstractSyntaxTree_la-printvisitor.lo `test -f 'src/cpp/printvisitor.cpp' || echo '$(srcdir)/'`src/cpp/printvisitor.cpp
 +
 +libsciabstractSyntaxTree_la-debugvisitor.lo: src/cpp/debugvisitor.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) -MT libsciabstractSyntaxTree_la-debugvisitor.lo -MD -MP -MF $(DEPDIR)/libsciabstractSyntaxTree_la-debugvisitor.Tpo -c -o libsciabstractSyntaxTree_la-debugvisitor.lo `test -f 'src/cpp/debugvisitor.cpp' || echo '$(srcdir)/'`src/cpp/debugvisitor.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libsciabstractSyntaxTree_la-debugvisitor.Tpo $(DEPDIR)/libsciabstractSyntaxTree_la-debugvisitor.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/debugvisitor.cpp' object='libsciabstractSyntaxTree_la-debugvisitor.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) -c -o libsciabstractSyntaxTree_la-debugvisitor.lo `test -f 'src/cpp/debugvisitor.cpp' || echo '$(srcdir)/'`src/cpp/debugvisitor.cpp
 +
 +libsciabstractSyntaxTree_la-mutevisitor.lo: src/cpp/mutevisitor.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) -MT libsciabstractSyntaxTree_la-mutevisitor.lo -MD -MP -MF $(DEPDIR)/libsciabstractSyntaxTree_la-mutevisitor.Tpo -c -o libsciabstractSyntaxTree_la-mutevisitor.lo `test -f 'src/cpp/mutevisitor.cpp' || echo '$(srcdir)/'`src/cpp/mutevisitor.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libsciabstractSyntaxTree_la-mutevisitor.Tpo $(DEPDIR)/libsciabstractSyntaxTree_la-mutevisitor.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/mutevisitor.cpp' object='libsciabstractSyntaxTree_la-mutevisitor.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) -c -o libsciabstractSyntaxTree_la-mutevisitor.lo `test -f 'src/cpp/mutevisitor.cpp' || echo '$(srcdir)/'`src/cpp/mutevisitor.cpp
 +
 +libsciabstractSyntaxTree_la-shortcutvisitor.lo: src/cpp/shortcutvisitor.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) -MT libsciabstractSyntaxTree_la-shortcutvisitor.lo -MD -MP -MF $(DEPDIR)/libsciabstractSyntaxTree_la-shortcutvisitor.Tpo -c -o libsciabstractSyntaxTree_la-shortcutvisitor.lo `test -f 'src/cpp/shortcutvisitor.cpp' || echo '$(srcdir)/'`src/cpp/shortcutvisitor.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libsciabstractSyntaxTree_la-shortcutvisitor.Tpo $(DEPDIR)/libsciabstractSyntaxTree_la-shortcutvisitor.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/shortcutvisitor.cpp' object='libsciabstractSyntaxTree_la-shortcutvisitor.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) -c -o libsciabstractSyntaxTree_la-shortcutvisitor.lo `test -f 'src/cpp/shortcutvisitor.cpp' || echo '$(srcdir)/'`src/cpp/shortcutvisitor.cpp
 +
 +libsciabstractSyntaxTree_la-scilabexception.lo: src/cpp/scilabexception.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) -MT libsciabstractSyntaxTree_la-scilabexception.lo -MD -MP -MF $(DEPDIR)/libsciabstractSyntaxTree_la-scilabexception.Tpo -c -o libsciabstractSyntaxTree_la-scilabexception.lo `test -f 'src/cpp/scilabexception.cpp' || echo '$(srcdir)/'`src/cpp/scilabexception.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libsciabstractSyntaxTree_la-scilabexception.Tpo $(DEPDIR)/libsciabstractSyntaxTree_la-scilabexception.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/scilabexception.cpp' object='libsciabstractSyntaxTree_la-scilabexception.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) -c -o libsciabstractSyntaxTree_la-scilabexception.lo `test -f 'src/cpp/scilabexception.cpp' || echo '$(srcdir)/'`src/cpp/scilabexception.cpp
 +
 +testConstExp-testConstExp.o: src/cpp/testConstExp.cpp
 +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testConstExp_CXXFLAGS) $(CXXFLAGS) -MT testConstExp-testConstExp.o -MD -MP -MF $(DEPDIR)/testConstExp-testConstExp.Tpo -c -o testConstExp-testConstExp.o `test -f 'src/cpp/testConstExp.cpp' || echo '$(srcdir)/'`src/cpp/testConstExp.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testConstExp-testConstExp.Tpo $(DEPDIR)/testConstExp-testConstExp.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/testConstExp.cpp' object='testConstExp-testConstExp.o' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testConstExp_CXXFLAGS) $(CXXFLAGS) -c -o testConstExp-testConstExp.o `test -f 'src/cpp/testConstExp.cpp' || echo '$(srcdir)/'`src/cpp/testConstExp.cpp
 +
 +testConstExp-testConstExp.obj: src/cpp/testConstExp.cpp
 +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testConstExp_CXXFLAGS) $(CXXFLAGS) -MT testConstExp-testConstExp.obj -MD -MP -MF $(DEPDIR)/testConstExp-testConstExp.Tpo -c -o testConstExp-testConstExp.obj `if test -f 'src/cpp/testConstExp.cpp'; then $(CYGPATH_W) 'src/cpp/testConstExp.cpp'; else $(CYGPATH_W) '$(srcdir)/src/cpp/testConstExp.cpp'; fi`
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testConstExp-testConstExp.Tpo $(DEPDIR)/testConstExp-testConstExp.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/testConstExp.cpp' object='testConstExp-testConstExp.obj' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testConstExp_CXXFLAGS) $(CXXFLAGS) -c -o testConstExp-testConstExp.obj `if test -f 'src/cpp/testConstExp.cpp'; then $(CYGPATH_W) 'src/cpp/testConstExp.cpp'; else $(CYGPATH_W) '$(srcdir)/src/cpp/testConstExp.cpp'; fi`
 +
 +testControlExp-testControlExp.o: src/cpp/testControlExp.cpp
 +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testControlExp_CXXFLAGS) $(CXXFLAGS) -MT testControlExp-testControlExp.o -MD -MP -MF $(DEPDIR)/testControlExp-testControlExp.Tpo -c -o testControlExp-testControlExp.o `test -f 'src/cpp/testControlExp.cpp' || echo '$(srcdir)/'`src/cpp/testControlExp.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testControlExp-testControlExp.Tpo $(DEPDIR)/testControlExp-testControlExp.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/testControlExp.cpp' object='testControlExp-testControlExp.o' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testControlExp_CXXFLAGS) $(CXXFLAGS) -c -o testControlExp-testControlExp.o `test -f 'src/cpp/testControlExp.cpp' || echo '$(srcdir)/'`src/cpp/testControlExp.cpp
 +
 +testControlExp-testControlExp.obj: src/cpp/testControlExp.cpp
 +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testControlExp_CXXFLAGS) $(CXXFLAGS) -MT testControlExp-testControlExp.obj -MD -MP -MF $(DEPDIR)/testControlExp-testControlExp.Tpo -c -o testControlExp-testControlExp.obj `if test -f 'src/cpp/testControlExp.cpp'; then $(CYGPATH_W) 'src/cpp/testControlExp.cpp'; else $(CYGPATH_W) '$(srcdir)/src/cpp/testControlExp.cpp'; fi`
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testControlExp-testControlExp.Tpo $(DEPDIR)/testControlExp-testControlExp.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/testControlExp.cpp' object='testControlExp-testControlExp.obj' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testControlExp_CXXFLAGS) $(CXXFLAGS) -c -o testControlExp-testControlExp.obj `if test -f 'src/cpp/testControlExp.cpp'; then $(CYGPATH_W) 'src/cpp/testControlExp.cpp'; else $(CYGPATH_W) '$(srcdir)/src/cpp/testControlExp.cpp'; fi`
 +
 +testVarExp-testVarExp.o: src/cpp/testVarExp.cpp
 +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testVarExp_CXXFLAGS) $(CXXFLAGS) -MT testVarExp-testVarExp.o -MD -MP -MF $(DEPDIR)/testVarExp-testVarExp.Tpo -c -o testVarExp-testVarExp.o `test -f 'src/cpp/testVarExp.cpp' || echo '$(srcdir)/'`src/cpp/testVarExp.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testVarExp-testVarExp.Tpo $(DEPDIR)/testVarExp-testVarExp.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/testVarExp.cpp' object='testVarExp-testVarExp.o' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testVarExp_CXXFLAGS) $(CXXFLAGS) -c -o testVarExp-testVarExp.o `test -f 'src/cpp/testVarExp.cpp' || echo '$(srcdir)/'`src/cpp/testVarExp.cpp
 +
 +testVarExp-testVarExp.obj: src/cpp/testVarExp.cpp
 +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testVarExp_CXXFLAGS) $(CXXFLAGS) -MT testVarExp-testVarExp.obj -MD -MP -MF $(DEPDIR)/testVarExp-testVarExp.Tpo -c -o testVarExp-testVarExp.obj `if test -f 'src/cpp/testVarExp.cpp'; then $(CYGPATH_W) 'src/cpp/testVarExp.cpp'; else $(CYGPATH_W) '$(srcdir)/src/cpp/testVarExp.cpp'; fi`
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testVarExp-testVarExp.Tpo $(DEPDIR)/testVarExp-testVarExp.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/testVarExp.cpp' object='testVarExp-testVarExp.obj' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testVarExp_CXXFLAGS) $(CXXFLAGS) -c -o testVarExp-testVarExp.obj `if test -f 'src/cpp/testVarExp.cpp'; then $(CYGPATH_W) 'src/cpp/testVarExp.cpp'; else $(CYGPATH_W) '$(srcdir)/src/cpp/testVarExp.cpp'; fi`
 +
 +mostlyclean-libtool:
 +      -rm -f *.lo
 +
 +clean-libtool:
 +      -rm -rf .libs _libs
 +install-libsciabstractSyntaxTree_la_includeHEADERS: $(libsciabstractSyntaxTree_la_include_HEADERS)
 +      @$(NORMAL_INSTALL)
 +      test -z "$(libsciabstractSyntaxTree_la_includedir)" || $(MKDIR_P) "$(DESTDIR)$(libsciabstractSyntaxTree_la_includedir)"
 +      @list='$(libsciabstractSyntaxTree_la_include_HEADERS)'; test -n "$(libsciabstractSyntaxTree_la_includedir)" || list=; \
 +      for p in $$list; do \
 +        if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 +        echo "$$d$$p"; \
 +      done | $(am__base_list) | \
 +      while read files; do \
 +        echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libsciabstractSyntaxTree_la_includedir)'"; \
 +        $(INSTALL_HEADER) $$files "$(DESTDIR)$(libsciabstractSyntaxTree_la_includedir)" || exit $$?; \
 +      done
 +
 +uninstall-libsciabstractSyntaxTree_la_includeHEADERS:
 +      @$(NORMAL_UNINSTALL)
 +      @list='$(libsciabstractSyntaxTree_la_include_HEADERS)'; test -n "$(libsciabstractSyntaxTree_la_includedir)" || list=; \
 +      files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 +      test -n "$$files" || exit 0; \
 +      echo " ( cd '$(DESTDIR)$(libsciabstractSyntaxTree_la_includedir)' && rm -f" $$files ")"; \
 +      cd "$(DESTDIR)$(libsciabstractSyntaxTree_la_includedir)" && rm -f $$files
 +
 +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 +      list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 +      unique=`for i in $$list; do \
 +          if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +        done | \
 +        $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +            END { if (nonempty) { for (i in files) print i; }; }'`; \
 +      mkid -fID $$unique
 +tags: TAGS
 +
 +TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 +              $(TAGS_FILES) $(LISP)
 +      set x; \
 +      here=`pwd`; \
 +      list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 +      unique=`for i in $$list; do \
 +          if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +        done | \
 +        $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +            END { if (nonempty) { for (i in files) print i; }; }'`; \
 +      shift; \
 +      if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 +        test -n "$$unique" || unique=$$empty_fix; \
 +        if test $$# -gt 0; then \
 +          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +            "$$@" $$unique; \
 +        else \
 +          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +            $$unique; \
 +        fi; \
 +      fi
 +ctags: CTAGS
 +CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 +              $(TAGS_FILES) $(LISP)
 +      list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 +      unique=`for i in $$list; do \
 +          if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +        done | \
 +        $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +            END { if (nonempty) { for (i in files) print i; }; }'`; \
 +      test -z "$(CTAGS_ARGS)$$unique" \
 +        || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 +           $$unique
 +
 +GTAGS:
 +      here=`$(am__cd) $(top_builddir) && pwd` \
 +        && $(am__cd) $(top_srcdir) \
 +        && gtags -i $(GTAGS_ARGS) "$$here"
 +
 +distclean-tags:
 +      -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 +
 +check-TESTS: $(TESTS)
 +      @failed=0; all=0; xfail=0; xpass=0; skip=0; \
 +      srcdir=$(srcdir); export srcdir; \
 +      list=' $(TESTS) '; \
 +      $(am__tty_colors); \
 +      if test -n "$$list"; then \
 +        for tst in $$list; do \
 +          if test -f ./$$tst; then dir=./; \
 +          elif test -f $$tst; then dir=; \
 +          else dir="$(srcdir)/"; fi; \
 +          if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
 +            all=`expr $$all + 1`; \
 +            case " $(XFAIL_TESTS) " in \
 +            *[\ \     ]$$tst[\ \      ]*) \
 +              xpass=`expr $$xpass + 1`; \
 +              failed=`expr $$failed + 1`; \
 +              col=$$red; res=XPASS; \
 +            ;; \
 +            *) \
 +              col=$$grn; res=PASS; \
 +            ;; \
 +            esac; \
 +          elif test $$? -ne 77; then \
 +            all=`expr $$all + 1`; \
 +            case " $(XFAIL_TESTS) " in \
 +            *[\ \     ]$$tst[\ \      ]*) \
 +              xfail=`expr $$xfail + 1`; \
 +              col=$$lgn; res=XFAIL; \
 +            ;; \
 +            *) \
 +              failed=`expr $$failed + 1`; \
 +              col=$$red; res=FAIL; \
 +            ;; \
 +            esac; \
 +          else \
 +            skip=`expr $$skip + 1`; \
 +            col=$$blu; res=SKIP; \
 +          fi; \
 +          echo "$${col}$$res$${std}: $$tst"; \
 +        done; \
 +        if test "$$all" -eq 1; then \
 +          tests="test"; \
 +          All=""; \
 +        else \
 +          tests="tests"; \
 +          All="All "; \
 +        fi; \
 +        if test "$$failed" -eq 0; then \
 +          if test "$$xfail" -eq 0; then \
 +            banner="$$All$$all $$tests passed"; \
 +          else \
 +            if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
 +            banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
 +          fi; \
 +        else \
 +          if test "$$xpass" -eq 0; then \
 +            banner="$$failed of $$all $$tests failed"; \
 +          else \
 +            if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
 +            banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
 +          fi; \
 +        fi; \
 +        dashes="$$banner"; \
 +        skipped=""; \
 +        if test "$$skip" -ne 0; then \
 +          if test "$$skip" -eq 1; then \
 +            skipped="($$skip test was not run)"; \
 +          else \
 +            skipped="($$skip tests were not run)"; \
 +          fi; \
 +          test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
 +            dashes="$$skipped"; \
 +        fi; \
 +        report=""; \
 +        if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
 +          report="Please report to $(PACKAGE_BUGREPORT)"; \
 +          test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
 +            dashes="$$report"; \
 +        fi; \
 +        dashes=`echo "$$dashes" | sed s/./=/g`; \
 +        if test "$$failed" -eq 0; then \
 +          echo "$$grn$$dashes"; \
 +        else \
 +          echo "$$red$$dashes"; \
 +        fi; \
 +        echo "$$banner"; \
 +        test -z "$$skipped" || echo "$$skipped"; \
 +        test -z "$$report" || echo "$$report"; \
 +        echo "$$dashes$$std"; \
 +        test "$$failed" -eq 0; \
 +      else :; fi
 +
 +distdir: $(DISTFILES)
 +      @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +      list='$(DISTFILES)'; \
 +        dist_files=`for file in $$list; do echo $$file; done | \
 +        sed -e "s|^$$srcdirstrip/||;t" \
 +            -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
 +      case $$dist_files in \
 +        */*) $(MKDIR_P) `echo "$$dist_files" | \
 +                         sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
 +                         sort -u` ;; \
 +      esac; \
 +      for file in $$dist_files; do \
 +        if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 +        if test -d $$d/$$file; then \
 +          dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +          if test -d "$(distdir)/$$file"; then \
 +            find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +          fi; \
 +          if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 +            cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
 +            find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +          fi; \
 +          cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 +        else \
 +          test -f "$(distdir)/$$file" \
 +          || cp -p $$d/$$file "$(distdir)/$$file" \
 +          || exit 1; \
 +        fi; \
 +      done
 +check-am: all-am
 +      $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
 +      $(MAKE) $(AM_MAKEFLAGS) check-TESTS
 +check: check-am
 +all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 +installdirs:
 +      for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(libsciabstractSyntaxTree_la_includedir)"; do \
 +        test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 +      done
 +install: install-am
 +install-exec: install-exec-am
 +install-data: install-data-am
 +uninstall: uninstall-am
 +
 +install-am: all-am
 +      @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 +
 +installcheck: installcheck-am
 +install-strip:
 +      $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 +        install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 +        `test -z '$(STRIP)' || \
 +          echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 +mostlyclean-generic:
 +
 +clean-generic:
 +
 +distclean-generic:
 +      -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 +      -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 +
 +maintainer-clean-generic:
 +      @echo "This command is intended for maintainers to use"
 +      @echo "it deletes files that may require special tools to rebuild."
 +clean: clean-am
 +
 +clean-am: clean-checkPROGRAMS clean-generic clean-libtool \
 +      clean-pkglibLTLIBRARIES mostlyclean-am
 +
 +distclean: distclean-am
 +      -rm -rf ./$(DEPDIR)
 +      -rm -f Makefile
 +distclean-am: clean-am distclean-compile distclean-generic \
 +      distclean-tags
 +
 +dvi: dvi-am
 +
 +dvi-am:
 +
 +html: html-am
 +
 +html-am:
 +
 +info: info-am
 +
 +info-am:
 +
 +install-data-am: install-libsciabstractSyntaxTree_la_includeHEADERS
 +
 +install-dvi: install-dvi-am
 +
 +install-dvi-am:
 +
 +install-exec-am: install-pkglibLTLIBRARIES
 +
 +install-html: install-html-am
 +
 +install-html-am:
 +
 +install-info: install-info-am
 +
 +install-info-am:
 +
 +install-man:
 +
 +install-pdf: install-pdf-am
 +
 +install-pdf-am:
 +
 +install-ps: install-ps-am
 +
 +install-ps-am:
 +
 +installcheck-am:
 +
 +maintainer-clean: maintainer-clean-am
 +      -rm -rf ./$(DEPDIR)
 +      -rm -f Makefile
 +maintainer-clean-am: distclean-am maintainer-clean-generic
 +
 +mostlyclean: mostlyclean-am
 +
 +mostlyclean-am: mostlyclean-compile mostlyclean-generic \
 +      mostlyclean-libtool
 +
 +pdf: pdf-am
 +
 +pdf-am:
 +
 +ps: ps-am
 +
 +ps-am:
 +
 +uninstall-am: uninstall-libsciabstractSyntaxTree_la_includeHEADERS \
 +      uninstall-pkglibLTLIBRARIES
 +
 +.MAKE: check-am install-am install-strip
 +
 +.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
 +      clean-checkPROGRAMS clean-generic clean-libtool \
 +      clean-pkglibLTLIBRARIES ctags distclean distclean-compile \
 +      distclean-generic distclean-libtool distclean-tags distdir dvi \
 +      dvi-am html html-am info info-am install install-am \
 +      install-data install-data-am install-dvi install-dvi-am \
 +      install-exec install-exec-am install-html install-html-am \
 +      install-info install-info-am \
 +      install-libsciabstractSyntaxTree_la_includeHEADERS install-man \
 +      install-pdf install-pdf-am install-pkglibLTLIBRARIES \
 +      install-ps install-ps-am install-strip installcheck \
 +      installcheck-am installdirs maintainer-clean \
 +      maintainer-clean-generic mostlyclean mostlyclean-compile \
 +      mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 +      tags uninstall uninstall-am \
 +      uninstall-libsciabstractSyntaxTree_la_includeHEADERS \
 +      uninstall-pkglibLTLIBRARIES
 +
 +
 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
Simple merge
@@@ -225,60 -225,22 +225,60 @@@ int createScalarDouble(void* _pvCtx, in
  int createScalarComplexDouble(void* _pvCtx, int _iVar, double _dblReal, double _dblImg);
  
  /**
-  * Create named scalar double
+  * Create a named scalar double variable
   * @param[in] _pstName variable name
-  * @param[in] _dblReal value
-  * @return if the operation successed (0) or not ( !0 )
+  * @param[in] _dblReal real value
+  * @return if the operation succeeded ( 0 ) or not ( !0 )
   */
- int createNamedScalarDouble(void* _pvCtx, char* _pstName, double _dblReal);
+ int createNamedScalarDouble(void* _pvCtx, const char* _pstName, double _dblReal);
  
  /**
-  * Create named scalar complex double variable
+  * Create a named scalar complex double variable
   * @param[in] _pstName variable name
-  * @param[in] _dblReal real value
-  * @param[in] _dblImg imaginary value
-  * @return if the operation successed (0) or not ( !0 )
+  * @param[in] _dblReal real part
+  * @param[in] _dblImg imaginary part
+  * @return if the operation succeeded ( 0 ) or not ( !0 )
   */
- int createNamedScalarComplexDouble(void* _pvCtx, char* _pstName, double _dblReal, double _dblImg);
+ int createNamedScalarComplexDouble(void* _pvCtx, const char* _pstName, double _dblReal, double _dblImg);
  
 +/**
 + * Create scalar double variable from integer value
 + * @param[in] _iVar variable number
 + * @param[in] _iReal real value
 + * @return if the operation successed (0) or not ( !0 )
 + */
 +int createScalarDoubleFromInteger(void* _pvCtx, int _iVar, int _iReal);
 +
 +/**
 + * Create scalar complex double variable from integer value
 + * @param[in] _iVar variable number
 + * @param[in] _iReal real value
 + * @param[in] _iImg imaginary value
 + * @return if the operation successed (0) or not ( !0 )
 + */
 +int createScalarComplexDoubleFromInteger(void* _pvCtx, int _iVar, int _iReal, int _iImg);
 +
 +/**
 + * Create matrix of double variable from integer value
 + * @param[in] _iVar variable number
 + * @param[in] _iRows Number of row
 + * @param[in] _iCols Number of column
 + * @param[in] _piReal real value
 + * @return if the operation successed (0) or not ( !0 )
 + */
 +int createMatrixOfDoubleFromInteger(void* _pvCtx, int _iVar, int _iRows, int _iCols, int* _piReal);
 +
 +/**
 + * Create matrix of complex double variable from integer value
 + * @param[in] _iVar variable number
 + * @param[in] _iRows Number of row
 + * @param[in] _iCols Number of column
 + * @param[in] _piReal real value
 + * @param[in] _piImg imaginary value
 + * @return if the operation successed (0) or not ( !0 )
 + */
 +int createMatrixOfComplexDoubleFromInteger(void* _pvCtx, int _iVar, int _iRows, int _iCols, int* _piReal, int* _piImg);
 +
  #ifdef __cplusplus
  }
  #endif
  extern "C" {
  #endif
  
 +#include "version.h"
 +#include "dynlib_api_scilab.h"
 +
+ /* These values are also used in:
+  * modules/core/includes/sci_types.h */
  #define SCI_INT8      1
  #define SCI_INT16     2
  #define SCI_INT32     4
@@@ -283,7 -278,7 +285,7 @@@ SciErr createNamedMatrixOfUnsignedInteg
   * @param[in] _pllData64 array of 64-bit integers
   * @return if the operation succeeded ( 0 ) or not ( !0 )
   */
- SciErr createNamedMatrixOfInteger64(void* _pvCtx, char* _pstName, int _iRows, int _iCols, const long long* _pllData64);
 -SciErr createNamedMatrixOfInteger64(void* _pvCtx, cosnt char* _pstName, int _iRows, int _iCols, const long long* _pllData64);
++SciErr createNamedMatrixOfInteger64(void* _pvCtx, const char* _pstName, int _iRows, int _iCols, const long long* _pllData64);
  
  /**
   * Create named 64-bit unsigned integer variable
@@@ -251,9 -186,7 +251,9 @@@ SciErr getVarType(void* _pvCtx, int* _p
        return sciErr;
  }
  /*--------------------------------------------------------------------------*/
 +// _pvCtx will not be used by getVarAddressFromName neither getVarType
 +// it can then be NULL.
- SciErr getNamedVarType(void* _pvCtx, char* _pstName, int* _piType)
+ SciErr getNamedVarType(void* _pvCtx, const char* _pstName, int* _piType)
  {
        SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
        int* piAddr                             = NULL;
@@@ -9,7 -9,7 +9,7 @@@
  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
  *
  * Please note that piece of code will be rewrited for the Scilab 6 family
--* However, the API (profile of the functions in the header files) will be 
++* However, the API (profile of the functions in the header files) will be
  * still available and supported in Scilab 6.
  */
  
@@@ -140,10 -133,15 +140,10 @@@ SciErr allocComplexMatrixOfDouble(void
  SciErr allocCommonMatrixOfDouble(void* _pvCtx, int _iVar, int _iComplex, int _iRows, int _iCols, double** _pdblReal, double** _pdblImg)
  {
        SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
-       
 -      int iNewPos                     = Top - Rhs + _iVar;
 -      int iAddr                               = *Lstk(iNewPos);
 -      int* piAddr                     = NULL;
 -      int iMemSize = _iRows * _iCols * (_iComplex + 1) + 2;
 -      int iFreeSpace = iadr(*Lstk(Bot)) - (iadr(iAddr));
 -      if (iMemSize > iFreeSpace)
 +      if(_pvCtx == NULL)
        {
 -              addStackSizeError(&sciErr, ((StrCtx*)_pvCtx)->pstName, iMemSize);
 +              addErrorMessage(&sciErr, API_ERROR_INVALID_POINTER, _("%s: Invalid argument address"), _iComplex ? "allocComplexMatrixOfDouble" : "allocexMatrixOfDouble");
                return sciErr;
        }
  
@@@ -296,8 -266,7 +296,8 @@@ SciErr createNamedComplexZMatrixOfDoubl
        //update "variable index"
        updateLstk(Top, *Lstk(Top) + sadr(4), iSize * (2) * 2);
  
 -      Rhs = 0;
 +      //Rhs = 0;
-       
++
        //Add name in stack reference list
        createNamedVariable(iVarID);
  
@@@ -311,12 -280,13 +311,13 @@@ SciErr createCommonNamedMatrixOfDouble(
  {
        SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
        int iVarID[nsiz];
 -      int iSaveRhs            = Rhs;
 -      int iSaveTop            = Top;
 -      int iSize               = _iRows * _iCols;
 -      int *piAddr             = NULL;
 +      int iSaveRhs                    = api_Rhs((int*)_pvCtx);
 +      int iSaveTop                    = api_Top((int*)_pvCtx);
 +      int iSize                                       = _iRows * _iCols;
 +      int *piAddr                             = NULL;
        double *pdblReal        = NULL;
        double *pdblImg         = NULL;
+       int iOne                = 1;
  
        C2F(str2name)(_pstName, iVarID, (int)strlen(_pstName));
        Top = Top + Nbvars + 1;
@@@ -562,78 -535,3 +566,78 @@@ static int createCommonNamedScalarDoubl
        return 0;
  }
  /*--------------------------------------------------------------------------*/
 +int createScalarDoubleFromInteger(void* _pvCtx, int _iVar, int _iReal)
 +{
 +      return createCommonScalarDoubleFromInteger(_pvCtx, _iVar, 0, _iReal, 0);
 +}
 +/*--------------------------------------------------------------------------*/
 +int createScalarComplexDoubleFromInteger(void* _pvCtx, int _iVar, int _iReal, int _iImg)
 +{
 +      return createCommonScalarDoubleFromInteger(_pvCtx, _iVar, 1, _iReal, _iImg);
 +}
 +/*--------------------------------------------------------------------------*/
 +static int createCommonScalarDoubleFromInteger(void* _pvCtx, int _iVar, int _iComplex, int _iReal, int _iImg)
 +{
 +      SciErr sciErr;
 +      double* pdblReal = NULL;
 +      double* pdblImg  = NULL;
-       
-       
++
++
 +      sciErr = allocCommonMatrixOfDouble(_pvCtx, _iVar, _iComplex, 1, 1, &pdblReal, &pdblImg);
 +      if(sciErr.iErr)
 +      {
 +              addErrorMessage(&sciErr, API_ERROR_CREATE_SCALAR_FROM_INTEGER, _("%s: Unable to create variable in Scilab memory"), _iComplex ? "createScalarComplexDoubleFromInteger" : "createScalarDoubleFromInteger");
 +              printError(&sciErr, 0);
 +              return sciErr.iErr;
 +      }
 +
 +      pdblReal[0] = (double)_iReal;
-       
++
 +      if(_iComplex)
 +      {
 +              pdblImg[0] = (double)_iImg;
 +      }
 +      return 0;
 +}
 +/*--------------------------------------------------------------------------*/
 +int createMatrixOfDoubleFromInteger(void* _pvCtx, int _iVar, int _iRows, int _iCols, int* _piReal)
 +{
 +      return createCommonMatrixDoubleFromInteger(_pvCtx, _iVar, 0, _iRows, _iCols, _piReal, NULL);
 +}
 +/*--------------------------------------------------------------------------*/
 +int createMatrixOfComplexDoubleFromInteger(void* _pvCtx, int _iVar, int _iRows, int _iCols, int* _piReal, int* _piImg)
 +{
 +      return createCommonMatrixDoubleFromInteger(_pvCtx, _iVar, 1, _iRows, _iCols, _piReal, _piImg);
 +}
 +/*--------------------------------------------------------------------------*/
 +static int createCommonMatrixDoubleFromInteger(void* _pvCtx, int _iVar, int _iComplex, int _iRows, int _iCols, int* _piReal, int* _piImg)
 +{
 +      SciErr sciErr;
 +      double* pdblReal = NULL;
 +      double* pdblImg  = NULL;
-       
-       
++
++
 +      sciErr = allocCommonMatrixOfDouble(_pvCtx, _iVar, _iComplex, _iRows, _iCols, &pdblReal, &pdblImg);
 +      if(sciErr.iErr)
 +      {
 +              addErrorMessage(&sciErr, API_ERROR_CREATE_MATRIX_FROM_INTEGER, _("%s: Unable to create variable in Scilab memory"), _iComplex ? "createMatrixOfComplexDoubleFromInteger" : "createMatrixOfDoubleFromInteger");
 +              printError(&sciErr, 0);
 +              return sciErr.iErr;
 +      }
 +
 +      for(int i = 0 ; i < _iRows * _iCols ; i++)
 +      {
 +              pdblReal[i] = (double)_piReal[i];
 +      }
-       
++
 +      if(_iComplex)
 +      {
 +              for(int i = 0 ; i < _iRows * _iCols ; i++)
 +              {
 +                      pdblImg[i] = (double)_piImg[i];
 +              }
 +      }
 +      return 0;
 +}
 +/*--------------------------------------------------------------------------*/
 +
@@@ -487,14 -442,7 +487,14 @@@ SciErr createNamedMatrixOfUnsignedInteg
        return createCommonNamedMatrixOfInteger(_pvCtx, _pstName, SCI_UINT32, _iRows, _iCols, _puiData32);
  }
  
 +#ifdef __SCILAB_INT64__
- SciErr createNamedMatrixOfUnsignedInteger64(void* _pvCtx, char* _pstName, int _iRows, int _iCols, const unsigned long long* _pullData64)
++SciErr createNamedMatrixOfUnsignedInteger64(void* _pvCtx, const char* _pstName, int _iRows, int _iCols, const unsigned long long* _pullData64)
 +{
 +      return createCommonNamedMatrixOfInteger(_pvCtx, _pstName, SCI_UINT64, _iRows, _iCols, _pullData64);
 +}
 +#endif
 +
- SciErr createNamedMatrixOfInteger8(void* _pvCtx, char* _pstName, int _iRows, int _iCols, const char* _pcData8)
+ SciErr createNamedMatrixOfInteger8(void* _pvCtx, const char* _pstName, int _iRows, int _iCols, const char* _pcData8)
  {
        return createCommonNamedMatrixOfInteger(_pvCtx, _pstName, SCI_INT8, _iRows, _iCols, _pcData8);
  }
@@@ -510,9 -458,9 +510,9 @@@ SciErr createNamedMatrixOfInteger32(voi
  }
  
  #ifdef __SCILAB_INT64__
- SciErr createNamedMatrixOfInteger64(void* _pvCtx, char* _pstName, int _iRows, int _iCols, const long long* _pllData64)
+ SciErr createNamedMatrixOfInteger64(void* _pvCtx, const char* _pstName, int _iRows, int _iCols, const long long* _pllData64)
  {
 -      return -1;
 +      return createCommonNamedMatrixOfInteger(_pvCtx, _pstName, SCI_INT64, _iRows, _iCols, _pllData64);
  }
  #endif
  
@@@ -600,14 -548,7 +600,14 @@@ SciErr readNamedMatrixOfUnsignedInteger
        return readCommonNamedMatrixOfInteger(_pvCtx, _pstName, SCI_UINT32, _piRows, _piCols, _puiData32);
  }
  
 +#ifdef __SCILAB_INT64__
- SciErr readNamedMatrixOfUnsignedInteger64(void* _pvCtx, char* _pstName, int* _piRows, int* _piCols, unsigned long long* _pullData64)
++SciErr readNamedMatrixOfUnsignedInteger64(void* _pvCtx, const char* _pstName, int* _piRows, int* _piCols, unsigned long long* _pullData64)
 +{
 +      return readCommonNamedMatrixOfInteger(_pvCtx, _pstName, SCI_UINT64, _piRows, _piCols, _pullData64);
 +}
 +#endif
 +
- SciErr readNamedMatrixOfInteger8(void* _pvCtx, char* _pstName, int* _piRows, int* _piCols, char* _pcData8)
+ SciErr readNamedMatrixOfInteger8(void* _pvCtx, const char* _pstName, int* _piRows, int* _piCols, char* _pcData8)
  {
        return readCommonNamedMatrixOfInteger(_pvCtx, _pstName, SCI_INT8, _piRows, _piCols, _pcData8);
  }
@@@ -623,9 -564,9 +623,9 @@@ SciErr readNamedMatrixOfInteger32(void
  }
  
  #ifdef __SCILAB_INT64__
- SciErr readNamedMatrixOfInteger64(void* _pvCtx, char* _pstName, int* _piRows, int* _piCols, long long* _pllData64)
+ SciErr readNamedMatrixOfInteger64(void* _pvCtx, const char* _pstName, int* _piRows, int* _piCols, long long* _pllData64)
  {
 -      return 1;
 +      return readCommonNamedMatrixOfInteger(_pvCtx, _pstName, SCI_INT64, _piRows, _piCols, _pllData64);
  }
  #endif
  
@@@ -21,10 -21,7 +21,10 @@@ SciErr readCommonNamedMatrixOfDouble(vo
  
  static int getCommonScalarDouble(void* _pvCtx, int* _piAddress, int _iComplex, double* _pdblReal, double* _pdblImg);
  static int createCommonScalarDouble(void* _pvCtx, int _iVar, int _iComplex, double _dblReal, double _dblImg);
- static int createCommonNamedScalarDouble(void* _pvCtx, char* _pstName, int _iComplex, double _dblReal, double _dblImg);
- static int getCommonNamedScalarDouble(void* _pvCtx, char* _pstName, int _iComplex, double* _pdblReal, double* _pdblImg);
+ static int createCommonNamedScalarDouble(void* _pvCtx, const char* _pstName, int _iComplex, double _dblReal, double _dblImg);
+ static int getCommonNamedScalarDouble(void* _pvCtx, const char* _pstName, int _iComplex, double* _pdblReal, double* _pdblImg);
  
 +static int createCommonScalarDoubleFromInteger(void* _pvCtx, int _iVar, int _iComplex, int _iReal, int _iImg);
 +static int createCommonMatrixDoubleFromInteger(void* _pvCtx, int _iVar, int _iComplex, int _iRows, int _iCols, int* _piReal, int* _piImg);
 +
  #endif /* __INTERNAL_DOUBLE_API__ */
@@@ -182,7 -184,7 +184,7 @@@ static SciErr createCommonNamedList(voi
    Top = Top + Nbvars + 1;
  
        getNewVarAddressFromPosition(_pvCtx, Top, &piAddr);
--      
++
        sciErr = fillCommonList(_pvCtx, piAddr, _iListType, _iNbItem);
        if(sciErr.iErr)
        {
  
  
        Rhs = 0;
--      
++
        if(_iNbItem == 0)
        {//Add name in stack reference list
                createNamedVariable(iVarID);
@@@ -1162,7 -1164,7 +1164,7 @@@ SciErr createMatrixOfBooleanInNamedList
    Top = Top + Nbvars + 1;
  
        getNewVarAddressFromPosition(_pvCtx, Top, &piAddr);
--      
++
        sciErr = fillMatrixOfBoolInList(_pvCtx, Top, _piParent, _iItemPos, _iRows, _iCols, &piBool);
        if(sciErr.iErr)
        {
@@@ -1597,14 -1592,7 +1599,14 @@@ SciErr allocMatrixOfInteger32InList(voi
        return allocCommonMatrixOfIntegerInList(_pvCtx, _iVar, _piParent, _iItemPos, SCI_INT32, _iRows, _iCols, (void**)_piData);
  }
  
 +#ifdef __SCILAB_INT64__
 +SciErr allocMatrixOfInteger64InList(void* _pvCtx, int _iVar, int* _piParent, int _iItemPos, int _iRows, int _iCols, long long** _pllData)
 +{
 +      return allocCommonMatrixOfIntegerInList(_pvCtx, _iVar, _piParent, _iItemPos, SCI_INT64, _iRows, _iCols, (void**)_pllData);
 +}
 +#endif
 +
- static SciErr createCommomMatrixOfIntegerInList(void* _pvCtx, int _iVar, int* _piParent, int _iItemPos, int _iPrecision, int _iRows, int _iCols, void* _pvData)
+ static SciErr createCommomMatrixOfIntegerInList(void* _pvCtx, int _iVar, int* _piParent, int _iItemPos, int _iPrecision, int _iRows, int _iCols, const void* _pvData)
  {
        SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
        void *pvData = NULL;
@@@ -1638,14 -1626,7 +1640,14 @@@ SciErr createMatrixOfUnsignedInteger32I
        return createCommomMatrixOfIntegerInList(_pvCtx, _iVar, _piParent, _iItemPos, SCI_UINT32, _iRows, _iCols, _puiData);
  }
  
 +#ifdef __SCILAB_INT64__
- SciErr createMatrixOfUnsignedInteger64InList(void* _pvCtx, int _iVar, int* _piParent, int _iItemPos, int _iRows, int _iCols, unsigned long long* _pullData)
++SciErr createMatrixOfUnsignedInteger64InList(void* _pvCtx, int _iVar, int* _piParent, int _iItemPos, int _iRows, int _iCols, const unsigned long long* _pullData)
 +{
 +      return createCommomMatrixOfIntegerInList(_pvCtx, _iVar, _piParent, _iItemPos, SCI_UINT64, _iRows, _iCols, _pullData);
 +}
 +#endif
 +
- SciErr createMatrixOfInteger8InList(void* _pvCtx, int _iVar, int* _piParent, int _iItemPos, int _iRows, int _iCols, char* _pcData)
+ SciErr createMatrixOfInteger8InList(void* _pvCtx, int _iVar, int* _piParent, int _iItemPos, int _iRows, int _iCols, const char* _pcData)
  {
        return createCommomMatrixOfIntegerInList(_pvCtx, _iVar, _piParent, _iItemPos, SCI_INT8, _iRows, _iCols, _pcData);
  }
@@@ -1660,18 -1641,11 +1662,18 @@@ SciErr createMatrixOfInteger32InList(vo
        return createCommomMatrixOfIntegerInList(_pvCtx, _iVar, _piParent, _iItemPos, SCI_INT32, _iRows, _iCols, _piData);
  }
  
 +#ifdef __SCILAB_INT64__
- SciErr createMatrixOfInteger64InList(void* _pvCtx, int _iVar, int* _piParent, int _iItemPos, int _iRows, int _iCols, long long* _pllData)
++SciErr createMatrixOfInteger64InList(void* _pvCtx, int _iVar, int* _piParent, int _iItemPos, int _iRows, int _iCols, const long long* _pllData)
 +{
 +      return createCommomMatrixOfIntegerInList(_pvCtx, _iVar, _piParent, _iItemPos, SCI_INT64, _iRows, _iCols, _pllData);
 +}
 +#endif
 +
  static SciErr getCommonMatrixOfIntegerInList(void* _pvCtx, int* _piParent, int _iItemPos, int _iPrecision, int* _piRows, int* _piCols, void** _pvData)
  {
        SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
        int* piAddr             = NULL;
--      
++
        sciErr = getListItemAddress(_pvCtx, _piParent, _iItemPos, &piAddr);
        if(sciErr.iErr)
        {
@@@ -1726,14 -1693,7 +1728,14 @@@ SciErr getMatrixOfInteger32InList(void
        return getCommonMatrixOfIntegerInList(_pvCtx, _piParent, _iItemPos, SCI_INT32, _piRows, _piCols, (void**)_piData);
  }
  
 +#ifdef __SCILAB_INT64__
 +SciErr getMatrixOfInteger64InList(void* _pvCtx, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, long long** _pllData)
 +{
 +      return getCommonMatrixOfIntegerInList(_pvCtx, _piParent, _iItemPos, SCI_INT64, _piRows, _piCols, (void**)_pllData);
 +}
 +#endif
 +
- static SciErr createCommonMatrixOfIntegerInNamedList(void* _pvCtx, char* _pstName, int* _piParent, int _iItemPos, int _iPrecision, int _iRows, int _iCols, void* _pvData)
+ static SciErr createCommonMatrixOfIntegerInNamedList(void* _pvCtx, const char* _pstName, int* _piParent, int _iItemPos, int _iPrecision, int _iRows, int _iCols, const void* _pvData)
  {
        SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
        int iVarID[nsiz];
@@@ -1796,14 -1756,7 +1798,14 @@@ SciErr createMatrixOfUnsignedInteger32I
        return createCommonMatrixOfIntegerInNamedList(_pvCtx, _pstName, _piParent, _iItemPos, SCI_UINT32, _iRows, _iCols, _puiData);
  }
  
 +#ifdef __SCILAB_INT64__
- SciErr createMatrixOfUnsignedInteger64InNamedList(void* _pvCtx, char* _pstName, int* _piParent, int _iItemPos, int _iRows, int _iCols, unsigned long long* _pullData)
++SciErr createMatrixOfUnsignedInteger64InNamedList(void* _pvCtx, const char* _pstName, int* _piParent, int _iItemPos, int _iRows, int _iCols, const unsigned long long* _pullData)
 +{
 +      return createCommonMatrixOfIntegerInNamedList(_pvCtx, _pstName, _piParent, _iItemPos, SCI_UINT64, _iRows, _iCols, _pullData);
 +}
 +#endif
 +
- SciErr createMatrixOfInteger8InNamedList(void* _pvCtx, char* _pstName, int* _piParent, int _iItemPos, int _iRows, int _iCols, char* _pcData)
+ SciErr createMatrixOfInteger8InNamedList(void* _pvCtx, const char* _pstName, int* _piParent, int _iItemPos, int _iRows, int _iCols, const char* _pcData)
  {
        return createCommonMatrixOfIntegerInNamedList(_pvCtx, _pstName, _piParent, _iItemPos, SCI_INT8, _iRows, _iCols, _pcData);
  }
@@@ -1818,14 -1771,7 +1820,14 @@@ SciErr createMatrixOfInteger32InNamedLi
        return createCommonMatrixOfIntegerInNamedList(_pvCtx, _pstName, _piParent, _iItemPos, SCI_INT32, _iRows, _iCols, _piData);
  }
  
 +#ifdef __SCILAB_INT64__
- SciErr createMatrixOfInteger64InNamedList(void* _pvCtx, char* _pstName, int* _piParent, int _iItemPos, int _iRows, int _iCols, long long* _pllData)
++SciErr createMatrixOfInteger64InNamedList(void* _pvCtx, const char* _pstName, int* _piParent, int _iItemPos, int _iRows, int _iCols, const long long* _pllData)
 +{
 +      return createCommonMatrixOfIntegerInNamedList(_pvCtx, _pstName, _piParent, _iItemPos, SCI_INT64, _iRows, _iCols, _pllData);
 +}
 +#endif
 +
- static SciErr readCommonMatrixOfIntgerInNamedList(void* _pvCtx, char* _pstName, int* _piParent, int _iItemPos, int _iPrecision, int* _piRows, int* _piCols, void* _pvData)
+ static SciErr readCommonMatrixOfIntgerInNamedList(void* _pvCtx, const char* _pstName, int* _piParent, int _iItemPos, int _iPrecision, int* _piRows, int* _piCols, void* _pvData)
  {
        SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
        int iNbItem                             = 0;
@@@ -1886,14 -1832,7 +1888,14 @@@ SciErr readMatrixOfUnsignedInteger32InN
        return readCommonMatrixOfIntgerInNamedList(_pvCtx, _pstName, _piParent, _iItemPos, SCI_UINT32, _piRows, _piCols, _puiData);
  }
  
 +#ifdef __SCILAB_INT64__
- SciErr readMatrixOfUnsignedInteger64InNamedList(void* _pvCtx, char* _pstName, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, unsigned long long* _pullData)
++SciErr readMatrixOfUnsignedInteger64InNamedList(void* _pvCtx, const char* _pstName, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, unsigned long long* _pullData)
 +{
 +      return readCommonMatrixOfIntgerInNamedList(_pvCtx, _pstName, _piParent, _iItemPos, SCI_UINT64, _piRows, _piCols, _pullData);
 +}
 +#endif
 +
- SciErr readMatrixOfIntger8InNamedList(void* _pvCtx, char* _pstName, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, char* _pcData)
+ SciErr readMatrixOfIntger8InNamedList(void* _pvCtx, const char* _pstName, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, char* _pcData)
  {
        return readCommonMatrixOfIntgerInNamedList(_pvCtx, _pstName, _piParent, _iItemPos, SCI_INT8, _piRows, _piCols, _pcData);
  }
@@@ -1908,13 -1847,6 +1910,13 @@@ SciErr readMatrixOfIntger32InNamedList(
        return readCommonMatrixOfIntgerInNamedList(_pvCtx, _pstName, _piParent, _iItemPos, SCI_INT32, _piRows, _piCols, _piData);
  }
  
 +#ifdef __SCILAB_INT64__
- SciErr readMatrixOfIntger64InNamedList(void* _pvCtx, char* _pstName, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, long long* _pllData)
++SciErr readMatrixOfIntger64InNamedList(void* _pvCtx, const char* _pstName, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, long long* _pllData)
 +{
 +      return readCommonMatrixOfIntgerInNamedList(_pvCtx, _pstName, _piParent, _iItemPos, SCI_INT64, _piRows, _piCols, _pllData);
 +}
 +#endif
 +
  /*********************
   * sparses functions *
   *********************/
@@@ -2001,7 -1933,7 +2003,7 @@@ static SciErr createCommonSparseMatrixI
                addErrorMessage(&sciErr, API_ERROR_CREATE_SPARSE_IN_LIST, _("%s: Unable to create list item #%d in Scilab memory"), _iComplex ? "createComplexSparseMatrixInList" : "createComplexSparseMatrixInList", _iItemPos + 1);
                return sciErr;
        }
--      
++
        iItemLen                                                = 5 + _iRows + _iNbItem + !((_iRows + _iNbItem) % 2);
        iItemLen                                                += iTotalLen * 2;
        piEnd                                                           =       piAddr + iItemLen;
@@@ -2086,7 -2018,7 +2088,7 @@@ static SciErr getCommonSparseMatrixInLi
  {
        SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
        int* piAddr             = NULL;
--      
++
        sciErr = getListItemAddress(_pvCtx, _piParent, _iItemPos, &piAddr);
        if(sciErr.iErr)
        {
@@@ -2263,7 -2195,7 +2265,7 @@@ SciErr createBooleanSparseMatrixInList(
                addErrorMessage(&sciErr, API_ERROR_CREATE_BOOLEAN_SPARSE_IN_LIST, _("%s: Unable to create list item #%d in Scilab memory"), "createBooleanSparseMatrixInList", _iItemPos + 1);
                return sciErr;
        }
--      
++
        iItemLen                                                = 5 + _iRows + _iNbItem + !((_iRows + _iNbItem) % 2);
        piEnd                                                           =       piAddr + iItemLen;
        if(_iItemPos == _piParent[1])
@@@ -2326,7 -2258,7 +2328,7 @@@ SciErr getBooleanSparseMatrixInList(voi
  {
        SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
        int* piAddr             = NULL;
--      
++
        sciErr = getListItemAddress(_pvCtx, _piParent, _iItemPos, &piAddr);
        if(sciErr.iErr)
        {
@@@ -2404,7 -2336,7 +2406,7 @@@ SciErr getPointerInList(void* _pvCtx, i
  {
        SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
        int* piAddr             = NULL;
--      
++
        sciErr = getListItemAddress(_pvCtx, _piParent, _iItemPos, &piAddr);
        if(sciErr.iErr)
        {
@@@ -72,271 -79,256 +72,271 @@@ SciErr getComplexMatrixOfPoly(void* _pv
  
  SciErr getCommonMatrixOfPoly(void* _pvCtx, int* _piAddress, int _iComplex, int* _piRows, int* _piCols, int* _piNbCoef, double** _pdblReal, double** _pdblImg)
  {
 -      SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
 -      int iType                                       = 0;
 -      int iSize                                       = 0;
 -      int *piOffset                   = NULL;
 -      double *pdblReal        = NULL;
 -      double *pdblImg         = NULL;
 -
 -      if(_piAddress == NULL)
 -      {
 -              addErrorMessage(&sciErr, API_ERROR_INVALID_POINTER, _("%s: Invalid argument address"), _iComplex ? "getComplexMatrixOfPoly" : "getMatrixOfPoly");
 -              return sciErr;
 -      }
 -
 -      sciErr = getVarType(_pvCtx, _piAddress, &iType);
 -      if(sciErr.iErr)
 -      {
 -              addErrorMessage(&sciErr, API_ERROR_GET_POLY, _("%s: Unable to get argument #%d"), _iComplex ? "getComplexMatrixOfPoly" : "getMatrixOfPoly", getRhsFromAddress(_pvCtx, _piAddress));
 -              return sciErr;
 -      }
 -      
 -      if(iType != sci_poly)
 -      {
 -              addErrorMessage(&sciErr, API_ERROR_INVALID_TYPE, _("%s: Invalid argument type, %s excepted"), _iComplex ? "getComplexMatrixOfPoly" : "getMatrixOfPoly", _("polynomial matrix"));
 -              return sciErr;
 -      }
 -
 -      if(isVarComplex(_pvCtx, _piAddress) != _iComplex)
 -      {
 -              addErrorMessage(&sciErr, API_ERROR_INVALID_COMPLEXITY, _("%s: Bad call to get a non complex matrix"), _iComplex ? "getComplexMatrixOfPoly" : "getMatrixOfPoly");
 -              return sciErr;
 -      }
 -
 -      sciErr = getVarDimension(_pvCtx, _piAddress, _piRows, _piCols);
 -      if(sciErr.iErr)
 -      {
 -              addErrorMessage(&sciErr, API_ERROR_GET_POLY, _("%s: Unable to get argument #%d"), _iComplex ? "getComplexMatrixOfPoly" : "getMatrixOfPoly", getRhsFromAddress(_pvCtx, _piAddress));
 -              return sciErr;
 -      }
 -
 -      iSize   = *_piRows * *_piCols;
 -
 -      if(_piNbCoef == NULL)
 -      {
 -              return sciErr;
 -      }
 -
 -      piOffset = _piAddress + 8; //4 for header and 4 for variable name
 -      for(int i = 0 ; i < iSize ; i++)
 -      {
 -              _piNbCoef[i]    = piOffset[i + 1] - piOffset[i];
 -      }
 -
 -      if(_pdblReal == NULL)
 -      {
 -              return sciErr;
 -      }
 -
 -      pdblReal = (double*)(piOffset + iSize + 1 + ((iSize + 1) % 2 == 0 ? 0 : 1 ));
 -      for(int i = 0 ; i < iSize ; i++)
 -      {
 -              memcpy(_pdblReal[i], pdblReal + piOffset[i] - 1, sizeof(double) * _piNbCoef[i]);
 -      }
 -
 -      if(_iComplex == 1)
 -      {
 -              pdblImg = pdblReal + piOffset[iSize] - 1;
 -              for(int i = 0 ; i < iSize ; i++)
 -              {
 -                      memcpy(_pdblImg[i], pdblImg + piOffset[i] - 1, sizeof(double) * _piNbCoef[i]);
 -              }
 -      }
 -      return sciErr;
 +    SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
 +    int iType                                 = 0;
 +    int iSize                                 = 0;
 +    int *piOffset                     = NULL;
 +    double *pdblReal  = NULL;
 +    double *pdblImg           = NULL;
 +
 +    if(_piAddress == NULL)
 +    {
 +        addErrorMessage(&sciErr, API_ERROR_INVALID_POINTER, _("%s: Invalid argument address"), _iComplex ? "getComplexMatrixOfPoly" : "getMatrixOfPoly");
 +        return sciErr;
 +    }
 +
 +    sciErr = getVarType(_pvCtx, _piAddress, &iType);
 +    if(sciErr.iErr)
 +    {
 +        addErrorMessage(&sciErr, API_ERROR_GET_POLY, _("%s: Unable to get argument #%d"), _iComplex ? "getComplexMatrixOfPoly" : "getMatrixOfPoly", getRhsFromAddress(_pvCtx, _piAddress));
 +        return sciErr;
 +    }
 +
 +    if(iType != sci_poly)
 +    {
 +        addErrorMessage(&sciErr, API_ERROR_INVALID_TYPE, _("%s: Invalid argument type, %s excepted"), _iComplex ? "getComplexMatrixOfPoly" : "getMatrixOfPoly", _("polynomial matrix"));
 +        return sciErr;
 +    }
 +
 +    if(isVarComplex(_pvCtx, _piAddress) != _iComplex)
 +    {
 +        addErrorMessage(&sciErr, API_ERROR_INVALID_COMPLEXITY, _("%s: Bad call to get a non complex matrix"), _iComplex ? "getComplexMatrixOfPoly" : "getMatrixOfPoly");
 +        return sciErr;
 +    }
 +
 +    sciErr = getVarDimension(_pvCtx, _piAddress, _piRows, _piCols);
 +    if(sciErr.iErr)
 +    {
 +        addErrorMessage(&sciErr, API_ERROR_GET_POLY, _("%s: Unable to get argument #%d"), _iComplex ? "getComplexMatrixOfPoly" : "getMatrixOfPoly", getRhsFromAddress(_pvCtx, _piAddress));
 +        return sciErr;
 +    }
 +
 +    iSize     = *_piRows * *_piCols;
 +
 +    if(_piNbCoef == NULL)
 +    {
 +        return sciErr;
 +    }
 +
 +    MatrixPoly *pMP = ((InternalType*)_piAddress)->getAsPoly();
 +    pMP->rank_get(_piNbCoef);
 +
 +    if(_pdblReal == NULL)
 +    {
 +        return sciErr;
 +    }
 +
 +    for(int i = 0 ; i < iSize ; i++)
 +    {
 +        memcpy(_pdblReal[i], pMP->poly_get(i)->coef_real_get(), sizeof(double) * pMP->poly_get(i)->rank_get());
 +    }
 +
 +    if(_iComplex == 1)
 +    {
 +        for(int i = 0 ; i < iSize ; i++)
 +        {
 +            memcpy(_pdblImg[i], pMP->poly_get(i)->coef_img_get(), sizeof(double) * _piNbCoef[i]);
 +        }
 +    }
 +    return sciErr;
  }
  
- SciErr createMatrixOfPoly(void* _pvCtx, int _iVar, char* _pstVarName, int _iRows, int _iCols, int* _piNbCoef, double** _pdblReal)
+ SciErr createMatrixOfPoly(void* _pvCtx, int _iVar, char* _pstVarName, int _iRows, int _iCols, const int* _piNbCoef, const double* const* _pdblReal)
  {
 -      return createCommonMatrixOfPoly(_pvCtx, _iVar, 0, _pstVarName, _iRows, _iCols, _piNbCoef, _pdblReal, NULL);
 +    return createCommonMatrixOfPoly(_pvCtx, _iVar, 0, _pstVarName, _iRows, _iCols, _piNbCoef, _pdblReal, NULL);
  }
  
- SciErr createComplexMatrixOfPoly(void* _pvCtx, int _iVar, char* _pstVarName, int _iRows, int _iCols, int* _piNbCoef, double** _pdblReal, double** _pdblImg)
+ SciErr createComplexMatrixOfPoly(void* _pvCtx, int _iVar, char* _pstVarName, int _iRows, int _iCols, const int* _piNbCoef, const double* const* _pdblReal, const double* const* _pdblImg)
  {
 -      return createCommonMatrixOfPoly(_pvCtx, _iVar, 1, _pstVarName, _iRows, _iCols, _piNbCoef, _pdblReal, _pdblImg);
 +    return createCommonMatrixOfPoly(_pvCtx, _iVar, 1, _pstVarName, _iRows, _iCols, _piNbCoef, _pdblReal, _pdblImg);
  }
  
- SciErr createCommonMatrixOfPoly(void* _pvCtx, int _iVar, int _iComplex, char* _pstVarName, int _iRows, int _iCols, int* _piNbCoef, double** _pdblReal, double** _pdblImg)
+ SciErr createCommonMatrixOfPoly(void* _pvCtx, int _iVar, int _iComplex, char* _pstVarName, int _iRows, int _iCols, const int* _piNbCoef, const double* const* _pdblReal, const double* const* _pdblImg)
  {
 -      SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
 -      int *piAddr                             = NULL;
 -      int iSize                                       = _iRows * _iCols;
 -      int iNewPos                             = Top - Rhs + _iVar;
 -      int iAddr                                       = *Lstk(iNewPos);
 -      int iTotalLen                   = 0;
 -
 -      getNewVarAddressFromPosition(_pvCtx, iNewPos, &piAddr);
 -      sciErr = fillCommonMatrixOfPoly(_pvCtx, piAddr, _pstVarName, _iComplex, _iRows, _iCols, _piNbCoef, _pdblReal, _pdblImg, &iTotalLen);
 -      if(sciErr.iErr)
 -      {
 -              addErrorMessage(&sciErr, API_ERROR_CREATE_POLY, _("%s: Unable to create variable in Scilab memory"), _iComplex ? "createComplexMatrixOfPoly" : "createMatrixOfPoly");
 -              return sciErr;
 -      }
 -
 -      updateInterSCI(_iVar, '$', iAddr, iAddr + 4 + 4 + iSize + 1);
 -      updateLstk(iNewPos, iAddr + 4 + 4 + iSize + 1, iTotalLen);
 -
 -      return sciErr;
 +    SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
 +    if(_pvCtx == NULL)
 +    {
 +        addErrorMessage(&sciErr, API_ERROR_INVALID_POINTER, _("%s: Invalid argument address"), _iComplex ? "createComplexMatrixOfPoly" : "createMatrixOfPoly");
 +        return sciErr;
 +    }
 +
 +    GatewayStruct* pStr = (GatewayStruct*)_pvCtx;
 +    InternalType** out = pStr->m_pOut;
 +
 +    wchar_t* pstTemp = to_wide_string(_pstVarName);
 +    MatrixPoly* pP = new MatrixPoly(pstTemp, _iRows, _iCols, _piNbCoef);
 +    FREE(pstTemp);
 +    if(pP == NULL)
 +    {
 +        addErrorMessage(&sciErr, API_ERROR_NO_MORE_MEMORY, _("%s: No more memory to allocated variable"), _iComplex ? "createComplexMatrixOfPoly" : "createMatrixOfPoly");
 +        return sciErr;
 +    }
 +
 +    if(_iComplex)
 +    {
 +        pP->complex_set(true);
 +    }
 +
 +    int rhs = _iVar - api_Rhs((int*)_pvCtx);
 +    out[rhs - 1] = pP;
 +
 +    for(int i = 0 ; i < pP->size_get() ; i++)
 +    {
 +        Double* pD = new Double(_piNbCoef[i], 1, _iComplex == 1);
 +        pD->real_set(_pdblReal[i]);
 +        if(_iComplex)
 +        {
 +            pD->img_set(_pdblImg[i]);
 +        }
 +        pP->poly_set(i, pD);
 +    }
 +
 +    return sciErr;
  }
  
- SciErr fillCommonMatrixOfPoly(void* _pvCtx, int* _piAddress, char* _pstVarName, int _iComplex, int _iRows, int _iCols, int* _piNbCoef, double** _pdblReal, double** _pdblImg, int* _piTotalLen)
+ SciErr fillCommonMatrixOfPoly(void* _pvCtx, int* _piAddress, char* _pstVarName, int _iComplex, int _iRows, int _iCols, const int* _piNbCoef, const double* const* _pdblReal, const double* const* _pdblImg, int* _piTotalLen)
  {
 -      SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
 -      int* piOffset                   = NULL;
 -      int *piVarName          = NULL;
 -      int iSize                                       = _iRows * _iCols;
 -
 -      double *pdblReal        = NULL;
 -      double *pdblImg         = NULL;
 -
 -      //header
 -      _piAddress[0] = sci_poly;
 -      _piAddress[1] = _iRows;
 -      _piAddress[2] = _iCols;
 -      _piAddress[3] = _iComplex;
 -
 -
 -      //4 for header
 -      piVarName = _piAddress + 4;//4 for header
 -      if(strlen(_pstVarName) > 4)//4 characters max
 -      {
 -              addErrorMessage(&sciErr, API_ERROR_TOO_LONG_VAR, _("%s: Formal variable name of polynomial can't exceed 4 characters"));
 -              return sciErr;
 -      }
 -
 -      //fill variable name with space ( 40 sergescii )
 -      piVarName[0] = 40;
 -      piVarName[1] = 40;
 -      piVarName[2] = 40;
 -      piVarName[3] = 40;
 -      str2code(piVarName, &_pstVarName);
 -
 -      piOffset = _piAddress + 8; //4 for header and 4 for variable name
 -      piOffset[0] = 1;
 -      for(int i = 0 ; i < iSize ; i++)
 -      {
 -              piOffset[i + 1] = piOffset[i] + _piNbCoef[i];
 -      }
 -
 -      pdblReal = (double*)(piOffset + iSize + 1 + ((iSize + 1) % 2 == 0 ? 0 : 1 ));
 -
 -      for(int i = 0 ; i < iSize ; i++)
 -      {
 -              memcpy(pdblReal + piOffset[i] - 1, _pdblReal[i], _piNbCoef[i] * sizeof(double));
 -      }
 -
 -      if(_iComplex == 1)
 -      {
 -              pdblImg = pdblReal + piOffset[iSize] - 1;
 -              for(int i = 0 ; i < iSize ; i++)
 -              {
 -                      memcpy(pdblImg + piOffset[i] - 1, _pdblImg[i], _piNbCoef[i] * sizeof(double));
 -              }
 -      }
 -
 -      *_piTotalLen = (piOffset[iSize] - 1) * (_iComplex + 1) * 2;
 -      return sciErr;
 +    SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
 +    int* piOffset                     = NULL;
 +    int *piVarName            = NULL;
 +    int iSize                                 = _iRows * _iCols;
 +
 +    double *pdblReal  = NULL;
 +    double *pdblImg           = NULL;
 +
 +    //header
 +    _piAddress[0] = sci_poly;
 +    _piAddress[1] = _iRows;
 +    _piAddress[2] = _iCols;
 +    _piAddress[3] = _iComplex;
 +
 +
 +    //4 for header
 +    piVarName = _piAddress + 4;//4 for header
 +    if(strlen(_pstVarName) > 4)//4 characters max
 +    {
 +        addErrorMessage(&sciErr, API_ERROR_TOO_LONG_VAR, _("%s: Formal variable name of polynomial can't exceed 4 characters"));
 +        return sciErr;
 +    }
 +
 +    //fill variable name with space ( 40 sergescii )
 +    piVarName[0] = 40;
 +    piVarName[1] = 40;
 +    piVarName[2] = 40;
 +    piVarName[3] = 40;
 +    //str2code(piVarName, &_pstVarName);
 +
 +    piOffset = _piAddress + 8; //4 for header and 4 for variable name
 +    piOffset[0] = 1;
 +    for(int i = 0 ; i < iSize ; i++)
 +    {
 +        piOffset[i + 1] = piOffset[i] + _piNbCoef[i];
 +    }
 +
 +    pdblReal = (double*)(piOffset + iSize + 1 + ((iSize + 1) % 2 == 0 ? 0 : 1 ));
 +
 +    for(int i = 0 ; i < iSize ; i++)
 +    {
 +        memcpy(pdblReal + piOffset[i] - 1, _pdblReal[i], _piNbCoef[i] * sizeof(double));
 +    }
 +
 +    if(_iComplex == 1)
 +    {
 +        pdblImg = pdblReal + piOffset[iSize] - 1;
 +        for(int i = 0 ; i < iSize ; i++)
 +        {
 +            memcpy(pdblImg + piOffset[i] - 1, _pdblImg[i], _piNbCoef[i] * sizeof(double));
 +        }
 +    }
 +
 +    *_piTotalLen = (piOffset[iSize] - 1) * (_iComplex + 1) * 2;
 +    return sciErr;
  }
  
- SciErr createNamedMatrixOfPoly(void* _pvCtx, char* _pstName, char* _pstVarName, int _iRows, int _iCols, int* _piNbCoef, double** _pdblReal)
+ SciErr createNamedMatrixOfPoly(void* _pvCtx, const char* _pstName, char* _pstVarName, int _iRows, int _iCols, const int* _piNbCoef, const double* const* _pdblReal)
  {
 -      return createCommonNamedMatrixOfPoly(_pvCtx, _pstName, _pstVarName, 0, _iRows, _iCols, _piNbCoef, _pdblReal, NULL);
 +    return createCommonNamedMatrixOfPoly(_pvCtx, _pstName, _pstVarName, 0, _iRows, _iCols, _piNbCoef, _pdblReal, NULL);
  }
  
- SciErr createNamedComplexMatrixOfPoly(void* _pvCtx, char* _pstName, char* _pstVarName, int _iRows, int _iCols, int* _piNbCoef, double** _pdblReal, double** _pdblImg)
+ SciErr createNamedComplexMatrixOfPoly(void* _pvCtx, const char* _pstName, char* _pstVarName, int _iRows, int _iCols, const int* _piNbCoef, const double* const* _pdblReal, const double* const* _pdblImg)
  {
 -      return createCommonNamedMatrixOfPoly(_pvCtx, _pstName, _pstVarName, 1, _iRows, _iCols, _piNbCoef, _pdblReal, _pdblImg);
 +    return createCommonNamedMatrixOfPoly(_pvCtx, _pstName, _pstVarName, 1, _iRows, _iCols, _piNbCoef, _pdblReal, _pdblImg);
  }
  
- SciErr createCommonNamedMatrixOfPoly(void* _pvCtx, char* _pstName, char* _pstVarName, int _iComplex, int _iRows, int _iCols, int* _piNbCoef, double** _pdblReal, double** _pdblImg)
+ SciErr createCommonNamedMatrixOfPoly(void* _pvCtx, const char* _pstName, char* _pstVarName, int _iComplex, int _iRows, int _iCols, const int* _piNbCoef, const double* const* _pdblReal, const double* const* _pdblImg)
  {
 -      SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
 -      int iVarID[nsiz];
 -  int iSaveRhs                        = Rhs;
 -      int iSaveTop                    = Top;
 -      int *piAddr                             = NULL;
 -      int iTotalLen                   = 0;
 +    SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
 +    int iVarID[nsiz];
 +    int iSaveRhs                      = api_Rhs((int*)_pvCtx);
 +    int iSaveTop                      = api_Top((int*)_pvCtx);
 +    int *piAddr                               = NULL;
 +    int iTotalLen                     = 0;
  
 -      C2F(str2name)(_pstName, iVarID, (unsigned long)strlen(_pstName));
 -  Top = Top + Nbvars + 1;
 +    C2F(str2name)(_pstName, iVarID, (unsigned long)strlen(_pstName));
 +    Top = Top + Nbvars + 1;
  
 -      getNewVarAddressFromPosition(_pvCtx, Top, &piAddr);
 +    getNewVarAddressFromPosition(_pvCtx, Top, &piAddr);
  
 -      //write matrix information
 -      sciErr = fillCommonMatrixOfPoly(_pvCtx, piAddr, _pstVarName, _iComplex, _iRows, _iCols, _piNbCoef, _pdblReal, _pdblImg, &iTotalLen);
 -      if(sciErr.iErr)
 -      {
 -              addErrorMessage(&sciErr, API_ERROR_CREATE_NAMED_POLY, _("%s: Unable to create %s named \"%s\""), _iComplex ? "createNamedComplexMatrixOfPoly" : "createNamedMatrixOfPoly", _("matrix of double"), _pstName);
 -              return sciErr;
 -      }
 +    //write matrix information
 +    sciErr = fillCommonMatrixOfPoly(_pvCtx, piAddr, _pstVarName, _iComplex, _iRows, _iCols, _piNbCoef, _pdblReal, _pdblImg, &iTotalLen);
 +    if(sciErr.iErr)
 +    {
 +        addErrorMessage(&sciErr, API_ERROR_CREATE_NAMED_POLY, _("%s: Unable to create %s named \"%s\""), _iComplex ? "createNamedComplexMatrixOfPoly" : "createNamedMatrixOfPoly", _("matrix of double"), _pstName);
 +        return sciErr;
 +    }
  
  
 -      //update "variable index"
 -      updateLstk(Top, *Lstk(Top) + 4, iTotalLen);
 +    //update "variable index"
 +    updateLstk(Top, *Lstk(Top) + 4, iTotalLen);
  
 -      Rhs = 0;
 -      //Add name in stack reference list
 -      createNamedVariable(iVarID);
 +    //Rhs = 0;
 +    //Add name in stack reference list
 +    createNamedVariable(iVarID);
  
 -      Top = iSaveTop;
 -  Rhs = iSaveRhs;
 +    //Top = iSaveTop;
 +    //Rhs = iSaveRhs;
  
 -      return sciErr;
 +    return sciErr;
  }
  
- SciErr readNamedMatrixOfPoly(void* _pvCtx, char* _pstName, int* _piRows, int* _piCols, int* _piNbCoef, double** _pdblReal)
+ SciErr readNamedMatrixOfPoly(void* _pvCtx, const char* _pstName, int* _piRows, int* _piCols, int* _piNbCoef, double** _pdblReal)
  {
 -      return readCommonNamedMatrixOfPoly(_pvCtx, _pstName, 0, _piRows, _piCols, _piNbCoef, _pdblReal, NULL);
 +    return readCommonNamedMatrixOfPoly(_pvCtx, _pstName, 0, _piRows, _piCols, _piNbCoef, _pdblReal, NULL);
  }
  
- SciErr readNamedComplexMatrixOfPoly(void* _pvCtx, char* _pstName, int* _piRows, int* _piCols, int* _piNbCoef, double** _pdblReal, double** _pdblImg)
+ SciErr readNamedComplexMatrixOfPoly(void* _pvCtx, const char* _pstName, int* _piRows, int* _piCols, int* _piNbCoef, double** _pdblReal, double** _pdblImg)
  {
 -      return readCommonNamedMatrixOfPoly(_pvCtx, _pstName, 1, _piRows, _piCols, _piNbCoef, _pdblReal, _pdblImg);
 +    return readCommonNamedMatrixOfPoly(_pvCtx, _pstName, 1, _piRows, _piCols, _piNbCoef, _pdblReal, _pdblImg);
  }
  
- SciErr readCommonNamedMatrixOfPoly(void* _pvCtx, char* _pstName, int _iComplex, int* _piRows, int* _piCols, int* _piNbCoef, double** _pdblReal, double** _pdblImg)
+ SciErr readCommonNamedMatrixOfPoly(void* _pvCtx, const char* _pstName, int _iComplex, int* _piRows, int* _piCols, int* _piNbCoef, double** _pdblReal, double** _pdblImg)
  {
 -      SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
 -      int* piAddr                             = NULL;
 -
 -      sciErr = getVarAddressFromName(_pvCtx, _pstName, &piAddr);
 -      if(sciErr.iErr)
 -      {
 -              addErrorMessage(&sciErr, API_ERROR_READ_NAMED_POLY, _("%s: Unable to get variable \"%s\""), _iComplex ? "readNamedComplexMatrixOfPoly" :"readNamedMatrixOfPoly", _pstName);
 -              return sciErr;
 -      }
 -      
 -      if(_iComplex == 1)
 -      {
 -              sciErr = getComplexMatrixOfPoly(_pvCtx, piAddr, _piRows, _piCols, _piNbCoef, _pdblReal, _pdblImg);
 -      }
 -      else
 -      {
 -              sciErr = getMatrixOfPoly(_pvCtx, piAddr, _piRows, _piCols, _piNbCoef, _pdblReal);
 -      }
 -
 -      if(sciErr.iErr)
 -      {
 -              addErrorMessage(&sciErr, API_ERROR_READ_NAMED_POLY, _("%s: Unable to get variable \"%s\""), _iComplex ? "readNamedComplexMatrixOfPoly" :"readNamedMatrixOfPoly", _pstName);
 -              return sciErr;
 -      }
 -
 -      return sciErr;
 +    SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
 +    int* piAddr                               = NULL;
 +
 +    sciErr = getVarAddressFromName(_pvCtx, _pstName, &piAddr);
 +    if(sciErr.iErr)
 +    {
 +        addErrorMessage(&sciErr, API_ERROR_READ_NAMED_POLY, _("%s: Unable to get variable \"%s\""), _iComplex ? "readNamedComplexMatrixOfPoly" :"readNamedMatrixOfPoly", _pstName);
 +        return sciErr;
 +    }
 +
 +    if(_iComplex == 1)
 +    {
 +        sciErr = getComplexMatrixOfPoly(_pvCtx, piAddr, _piRows, _piCols, _piNbCoef, _pdblReal, _pdblImg);
 +    }
 +    else
 +    {
 +        sciErr = getMatrixOfPoly(_pvCtx, piAddr, _piRows, _piCols, _piNbCoef, _pdblReal);
 +    }
 +
 +    if(sciErr.iErr)
 +    {
 +        addErrorMessage(&sciErr, API_ERROR_READ_NAMED_POLY, _("%s: Unable to get variable \"%s\""), _iComplex ? "readNamedComplexMatrixOfPoly" :"readNamedMatrixOfPoly", _pstName);
 +        return sciErr;
 +    }
 +
 +    return sciErr;
  }
  
  /*shortcut functions */
  /*--------------------------------------------------------------------------*/
  int isPolyType(void* _pvCtx, int* _piAddress)
  {
 -      return checkVarType(_pvCtx, _piAddress, sci_poly);
 +    return checkVarType(_pvCtx, _piAddress, sci_poly);
  }
  /*--------------------------------------------------------------------------*/
- int isNamedPolyType(void* _pvCtx, char* _pstName)
+ int isNamedPolyType(void* _pvCtx, const char* _pstName)
  {
 -      return checkNamedVarType(_pvCtx, _pstName, sci_poly);
 +    return checkNamedVarType(_pvCtx, _pstName, sci_poly);
  }
  /*--------------------------------------------------------------------------*/
  int getAllocatedSinglePoly(void* _pvCtx, int* _piAddress, int* _piNbCoef, double** _pdblReal)
@@@ -364,89 -356,89 +364,89 @@@ int getAllocatedSingleComplexPoly(void
  /*--------------------------------------------------------------------------*/
  static int getCommonAllocatedSinglePoly(void* _pvCtx, int* _piAddress, int _iComplex, int* _piNbCoef, double** _pdblReal, double** _pdblImg)
  {
 -      SciErr sciErr;
 -      int iRows       = 0;
 -      int iCols       = 0;
 -
 -      double* pdblReal = NULL;
 -      double* pdblImg  = NULL;
 -
 -      if(isScalar(_pvCtx, _piAddress) == 0)
 -      {
 -              addErrorMessage(&sciErr, API_ERROR_GET_ALLOC_SINGLE_POLY, _("%s: Wrong type for input argument #%d: A scalar expected.\n"), _iComplex ? "getAllocatedSingleComplexPoly" : "getAllocatedSinglePoly", getRhsFromAddress(_pvCtx, _piAddress));
 -              printError(&sciErr, 0);
 -              return sciErr.iErr;
 -      }
 -
 -      sciErr = getCommonMatrixOfPoly(_pvCtx, _piAddress, _iComplex, &iRows, &iCols, _piNbCoef, NULL, NULL);
 -      if(sciErr.iErr)
 -      {
 -              addErrorMessage(&sciErr, API_ERROR_GET_ALLOC_SINGLE_POLY, _("%s: Unable to get argument #%d"), _iComplex ? "getAllocatedSingleComplexPoly" : "getAllocatedSinglePoly", getRhsFromAddress(_pvCtx, _piAddress));
 -              printError(&sciErr, 0);
 -              return sciErr.iErr;
 -      }
 -
 -      *_pdblReal = (double*)MALLOC(sizeof(double) * *_piNbCoef);
 -
 -      if(_iComplex)
 -      {
 -              *_pdblImg       = (double*)MALLOC(sizeof(double) * *_piNbCoef);
 -      }
 -
 -      sciErr = getCommonMatrixOfPoly(_pvCtx, _piAddress, _iComplex, &iRows, &iCols, _piNbCoef, _pdblReal, _pdblImg);
 -      if(sciErr.iErr)
 -      {
 -              addErrorMessage(&sciErr, API_ERROR_GET_ALLOC_SINGLE_POLY, _("%s: Unable to get argument #%d"), _iComplex ? "getAllocatedSingleComplexPoly" : "getAllocatedSinglePoly", getRhsFromAddress(_pvCtx, _piAddress));
 -              printError(&sciErr, 0);
 -              return sciErr.iErr;
 -      }
 -
 -      return 0;
 +    SciErr sciErr;
 +    int iRows = 0;
 +    int iCols = 0;
 +
 +    double* pdblReal = NULL;
 +    double* pdblImg    = NULL;
 +
 +    if(isScalar(_pvCtx, _piAddress) == 0)
 +    {
 +        addErrorMessage(&sciErr, API_ERROR_GET_ALLOC_SINGLE_POLY, _("%s: Wrong type for input argument #%d: A scalar expected.\n"), _iComplex ? "getAllocatedSingleComplexPoly" : "getAllocatedSinglePoly", getRhsFromAddress(_pvCtx, _piAddress));
 +        printError(&sciErr, 0);
 +        return sciErr.iErr;
 +    }
 +
 +    sciErr = getCommonMatrixOfPoly(_pvCtx, _piAddress, _iComplex, &iRows, &iCols, _piNbCoef, NULL, NULL);
 +    if(sciErr.iErr)
 +    {
 +        addErrorMessage(&sciErr, API_ERROR_GET_ALLOC_SINGLE_POLY, _("%s: Unable to get argument #%d"), _iComplex ? "getAllocatedSingleComplexPoly" : "getAllocatedSinglePoly", getRhsFromAddress(_pvCtx, _piAddress));
 +        printError(&sciErr, 0);
 +        return sciErr.iErr;
 +    }
 +
 +    *_pdblReal = (double*)MALLOC(sizeof(double) * *_piNbCoef);
 +
 +    if(_iComplex)
 +    {
 +        *_pdblImg     = (double*)MALLOC(sizeof(double) * *_piNbCoef);
 +    }
 +
 +    sciErr = getCommonMatrixOfPoly(_pvCtx, _piAddress, _iComplex, &iRows, &iCols, _piNbCoef, _pdblReal, _pdblImg);
 +    if(sciErr.iErr)
 +    {
 +        addErrorMessage(&sciErr, API_ERROR_GET_ALLOC_SINGLE_POLY, _("%s: Unable to get argument #%d"), _iComplex ? "getAllocatedSingleComplexPoly" : "getAllocatedSinglePoly", getRhsFromAddress(_pvCtx, _piAddress));
 +        printError(&sciErr, 0);
 +        return sciErr.iErr;
 +    }
 +
 +    return 0;
  }
  /*--------------------------------------------------------------------------*/
- int getAllocatedNamedSinglePoly(void* _pvCtx, char* _pstName, int* _piNbCoef, double** _pdblReal)
+ int getAllocatedNamedSinglePoly(void* _pvCtx, const char* _pstName, int* _piNbCoef, double** _pdblReal)
  {
 -      return getCommonAllocatedNamedSinglePoly(_pvCtx, _pstName, 0, _piNbCoef, _pdblReal, NULL);
 +    return getCommonAllocatedNamedSinglePoly(_pvCtx, _pstName, 0, _piNbCoef, _pdblReal, NULL);
  }
  /*--------------------------------------------------------------------------*/
- int getAllocatedNamedSingleComplexPoly(void* _pvCtx, char* _pstName, int* _piNbCoef, double** _pdblReal, double** _pdblImg)
+ int getAllocatedNamedSingleComplexPoly(void* _pvCtx, const char* _pstName, int* _piNbCoef, double** _pdblReal, double** _pdblImg)
  {
 -      return getCommonAllocatedNamedSinglePoly(_pvCtx, _pstName, 1, _piNbCoef, _pdblReal, _pdblImg);
 +    return getCommonAllocatedNamedSinglePoly(_pvCtx, _pstName, 1, _piNbCoef, _pdblReal, _pdblImg);
  }
  /*--------------------------------------------------------------------------*/
- static int getCommonAllocatedNamedSinglePoly(void* _pvCtx, char* _pstName, int _iComplex, int* _piNbCoef, double** _pdblReal, double** _pdblImg)
+ static int getCommonAllocatedNamedSinglePoly(void* _pvCtx, const char* _pstName, int _iComplex, int* _piNbCoef, double** _pdblReal, double** _pdblImg)
  {
 -      SciErr sciErr;
 -      int iRows       = 0;
 -      int iCols       = 0;
 -
 -      double* pdblReal = NULL;
 -      double* pdblImg  = NULL;
 -
 -      if(isNamedScalar(_pvCtx, _pstName) == 0)
 -      {
 -              addErrorMessage(&sciErr, API_ERROR_GET_ALLOC_NAMED_SINGLE_POLY, _("%s: Wrong type for input argument \"%s\": A scalar expected.\n"), _iComplex ? "getAllocatedNamedSingleComplexPoly" : "getAllocatedNamedSinglePoly", _pstName);
 -              printError(&sciErr, 0);
 -              return sciErr.iErr;
 -      }
 -
 -      sciErr = readCommonNamedMatrixOfPoly(_pvCtx, _pstName, _iComplex, &iRows, &iCols, _piNbCoef, &pdblReal, &pdblImg);
 -      if(sciErr.iErr)
 -      {
 -              addErrorMessage(&sciErr, API_ERROR_GET_ALLOC_NAMED_SINGLE_POLY, _("%s: Unable to get argument \"%s\""), _iComplex ? "getAllocatedNamedSingleComplexPoly" : "getAllocatedNamedSinglePoly", _pstName);
 -              printError(&sciErr, 0);
 -              return sciErr.iErr;
 -      }
 -
 -      *_pdblReal = (double*)MALLOC(sizeof(double) * *_piNbCoef);
 -      memcpy(*_pdblReal, pdblReal, sizeof(double) * *_piNbCoef);
 -
 -      if(_iComplex)
 -      {
 -              *_pdblImg       = (double*)MALLOC(sizeof(double) * *_piNbCoef);
 -              memcpy(*_pdblImg, pdblImg, sizeof(double) * *_piNbCoef);
 -      }
 -      return 0;
 +    SciErr sciErr;
 +    int iRows = 0;
 +    int iCols = 0;
 +
 +    double* pdblReal = NULL;
 +    double* pdblImg    = NULL;
 +
 +    if(isNamedScalar(_pvCtx, _pstName) == 0)
 +    {
 +        addErrorMessage(&sciErr, API_ERROR_GET_ALLOC_NAMED_SINGLE_POLY, _("%s: Wrong type for input argument \"%s\": A scalar expected.\n"), _iComplex ? "getAllocatedNamedSingleComplexPoly" : "getAllocatedNamedSinglePoly", _pstName);
 +        printError(&sciErr, 0);
 +        return sciErr.iErr;
 +    }
 +
 +    sciErr = readCommonNamedMatrixOfPoly(_pvCtx, _pstName, _iComplex, &iRows, &iCols, _piNbCoef, &pdblReal, &pdblImg);
 +    if(sciErr.iErr)
 +    {
 +        addErrorMessage(&sciErr, API_ERROR_GET_ALLOC_NAMED_SINGLE_POLY, _("%s: Unable to get argument \"%s\""), _iComplex ? "getAllocatedNamedSingleComplexPoly" : "getAllocatedNamedSinglePoly", _pstName);
 +        printError(&sciErr, 0);
 +        return sciErr.iErr;
 +    }
 +
 +    *_pdblReal = (double*)MALLOC(sizeof(double) * *_piNbCoef);
 +    memcpy(*_pdblReal, pdblReal, sizeof(double) * *_piNbCoef);
 +
 +    if(_iComplex)
 +    {
 +        *_pdblImg     = (double*)MALLOC(sizeof(double) * *_piNbCoef);
 +        memcpy(*_pdblImg, pdblImg, sizeof(double) * *_piNbCoef);
 +    }
 +    return 0;
  }
  /*--------------------------------------------------------------------------*/
  int getAllocatedMatrixOfPoly(void* _pvCtx, int* _piAddress, int* _piRows, int* _piCols, int** _piNbCoef, double*** _pdblReal)
@@@ -461,117 -453,117 +461,117 @@@ int getAllocatedMatrixOfComplexPoly(voi
  /*--------------------------------------------------------------------------*/
  static int getCommonAllocatedMatrixOfPoly(void* _pvCtx, int* _piAddress, int _iComplex, int* _piRows, int* _piCols, int** _piNbCoef, double*** _pdblReal, double*** _pdblImg)
  {
 -      SciErr sciErr;
 -
 -      double* pdblReal        = NULL;
 -      double* pdblImg         = NULL;
 -
 -      sciErr = getCommonMatrixOfPoly(_pvCtx, _piAddress, _iComplex, _piRows, _piCols, NULL, NULL, NULL);
 -      if(sciErr.iErr)
 -      {
 -              addErrorMessage(&sciErr, API_ERROR_GET_ALLOC_MATRIX_POLY, _("%s: Unable to get argument #%d"), _iComplex ? "getAllocatedMatrixOfComplexPoly" : "getAllocatedMatrixOfPoly", getRhsFromAddress(_pvCtx, _piAddress));
 -              printError(&sciErr, 0);
 -              return sciErr.iErr;
 -      }
 -
 -      *_piNbCoef = (int*)MALLOC(sizeof(int) * *_piRows * *_piCols);
 -
 -      sciErr = getCommonMatrixOfPoly(_pvCtx, _piAddress, _iComplex, _piRows, _piCols, *_piNbCoef, NULL, NULL);
 -      if(sciErr.iErr)
 -      {
 -              addErrorMessage(&sciErr, API_ERROR_GET_ALLOC_MATRIX_POLY, _("%s: Unable to get argument #%d"), _iComplex ? "getAllocatedMatrixOfComplexPoly" : "getAllocatedMatrixOfPoly", getRhsFromAddress(_pvCtx, _piAddress));
 -              printError(&sciErr, 0);
 -              return sciErr.iErr;
 -      }
 -
 -      *_pdblReal = (double**)MALLOC(sizeof(double*) * *_piRows * *_piCols);
 -      for(int i = 0 ; i < *_piRows * *_piCols ; i++)
 -      {
 -              (*_pdblReal)[i] = (double*)MALLOC(sizeof(double) * (*_piNbCoef)[i]);
 -      }
 -
 -      if(_iComplex)
 -      {
 -              *_pdblImg       = (double**)MALLOC(sizeof(double*) * *_piRows * *_piCols);
 -              for(int i = 0 ; i < *_piRows * *_piCols ; i++)
 -              {
 -                      (*_pdblImg)[i] = (double*)MALLOC(sizeof(double) * (*_piNbCoef)[i]);
 -              }
 -      }
 -
 -      sciErr = getCommonMatrixOfPoly(_pvCtx, _piAddress, _iComplex, _piRows, _piCols, *_piNbCoef, *_pdblReal, _pdblImg == NULL ? NULL : *_pdblImg);
 -      if(sciErr.iErr)
 -      {
 -              addErrorMessage(&sciErr, API_ERROR_GET_ALLOC_MATRIX_POLY, _("%s: Unable to get argument #%d"), _iComplex ? "getAllocatedSingleComplexPoly" : "getAllocatedSinglePoly", getRhsFromAddress(_pvCtx, _piAddress));
 -              printError(&sciErr, 0);
 -              return sciErr.iErr;
 -      }
 -
 -      return 0;
 +    SciErr sciErr;
 +
 +    double* pdblReal  = NULL;
 +    double* pdblImg           = NULL;
 +
 +    sciErr = getCommonMatrixOfPoly(_pvCtx, _piAddress, _iComplex, _piRows, _piCols, NULL, NULL, NULL);
 +    if(sciErr.iErr)
 +    {
 +        addErrorMessage(&sciErr, API_ERROR_GET_ALLOC_MATRIX_POLY, _("%s: Unable to get argument #%d"), _iComplex ? "getAllocatedMatrixOfComplexPoly" : "getAllocatedMatrixOfPoly", getRhsFromAddress(_pvCtx, _piAddress));
 +        printError(&sciErr, 0);
 +        return sciErr.iErr;
 +    }
 +
 +    *_piNbCoef = (int*)MALLOC(sizeof(int) * *_piRows * *_piCols);
 +
 +    sciErr = getCommonMatrixOfPoly(_pvCtx, _piAddress, _iComplex, _piRows, _piCols, *_piNbCoef, NULL, NULL);
 +    if(sciErr.iErr)
 +    {
 +        addErrorMessage(&sciErr, API_ERROR_GET_ALLOC_MATRIX_POLY, _("%s: Unable to get argument #%d"), _iComplex ? "getAllocatedMatrixOfComplexPoly" : "getAllocatedMatrixOfPoly", getRhsFromAddress(_pvCtx, _piAddress));
 +        printError(&sciErr, 0);
 +        return sciErr.iErr;
 +    }
 +
 +    *_pdblReal = (double**)MALLOC(sizeof(double*) * *_piRows * *_piCols);
 +    for(int i = 0 ; i < *_piRows * *_piCols ; i++)
 +    {
 +        (*_pdblReal)[i] = (double*)MALLOC(sizeof(double) * (*_piNbCoef)[i]);
 +    }
 +
 +    if(_iComplex)
 +    {
 +        *_pdblImg     = (double**)MALLOC(sizeof(double*) * *_piRows * *_piCols);
 +        for(int i = 0 ; i < *_piRows * *_piCols ; i++)
 +        {
 +            (*_pdblImg)[i] = (double*)MALLOC(sizeof(double) * (*_piNbCoef)[i]);
 +        }
 +    }
 +
 +    sciErr = getCommonMatrixOfPoly(_pvCtx, _piAddress, _iComplex, _piRows, _piCols, *_piNbCoef, *_pdblReal, _pdblImg == NULL ? NULL : *_pdblImg);
 +    if(sciErr.iErr)
 +    {
 +        addErrorMessage(&sciErr, API_ERROR_GET_ALLOC_MATRIX_POLY, _("%s: Unable to get argument #%d"), _iComplex ? "getAllocatedSingleComplexPoly" : "getAllocatedSinglePoly", getRhsFromAddress(_pvCtx, _piAddress));
 +        printError(&sciErr, 0);
 +        return sciErr.iErr;
 +    }
 +
 +    return 0;
  }
  /*--------------------------------------------------------------------------*/
- int getAllocatedNamedMatrixOfPoly(void* _pvCtx, char* _pstName, int* _piRows, int* _piCols, int** _piNbCoef, double*** _pdblReal)
+ int getAllocatedNamedMatrixOfPoly(void* _pvCtx, const char* _pstName, int* _piRows, int* _piCols, int** _piNbCoef, double*** _pdblReal)
  {
 -      return getCommonAllocatedNamedMatrixOfPoly(_pvCtx, _pstName, 0, _piRows, _piCols, _piNbCoef, _pdblReal, NULL);
 +    return getCommonAllocatedNamedMatrixOfPoly(_pvCtx, _pstName, 0, _piRows, _piCols, _piNbCoef, _pdblReal, NULL);
  }
  /*--------------------------------------------------------------------------*/
- int getAllocatedNamedMatrixOfComplexPoly(void* _pvCtx, char* _pstName, int* _piRows, int* _piCols, int** _piNbCoef, double*** _pdblReal, double*** _pdblImg)
+ int getAllocatedNamedMatrixOfComplexPoly(void* _pvCtx, const char* _pstName, int* _piRows, int* _piCols, int** _piNbCoef, double*** _pdblReal, double*** _pdblImg)
  {
 -      return getCommonAllocatedNamedMatrixOfPoly(_pvCtx, _pstName, 1, _piRows, _piCols, _piNbCoef, _pdblReal, _pdblImg);
 +    return getCommonAllocatedNamedMatrixOfPoly(_pvCtx, _pstName, 1, _piRows, _piCols, _piNbCoef, _pdblReal, _pdblImg);
  }
  /*--------------------------------------------------------------------------*/
- static int getCommonAllocatedNamedMatrixOfPoly(void* _pvCtx, char* _pstName, int _iComplex, int* _piRows, int* _piCols, int** _piNbCoef, double*** _pdblReal, double*** _pdblImg)
+ static int getCommonAllocatedNamedMatrixOfPoly(void* _pvCtx, const char* _pstName, int _iComplex, int* _piRows, int* _piCols, int** _piNbCoef, double*** _pdblReal, double*** _pdblImg)
  {
 -      SciErr sciErr;
 -      int iRows       = 0;
 -      int iCols       = 0;
 -
 -      double* pdblReal = NULL;
 -      double* pdblImg  = NULL;
 -
 -
 -      sciErr = readCommonNamedMatrixOfPoly(_pvCtx, _pstName, _iComplex, _piRows, _piCols, NULL, NULL, NULL);
 -      if(sciErr.iErr)
 -      {
 -              addErrorMessage(&sciErr, API_ERROR_GET_ALLOC_NAMED_MATRIX_POLY, _("%s: Unable to get argument \"%s\""), _iComplex ? "getAllocatedNamedMatrixOfComplexPoly" : "getAllocatedNamedMatrixOfPoly", _pstName);
 -              printError(&sciErr, 0);
 -              return sciErr.iErr;
 -      }
 -
 -      *_piNbCoef = (int*)MALLOC(sizeof(int) * *_piRows * *_piCols);
 -
 -      sciErr = readCommonNamedMatrixOfPoly(_pvCtx, _pstName, _iComplex, _piRows, _piCols, *_piNbCoef, NULL, NULL);
 -      if(sciErr.iErr)
 -      {
 -              addErrorMessage(&sciErr, API_ERROR_GET_ALLOC_NAMED_MATRIX_POLY, _("%s: Unable to get argument \"%s\""), _iComplex ? "getAllocatedNamedMatrixOfComplexPoly" : "getAllocatedNamedMatrixOfPoly", _pstName);
 -              printError(&sciErr, 0);
 -              return sciErr.iErr;
 -      }
 -
 -      *_pdblReal = (double**)MALLOC(sizeof(double*) * *_piRows * *_piCols);
 -      for(int i = 0 ; i < *_piRows * *_piCols ; i++)
 -      {
 -              (*_pdblReal)[i] = (double*)MALLOC(sizeof(double) * (*_piNbCoef)[i]);
 -      }
 -
 -      if(_iComplex)
 -      {
 -              *_pdblImg       = (double**)MALLOC(sizeof(double*) * *_piRows * *_piCols);
 -              for(int i = 0 ; i < *_piRows * *_piCols ; i++)
 -              {
 -                      (*_pdblImg)[i] = (double*)MALLOC(sizeof(double) * (*_piNbCoef)[i]);
 -              }
 -      }
 -
 -      sciErr = readCommonNamedMatrixOfPoly(_pvCtx, _pstName, _iComplex, _piRows, _piCols, *_piNbCoef, *_pdblReal, _pdblImg == NULL ? NULL : *_pdblImg);
 -      if(sciErr.iErr)
 -      {
 -              addErrorMessage(&sciErr, API_ERROR_GET_ALLOC_NAMED_MATRIX_POLY, _("%s: Unable to get argument \"%s\""), _iComplex ? "getAllocatedNamedMatrixOfComplexPoly" : "getAllocatedNamedMatrixOfPoly", _pstName);
 -              printError(&sciErr, 0);
 -              return sciErr.iErr;
 -      }
 -
 -      return 0;
 +    SciErr sciErr;
 +    int iRows = 0;
 +    int iCols = 0;
 +
 +    double* pdblReal = NULL;
 +    double* pdblImg    = NULL;
 +
 +
 +    sciErr = readCommonNamedMatrixOfPoly(_pvCtx, _pstName, _iComplex, _piRows, _piCols, NULL, NULL, NULL);
 +    if(sciErr.iErr)
 +    {
 +        addErrorMessage(&sciErr, API_ERROR_GET_ALLOC_NAMED_MATRIX_POLY, _("%s: Unable to get argument \"%s\""), _iComplex ? "getAllocatedNamedMatrixOfComplexPoly" : "getAllocatedNamedMatrixOfPoly", _pstName);
 +        printError(&sciErr, 0);
 +        return sciErr.iErr;
 +    }
 +
 +    *_piNbCoef = (int*)MALLOC(sizeof(int) * *_piRows * *_piCols);
 +
 +    sciErr = readCommonNamedMatrixOfPoly(_pvCtx, _pstName, _iComplex, _piRows, _piCols, *_piNbCoef, NULL, NULL);
 +    if(sciErr.iErr)
 +    {
 +        addErrorMessage(&sciErr, API_ERROR_GET_ALLOC_NAMED_MATRIX_POLY, _("%s: Unable to get argument \"%s\""), _iComplex ? "getAllocatedNamedMatrixOfComplexPoly" : "getAllocatedNamedMatrixOfPoly", _pstName);
 +        printError(&sciErr, 0);
 +        return sciErr.iErr;
 +    }
 +
 +    *_pdblReal = (double**)MALLOC(sizeof(double*) * *_piRows * *_piCols);
 +    for(int i = 0 ; i < *_piRows * *_piCols ; i++)
 +    {
 +        (*_pdblReal)[i] = (double*)MALLOC(sizeof(double) * (*_piNbCoef)[i]);
 +    }
 +
 +    if(_iComplex)
 +    {
 +        *_pdblImg     = (double**)MALLOC(sizeof(double*) * *_piRows * *_piCols);
 +        for(int i = 0 ; i < *_piRows * *_piCols ; i++)
 +        {
 +            (*_pdblImg)[i] = (double*)MALLOC(sizeof(double) * (*_piNbCoef)[i]);
 +        }
 +    }
 +
 +    sciErr = readCommonNamedMatrixOfPoly(_pvCtx, _pstName, _iComplex, _piRows, _piCols, *_piNbCoef, *_pdblReal, _pdblImg == NULL ? NULL : *_pdblImg);
 +    if(sciErr.iErr)
 +    {
 +        addErrorMessage(&sciErr, API_ERROR_GET_ALLOC_NAMED_MATRIX_POLY, _("%s: Unable to get argument \"%s\""), _iComplex ? "getAllocatedNamedMatrixOfComplexPoly" : "getAllocatedNamedMatrixOfPoly", _pstName);
 +        printError(&sciErr, 0);
 +        return sciErr.iErr;
 +    }
 +
 +    return 0;
  }
  /*--------------------------------------------------------------------------*/
  void freeAllocatedSinglePoly(double* _pdblReal)
  
  /*--------------------------------------------------------------------------*/
  #include <string.h>
 -
 +#include <stdlib.h>
 +#include "machine.h"
  #include "charEncoding.h"
 -#include "MALLOC.h"
 -#include "api_common.h"
 -#include "api_internal_common.h"
 -#include "api_string.h"
 -#include "api_internal_string.h"
  #include "call_scilab.h"
 +#include "api_scilab.h"
 +#include "api_internal_string.h"
 +#include "api_internal_common.h"
  #include "stack-c.h"
 +#include "api_oldstack.h"
  #include "localization.h"
 +#include "MALLOC.h"
 +#include "context.hxx"
  
- extern "C" 
+ extern "C"
  {
 -#include "code2str.h"
  #include "freeArrayOfString.h"
 -};
 +}
 +
 +using namespace std;
 +using namespace types;
  /*--------------------------------------------------------------------------*/
  
  /*******************************/
@@@ -150,7 -141,7 +150,7 @@@ SciErr fillMatrixOfString(void* _pvCtx
        piOffset        = _piAddress + 4;
        piOffset[0] = 1; //Always 1
        piData          = piOffset + _iRows * _iCols + 1;
--      
++
        if(_pstStrings == NULL)
        {
                addErrorMessage(&sciErr, API_ERROR_INVALID_POINTER, _("%s: Invalid argument address"), "fillMatrixOfString");
@@@ -317,7 -315,7 +317,7 @@@ SciErr getMatrixOfWideString(void* _pvC
                freeArrayOfString(pstStrings,strSize);
                return sciErr;
        }
--      
++
        for (int i = 0; i < (*_piRows * *_piCols); i++)
        {
                if (pstStrings[i])
@@@ -749,7 -747,7 +749,7 @@@ int getAllocatedNamedMatrixOfWideString
  int createSingleString(void* _pvCtx, int _iVar, const char* _pstStrings)
  {
        SciErr sciErr;
--      
++
        sciErr = createMatrixOfString(_pvCtx, _iVar, 1, 1,      &_pstStrings);
        if(sciErr.iErr)
        {
  int createSingleWideString(void* _pvCtx, int _iVar, const wchar_t* _pwstStrings)
  {
        SciErr sciErr;
--      
++
        sciErr = createMatrixOfWideString(_pvCtx, _iVar, 1, 1,  &_pwstStrings);
        if(sciErr.iErr)
        {
        return 0;
  }
  /*--------------------------------------------------------------------------*/
- int createNamedSingleString(void* _pvCtx, char* _pstName, const char* _pstStrings)
+ int createNamedSingleString(void* _pvCtx, const char* _pstName, const char* _pstStrings)
  {
        SciErr sciErr;
--      
++
        sciErr = createNamedMatrixOfString(_pvCtx, _pstName, 1, 1,      &_pstStrings);
        if(sciErr.iErr)
        {
        return 0;
  }
  /*--------------------------------------------------------------------------*/
- int createNamedSingleWideString(void* _pvCtx, char* _pstName, const wchar_t* _pwstStrings)
+ int createNamedSingleWideString(void* _pvCtx, const char* _pstName, const wchar_t* _pwstStrings)
  {
        SciErr sciErr;
--      
++
        sciErr = createNamedMatrixOfWideString(_pvCtx, _pstName, 1, 1,  &_pwstStrings);
        if(sciErr.iErr)
        {
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -138,10 -150,10 +144,10 @@@ int Call_ScilabOpen(char* SCIpath, BOO
      }
      else
      {
 -        ScilabStartupUsed = strdup(ScilabStartup);
 +        ScilabStartupUsed = os_strdup(ScilabStartup);
      }
  
-     if (Stacksize==NULL || Stacksize == -1)
+     if (Stacksize == NULL || Stacksize == -1)
      {
          StacksizeUsed = DEFAULTSTACKSIZE;
      }
@@@ -223,12 -240,15 +233,15 @@@ CALL_SCILAB_ENGINE_STATE getCallScilabE
      return csEngineState;
  }
  /*--------------------------------------------------------------------------*/
- sci_types getVariableType(char *varName) {
 -sci_types getVariableType(char *varName) 
++sci_types getVariableType(char *varName)
+ {
      int iSciType = -1;
 -    SciErr sciErr = getNamedVarType(pvApiCtx, (char*)varName, &iSciType);
 -    if (sciErr.iErr == API_ERROR_NAMED_UNDEFINED_VAR) 
 +    SciErr sciErr = getNamedVarType(NULL, (char*)varName, &iSciType);
-     if (sciErr.iErr == API_ERROR_NAMED_UNDEFINED_VAR) {
++    if (sciErr.iErr == API_ERROR_NAMED_UNDEFINED_VAR)
+     {
          return -2;
      }
      if(sciErr.iErr)
      {
          printError(&sciErr, 0);
Simple merge
Simple merge
Simple merge
@@@ -32,8 -34,9 +32,9 @@@ static int cmpPos(char *str1,char *str2
                char *s2 = NULL;
                int lenstr1 = (int) strlen(str1);
                int lenstr2 = (int) strlen(str2);
+               int slen;
  
--              if (lenstr1 > lenstr2) 
++              if (lenstr1 > lenstr2)
                {
                        s1 = str2;
                        s2 = str1;
@@@ -81,9 -85,9 +83,9 @@@ char *getCommonPart(char **dictionary, 
                                currentstr = dictionary[i+1];
                        }
                }
--              
 -              commonpart = strdup(currentstr);
++
 +              commonpart = os_strdup(currentstr);
-               if (r>0) commonpart[r] = '\0';
+               commonpart[r] = '\0';
        }
        return commonpart;
  }
index 0000000,3520d7b..80bf9f7
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,135 +1,137 @@@
+ /*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2010 - Calixte DENIZET
+ *
+ * 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
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+ #include <string.h> /* strcmp */
+ #include <stdlib.h> /* qsort */
+ #include "Scierror.h"
+ #include "api_scilab.h"
+ #include "stack-c.h"
+ #include "MALLOC.h"
+ #include "getfieldsdictionary.h"
+ #include "getPartLine.h"
+ /*--------------------------------------------------------------------------*/
+ extern char **completionOnHandleGraphicsProperties(char *, int *);
+ /*--------------------------------------------------------------------------*/
+ static int cmpNames(const void *a, const void *b)
+ {
+     return strcmp(*(const char **)a, *(const char **)b);
+ }
+ /*--------------------------------------------------------------------------*/
+ char **getfieldsdictionary(char *lineBeforeCaret, char *pattern, int *size)
+ {
+     SciErr sciErr;
+     int *piAddr = NULL;
+     int *piLen = NULL;
+     int piType = 0;
+     int nbItem = 0;
+     int rows = 0;
+     int cols = 0;
+     int rc = 0;
+     int i;
+     int last = 0;
+     char **pstData = NULL;
+     char *var = NULL;
+     char *lineBeforePoint = NULL;
+     int pos = strlen(lineBeforeCaret) - strlen(pattern) - 1;
+     if (pos <= 0 || lineBeforeCaret[pos] != '.')
+     {
+         return NULL;
+     }
+     lineBeforePoint = (char*)MALLOC(sizeof(char) * (pos + 1));
+     if (lineBeforePoint == NULL) return NULL;
+     memcpy(lineBeforePoint, lineBeforeCaret, pos);
+     lineBeforePoint[pos] = '\0';
+     var = getPartLevel(lineBeforePoint);
+     FREE(lineBeforePoint);
+     lineBeforePoint = NULL;
 -    sciErr = getNamedVarType(pvApiCtx, var, &piType);
++    sciErr = getNamedVarType(NULL, var, &piType);
+     if (sciErr.iErr && piType != sci_mlist && piType != sci_tlist && piType != sci_handles)
+     {
+         FREE(var);
+         var = NULL;
+         return NULL;
+     }
+     if (piType == sci_mlist || piType == sci_tlist)
+     {
 -        getVarAddressFromName(pvApiCtx, var, &piAddr);
++        getVarAddressFromName(NULL, var, &piAddr);
+         FREE(var);
+         var = NULL;
+         if (sciErr.iErr)
+         {
+             return NULL;
+         }
 -        sciErr = getMatrixOfStringInList(pvApiCtx, piAddr, 1, &rows, &cols, NULL, NULL);
++        sciErr = getMatrixOfStringInList(NULL, piAddr, 1, &rows, &cols, NULL, NULL);
+         if (sciErr.iErr)
+         {
+             return NULL;
+         }
+         rc = rows * cols;
+         piLen = (int*)MALLOC(sizeof(int) * rc);
 -        sciErr = getMatrixOfStringInList(pvApiCtx, piAddr, 1, &rows, &cols, piLen, NULL);
++        sciErr = getMatrixOfStringInList(NULL, piAddr, 1, &rows, &cols, piLen, NULL);
+         if (sciErr.iErr)
+         {
+             FREE(piLen);
+             return NULL;
+         }
+         pstData = (char**)MALLOC(sizeof(char*) * (rc + 1));
+         for (i = 0 ; i < rc ; i++)
+         {
+             pstData[i] = (char*)MALLOC(sizeof(char) * (piLen[i] + 1));
+         }
 -        sciErr = getMatrixOfStringInList(pvApiCtx, piAddr, 1, &rows, &cols, piLen, pstData);
++
++        #pragma message "!! WARNING !! : getfielddictionnary may crash YaSp."
++        sciErr = getMatrixOfStringInList(NULL, piAddr, 1, &rows, &cols, piLen, pstData);
+         if (sciErr.iErr)
+         {
+             FREE(piLen);
+             FREE(pstData);
+             return NULL;
+         }
+         // We remove all the entries which don't begin with fieldpart
+         // and the first entry (and the second if it is a struct)
+         if (!strcmp(pstData[0], "st")) i = 2; else i = 1;
+         for (; i < rc ; i++)
+         {
+             if (strstr(pstData[i], pattern) != pstData[i])
+             {
+                 FREE(pstData[i]);
+                 pstData[i] = NULL;
+             }
+             else
+             {
+                 pstData[last] = pstData[i];
+                 pstData[i] = NULL;
+                 last++;
+             }
+         }
+         *size = last;
+         qsort(pstData, *size, sizeof(char*), cmpNames);
+         FREE(piLen);
+     }
+     else
+     {
+         pstData = completionOnHandleGraphicsProperties(pattern, size);
+     }
+     return pstData;
+ }
+ /*--------------------------------------------------------------------------*/
Simple merge
Simple merge
@@@ -41,15 -41,17 +41,17 @@@ typedef enum 
  } sci_types;
  
  
+ /* These values are also used in:
+  * modules/api_scilab/includes/api_int.h */
  typedef enum {
 -    sci_int8 = 1,
 -    sci_int16 = 2,
 -    sci_int32 = 4,
 -    sci_int64 = 8,
 -    sci_uint8 = 11,
 -    sci_uint16 = 12,
 -    sci_uint32 = 14,
 -    sci_uint64 = 18
 +    sci_integer8 = 1,
 +    sci_integer16 = 2,
 +    sci_integer32 = 4,
 +    sci_integer64 = 8,
 +    sci_uinteger8 = 11,
 +    sci_uinteger16 = 12,
 +    sci_uinteger32 = 14,
 +    sci_uinteger64 = 18
  } sci_int_types;
  
  
@@@ -178,38 -178,38 +178,7 @@@ int iGetBooleanSparseFromAddress(int _i
  int iGetBooleanFromAddress(int _iAddr, int *_piRows, int *_piCols, int* _piBool);
  int iGetStringFromAddress(int _iAddr, int *_piRows, int *_piCols, int *_piLen, int* _piString);
  
 -/** 
 -*  Set the target real and imaginary part of an array from a source doublecomplex array.
 -*  @param _poComplex the source array
 -*  @param _iSize the number of elements to set
 -*  @param _pdblReal, _pdblImg the target array (real and imaginary parts)
 -*/
 -void vGetPointerFromDoubleComplex(const doublecomplex *_poComplex, int _iSize, double *_pdblReal, double *_pdblImg);
 -
 -/**
 -*  Returns a target doublecomplex array constructed from the source real and imaginary parts.
 -*  The real and imaginary parts can be NULL or not NULL :
 -*  * if real part and imaginary part of source array are not NULL, the returned array is as expected,
 -*  * if real part of source array is NULL and imaginary part is not NULL, the real part of the returned array is filled with zeros,
 -*  * if real part of source array is not NULL and imaginary part is NULL, the imaginary part of the returned array is filled with zeros,
 -*  * if both real and imaginary parts of source array are NULL, the returned array is NULL.
 -*  @param _pdblReal the real part of the source array
 -*  @param _pdblImg the imaginary part of the source array
 -*  @param _iSize the size of the source array
 -*  @return a target doublecomplex array constructed from the source real and imaginary parts.
 -*/
 -doublecomplex* oGetDoubleComplexFromPointer(double *_pdblReal, double *_pdblImg, int _iSize);
 -/**
 -*  Free the given pointer of double complex.
 -*  Note
 -*  The goal of this function is to allow the client 
 -*  code to be independent of the particular allocation system used
 -*  in oGetDoubleComplexFromPointer.
 -*  @param _poComplex the array to free
 -*/
 -void vFreeDoubleComplexFromPointer(doublecomplex *_poComplex);
 -
  /**
- *  Set the target real and imaginary part of an array from a source doublecomplex array.
- *  @param _poComplex the source array
- *  @param _iSize the number of elements to set
- *  @param _pdblReal, _pdblImg the target array (real and imaginary parts)
- */
- //void vGetPointerFromDoubleComplex(doublecomplex *_poComplex, int _iSize, double *_pdblReal, double *_pdblImg);
- /**
- *  Returns a target doublecomplex array constructed from the source real and imaginary parts.
- *  The real and imaginary parts can be NULL or not NULL :
- *  * if real part and imaginary part of source array are not NULL, the returned array is as expected,
- *  * if real part of source array is NULL and imaginary part is not NULL, the real part of the returned array is filled with zeros,
- *  * if real part of source array is not NULL and imaginary part is NULL, the imaginary part of the returned array is filled with zeros,
- *  * if both real and imaginary parts of source array are NULL, the returned array is NULL.
- *  @param _pdblReal the real part of the source array
- *  @param _pdblImg the imaginary part of the source array
- *  @param _iSize the size of the source array
- *  @return a target doublecomplex array constructed from the source real and imaginary parts.
- */
- //doublecomplex* oGetDoubleComplexFromPointer(double *_pdblReal, double *_pdblImg, int _iSize);
- /**
- *  Free the given pointer of double complex.
- *  Note
- *  The goal of this function is to allow the client
- *  code to be independent of the particular allocation system used
- *  in oGetDoubleComplexFromPointer.
- *  @param _poComplex the array to free
- */
- //void vFreeDoubleComplexFromPointer(doublecomplex *_poComplex);
- /**
  * Returns a pointer on the data of a matrix of double
  *  @param number index of the Scilab variable
  *  @param _iRows number of rows in the matrix
@@@ -606,29 -606,26 +606,26 @@@ int Name2where(char *namex
   *             since it can be wrong (ex when name is transmited
   *             by fort (intfort : function )
   *----------------------------------------------------------------*/
- int C2F(str2name)(char *namex, int *id, unsigned long name_len)
+ int C2F(str2name)(const char *namex, int *id, unsigned long name_len)
  {
        int ix = 0;
-       int lon = 0;
+     int i = 0;
+       char* temp = 0;
  
-       for (ix = 0 ; ix < (int)  name_len ; ix++ )
-       {
-               if ( namex[ix] == '\0') break;
-               lon++;
-       }
+     /* initialize id array */
+     for (i = 0; i < nsiz;i++) id[i] = 0;
  
-       lon = (int)strlen(namex);
-       /* remove blanks in namex */
-       for (ix = 0; ix < lon; ix++)
-       {
-               if ( namex[ix] == ' ')
-               {
-                       namex[ix] = '\0';
-                       lon = (int)strlen(namex);
-                       break;
-               }
-       }
-       C2F(cvname)(id, namex, &cx0, lon);
+       for (ix = 0; namex[ix] != ' ' && namex[ix] != '\0'; ix++);
 -      
++
+       temp = (char*)MALLOC((ix + 1) * sizeof(char) );
+     if (temp)
+     {
+           memcpy(temp, namex, ix);
+           temp[ix] = '\0';
+         /* cx0 = 0 convert name to ID */
+           C2F(cvname)(id, temp, &cx0, ix);
+         FREE(temp);
+     }
        return 0;
  }
  /*----------------------------------------------------------------
@@@ -990,7 -987,7 +987,7 @@@ void GetRhsStringVar(int _iVarNum, int
                return;
        }
        code2str(&_pstData, (int*) cstk(iAddrData), iArraySum(_piLen, 0, *_piRows * *_piCols));
--      
++
        C2F(intersci).ntypes[_iVarNum - 1] = '$' ;
        C2F(intersci).iwhere[_iVarNum - 1] = *Lstk(_iVarNum);
  }
@@@ -1342,7 -1339,7 +1339,7 @@@ Argument
  */
  int iAllocMatrixOfDouble(int _iPos, int _iRows, int _iCols, double **_pdblRealData)
  {
--      if(_iPos + 1 > Bot) 
++      if(_iPos + 1 > Bot)
                return 10;//Too many names
  
        return _iAllocMatrixDoubleOrComplex(_iPos, 0, _iRows, _iCols, _pdblRealData, NULL);
@@@ -1972,6 -1969,68 +1969,7 @@@ int iGetStringFromPointer(int* _piAddr
        *_piString                      = _piAddr + (5 + (*_piRows) * (*_piCols));
        return 0;
  }
 -void vGetPointerFromDoubleComplex(const doublecomplex *_poComplex, int _iSize, double *_pdblReal, double *_pdblImg)
 -{
 -
 -      int iTwo        = 2;
 -      int iOne        = 1;
 -      double *pReal = (double*)&_poComplex[0].r;
 -      double *pImg = (double*)&_poComplex[0].i;
 -
 -      if(_pdblReal != NULL && _pdblImg != NULL)
 -      {
 -              C2F(dcopy)(&_iSize, pReal, &iTwo, _pdblReal, &iOne);
 -              C2F(dcopy)(&_iSize, pImg, &iTwo, _pdblImg, &iOne);
 -      }
 -      else if(_pdblReal != NULL && _pdblImg == NULL)
 -      {
 -              C2F(dcopy)(&_iSize, pReal, &iTwo, _pdblReal, &iOne);
 -      }
 -      else if(_pdblReal == NULL && _pdblImg != NULL)
 -      {
 -              C2F(dcopy)(&_iSize, pImg, &iTwo, _pdblImg, &iOne);
 -      }
 -}
 -doublecomplex* oGetDoubleComplexFromPointer(double *_pdblReal, double *_pdblImg, int _iSize)
 -{
 -      doublecomplex *poComplex = (doublecomplex*)MALLOC(sizeof(doublecomplex) * _iSize);
 -      int iTwo        = 2;
 -      int iOne        = 1;
 -      double *pReal = &poComplex[0].r;
 -      double *pImg = &poComplex[0].i;
 -
 -      if(_pdblReal != NULL && _pdblImg != NULL)
 -      {
 -
 -              C2F(dcopy)(&_iSize, _pdblReal, &iOne, pReal, &iTwo);
 -              C2F(dcopy)(&_iSize, _pdblImg, &iOne, pImg, &iTwo);
 -      }
 -      else if(_pdblReal != NULL && _pdblImg == NULL)
 -      {
 -              double ZERO = 0.;
 -              C2F(dcopy)(&_iSize, _pdblReal, &iOne, pReal, &iTwo);
 -              C2F(dset)(&_iSize, &ZERO, pImg, &iTwo);
 -      }
 -      else if(_pdblReal == NULL && _pdblImg != NULL)
 -      {
 -              double ZERO = 0.;
 -              C2F(dset)(&_iSize, &ZERO, pReal, &iTwo);
 -              C2F(dcopy)(&_iSize, _pdblImg, &iOne, pImg, &iTwo);
 -      }
 -      else
 -      {
 -              FREE(poComplex);
 -              return NULL;
 -      }
 -      return poComplex;
 -}
 -void vFreeDoubleComplexFromPointer(doublecomplex *_poComplex)
 -{
 -      if(_poComplex != NULL)
 -              FREE(_poComplex);
 -}
 -
  /*
  Create a list in scilab stack
  This function only "reserves" VarNum
@@@ -2318,7 -2377,7 +2316,7 @@@ int *GetLengthStringMatrixByName(char *
        int mn = 0;
        int lp = 0;
        int j = 0;
--      
++
        int iposx = 0, iposy = 0;
        int lengthAtiposxiposy = 0;
  
        j = 0;
        for (x = 1; x <= *m;x++)
        {
--              for (y = 1; y <= *n;y++) 
++              for (y = 1; y <= *n;y++)
                {
                        if ( !C2F(cmatsptr)  (name_, m,n, &x, &y, &lp, &lengthAtiposxiposy, name_len) )
                        {
Simple merge
Simple merge
diff --cc scilab/modules/elementary_functions/sci_gateway/c/sci_size.c
index 8c9dd78,954de35..0000000
deleted file mode 100644,100644
+++ /dev/null
@@@ -1,255 -1,107 +1,0 @@@
--/*
-- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-- * Copyright (C) 2006 - INRIA - Allan CORNET
-  *
-  * 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
-  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
-  *
-  */
- /*--------------------------------------------------------------------------*/
- #include "gw_elementary_functions.h"
- #include "stack-c.h"
- #include "basic_functions.h"
- #include "stdio.h"
- #include "api_scilab.h"
- #include "Scierror.h"
- #include "api_oldstack.h"
- SciErr size_matrix(int* _piKey, int* _piAddress, int _iMode);
- SciErr size_list(int* _piKey, int* _piAddress);
- extern int C2F(intsize)(int* id);
- /*--------------------------------------------------------------------------*/
- int sci_size(char *fname, int* _piKey)
- {
-       SciErr sciErr;
-       int iType       = 0;
-       int iMode               = BY_MTLB;
-       int* piAddr     = NULL;
-       /*check inputs*/
-       CheckRhs(1,2);
-       CheckLhs(1,1000000);
-       sciErr = getVarAddressFromPosition(_piKey, 1, &piAddr);
-       if(sciErr.iErr)
-       {
-               printError(&sciErr, 0);
-               return 0;
-       }
-       if(Rhs > 1)
-       {
-               int* piAddr2 = NULL;
-               sciErr = getVarAddressFromPosition(_piKey, 2, &piAddr2);
-               if(sciErr.iErr)
-               {
-                       printError(&sciErr, 0);
-                       return 0;
-               }
-               sciErr = getProcessMode(_piKey, 2, piAddr, &iMode);
-               if(sciErr.iErr)
-               {
-                       printError(&sciErr, 0);
-                       return 0;
-               }
-       }
-       sciErr = getVarType(_piKey, piAddr, &iType);
-       if(sciErr.iErr)
-       {
-               printError(&sciErr, 0);
-               return 0;
-       }
-       switch(iType)
-       {
-       case sci_list  :
-       case sci_tlist :
-       case sci_mlist :
-               if(Rhs != 1)
-               {
-                       SciError(39);
-                       return 0;
-               }
-               sciErr = size_list(_piKey, piAddr);
-               break;
-       case sci_matrix :
-       case sci_poly :
-       case sci_boolean :
-       case sci_sparse :
-       case sci_boolean_sparse :
-       case sci_ints :
-       case sci_strings :
-               sciErr = size_matrix(_piKey, piAddr, iMode);
-               break;
-       }
-       if(sciErr.iErr)
-       {
-               printError(&sciErr, 0);
-               return 0;
-       }
-       PutLhsVar();
-       return 0;
- /*
-       static int id[6];
-       C2F(intsize)(id);
-       return 0;
- */
-       }
- SciErr size_list(int* _piKey, int* _piAddress)
- {
-       SciErr sciErr;sciErr.iErr = 0;
-       //int iIndex                    = 0;
-       //int iItemNumber               = 0;
-       //int *piItemType               = NULL;
-       //int iItemCount                = 0;
-       //int iRows                     = 0;
-       //int iCols                     = 0;
-       //double *pReturnData   = NULL;
-       //iGetListItemType(1, NULL, &iItemNumber, NULL);
-       //piItemType                    = (int*)malloc(sizeof(int) * iItemNumber);
-       //iGetListItemType(1, NULL, &iItemNumber, piItemType);
-       //if(GetType(1) == sci_tlist && piItemType[0] == sci_strings)
-       //{
-       //      char *pszData   = NULL;
-       //      int *pLen               = NULL;
-       //      int iLen                = 0;
-       //      iGetListItemString(1, 0, &iRows, &iCols, NULL, NULL);
-       //      pLen                    = (int*)malloc(sizeof(int) * iRows * iCols);
-       //      iGetListItemString(1, 0, &iRows, &iCols, pLen, NULL);
-       //      iLen = iArraySum(pLen, 0, iRows * iCols);
-       //      pszData                 = (char*)malloc(sizeof(char) * iLen);
-       //      iGetListItemString(1, 0, &iRows, &iCols, pLen, pszData);
-       //      if(memcmp(pszData, "lss", strlen("lss")) == 0 || memcmp(pszData, "r", strlen("r")))
-       //      {
-       //              char fname[] = "size";
-       //              OverLoad(1);
-       //              return 0;
-       //      }
-       //}
-       //iAllocMatrixOfDouble(Rhs + 1, 1, 1, &pReturnData);
-       //pReturnData[0] = iItemNumber;
-       //LhsVar(1) = Rhs + 1;
-       //PutLhsVar();
-       return sciErr;
- }
- SciErr size_matrix(int* _piKey, int* _piAddress, int _iMode)
- {
-       SciErr sciErr;
-       //int iRet              = 0;
-       int iRows               = 0;
-       int iCols               = 0;
-       int iRowsOut    = 1;
-       int iColsOut    = 0;
-       double pdblReal[2] = {0,0};
-       sciErr = getVarDimension(_piKey, _piAddress, &iRows, &iCols);
-       if(sciErr.iErr)
-       {
-               return sciErr;
-       }
-       if(Lhs == 1)
-       {
-               switch(_iMode)
-               {
-               case BY_MTLB : 
-                       iColsOut = 2;
-                       pdblReal[0] = iRows;
-                       pdblReal[1] = iCols;
-                       break;
-               case BY_ROWS : 
-                       iColsOut = 1;
-                       pdblReal[0] = iRows;
-                       break;
-               case BY_COLS : 
-                       iColsOut = 1;
-                       pdblReal[0] = iCols;
-                       break;
-               case BY_ALL : 
-                       iColsOut = 1;
-                       pdblReal[0] = iRows * iCols;
-                       break;
-               }
-               
-               sciErr = createMatrixOfDouble(_piKey, Rhs + 1, iRowsOut, iColsOut, pdblReal);
-               if(sciErr.iErr)
-               {
-                       return sciErr;
-               }
-               LhsVar(1) = Rhs + 1;
-       }
-       else
-       {
-               int iRet = createScalarDoubleFromInteger(_piKey, Rhs + 1, iRows);
-               if(iRet)
-               {
-                       SciErr sciErr;
-                       sciErr.iErr = iRet;
-                       return sciErr;
-               }
-               iRet = createScalarDoubleFromInteger(_piKey, Rhs + 2, iCols);
-               if(iRet)
-               {
-                       SciErr sciErr;
-                       sciErr.iErr = iRet;
-                       return sciErr;
-               }
-               LhsVar(1) = Rhs + 1;
-               LhsVar(2) = Rhs + 2;
-       }
-       //      if(Rhs == 1)
-       //      {
-       //              iRet = allocMatrixOfDouble(Rhs + 1, 1, 2, &pdblVal);
-       //      }
-       //      else
-       //      {
-       //              double* pdblVal         = NULL;
-       //
-       //              iRet = allocMatrixOfDouble(Rhs + 1, 1, 1, &pdblVal);
-       //              if(iRet)
-       //              {
-       //                      return 1;
-       //              }
-       //              switch(_iMode)
-       //              {
-       //                      case BY_ROWS :
-       //                              pdblVal[0] = iCols;
-       //                              break;
-       //                      case BY_COLS :
-       //                              pdblVal[0] = iRows;
-       //                              break;
-       //                      default : //BY_ALL
-       //                              pdblVal[0] = iRows * iCols;
-       //                              break;
-       //              }
-       //      }
-       //}
-       return sciErr;
- }
- /*--------------------------------------------------------------------------*/
 - * Copyright (C) 2010 - DIGITEO - Allan CORNET
 - * 
 - * 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    
 - * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 - *
 - */
 -/*--------------------------------------------------------------------------*/ 
 -#include "gw_elementary_functions.h"
 -#include "stack-c.h"
 -#include "api_scilab.h"
 -#include "localization.h"
 -#include "Scierror.h"
 -/*--------------------------------------------------------------------------*/
 -extern int C2F(intsize)(int *id);
 -/*--------------------------------------------------------------------------*/
 -typedef enum { I_SIZE_ROW = 1,
 -I_SIZE_COL = 2,
 -I_SIZE_ROWCOL = 0,
 -} size_second_input_argument_int;
 -/*--------------------------------------------------------------------------*/
 -#define C_SIZE_ROW "r"
 -#define C_SIZE_COL "c"
 -#define C_SIZE_ROWCOL "*"
 -/*--------------------------------------------------------------------------*/
 -int sci_size(char *fname,unsigned long fname_len)
 -{
 -      static int id[6];
 -
 -    CheckRhs(1,2);
 -
 -    /*        bug 8296, we check second input argument, it must be r,c,* or 1,2,0 (compatibility) */
 -    if (Rhs == 2)
 -    {
 -        int iType = 0;
 -        int *piAddressVarTwo = NULL;
 -
 -        /* get Address of inputs */
 -        SciErr sciErr = getVarAddressFromPosition(pvApiCtx, 2, &piAddressVarTwo);
 -        if(sciErr.iErr)
 -        {
 -            printError(&sciErr, 0);
 -            return 0;
 -        }
 -
 -        if ( isDoubleType(pvApiCtx, piAddressVarTwo) ||
 -            isStringType(pvApiCtx, piAddressVarTwo) )
 -        {
 -            int iValue = -1; 
 -
 -            if (isScalar(pvApiCtx, piAddressVarTwo))
 -            {
 -                if (isDoubleType(pvApiCtx, piAddressVarTwo))
 -                {
 -                    double dValue = 0.;
 -                    
 -                    if (getScalarDouble(pvApiCtx, piAddressVarTwo, &dValue) == 0)
 -                    {
 -                        iValue = (int)(dValue);
 -                    }
 -                }
 -                else // string
 -                {
 -                    char *pStr = NULL;
 -                    if (getAllocatedSingleString(pvApiCtx, piAddressVarTwo, &pStr) == 0)
 -                    {
 -                        if (pStr)
 -                        {
 -                            if (strcmp(pStr, C_SIZE_ROW) == 0) iValue = I_SIZE_ROW;
 -                            if (strcmp(pStr, C_SIZE_COL) == 0) iValue = I_SIZE_COL; 
 -                            if (strcmp(pStr, C_SIZE_ROWCOL) == 0) iValue = I_SIZE_ROWCOL;
 -                            freeAllocatedSingleString(pStr);
 -                            pStr = NULL;
 -                        }
 -
 -                    }
 -                }
 -
 -                if ((iValue != I_SIZE_ROW) && (iValue != I_SIZE_COL) && (iValue != I_SIZE_ROWCOL))
 -                {
 -                    /* compatilibity with previous error code 44 */
 -                    Scierror(44, _("%s: Wrong value for input argument #%d: \"%s\", \"%s\" or \"%s\" expected.\n"),fname,2, "r", "c", "*");
 -                    return 0;
 -                }
 -            }
 -            else
 -            {
 -                Scierror(999, _("%s: Wrong size for input argument #%d.\n"), fname, 2);
 -                return 0;
 -            }
 -        }
 -        else
 -        {
 -            Scierror(999, _("%s: Wrong type for input argument #%d.\n"), fname, 2);
 -            return 0;
 -        }
 -    }
 -
 -      C2F(intsize)(id);
 -      return 0;
 -}
 -/*--------------------------------------------------------------------------*/
Simple merge
Simple merge
  #include "Scierror.h"
  #include "localization.h"
  #include "freeArrayOfString.h"
- #include "PATH_MAX.h"
- #include "charEncoding.h"
- #include "StringConvert.h"
- #include "os_strdup.h"
+ #include "expandPathVariable.h"
+ #ifdef _MSC_VER
+ #include "strdup_windows.h"
+ #endif
  #include "fscanfMat.h"
  /*--------------------------------------------------------------------------*/
- #define INFOSIZE 1024
- #define DEFAULT_FORMAT_FSCANFMAT "%lf"
- #define NUMTOKENS_ERROR -1
- /*--------------------------------------------------------------------------*/
- static int  Info_size = 0;
- static char *Info = NULL;
- /*--------------------------------------------------------------------------*/
- static int ReadLine(FILE *fd,int *mem);
- static BOOL checkFormat(char *fmt);
- static BOOL checkLineHaveSeparator(char *line);
- static int NumTokens(char *string);
- /*--------------------------------------------------------------------------*/
- int sci_fscanfMat(char *fname, int *_piKey)
 -int sci_fscanfMat(char *fname,unsigned long fname_len)
++int sci_fscanfMat(char *fname, int* _piKey)
  {
      SciErr sciErr;
      int *piAddressVarOne = NULL;
      }
      else
      {
-         Format = os_strdup(DEFAULT_FSCANFMAT_FORMAT);
+         Format = strdup(DEFAULT_FSCANFMAT_FORMAT);
      }
  
 -    sciErr = getVarAddressFromPosition(pvApiCtx, 1, &piAddressVarOne);
 +    sciErr = getVarAddressFromPosition(_piKey, 1, &piAddressVarOne);
      if(sciErr.iErr)
      {
          if (separator) {FREE(separator); separator = NULL;}
      }
  
      expandedFilename = expandPathVariable(filename);
-     results = fscanfMat(expandedFilename, Format, " ", TRUE);
+     if (bIsDefaultSeparator)
+     {
+         #define NB_DEFAULT_SUPPORTED_SEPARATORS 2
+         /* bug 8148 */
+         /* default separator can be a space or a tabulation */
+         char *supportedSeparators[NB_DEFAULT_SUPPORTED_SEPARATORS] = {DEFAULT_FSCANFMAT_SEPARATOR, "\t"};
+         int i = 0;
+         for (i = 0; i < NB_DEFAULT_SUPPORTED_SEPARATORS; i++)
+         {
+             results = fscanfMat(expandedFilename, Format, supportedSeparators[i], TRUE);
 -            if (results && results->err == FSCANFMAT_NO_ERROR)  
++            if (results && results->err == FSCANFMAT_NO_ERROR)
+             {
+                 break;
+             }
+         }
+     }
+     else
+     {
+         results = fscanfMat(expandedFilename, Format, separator, TRUE);
+     }
      if (expandedFilename) {FREE(expandedFilename); expandedFilename = NULL;}
      if (Format) {FREE(Format); Format = NULL;}
      if (separator) {FREE(separator); separator = NULL;}
                      }
                      else
                      {
-                         char *emptryStr = os_strdup("");
+                         char *emptryStr = strdup("");
                          if (emptryStr)
                          {
 -                            createSingleString(pvApiCtx, Rhs + 2, emptryStr);
 +                            createSingleString(_piKey, Rhs + 2, emptryStr);
                              FREE(emptryStr);
                              emptryStr = NULL;
                          }
@@@ -133,59 -136,59 +134,59 @@@ void SetFileTypeOpenedInScilab(int Id,i
  /*--------------------------------------------------------------------------*/
  char* GetFileNameOpenedInScilab(int Id)
  {
-       if (GetFileTypeOpenedInScilab(Id) == 1) // Fortran file
-       {
-               /* A exception for Id 5 and 6 */ 
-               /* no name */
-               if ((Id != 5) && (Id != 6))
-               {
-                       return ScilabFileList[Id].ftname;
-               }
-       }
-       else
-       {
-               if (GetFileOpenedInScilab(Id) != NULL) return ScilabFileList[Id].ftname;
-       }
-       return NULL;
+     if (GetFileTypeOpenedInScilab(Id) == 1) // Fortran file
+     {
 -        /* A exception for Id 5 and 6 */ 
++        /* A exception for Id 5 and 6 */
+         /* no name */
+         if ((Id != 5) && (Id != 6))
+         {
+             return ScilabFileList[Id].ftname;
+         }
+     }
+     else
+     {
+         if (GetFileOpenedInScilab(Id) != NULL) return ScilabFileList[Id].ftname;
+     }
+     return NULL;
  }
  /*--------------------------------------------------------------------------*/
  BOOL SetFileNameOpenedInScilab(int Id,char *name)
  {
-       BOOL bOK=FALSE;
-       char *ptrName=NULL;
-       char fullpath[PATH_MAX*4];
+     BOOL bOK=FALSE;
+     char *ptrName=NULL;
+     char fullpath[PATH_MAX*4];
  
 -    /* A exception for Id 5 and 6 */
 -    /* no filename */
 -    if ( strcmp(name,"") == 0 )
 -    {
 -        ptrName = strdup(name);
 -        if (ptrName)
 -        {
 -            bOK=TRUE;
 -        }
 -    }
 -    else
 -    {
 -        if( get_full_path( fullpath, name, PATH_MAX*4 ) != NULL )
 -        {
 -            ptrName = strdup(fullpath);
 -            if (ptrName)
 -            {
 -                bOK=TRUE;
 -            }
 -        }
 -        else
 -        {
 -            ptrName = strdup(name);
 -            if (ptrName)
 -            {
 -                bOK=TRUE;
 -            }
 -        }
 -    }
 -    ScilabFileList[Id].ftname = ptrName;
 -    return bOK;
 +      /* A exception for Id 5 and 6 */
 +      /* no filename */
 +      if ( strcmp(name,"") == 0 )
 +      {
 +              ptrName = os_strdup(name);
 +              if (ptrName)
 +              {
 +                      bOK=TRUE;
 +              }
 +      }
 +      else
 +      {
 +              if( get_full_path( fullpath, name, PATH_MAX*4 ) != NULL )
 +              {
 +                      ptrName = os_strdup(fullpath);
 +                      if (ptrName)
 +                      {
 +                              bOK=TRUE;
 +                      }
 +              }
 +              else
 +              {
 +                      ptrName = os_strdup(name);
 +                      if (ptrName)
 +                      {
 +                              bOK=TRUE;
 +                      }
 +              }
 +      }
 +      ScilabFileList[Id].ftname = ptrName;
 +      return bOK;
  }
  /*--------------------------------------------------------------------------*/
  BOOL FreeFileNameOpenedInScilab(int Id)
@@@ -442,35 -450,35 +448,35 @@@ char **GetTypesUsedAsString(int *sizeAr
  /*--------------------------------------------------------------------------*/
  char **GetFilenamesUsed(int *sizeArrayReturned)
  {
-       char **FilenamesArray = NULL;
-       int i = 0, j = 0;
+     char **FilenamesArray = NULL;
+     int i = 0, j = 0;
  
-       *sizeArrayReturned = GetNumberOfIdsUsed();
+     *sizeArrayReturned = GetNumberOfIdsUsed();
  
-       FilenamesArray = (char**)MALLOC(sizeof(char*) * (*sizeArrayReturned));
-       if (FilenamesArray == NULL)
-       {
-               *sizeArrayReturned = 0;
-               return NULL;
-       }
+     FilenamesArray = (char**)MALLOC(sizeof(char*) * (*sizeArrayReturned));
+     if (FilenamesArray == NULL)
+     {
+         *sizeArrayReturned = 0;
+         return NULL;
+     }
  
 -    j = 0;
 -    for (i = 0; i < GetMaximumFileOpenedInScilab(); i++)
 -    {
 -        if (GetFileTypeOpenedInScilab(i) != 0)
 -        {
 -            if (GetFileNameOpenedInScilab(i))
 -            {
 -                FilenamesArray[j] = strdup(GetFileNameOpenedInScilab(i));
 -            }
 -            else
 -            {
 -                FilenamesArray[j] = strdup("");
 -            }
 -            j++;
 -        }
 -    }
 -    return FilenamesArray;
 +      j = 0;
 +      for (i = 0; i < GetMaximumFileOpenedInScilab(); i++)
 +      {
 +              if (GetFileTypeOpenedInScilab(i) != 0)
 +              {
 +                      if (GetFileNameOpenedInScilab(i))
 +                      {
 +                              FilenamesArray[j] = os_strdup(GetFileNameOpenedInScilab(i));
 +                      }
 +                      else
 +                      {
 +                              FilenamesArray[j] = os_strdup("");
 +                      }
 +                      j++;
 +              }
 +      }
 +      return FilenamesArray;
  }
  /*--------------------------------------------------------------------------*/
  int GetNumberOfIdsUsed(void)
@@@ -1,16 -1,16 +1,17 @@@
  /*
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2007 - INRIA - Allan CORNET
- * ...
- * 
+ * Copyright (C) 2010 - DIGITEO - Allan CORNET
 -* 
++* Copyright (C) 2010 - DIGITEO - Antoine ELIAS
++*
  * 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-en.txt
  *
  */
--/*--------------------------------------------------------------------------*/ 
++/*--------------------------------------------------------------------------*/
  #ifdef _MSC_VER
  #include <Windows.h>
  #else
  #include "isdir.h"
  #include "MALLOC.h"
  #include "charEncoding.h"
 -/*--------------------------------------------------------------------------*/ 
 +#include "os_swprintf.h"
- /*--------------------------------------------------------------------------*/ 
++/*--------------------------------------------------------------------------*/
  #ifdef _MSC_VER
  static int DeleteDirectory(wchar_t *refcstrRootDirectory);
  #else
  static int DeleteDirectory(char *refcstrRootDirectory);
  #endif
--/*--------------------------------------------------------------------------*/ 
++/*--------------------------------------------------------------------------*/
  BOOL removedir(char *path)
  {
-       if (isdir(path))
-       {
+     if (isdir(path))
+     {
  #ifdef _MSC_VER
-               {
-                       wchar_t *pstPath = to_wide_string(path);
-                       if(pstPath)
-                       {
-                               removedirW(pstPath);
-                               FREE(pstPath);
-                               pstPath = NULL;
-                       }
-               }
+         {
+             wchar_t *pstPath = to_wide_string(path);
+             if(pstPath)
+             {
+                 removedirW(pstPath);
+                 FREE(pstPath);
+                 pstPath = NULL;
+             }
+         }
  #else
-               DeleteDirectory(path);
+         DeleteDirectory(path);
  #endif
-               if (!isdir(path)) return TRUE;
-       }
-       return FALSE;
+         if (!isdir(path)) return TRUE;
+     }
+     return FALSE;
  }
--/*--------------------------------------------------------------------------*/ 
++/*--------------------------------------------------------------------------*/
  BOOL removedirW(wchar_t *pathW)
  {
-       if (isdirW(pathW))
-       {
+     if (isdirW(pathW))
+     {
  #ifdef _MSC_VER
-               DeleteDirectory(pathW);
+         DeleteDirectory(pathW);
  #else
-               char *path = wide_string_to_UTF8(pathW);
-               if (path)
-               {
-                       DeleteDirectory(path);
-                       FREE(path);
-                       path = NULL;
-               }
+         char *path = wide_string_to_UTF8(pathW);
+         if (path)
+         {
+             DeleteDirectory(path);
+             FREE(path);
+             path = NULL;
+         }
  #endif
-               if (!isdirW(pathW)) return TRUE;
-       }
-       return FALSE;
+         if (!isdirW(pathW)) return TRUE;
+     }
+     return FALSE;
  }
--/*--------------------------------------------------------------------------*/ 
++/*--------------------------------------------------------------------------*/
  #ifdef _MSC_VER
  static int DeleteDirectory(wchar_t *refcstrRootDirectory)
  {
- #define DEFAULT_PATTERN L"%ls/*.*"
-       BOOL bDeleteSubdirectories = TRUE;
-       BOOL bSubdirectory = FALSE;
-       HANDLE hFile;
-       WIN32_FIND_DATAW FileInformation;
-       DWORD dwError;
-       wchar_t *strPattern             = NULL;
-       wchar_t *strFilePath    = NULL;
 -    #define DEFAULT_PATTERN L"%s/*.*"
++    #define DEFAULT_PATTERN L"%ls/*.*"
+     BOOL bDeleteSubdirectories = TRUE;
+     BOOL bSubdirectory = FALSE;
+     HANDLE hFile;
+     WIN32_FIND_DATAW FileInformation;
+     DWORD dwError;
+     wchar_t   *strPattern             = NULL;
+     wchar_t   *strFilePath    = NULL;
+     int len = 0;
+     if (refcstrRootDirectory == NULL) return 1;
  
-       strPattern = (wchar_t*)MALLOC(sizeof(wchar_t)*((int)wcslen(refcstrRootDirectory) + (int)wcslen(DEFAULT_PATTERN) + 1));
-       os_swprintf(strPattern,((int)wcslen(refcstrRootDirectory) + (int)wcslen(DEFAULT_PATTERN) + 1), DEFAULT_PATTERN, refcstrRootDirectory);
+     len = (int)(wcslen(refcstrRootDirectory) + (int)wcslen(DEFAULT_PATTERN) + 1);
  
-       hFile = FindFirstFileW(strPattern, &FileInformation);
-       if (strPattern) { FREE(strPattern);strPattern=NULL;}
+     strPattern = (wchar_t*)MALLOC(sizeof(wchar_t) * len);
+     if (strPattern)
+     {
 -        swprintf(strPattern, len, DEFAULT_PATTERN, refcstrRootDirectory);
++        os_swprintf(strPattern, len, DEFAULT_PATTERN, refcstrRootDirectory);
+     }
+     else
+     {
+         return 1;
+     }
  
-       if(hFile != INVALID_HANDLE_VALUE)
-       {
-               do
-               {
-                       if ( (wcscmp(FileInformation.cFileName,L".") != 0) && (wcscmp(FileInformation.cFileName,L"..") != 0) )
-                       {
-                               strFilePath = (wchar_t*)MALLOC(sizeof(wchar_t)*(wcslen(refcstrRootDirectory)+5+wcslen((wchar_t*)(FileInformation.cFileName))));
-                               os_swprintf(strFilePath,wcslen(refcstrRootDirectory)+5+wcslen((wchar_t*)(FileInformation.cFileName)),L"%ls\\%ls",refcstrRootDirectory,FileInformation.cFileName);
+     hFile = FindFirstFileW(strPattern, &FileInformation);
+     if (strPattern) { FREE(strPattern);strPattern=NULL;}
  
-                               if(FileInformation.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
-                               {
-                                       if(bDeleteSubdirectories)
-                                       {
-                                               int iRC = DeleteDirectory(strFilePath);
-                                               if (strFilePath) {FREE(strFilePath); strFilePath = NULL;}
-                                               if (strPattern) {FREE(strPattern); strPattern = NULL;}
+     if(hFile != INVALID_HANDLE_VALUE)
+     {
+         do
+         {
+             if ( (wcscmp(FileInformation.cFileName,L".") != 0) && (wcscmp(FileInformation.cFileName,L"..") != 0) )
+             {
 -                #define FORMAT_PATH_TO_REMOVE L"%s\\%s"
++                #define FORMAT_PATH_TO_REMOVE L"%ls\\%ls"
+                 int len = (int) (wcslen(refcstrRootDirectory) + wcslen(FORMAT_PATH_TO_REMOVE) + wcslen((wchar_t*)(FileInformation.cFileName)) + 1);
+                 strFilePath = (wchar_t*) MALLOC(sizeof(wchar_t) * len);
+                 if (strFilePath)
+                 {
 -                    swprintf(strFilePath, len, FORMAT_PATH_TO_REMOVE, refcstrRootDirectory, FileInformation.cFileName);
++                    os_swprintf(strFilePath, len, FORMAT_PATH_TO_REMOVE, refcstrRootDirectory, FileInformation.cFileName);
+                 }
  
-                                               if(iRC) 
-                                               {
-                                                       return iRC;
-                                               }
-                                       }
-                                       else bSubdirectory = TRUE;
-                               }
-                               else
-                               {
-                                       if(SetFileAttributesW(strFilePath,FILE_ATTRIBUTE_NORMAL) == FALSE) 
-                                       {
-                                               if (strFilePath) {FREE(strFilePath); strFilePath = NULL;}
-                                               if (strPattern) {FREE(strPattern); strPattern = NULL;}
-                                               return GetLastError();
-                                       }
+                 if(FileInformation.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
+                 {
+                     if(bDeleteSubdirectories)
+                     {
+                         int iRC = DeleteDirectory(strFilePath);
+                         if (strFilePath) {FREE(strFilePath); strFilePath = NULL;}
+                         if (strPattern) {FREE(strPattern); strPattern = NULL;}
  
-                                       if(DeleteFileW(strFilePath) == FALSE) 
-                                       {
-                                               if (strFilePath) {FREE(strFilePath); strFilePath = NULL;}
-                                               if (strPattern) {FREE(strPattern); strPattern = NULL;}
-                                               return GetLastError();
-                                       }
-                               }
-                       }
-               } while(FindNextFileW(hFile, &FileInformation) == TRUE);
 -                        if(iRC) 
++                        if(iRC)
+                         {
+                             return iRC;
+                         }
+                     }
+                     else bSubdirectory = TRUE;
+                 }
+                 else
+                 {
 -                    if(SetFileAttributesW(strFilePath,FILE_ATTRIBUTE_NORMAL) == FALSE) 
++                    if(SetFileAttributesW(strFilePath,FILE_ATTRIBUTE_NORMAL) == FALSE)
+                     {
+                         if (strFilePath) {FREE(strFilePath); strFilePath = NULL;}
+                         if (strPattern) {FREE(strPattern); strPattern = NULL;}
+                         return GetLastError();
+                     }
  
-               FindClose(hFile);
-               if (strFilePath) {FREE(strFilePath); strFilePath = NULL;}
-               if (strPattern) {FREE(strPattern); strPattern = NULL;}
 -                    if(DeleteFileW(strFilePath) == FALSE) 
++                    if(DeleteFileW(strFilePath) == FALSE)
+                     {
+                         if (strFilePath) {FREE(strFilePath); strFilePath = NULL;}
+                         if (strPattern) {FREE(strPattern); strPattern = NULL;}
+                         return GetLastError();
+                     }
+                 }
+             }
+         } while(FindNextFileW(hFile, &FileInformation) == TRUE);
  
-               dwError = GetLastError();
-               if(dwError != ERROR_NO_MORE_FILES) 
-               {
-                       return dwError;
-               }
-               else
-               {
-                       if(!bSubdirectory)
-                       {
-                               if(SetFileAttributesW(refcstrRootDirectory,FILE_ATTRIBUTE_NORMAL) == FALSE) 
-                               {
-                                       return GetLastError();
-                               }
-                               if(RemoveDirectoryW(refcstrRootDirectory) == FALSE)     
-                               {
-                                       return GetLastError();
-                               }
-                       }
-               }
-       }
+         FindClose(hFile);
+         if (strFilePath) {FREE(strFilePath); strFilePath = NULL;}
+         if (strPattern) {FREE(strPattern); strPattern = NULL;}
  
-       if (strFilePath) {FREE(strFilePath); strFilePath = NULL;}
-       if (strPattern) {FREE(strPattern); strPattern = NULL;}
-       return 0;
+         dwError = GetLastError();
 -        if(dwError != ERROR_NO_MORE_FILES) 
++        if(dwError != ERROR_NO_MORE_FILES)
+         {
+             return dwError;
+         }
+         else
+         {
+             if(!bSubdirectory)
+             {
 -                if(SetFileAttributesW(refcstrRootDirectory,FILE_ATTRIBUTE_NORMAL) == FALSE) 
++                if(SetFileAttributesW(refcstrRootDirectory,FILE_ATTRIBUTE_NORMAL) == FALSE)
+                 {
+                     return GetLastError();
+                 }
 -                if(RemoveDirectoryW(refcstrRootDirectory) == FALSE)   
++                if(RemoveDirectoryW(refcstrRootDirectory) == FALSE)
+                 {
+                     return GetLastError();
+                 }
+             }
+         }
+     }
+     if (strFilePath) {FREE(strFilePath); strFilePath = NULL;}
+     if (strPattern) {FREE(strPattern); strPattern = NULL;}
+     return 0;
  }
  #endif
  /*--------------------------------------------------------------------------*/
Simple merge
index b11c5d9,0000000..62bcd45
mode 100644,000000..100644
--- /dev/null
@@@ -1,912 -1,0 +1,913 @@@
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
 +# @configure_input@
 +
 +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
 +# This Makefile.in is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
 +# with or without modifications, as long as this notice is preserved.
 +
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
 +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 +# PARTICULAR PURPOSE.
 +
 +@SET_MAKE@
 +
 +
 +VPATH = @srcdir@
 +pkgdatadir = $(datadir)/@PACKAGE@
 +pkgincludedir = $(includedir)/@PACKAGE@
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
 +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 +install_sh_DATA = $(install_sh) -c -m 644
 +install_sh_PROGRAM = $(install_sh) -c
 +install_sh_SCRIPT = $(install_sh) -c
 +INSTALL_HEADER = $(INSTALL_DATA)
 +transform = $(program_transform_name)
 +NORMAL_INSTALL = :
 +PRE_INSTALL = :
 +POST_INSTALL = :
 +NORMAL_UNINSTALL = :
 +PRE_UNINSTALL = :
 +POST_UNINSTALL = :
 +build_triplet = @build@
 +host_triplet = @host@
 +check_PROGRAMS = testFunctionManager$(EXEEXT)
 +TESTS = testFunctionManager$(EXEEXT)
 +subdir = modules/functions_manager
 +DIST_COMMON = $(libscifunctions_manager_la_include_HEADERS) \
 +      $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 +am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
 +      $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
 +      $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
 +      $(top_srcdir)/m4/intel_compiler.m4 \
 +      $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
 +      $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
 +      $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
 +      $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 +      $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
++      $(top_srcdir)/m4/macosx.m4 $(top_srcdir)/m4/ocaml.m4 \
++      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
++      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
++      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
++      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
++      $(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +      $(ACLOCAL_M4)
 +mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 +CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h
 +CONFIG_CLEAN_FILES =
 +CONFIG_CLEAN_VPATH_FILES =
 +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 +am__vpath_adj = case $$p in \
 +    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
 +    *) f=$$p;; \
 +  esac;
 +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
 +am__install_max = 40
 +am__nobase_strip_setup = \
 +  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
 +am__nobase_strip = \
 +  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
 +am__nobase_list = $(am__nobase_strip_setup); \
 +  for p in $$list; do echo "$$p $$p"; done | \
 +  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
 +  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
 +    if (++n[$$2] == $(am__install_max)) \
 +      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
 +    END { for (dir in files) print dir, files[dir] }'
 +am__base_list = \
 +  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
 +  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 +am__installdirs = "$(DESTDIR)$(pkglibdir)" \
 +      "$(DESTDIR)$(libscifunctions_manager_la_includedir)"
 +LTLIBRARIES = $(pkglib_LTLIBRARIES)
 +libscifunctions_manager_la_DEPENDENCIES = $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
 +      $(top_builddir)/modules/matio/libscimatio.la
 +am__objects_1 = libscifunctions_manager_la-funcmanager.lo
 +am_libscifunctions_manager_la_OBJECTS = $(am__objects_1)
 +libscifunctions_manager_la_OBJECTS =  \
 +      $(am_libscifunctions_manager_la_OBJECTS)
 +libscifunctions_manager_la_LINK = $(LIBTOOL) --tag=CXX \
 +      $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
 +      $(libscifunctions_manager_la_CXXFLAGS) $(CXXFLAGS) \
 +      $(AM_LDFLAGS) $(LDFLAGS) -o $@
 +am_testFunctionManager_OBJECTS =  \
 +      testFunctionManager-test-function.$(OBJEXT) \
 +      testFunctionManager-foo.$(OBJEXT) \
 +      testFunctionManager-cosinus.$(OBJEXT)
 +testFunctionManager_OBJECTS = $(am_testFunctionManager_OBJECTS)
 +testFunctionManager_DEPENDENCIES =  \
 +      $(top_builddir)/modules/types/libsciTypes.la \
 +      $(top_builddir)/modules/functions_manager/libscifunctions_manager.la
 +testFunctionManager_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
 +      $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
 +      $(testFunctionManager_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
 +      $(LDFLAGS) -o $@
 +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
 +depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 +am__depfiles_maybe = depfiles
 +am__mv = mv -f
 +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 +      $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 +LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +      --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 +      $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 +CXXLD = $(CXX)
 +CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +      --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
 +      $(LDFLAGS) -o $@
 +SOURCES = $(libscifunctions_manager_la_SOURCES) \
 +      $(testFunctionManager_SOURCES)
 +DIST_SOURCES = $(libscifunctions_manager_la_SOURCES) \
 +      $(testFunctionManager_SOURCES)
 +HEADERS = $(libscifunctions_manager_la_include_HEADERS)
 +ETAGS = etags
 +CTAGS = ctags
 +am__tty_colors = \
 +red=; grn=; lgn=; blu=; std=
 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 +ACLOCAL = @ACLOCAL@
 +ALL_LINGUAS = @ALL_LINGUAS@
 +AMTAR = @AMTAR@
 +ANT = @ANT@
 +ANTLR = @ANTLR@
 +AR = @AR@
 +AUTOCONF = @AUTOCONF@
 +AUTOHEADER = @AUTOHEADER@
 +AUTOMAKE = @AUTOMAKE@
 +AVALON_FRAMEWORK = @AVALON_FRAMEWORK@
 +AWK = @AWK@
 +BATIK = @BATIK@
 +BLAS_LIBS = @BLAS_LIBS@
 +BSH = @BSH@
 +CC = @CC@
 +CCDEPMODE = @CCDEPMODE@
 +CFLAGS = @CFLAGS@
 +CHECKSTYLE = @CHECKSTYLE@
 +COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
 +COMMONS_IO = @COMMONS_IO@
 +COMMONS_LOGGING = @COMMONS_LOGGING@
 +CPP = @CPP@
 +CPPFLAGS = @CPPFLAGS@
 +CXX = @CXX@
 +CXXCPP = @CXXCPP@
 +CXXDEPMODE = @CXXDEPMODE@
 +CXXFLAGS = @CXXFLAGS@
 +CYGPATH_W = @CYGPATH_W@
 +DEFS = @DEFS@
 +DEMOTOOLS_ENABLE = @DEMOTOOLS_ENABLE@
 +DEPDIR = @DEPDIR@
 +DOCBOOK_ROOT = @DOCBOOK_ROOT@
 +DSYMUTIL = @DSYMUTIL@
 +DUMPBIN = @DUMPBIN@
 +ECHO_C = @ECHO_C@
 +ECHO_N = @ECHO_N@
 +ECHO_T = @ECHO_T@
 +EGREP = @EGREP@
 +EXEEXT = @EXEEXT@
 +F77 = @F77@
 +FFLAGS = @FFLAGS@
 +FFTW3_LIB = @FFTW3_LIB@
 +FFTW_ENABLE = @FFTW_ENABLE@
 +FGREP = @FGREP@
 +FLEXDOCK = @FLEXDOCK@
 +FLIBS = @FLIBS@
 +FOP = @FOP@
 +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 +GIWS_BIN = @GIWS_BIN@
 +GLUEGEN_RT = @GLUEGEN_RT@
 +GMSGFMT = @GMSGFMT@
 +GMSGFMT_015 = @GMSGFMT_015@
 +GRAPHICS_ENABLE = @GRAPHICS_ENABLE@
 +GREP = @GREP@
 +GUI_ENABLE = @GUI_ENABLE@
 +HDF5_CFLAGS = @HDF5_CFLAGS@
 +HDF5_ENABLE = @HDF5_ENABLE@
 +HDF5_LIBS = @HDF5_LIBS@
 +HELP_ENABLE = @HELP_ENABLE@
 +INSTALL = @INSTALL@
 +INSTALL_DATA = @INSTALL_DATA@
 +INSTALL_PROGRAM = @INSTALL_PROGRAM@
 +INSTALL_SCRIPT = @INSTALL_SCRIPT@
 +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 +INTLLIBS = @INTLLIBS@
 +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 +JAR = @JAR@
 +JAVA = @JAVA@
 +JAVAC = @JAVAC@
 +JAVAH = @JAVAH@
 +JAVASCI_ENABLE = @JAVASCI_ENABLE@
 +JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
 +JAVA_ENABLE = @JAVA_ENABLE@
 +JAVA_G = @JAVA_G@
 +JAVA_HOME = @JAVA_HOME@
 +JAVA_JNI_INCLUDE = @JAVA_JNI_INCLUDE@
 +JAVA_JNI_LIBS = @JAVA_JNI_LIBS@
 +JDB = @JDB@
 +JEUCLID_CORE = @JEUCLID_CORE@
 +JGRAPHX = @JGRAPHX@
 +JHALL = @JHALL@
 +JHDF5 = @JHDF5@
 +JLATEXMATH = @JLATEXMATH@
 +JLATEXMATH_FOP = @JLATEXMATH_FOP@
 +JOGL = @JOGL@
 +JROSETTA_API = @JROSETTA_API@
 +JROSETTA_ENGINE = @JROSETTA_ENGINE@
 +JUNIT = @JUNIT@
 +LAPACK_LIBS = @LAPACK_LIBS@
 +LD = @LD@
 +LDFLAGS = @LDFLAGS@
 +LEX = @LEX@
 +LEXLIB = @LEXLIB@
 +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 +LIBICONV = @LIBICONV@
 +LIBINTL = @LIBINTL@
 +LIBM = @LIBM@
 +LIBOBJS = @LIBOBJS@
 +LIBS = @LIBS@
 +LIBTOOL = @LIBTOOL@
 +LIPO = @LIPO@
 +LN_S = @LN_S@
 +LOOKS = @LOOKS@
 +LTLIBICONV = @LTLIBICONV@
 +LTLIBINTL = @LTLIBINTL@
 +LTLIBOBJS = @LTLIBOBJS@
 +MAINT = @MAINT@
 +MAKEINFO = @MAKEINFO@
 +MATIO_CFLAGS = @MATIO_CFLAGS@
 +MATIO_ENABLE = @MATIO_ENABLE@
 +MATIO_LIBS = @MATIO_LIBS@
 +MKDIR_P = @MKDIR_P@
 +MSGCAT = @MSGCAT@
 +MSGFMT = @MSGFMT@
 +MSGFMT_015 = @MSGFMT_015@
 +MSGMERGE = @MSGMERGE@
 +NM = @NM@
 +NMEDIT = @NMEDIT@
 +OBJDUMP = @OBJDUMP@
 +OBJEXT = @OBJEXT@
 +OCAMLC = @OCAMLC@
 +OCAMLDEP = @OCAMLDEP@
 +OCAMLLEX = @OCAMLLEX@
 +OCAMLOPT = @OCAMLOPT@
 +OCAMLYACC = @OCAMLYACC@
 +OPENMP_CFLAGS = @OPENMP_CFLAGS@
 +OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
 +OPENMP_ENABLE = @OPENMP_ENABLE@
 +OPENMP_LIBS = @OPENMP_LIBS@
 +OTOOL = @OTOOL@
 +OTOOL64 = @OTOOL64@
 +PACKAGE = @PACKAGE@
 +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 +PACKAGE_NAME = @PACKAGE_NAME@
 +PACKAGE_STRING = @PACKAGE_STRING@
 +PACKAGE_TARNAME = @PACKAGE_TARNAME@
 +PACKAGE_URL = @PACKAGE_URL@
 +PACKAGE_VERSION = @PACKAGE_VERSION@
 +PATH_SEPARATOR = @PATH_SEPARATOR@
 +PCRE_CFLAGS = @PCRE_CFLAGS@
 +PCRE_CONFIG = @PCRE_CONFIG@
 +PCRE_LIBS = @PCRE_LIBS@
 +PCRE_VERSION = @PCRE_VERSION@
 +PKG_CONFIG = @PKG_CONFIG@
 +POSUB = @POSUB@
 +POW_LIB = @POW_LIB@
 +PVMGETARCH = @PVMGETARCH@
 +PVM_ARCH = @PVM_ARCH@
 +PVM_ENABLE = @PVM_ENABLE@
 +PVM_INCLUDE = @PVM_INCLUDE@
 +PVM_LIB = @PVM_LIB@
 +PYTHON = @PYTHON@
 +QDOX = @QDOX@
 +RANLIB = @RANLIB@
 +RELOCATABLE = @RELOCATABLE@
 +RT_LIB = @RT_LIB@
 +SAXON = @SAXON@
 +SCICOS_ENABLE = @SCICOS_ENABLE@
 +SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
 +SED = @SED@
 +SET_MAKE = @SET_MAKE@
 +SET_RELOCATABLE = @SET_RELOCATABLE@
 +SHELL = @SHELL@
 +SKINLF = @SKINLF@
 +SPLINT = @SPLINT@
 +STRIP = @STRIP@
 +SWIG_BIN = @SWIG_BIN@
 +SWIG_JAVA = @SWIG_JAVA@
 +SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
 +TCLTK_LIBS = @TCLTK_LIBS@
 +TCL_INC_PATH = @TCL_INC_PATH@
 +TESTNG = @TESTNG@
 +TK_INC_PATH = @TK_INC_PATH@
 +UMFPACK_ENABLE = @UMFPACK_ENABLE@
 +UMFPACK_LIB = @UMFPACK_LIB@
 +USE_NLS = @USE_NLS@
 +VERSION = @VERSION@
 +WITH_OCAML = @WITH_OCAML@
 +WITH_TKSCI = @WITH_TKSCI@
 +XGETTEXT = @XGETTEXT@
 +XGETTEXT_015 = @XGETTEXT_015@
 +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 +XMKMF = @XMKMF@
 +XMLGRAPHICS_COMMONS = @XMLGRAPHICS_COMMONS@
 +XML_APIS_EXT = @XML_APIS_EXT@
 +XML_CONFIG = @XML_CONFIG@
 +XML_FLAGS = @XML_FLAGS@
 +XML_LIBS = @XML_LIBS@
 +XML_VERSION = @XML_VERSION@
 +X_CFLAGS = @X_CFLAGS@
 +X_EXTRA_LIBS = @X_EXTRA_LIBS@
 +X_LIBS = @X_LIBS@
 +X_PRE_LIBS = @X_PRE_LIBS@
 +YACC = @YACC@
 +YFLAGS = @YFLAGS@
 +abs_builddir = @abs_builddir@
 +abs_srcdir = @abs_srcdir@
 +abs_top_builddir = @abs_top_builddir@
 +abs_top_srcdir = @abs_top_srcdir@
 +ac_ct_CC = @ac_ct_CC@
 +ac_ct_CXX = @ac_ct_CXX@
 +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 +ac_ct_F77 = @ac_ct_F77@
 +am__include = @am__include@
 +am__leading_dot = @am__leading_dot@
 +am__quote = @am__quote@
 +am__tar = @am__tar@
 +am__untar = @am__untar@
 +bindir = @bindir@
 +build = @build@
 +build_alias = @build_alias@
 +build_cpu = @build_cpu@
 +build_os = @build_os@
 +build_vendor = @build_vendor@
 +builddir = @builddir@
 +cxx_present = @cxx_present@
 +datadir = @datadir@
 +datarootdir = @datarootdir@
 +docdir = @docdir@
 +dvidir = @dvidir@
 +exec_prefix = @exec_prefix@
 +host = @host@
 +host_alias = @host_alias@
 +host_cpu = @host_cpu@
 +host_os = @host_os@
 +host_vendor = @host_vendor@
 +htmldir = @htmldir@
 +includedir = @includedir@
 +infodir = @infodir@
 +install_sh = @install_sh@
 +libdir = @libdir@
 +libexecdir = @libexecdir@
 +localedir = @localedir@
 +localstatedir = @localstatedir@
 +mandir = @mandir@
 +mkdir_p = @mkdir_p@
 +oldincludedir = @oldincludedir@
 +pdfdir = @pdfdir@
 +prefix = @prefix@
 +program_transform_name = @program_transform_name@
 +psdir = @psdir@
 +sbindir = @sbindir@
 +sharedstatedir = @sharedstatedir@
 +srcdir = @srcdir@
 +sysconfdir = @sysconfdir@
 +target_alias = @target_alias@
 +top_build_prefix = @top_build_prefix@
 +top_builddir = @top_builddir@
 +top_srcdir = @top_srcdir@
 +yacc_present = @yacc_present@
 +FUNCTION_MANAGER_CPP_SOURCES = src/cpp/funcmanager.cpp
 +pkglib_LTLIBRARIES = libscifunctions_manager.la
 +libscifunctions_manager_la_SOURCES = $(FUNCTION_MANAGER_CPP_SOURCES)
 +libscifunctions_manager_la_CXXFLAGS = -I$(top_builddir)/modules/types/includes/ \
 +                                              -I$(top_builddir)/modules/core/includes/ \
 +                                              -I$(top_builddir)/modules/string/includes/ \
 +                                              -I$(top_builddir)/modules/symbol/includes/ \
 +                                              -I$(top_builddir)/modules/elementary_functions/includes/ \
 +                                              -I$(top_builddir)/modules/operations/includes/ \
 +                                              -I$(top_builddir)/modules/system_env/includes/ \
 +                                              -I$(top_builddir)/modules/api_scilab/includes/ \
 +                                              -I$(top_builddir)/modules/fileio/includes/ \
 +                                              -I$(top_builddir)/modules/abstractSyntaxTree/includes/ \
 +                                              -I$(top_builddir)/modules/parse/includes/ \
 +                                              -I$(top_builddir)/modules/output_stream/includes/ \
 +                                              -Iincludes/ \
 +                                              -Isrc/cpp \
 +                                              $(XML_FLAGS)
 +
 +libscifunctions_manager_la_LIBADD = $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
 +                                      $(top_builddir)/modules/matio/libscimatio.la
 +
 +libscifunctions_manager_la_includedir = $(pkgincludedir)/Types
 +libscifunctions_manager_la_include_HEADERS = 
 +
 +####################
 +####################
 +check_INCLUDES = -I$(top_builddir)/modules/types/includes/ \
 +                              -Iincludes/ \
 +                              -Isrc/cpp
 +
 +testFunctionManager_SOURCES = src/cpp/test-function.cpp \
 +                                      src/cpp/foo.cpp \
 +                                      src/cpp/cosinus.cpp
 +
 +testFunctionManager_CXXFLAGS = $(check_INCLUDES)
 +testFunctionManager_LDADD = $(top_builddir)/modules/types/libsciTypes.la \
 +                                      $(top_builddir)/modules/functions_manager/libscifunctions_manager.la
 +
 +all: all-am
 +
 +.SUFFIXES:
 +.SUFFIXES: .cpp .lo .o .obj
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 +      @for dep in $?; do \
 +        case '$(am__configure_deps)' in \
 +          *$$dep*) \
 +            ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
 +              && { if test -f $@; then exit 0; else break; fi; }; \
 +            exit 1;; \
 +        esac; \
 +      done; \
 +      echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign modules/functions_manager/Makefile'; \
 +      $(am__cd) $(top_srcdir) && \
 +        $(AUTOMAKE) --foreign modules/functions_manager/Makefile
 +.PRECIOUS: Makefile
 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +      @case '$?' in \
 +        *config.status*) \
 +          cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 +        *) \
 +          echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 +          cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 +      esac;
 +
 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 +      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 +      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 +      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(am__aclocal_m4_deps):
 +install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 +      @$(NORMAL_INSTALL)
 +      test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)"
 +      @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
 +      list2=; for p in $$list; do \
 +        if test -f $$p; then \
 +          list2="$$list2 $$p"; \
 +        else :; fi; \
 +      done; \
 +      test -z "$$list2" || { \
 +        echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \
 +        $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \
 +      }
 +
 +uninstall-pkglibLTLIBRARIES:
 +      @$(NORMAL_UNINSTALL)
 +      @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
 +      for p in $$list; do \
 +        $(am__strip_dir) \
 +        echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
 +        $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
 +      done
 +
 +clean-pkglibLTLIBRARIES:
 +      -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
 +      @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
 +        dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
 +        test "$$dir" != "$$p" || dir=.; \
 +        echo "rm -f \"$${dir}/so_locations\""; \
 +        rm -f "$${dir}/so_locations"; \
 +      done
 +libscifunctions_manager.la: $(libscifunctions_manager_la_OBJECTS) $(libscifunctions_manager_la_DEPENDENCIES) 
 +      $(libscifunctions_manager_la_LINK) -rpath $(pkglibdir) $(libscifunctions_manager_la_OBJECTS) $(libscifunctions_manager_la_LIBADD) $(LIBS)
 +
 +clean-checkPROGRAMS:
 +      @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
 +      echo " rm -f" $$list; \
 +      rm -f $$list || exit $$?; \
 +      test -n "$(EXEEXT)" || exit 0; \
 +      list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 +      echo " rm -f" $$list; \
 +      rm -f $$list
 +testFunctionManager$(EXEEXT): $(testFunctionManager_OBJECTS) $(testFunctionManager_DEPENDENCIES) 
 +      @rm -f testFunctionManager$(EXEEXT)
 +      $(testFunctionManager_LINK) $(testFunctionManager_OBJECTS) $(testFunctionManager_LDADD) $(LIBS)
 +
 +mostlyclean-compile:
 +      -rm -f *.$(OBJEXT)
 +
 +distclean-compile:
 +      -rm -f *.tab.c
 +
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifunctions_manager_la-funcmanager.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testFunctionManager-cosinus.Po@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testFunctionManager-foo.Po@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testFunctionManager-test-function.Po@am__quote@
 +
 +.cpp.o:
 +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXXCOMPILE) -c -o $@ $<
 +
 +.cpp.obj:
 +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 +
 +.cpp.lo:
 +@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LTCXXCOMPILE) -c -o $@ $<
 +
 +libscifunctions_manager_la-funcmanager.lo: src/cpp/funcmanager.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscifunctions_manager_la_CXXFLAGS) $(CXXFLAGS) -MT libscifunctions_manager_la-funcmanager.lo -MD -MP -MF $(DEPDIR)/libscifunctions_manager_la-funcmanager.Tpo -c -o libscifunctions_manager_la-funcmanager.lo `test -f 'src/cpp/funcmanager.cpp' || echo '$(srcdir)/'`src/cpp/funcmanager.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscifunctions_manager_la-funcmanager.Tpo $(DEPDIR)/libscifunctions_manager_la-funcmanager.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/funcmanager.cpp' object='libscifunctions_manager_la-funcmanager.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscifunctions_manager_la_CXXFLAGS) $(CXXFLAGS) -c -o libscifunctions_manager_la-funcmanager.lo `test -f 'src/cpp/funcmanager.cpp' || echo '$(srcdir)/'`src/cpp/funcmanager.cpp
 +
 +testFunctionManager-test-function.o: src/cpp/test-function.cpp
 +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testFunctionManager_CXXFLAGS) $(CXXFLAGS) -MT testFunctionManager-test-function.o -MD -MP -MF $(DEPDIR)/testFunctionManager-test-function.Tpo -c -o testFunctionManager-test-function.o `test -f 'src/cpp/test-function.cpp' || echo '$(srcdir)/'`src/cpp/test-function.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testFunctionManager-test-function.Tpo $(DEPDIR)/testFunctionManager-test-function.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/test-function.cpp' object='testFunctionManager-test-function.o' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testFunctionManager_CXXFLAGS) $(CXXFLAGS) -c -o testFunctionManager-test-function.o `test -f 'src/cpp/test-function.cpp' || echo '$(srcdir)/'`src/cpp/test-function.cpp
 +
 +testFunctionManager-test-function.obj: src/cpp/test-function.cpp
 +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testFunctionManager_CXXFLAGS) $(CXXFLAGS) -MT testFunctionManager-test-function.obj -MD -MP -MF $(DEPDIR)/testFunctionManager-test-function.Tpo -c -o testFunctionManager-test-function.obj `if test -f 'src/cpp/test-function.cpp'; then $(CYGPATH_W) 'src/cpp/test-function.cpp'; else $(CYGPATH_W) '$(srcdir)/src/cpp/test-function.cpp'; fi`
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testFunctionManager-test-function.Tpo $(DEPDIR)/testFunctionManager-test-function.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/test-function.cpp' object='testFunctionManager-test-function.obj' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testFunctionManager_CXXFLAGS) $(CXXFLAGS) -c -o testFunctionManager-test-function.obj `if test -f 'src/cpp/test-function.cpp'; then $(CYGPATH_W) 'src/cpp/test-function.cpp'; else $(CYGPATH_W) '$(srcdir)/src/cpp/test-function.cpp'; fi`
 +
 +testFunctionManager-foo.o: src/cpp/foo.cpp
 +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testFunctionManager_CXXFLAGS) $(CXXFLAGS) -MT testFunctionManager-foo.o -MD -MP -MF $(DEPDIR)/testFunctionManager-foo.Tpo -c -o testFunctionManager-foo.o `test -f 'src/cpp/foo.cpp' || echo '$(srcdir)/'`src/cpp/foo.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testFunctionManager-foo.Tpo $(DEPDIR)/testFunctionManager-foo.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/foo.cpp' object='testFunctionManager-foo.o' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testFunctionManager_CXXFLAGS) $(CXXFLAGS) -c -o testFunctionManager-foo.o `test -f 'src/cpp/foo.cpp' || echo '$(srcdir)/'`src/cpp/foo.cpp
 +
 +testFunctionManager-foo.obj: src/cpp/foo.cpp
 +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testFunctionManager_CXXFLAGS) $(CXXFLAGS) -MT testFunctionManager-foo.obj -MD -MP -MF $(DEPDIR)/testFunctionManager-foo.Tpo -c -o testFunctionManager-foo.obj `if test -f 'src/cpp/foo.cpp'; then $(CYGPATH_W) 'src/cpp/foo.cpp'; else $(CYGPATH_W) '$(srcdir)/src/cpp/foo.cpp'; fi`
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testFunctionManager-foo.Tpo $(DEPDIR)/testFunctionManager-foo.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/foo.cpp' object='testFunctionManager-foo.obj' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testFunctionManager_CXXFLAGS) $(CXXFLAGS) -c -o testFunctionManager-foo.obj `if test -f 'src/cpp/foo.cpp'; then $(CYGPATH_W) 'src/cpp/foo.cpp'; else $(CYGPATH_W) '$(srcdir)/src/cpp/foo.cpp'; fi`
 +
 +testFunctionManager-cosinus.o: src/cpp/cosinus.cpp
 +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testFunctionManager_CXXFLAGS) $(CXXFLAGS) -MT testFunctionManager-cosinus.o -MD -MP -MF $(DEPDIR)/testFunctionManager-cosinus.Tpo -c -o testFunctionManager-cosinus.o `test -f 'src/cpp/cosinus.cpp' || echo '$(srcdir)/'`src/cpp/cosinus.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testFunctionManager-cosinus.Tpo $(DEPDIR)/testFunctionManager-cosinus.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/cosinus.cpp' object='testFunctionManager-cosinus.o' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testFunctionManager_CXXFLAGS) $(CXXFLAGS) -c -o testFunctionManager-cosinus.o `test -f 'src/cpp/cosinus.cpp' || echo '$(srcdir)/'`src/cpp/cosinus.cpp
 +
 +testFunctionManager-cosinus.obj: src/cpp/cosinus.cpp
 +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testFunctionManager_CXXFLAGS) $(CXXFLAGS) -MT testFunctionManager-cosinus.obj -MD -MP -MF $(DEPDIR)/testFunctionManager-cosinus.Tpo -c -o testFunctionManager-cosinus.obj `if test -f 'src/cpp/cosinus.cpp'; then $(CYGPATH_W) 'src/cpp/cosinus.cpp'; else $(CYGPATH_W) '$(srcdir)/src/cpp/cosinus.cpp'; fi`
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testFunctionManager-cosinus.Tpo $(DEPDIR)/testFunctionManager-cosinus.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/cosinus.cpp' object='testFunctionManager-cosinus.obj' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testFunctionManager_CXXFLAGS) $(CXXFLAGS) -c -o testFunctionManager-cosinus.obj `if test -f 'src/cpp/cosinus.cpp'; then $(CYGPATH_W) 'src/cpp/cosinus.cpp'; else $(CYGPATH_W) '$(srcdir)/src/cpp/cosinus.cpp'; fi`
 +
 +mostlyclean-libtool:
 +      -rm -f *.lo
 +
 +clean-libtool:
 +      -rm -rf .libs _libs
 +install-libscifunctions_manager_la_includeHEADERS: $(libscifunctions_manager_la_include_HEADERS)
 +      @$(NORMAL_INSTALL)
 +      test -z "$(libscifunctions_manager_la_includedir)" || $(MKDIR_P) "$(DESTDIR)$(libscifunctions_manager_la_includedir)"
 +      @list='$(libscifunctions_manager_la_include_HEADERS)'; test -n "$(libscifunctions_manager_la_includedir)" || list=; \
 +      for p in $$list; do \
 +        if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 +        echo "$$d$$p"; \
 +      done | $(am__base_list) | \
 +      while read files; do \
 +        echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libscifunctions_manager_la_includedir)'"; \
 +        $(INSTALL_HEADER) $$files "$(DESTDIR)$(libscifunctions_manager_la_includedir)" || exit $$?; \
 +      done
 +
 +uninstall-libscifunctions_manager_la_includeHEADERS:
 +      @$(NORMAL_UNINSTALL)
 +      @list='$(libscifunctions_manager_la_include_HEADERS)'; test -n "$(libscifunctions_manager_la_includedir)" || list=; \
 +      files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 +      test -n "$$files" || exit 0; \
 +      echo " ( cd '$(DESTDIR)$(libscifunctions_manager_la_includedir)' && rm -f" $$files ")"; \
 +      cd "$(DESTDIR)$(libscifunctions_manager_la_includedir)" && rm -f $$files
 +
 +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 +      list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 +      unique=`for i in $$list; do \
 +          if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +        done | \
 +        $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +            END { if (nonempty) { for (i in files) print i; }; }'`; \
 +      mkid -fID $$unique
 +tags: TAGS
 +
 +TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 +              $(TAGS_FILES) $(LISP)
 +      set x; \
 +      here=`pwd`; \
 +      list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 +      unique=`for i in $$list; do \
 +          if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +        done | \
 +        $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +            END { if (nonempty) { for (i in files) print i; }; }'`; \
 +      shift; \
 +      if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 +        test -n "$$unique" || unique=$$empty_fix; \
 +        if test $$# -gt 0; then \
 +          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +            "$$@" $$unique; \
 +        else \
 +          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +            $$unique; \
 +        fi; \
 +      fi
 +ctags: CTAGS
 +CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 +              $(TAGS_FILES) $(LISP)
 +      list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 +      unique=`for i in $$list; do \
 +          if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +        done | \
 +        $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +            END { if (nonempty) { for (i in files) print i; }; }'`; \
 +      test -z "$(CTAGS_ARGS)$$unique" \
 +        || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 +           $$unique
 +
 +GTAGS:
 +      here=`$(am__cd) $(top_builddir) && pwd` \
 +        && $(am__cd) $(top_srcdir) \
 +        && gtags -i $(GTAGS_ARGS) "$$here"
 +
 +distclean-tags:
 +      -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 +
 +check-TESTS: $(TESTS)
 +      @failed=0; all=0; xfail=0; xpass=0; skip=0; \
 +      srcdir=$(srcdir); export srcdir; \
 +      list=' $(TESTS) '; \
 +      $(am__tty_colors); \
 +      if test -n "$$list"; then \
 +        for tst in $$list; do \
 +          if test -f ./$$tst; then dir=./; \
 +          elif test -f $$tst; then dir=; \
 +          else dir="$(srcdir)/"; fi; \
 +          if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
 +            all=`expr $$all + 1`; \
 +            case " $(XFAIL_TESTS) " in \
 +            *[\ \     ]$$tst[\ \      ]*) \
 +              xpass=`expr $$xpass + 1`; \
 +              failed=`expr $$failed + 1`; \
 +              col=$$red; res=XPASS; \
 +            ;; \
 +            *) \
 +              col=$$grn; res=PASS; \
 +            ;; \
 +            esac; \
 +          elif test $$? -ne 77; then \
 +            all=`expr $$all + 1`; \
 +            case " $(XFAIL_TESTS) " in \
 +            *[\ \     ]$$tst[\ \      ]*) \
 +              xfail=`expr $$xfail + 1`; \
 +              col=$$lgn; res=XFAIL; \
 +            ;; \
 +            *) \
 +              failed=`expr $$failed + 1`; \
 +              col=$$red; res=FAIL; \
 +            ;; \
 +            esac; \
 +          else \
 +            skip=`expr $$skip + 1`; \
 +            col=$$blu; res=SKIP; \
 +          fi; \
 +          echo "$${col}$$res$${std}: $$tst"; \
 +        done; \
 +        if test "$$all" -eq 1; then \
 +          tests="test"; \
 +          All=""; \
 +        else \
 +          tests="tests"; \
 +          All="All "; \
 +        fi; \
 +        if test "$$failed" -eq 0; then \
 +          if test "$$xfail" -eq 0; then \
 +            banner="$$All$$all $$tests passed"; \
 +          else \
 +            if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
 +            banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
 +          fi; \
 +        else \
 +          if test "$$xpass" -eq 0; then \
 +            banner="$$failed of $$all $$tests failed"; \
 +          else \
 +            if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
 +            banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
 +          fi; \
 +        fi; \
 +        dashes="$$banner"; \
 +        skipped=""; \
 +        if test "$$skip" -ne 0; then \
 +          if test "$$skip" -eq 1; then \
 +            skipped="($$skip test was not run)"; \
 +          else \
 +            skipped="($$skip tests were not run)"; \
 +          fi; \
 +          test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
 +            dashes="$$skipped"; \
 +        fi; \
 +        report=""; \
 +        if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
 +          report="Please report to $(PACKAGE_BUGREPORT)"; \
 +          test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
 +            dashes="$$report"; \
 +        fi; \
 +        dashes=`echo "$$dashes" | sed s/./=/g`; \
 +        if test "$$failed" -eq 0; then \
 +          echo "$$grn$$dashes"; \
 +        else \
 +          echo "$$red$$dashes"; \
 +        fi; \
 +        echo "$$banner"; \
 +        test -z "$$skipped" || echo "$$skipped"; \
 +        test -z "$$report" || echo "$$report"; \
 +        echo "$$dashes$$std"; \
 +        test "$$failed" -eq 0; \
 +      else :; fi
 +
 +distdir: $(DISTFILES)
 +      @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +      list='$(DISTFILES)'; \
 +        dist_files=`for file in $$list; do echo $$file; done | \
 +        sed -e "s|^$$srcdirstrip/||;t" \
 +            -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
 +      case $$dist_files in \
 +        */*) $(MKDIR_P) `echo "$$dist_files" | \
 +                         sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
 +                         sort -u` ;; \
 +      esac; \
 +      for file in $$dist_files; do \
 +        if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 +        if test -d $$d/$$file; then \
 +          dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +          if test -d "$(distdir)/$$file"; then \
 +            find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +          fi; \
 +          if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 +            cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
 +            find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +          fi; \
 +          cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 +        else \
 +          test -f "$(distdir)/$$file" \
 +          || cp -p $$d/$$file "$(distdir)/$$file" \
 +          || exit 1; \
 +        fi; \
 +      done
 +check-am: all-am
 +      $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
 +      $(MAKE) $(AM_MAKEFLAGS) check-TESTS
 +check: check-am
 +all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 +installdirs:
 +      for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(libscifunctions_manager_la_includedir)"; do \
 +        test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 +      done
 +install: install-am
 +install-exec: install-exec-am
 +install-data: install-data-am
 +uninstall: uninstall-am
 +
 +install-am: all-am
 +      @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 +
 +installcheck: installcheck-am
 +install-strip:
 +      $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 +        install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 +        `test -z '$(STRIP)' || \
 +          echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 +mostlyclean-generic:
 +
 +clean-generic:
 +
 +distclean-generic:
 +      -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 +      -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 +
 +maintainer-clean-generic:
 +      @echo "This command is intended for maintainers to use"
 +      @echo "it deletes files that may require special tools to rebuild."
 +clean: clean-am
 +
 +clean-am: clean-checkPROGRAMS clean-generic clean-libtool \
 +      clean-pkglibLTLIBRARIES mostlyclean-am
 +
 +distclean: distclean-am
 +      -rm -rf ./$(DEPDIR)
 +      -rm -f Makefile
 +distclean-am: clean-am distclean-compile distclean-generic \
 +      distclean-tags
 +
 +dvi: dvi-am
 +
 +dvi-am:
 +
 +html: html-am
 +
 +html-am:
 +
 +info: info-am
 +
 +info-am:
 +
 +install-data-am: install-libscifunctions_manager_la_includeHEADERS
 +
 +install-dvi: install-dvi-am
 +
 +install-dvi-am:
 +
 +install-exec-am: install-pkglibLTLIBRARIES
 +
 +install-html: install-html-am
 +
 +install-html-am:
 +
 +install-info: install-info-am
 +
 +install-info-am:
 +
 +install-man:
 +
 +install-pdf: install-pdf-am
 +
 +install-pdf-am:
 +
 +install-ps: install-ps-am
 +
 +install-ps-am:
 +
 +installcheck-am:
 +
 +maintainer-clean: maintainer-clean-am
 +      -rm -rf ./$(DEPDIR)
 +      -rm -f Makefile
 +maintainer-clean-am: distclean-am maintainer-clean-generic
 +
 +mostlyclean: mostlyclean-am
 +
 +mostlyclean-am: mostlyclean-compile mostlyclean-generic \
 +      mostlyclean-libtool
 +
 +pdf: pdf-am
 +
 +pdf-am:
 +
 +ps: ps-am
 +
 +ps-am:
 +
 +uninstall-am: uninstall-libscifunctions_manager_la_includeHEADERS \
 +      uninstall-pkglibLTLIBRARIES
 +
 +.MAKE: check-am install-am install-strip
 +
 +.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
 +      clean-checkPROGRAMS clean-generic clean-libtool \
 +      clean-pkglibLTLIBRARIES ctags distclean distclean-compile \
 +      distclean-generic distclean-libtool distclean-tags distdir dvi \
 +      dvi-am html html-am info info-am install install-am \
 +      install-data install-data-am install-dvi install-dvi-am \
 +      install-exec install-exec-am install-html install-html-am \
 +      install-info install-info-am \
 +      install-libscifunctions_manager_la_includeHEADERS install-man \
 +      install-pdf install-pdf-am install-pkglibLTLIBRARIES \
 +      install-ps install-ps-am install-strip installcheck \
 +      installcheck-am installdirs maintainer-clean \
 +      maintainer-clean-generic mostlyclean mostlyclean-compile \
 +      mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 +      tags uninstall uninstall-am \
 +      uninstall-libscifunctions_manager_la_includeHEADERS \
 +      uninstall-pkglibLTLIBRARIES
 +
 +
 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
Simple merge
Simple merge
@@@ -5,11 -5,11 +5,11 @@@
  # Copyright (C) DIGITEO - 2009 - Sylvestre Ledru
  # Copyright (C) DIGITEO - 2009 - Pierre MARECHAL
  # Copyright (C) DIGITEO - 2010 - Clément DAVID
--# 
++#
  # 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-en.txt
  #
  
@@@ -51,7 -51,8 +51,8 @@@ src/c/InitWaitBar.c 
  src/c/InitProgressionBar.c \
  src/c/CreateUIContextMenu.c \
  src/c/UicontrolStyleToString.c \
+ src/c/checkColorRange.c \
 -src/c/messageboxoptions.c 
 +src/c/messageboxoptions.c
  
  GUI_CPP_SOURCES = src/cpp/InitUIMenu.cpp \
  src/jni/CallScilabBridge.cpp \
@@@ -271,7 -261,7 +272,7 @@@ libscigui_disable_la_SOURCES = $(GUI_DI
  pkglib_LTLIBRARIES = libscigui-disable.la
  
  if GUI
--pkglib_LTLIBRARIES += libscigui.la 
++pkglib_LTLIBRARIES += libscigui.la
  endif
  
  libscigui_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION) $(LD_FLAGS)  $(X_LIBS) $(X_EXTRA_LIBS)
  # Copyright (C) DIGITEO - 2009 - Sylvestre Ledru
  # Copyright (C) DIGITEO - 2009 - Pierre MARECHAL
  # Copyright (C) DIGITEO - 2010 - Clément DAVID
--# 
++#
  # 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-en.txt
  #
  
@@@ -72,7 -72,7 +72,7 @@@ DIST_COMMON = $(srcdir)/Makefile.am $(s
  
  # With --enable-compilation-tests, launch java unitary tests
  @COMPILATION_TESTS_TRUE@am__append_2 = test
--@GUI_TRUE@am__append_3 = libscigui.la 
++@GUI_TRUE@am__append_3 = libscigui.la
  subdir = modules/gui
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
@@@ -143,8 -144,9 +144,9 @@@ am__objects_3 = libscigui_la-TerminateG
        libscigui_la-InitWaitBar.lo libscigui_la-InitProgressionBar.lo \
        libscigui_la-CreateUIContextMenu.lo \
        libscigui_la-UicontrolStyleToString.lo \
+       libscigui_la-checkColorRange.lo \
        libscigui_la-messageboxoptions.lo
 -am__objects_3 = libscigui_la-sci_x_choice.lo libscigui_la-gw_gui.lo \
 +am__objects_4 = libscigui_la-sci_x_choice.lo libscigui_la-gw_gui.lo \
        libscigui_la-sci_x_mdialog.lo libscigui_la-sci_x_dialog.lo \
        libscigui_la-sci_x_choose.lo \
        libscigui_la-sci_x_choose_modeless.lo \
@@@ -625,7 -621,8 +627,8 @@@ src/c/InitWaitBar.c 
  src/c/InitProgressionBar.c \
  src/c/CreateUIContextMenu.c \
  src/c/UicontrolStyleToString.c \
+ src/c/checkColorRange.c \
 -src/c/messageboxoptions.c 
 +src/c/messageboxoptions.c
  
  GUI_CPP_SOURCES = src/cpp/InitUIMenu.cpp \
  src/jni/CallScilabBridge.cpp \
@@@ -2,10 -2,12 +2,12 @@@
  <menubar>
  
     <!-- All "main" menus are disabled when created and then enabled in scilab.start file after all macros are loaded -->
+    <!-- The accelerator can be "control shift A" or "control A" or "meta A" or "OSSCKEY A" where oskey means "OS ShortCut key"
+       and is replaced by the good key (control for Unix/Windows OS and meta for Mac) -->
 - 
 +
     <!-- File menu -->
 -   <menu label="&amp;File" enabled="false">
 -        <submenu label="&amp;Execute..." accelerator="OSSCKEY E">
 +   <menu label="&amp;File" enabled="true">
 +        <submenu label="&amp;Execute...">
              <callback
              instruction='
                %fileToExec = uigetfile("*.sc*", "", gettext("Select a file to execute"));
      </menu>
  
      <!-- Edit menu -->
 -    <menu label="&amp;Edit" enabled="false">
 +    <menu label="&amp;Edit" enabled="true">
-         <submenu label="C&amp;ut">
+         <submenu label="C&amp;ut" accelerator="OSSCKEY X">
              <callback instruction='org.scilab.modules.gui.bridge.CallScilabBridge.cutConsoleSelection' type="3"/>
          </submenu>
-         <submenu label="&amp;Copy">
+         <submenu label="&amp;Copy" accelerator="OSSCKEY C">
              <callback instruction='org.scilab.modules.gui.bridge.CallScilabBridge.copyConsoleSelection' type="3"/>
          </submenu>
-         <submenu label="&amp;Paste">
+         <submenu label="&amp;Paste" accelerator="OSSCKEY V">
              <callback instruction='org.scilab.modules.gui.bridge.CallScilabBridge.pasteClipboardIntoConsole' type="3"/>
          </submenu>
          <separator/>
      </menu>
  
      <!-- Help menu -->
 -    <menu label="&amp;?" enabled="false">
 +    <menu label="&amp;?" enabled="true">
-         <submenu label="Scilab &amp;Help">
+         <submenu label="Scilab &amp;Help" accelerator="F1">
              <callback instruction='help();' type="0"/>
          </submenu>
          <separator/>
@@@ -1,16 -1,17 +1,17 @@@
  /*
-  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-  * Copyright (C) 2005 - INRIA - Allan CORNET
-  * Copyright (C) 2008 - INRIA - Vincent COUVERT
-  * 
-  * 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    
-  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
-  *
-  */
-  
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2005 - INRIA - Allan CORNET
+ * Copyright (C) 2008 - INRIA - Vincent COUVERT
+ * Copyright (C) 2010 - DIGITEO - Vincent COUVERT
 -* 
++*
+ * 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-en.txt
+ *
+ */
  #include <string.h>
  #include <stdlib.h>
  #include <stdio.h>
  /*--------------------------------------------------------------------------*/
  int sci_ClipBoard(char *fname,unsigned long l)
  {
-   static int l1,n1,m1;
-   char *param1=NULL,*param2=NULL;
+     static int l1,n1,m1;
+     char *param1=NULL,*param2=NULL;
  
-   Rhs=Max(0,Rhs);
-   CheckRhs(0,2);
-   CheckLhs(0,1);
+     Rhs=Max(0,Rhs);
+     CheckRhs(0,2);
+     CheckLhs(0,1);
  
-   if ( getScilabMode() != SCILAB_NWNI )
+     if ( getScilabMode() != SCILAB_NWNI )
      {
-       /*--------------------*/
-       /* clipboard("paste") */
-       /*--------------------*/
- &n