merge ast/system_env interface on Configvariable in one file, configvariable_interface 91/15391/4
Antoine ELIAS [Thu, 16 Oct 2014 14:25:23 +0000 (16:25 +0200)]
Change-Id: I24ddb010236fb00e70bae02068fb45b55ceb4619

111 files changed:
scilab/modules/ast/Makefile.am
scilab/modules/ast/ast.vcxproj
scilab/modules/ast/ast.vcxproj.filters
scilab/modules/ast/includes/system_env/configvariable.hxx
scilab/modules/ast/includes/system_env/configvariable_interface.h [new file with mode: 0644]
scilab/modules/ast/includes/system_env/formatmode.h [deleted file]
scilab/modules/ast/includes/system_env/promptmode.h [deleted file]
scilab/modules/ast/includes/system_env/reference_modules.h [deleted file]
scilab/modules/ast/includes/system_env/sci_ieee.h [deleted file]
scilab/modules/ast/includes/system_env/sci_mode.h [deleted file]
scilab/modules/ast/includes/system_env/sci_simpMode.h [deleted file]
scilab/modules/ast/includes/system_env/warningmode.h [deleted file]
scilab/modules/ast/src/c/operations/matrix_division.c
scilab/modules/ast/src/c/operations/matrix_power.c
scilab/modules/ast/src/cpp/operations/types_divide.cpp
scilab/modules/ast/src/cpp/system_env/configvariable.cpp
scilab/modules/ast/src/cpp/system_env/configvariable_interface.cpp [new file with mode: 0644]
scilab/modules/ast/src/cpp/system_env/formatmode.cpp [deleted file]
scilab/modules/ast/src/cpp/system_env/promptmode.cpp [deleted file]
scilab/modules/ast/src/cpp/system_env/reference_modules.cpp [deleted file]
scilab/modules/ast/src/cpp/system_env/sci_ieee.cpp [deleted file]
scilab/modules/ast/src/cpp/system_env/sci_mode.cpp [deleted file]
scilab/modules/ast/src/cpp/system_env/sci_simpMode.cpp [deleted file]
scilab/modules/ast/src/cpp/system_env/warningmode.cpp [deleted file]
scilab/modules/call_scilab/src/c/call_scilab.c
scilab/modules/console/sci_gateway/cpp/sci_iswaitingforinput.cpp
scilab/modules/console/src/c/GetCommandLine.c
scilab/modules/console/src/c/InitializeConsole.c
scilab/modules/console/src/c/clc.c
scilab/modules/console/src/c/more.c
scilab/modules/console/src/c/prompt.c
scilab/modules/console/src/c/scilines.c
scilab/modules/console/src/c/tohome.c
scilab/modules/console/src/cpp/scilabRead.cpp
scilab/modules/core/sci_gateway/cpp/sci_exit.cpp
scilab/modules/core/sci_gateway/cpp/sci_getscilabmode.cpp
scilab/modules/core/sci_gateway/cpp/sci_warning.cpp
scilab/modules/core/src/c/dynamic_gateways.c
scilab/modules/core/src/c/dynamic_tclsci.c
scilab/modules/core/src/c/getval.c
scilab/modules/core/src/c/getversion.c
scilab/modules/core/src/c/signal_mgmt.c
scilab/modules/core/src/c/suspendProcess.c
scilab/modules/core/src/c/texmacs.c
scilab/modules/core/src/c/version.c
scilab/modules/core/src/c/xscion.c
scilab/modules/differential_equations/sci_gateway/cpp/sci_int2d.cpp
scilab/modules/differential_equations/sci_gateway/cpp/sci_int3d.cpp
scilab/modules/differential_equations/sci_gateway/cpp/sci_intg.cpp
scilab/modules/differential_equations/sci_gateway/cpp/sci_ode.cpp
scilab/modules/differential_equations/sci_gateway/cpp/sci_odedc.cpp
scilab/modules/differential_equations/src/cpp/checkodeerror.cpp
scilab/modules/dynamic_link/src/cpp/dynamic_link.cpp
scilab/modules/external_objects_java/sci_gateway/cpp/sci_jconvMatrixMethod.cpp
scilab/modules/fileio/sci_gateway/cpp/sci_createdir.cpp
scilab/modules/fileio/sci_gateway/cpp/sci_mclearerr.cpp
scilab/modules/fileio/sci_gateway/cpp/sci_meof.cpp
scilab/modules/fileio/sci_gateway/cpp/sci_mfprintf.cpp
scilab/modules/fileio/sci_gateway/cpp/sci_removedir.cpp
scilab/modules/fileio/src/c/scicurdir.c
scilab/modules/fileio/src/cpp/mclose.cpp
scilab/modules/fileio/src/cpp/mopen.cpp
scilab/modules/fileio/src/cpp/mput.cpp
scilab/modules/functions/sci_gateway/cpp/sci_exec.cpp
scilab/modules/functions_manager/src/cpp/dynamic_modules.cpp
scilab/modules/functions_manager/src/cpp/funcmanager.cpp
scilab/modules/graphics/sci_gateway/c/sci_relocate_handle.c
scilab/modules/graphics/sci_gateway/cpp/sci_xset.cpp
scilab/modules/graphics/src/c/getHandleProperty/set_line_style_property.c
scilab/modules/gui/sci_gateway/c/sci_ClipBoard.c
scilab/modules/gui/sci_gateway/c/sci_delmenu.c
scilab/modules/gui/sci_gateway/c/sci_mpopup.c
scilab/modules/gui/sci_gateway/c/sci_setmenu.c
scilab/modules/gui/sci_gateway/c/sci_toolbar.c
scilab/modules/gui/sci_gateway/c/sci_unsetmenu.c
scilab/modules/gui/sci_gateway/cpp/sci_printfigure.cpp
scilab/modules/gui/sci_gateway/cpp/sci_toprint.cpp
scilab/modules/gui/src/c/InitializeGUI.c
scilab/modules/gui/src/cpp/InitUIMenu.cpp
scilab/modules/hdf5/sci_gateway/cpp/sci_export_to_hdf5.cpp
scilab/modules/history_browser/src/cpp/CommandHistory_Wrap.cpp
scilab/modules/interpolation/sci_gateway/cpp/sci_lsq_splin.cpp
scilab/modules/jvm/sci_gateway/cpp/sci_system_getproperty.cpp
scilab/modules/jvm/src/c/createMainScilabObject.c
scilab/modules/jvm/src/c/loadClasspath.c
scilab/modules/linear_algebra/sci_gateway/cpp/sci_inv.cpp
scilab/modules/localization/sci_gateway/cpp/sci_setdefaultlanguage.cpp
scilab/modules/localization/sci_gateway/cpp/sci_setlanguage.cpp
scilab/modules/optimization/sci_gateway/c/sci_qp_solve.c
scilab/modules/optimization/src/c/sp.c
scilab/modules/optimization/src/cpp/checkoptimerror.cpp
scilab/modules/output_stream/src/c/msgs.c
scilab/modules/output_stream/src/c/sciprint.c
scilab/modules/output_stream/src/cpp/scilabWrite.cpp
scilab/modules/randlib/src/c/clcg4.c
scilab/modules/spreadsheet/src/c/csvRead.c
scilab/modules/startup/src/cpp/scilab.cpp
scilab/modules/string/sci_gateway/cpp/sci_ascii.cpp
scilab/modules/string/src/c/pcre_private.c
scilab/modules/tclsci/sci_gateway/c/gw_tclsci.c
scilab/modules/tclsci/src/c/EnvTclTk.c
scilab/modules/tclsci/src/c/InitTclTk.c
scilab/modules/tclsci/src/c/InitializeTclTk.c
scilab/modules/umfpack/sci_gateway/c/sci_umf_lufact.c
scilab/modules/windows_tools/sci_gateway/cpp/sci_consolebox.cpp
scilab/modules/windows_tools/src/c/TerminateWindows_tools.c
scilab/modules/windows_tools/src/c/WinConsole.c
scilab/modules/windows_tools/src/c/scilab_windows/FocusOnConsole.c
scilab/modules/windows_tools/src/c/scilab_windows/scilab_main.c
scilab/modules/windows_tools/src/c/scilab_windows/spawncommand.c
scilab/modules/xcos/sci_gateway/cpp/sci_closeXcosFromScilab.cpp

index 6f21794..db25336 100644 (file)
@@ -94,16 +94,10 @@ libsciast_la_SOURCES = \
     src/cpp/system_env/context_get.cpp \
     src/cpp/system_env/configvariable.cpp \
     src/cpp/system_env/sci_path.cpp \
-    src/cpp/system_env/sci_ieee.cpp \
     src/cpp/system_env/lasterror.cpp \
-    src/cpp/system_env/sci_mode.cpp \
-    src/cpp/system_env/promptmode.cpp \
-    src/cpp/system_env/sci_simpMode.cpp \
     src/cpp/system_env/home.cpp \
     src/cpp/system_env/sci_tmpdir.cpp \
-    src/cpp/system_env/reference_modules.cpp \
-    src/cpp/system_env/formatmode.cpp \
-    src/cpp/system_env/warningmode.cpp
+    src/cpp/system_env/configvariable_interface.cpp
 
 if ENABLE_DEBUG
 libsciast_la_SOURCES += src/cpp/types/inspector.cpp
@@ -306,22 +300,15 @@ includes/symbol/context.hxx \
 includes/symbol/variables.hxx \
 includes/symbol/libraries.hxx \
 includes/system_env/setenvvar.h \
-includes/system_env/sci_simpMode.h \
 includes/system_env/dynamic_module.h \
-includes/system_env/reference_modules.h \
 includes/system_env/sci_tmpdir.h \
 includes/system_env/context_get.h \
 includes/system_env/lasterror.h \
-includes/system_env/promptmode.h \
 includes/system_env/sci_path.h \
-includes/system_env/sci_mode.h \
-includes/system_env/sci_ieee.h \
-includes/system_env/formatmode.h \
 includes/system_env/sci_home.h \
-includes/system_env/warningmode.h \
 includes/system_env/configvariable.hxx \
-includes/system_env/home.h
-
+includes/system_env/home.h \
+includes/system_env/configvariable_interface.h
 
 if BUILD_PARSER
 
index 3fb5e56..11fc1af 100644 (file)
@@ -360,21 +360,15 @@ lib /DEF:"$(ProjectDir)fileio_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform
     <ClInclude Include="includes\symbol\symbol.hxx" />
     <ClInclude Include="includes\symbol\variables.hxx" />
     <ClInclude Include="includes\system_env\configvariable.hxx" />
+    <ClInclude Include="includes\system_env\configvariable_interface.h" />
     <ClInclude Include="includes\system_env\context_get.h" />
     <ClInclude Include="includes\system_env\dynamic_module.h" />
-    <ClInclude Include="includes\system_env\formatmode.h" />
     <ClInclude Include="includes\system_env\home.h" />
     <ClInclude Include="includes\system_env\lasterror.h" />
-    <ClInclude Include="includes\system_env\promptmode.h" />
-    <ClInclude Include="includes\system_env\reference_modules.h" />
     <ClInclude Include="includes\system_env\sci_home.h" />
-    <ClInclude Include="includes\system_env\sci_ieee.h" />
-    <ClInclude Include="includes\system_env\sci_mode.h" />
     <ClInclude Include="includes\system_env\sci_path.h" />
-    <ClInclude Include="includes\system_env\sci_simpMode.h" />
     <ClInclude Include="includes\system_env\sci_tmpdir.h" />
     <ClInclude Include="includes\system_env\setenvvar.h" />
-    <ClInclude Include="includes\system_env\warningmode.h" />
     <ClInclude Include="includes\types\alltypes.hxx" />
     <ClInclude Include="includes\types\arrayof.hxx" />
     <ClInclude Include="includes\types\bool.hxx" />
@@ -457,21 +451,15 @@ lib /DEF:"$(ProjectDir)fileio_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform
     <ClCompile Include="src\cpp\symbol\context.cpp" />
     <ClCompile Include="src\cpp\symbol\symbol.cpp" />
     <ClCompile Include="src\cpp\system_env\configvariable.cpp" />
+    <ClCompile Include="src\cpp\system_env\configvariable_interface.cpp" />
     <ClCompile Include="src\cpp\system_env\context_get.cpp" />
     <ClCompile Include="src\cpp\system_env\dynamic_module.cpp" />
-    <ClCompile Include="src\cpp\system_env\formatmode.cpp" />
     <ClCompile Include="src\cpp\system_env\home.cpp" />
     <ClCompile Include="src\cpp\system_env\lasterror.cpp" />
-    <ClCompile Include="src\cpp\system_env\promptmode.cpp" />
-    <ClCompile Include="src\cpp\system_env\reference_modules.cpp" />
     <ClCompile Include="src\cpp\system_env\sci_home.cpp" />
-    <ClCompile Include="src\cpp\system_env\sci_ieee.cpp" />
-    <ClCompile Include="src\cpp\system_env\sci_mode.cpp" />
     <ClCompile Include="src\cpp\system_env\sci_path.cpp" />
-    <ClCompile Include="src\cpp\system_env\sci_simpMode.cpp" />
     <ClCompile Include="src\cpp\system_env\sci_tmpdir.cpp" />
     <ClCompile Include="src\cpp\system_env\setenvvar.cpp" />
-    <ClCompile Include="src\cpp\system_env\warningmode.cpp" />
     <ClCompile Include="src\cpp\types\arrayof.cpp" />
     <ClCompile Include="src\cpp\types\bool.cpp" />
     <ClCompile Include="src\cpp\types\callable.cpp" />
@@ -524,4 +512,4 @@ lib /DEF:"$(ProjectDir)fileio_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
index e53d949..e976772 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Library Include="..\..\bin\blasplus.lib" />
     <ClInclude Include="includes\system_env\dynamic_module.h">
       <Filter>Header Files\system_env</Filter>
     </ClInclude>
-    <ClInclude Include="includes\system_env\formatmode.h">
-      <Filter>Header Files\system_env</Filter>
-    </ClInclude>
     <ClInclude Include="includes\system_env\home.h">
       <Filter>Header Files\system_env</Filter>
     </ClInclude>
     <ClInclude Include="includes\system_env\lasterror.h">
       <Filter>Header Files\system_env</Filter>
     </ClInclude>
-    <ClInclude Include="includes\system_env\promptmode.h">
-      <Filter>Header Files\system_env</Filter>
-    </ClInclude>
-    <ClInclude Include="includes\system_env\reference_modules.h">
-      <Filter>Header Files\system_env</Filter>
-    </ClInclude>
     <ClInclude Include="includes\system_env\sci_home.h">
       <Filter>Header Files\system_env</Filter>
     </ClInclude>
-    <ClInclude Include="includes\system_env\sci_ieee.h">
-      <Filter>Header Files\system_env</Filter>
-    </ClInclude>
-    <ClInclude Include="includes\system_env\sci_mode.h">
-      <Filter>Header Files\system_env</Filter>
-    </ClInclude>
     <ClInclude Include="includes\system_env\sci_path.h">
       <Filter>Header Files\system_env</Filter>
     </ClInclude>
-    <ClInclude Include="includes\system_env\sci_simpMode.h">
-      <Filter>Header Files\system_env</Filter>
-    </ClInclude>
     <ClInclude Include="includes\system_env\sci_tmpdir.h">
       <Filter>Header Files\system_env</Filter>
     </ClInclude>
-    <ClInclude Include="includes\system_env\warningmode.h">
-      <Filter>Header Files\system_env</Filter>
-    </ClInclude>
     <ClInclude Include="includes\symbol\context.hxx">
       <Filter>Header Files\symbol</Filter>
     </ClInclude>
     <ClInclude Include="includes\exps\daxpyexp.hxx">
       <Filter>Header Files\exps</Filter>
     </ClInclude>
+    <ClInclude Include="includes\system_env\configvariable_interface.h">
+      <Filter>Header Files\system_env</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\cpp\ast\debugvisitor.cpp">
     <ClCompile Include="src\cpp\system_env\dynamic_module.cpp">
       <Filter>Source Files\system_env</Filter>
     </ClCompile>
-    <ClCompile Include="src\cpp\system_env\formatmode.cpp">
-      <Filter>Source Files\system_env</Filter>
-    </ClCompile>
     <ClCompile Include="src\cpp\system_env\home.cpp">
       <Filter>Source Files\system_env</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\system_env\lasterror.cpp">
       <Filter>Source Files\system_env</Filter>
     </ClCompile>
-    <ClCompile Include="src\cpp\system_env\promptmode.cpp">
-      <Filter>Source Files\system_env</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\system_env\reference_modules.cpp">
-      <Filter>Source Files\system_env</Filter>
-    </ClCompile>
     <ClCompile Include="src\cpp\system_env\sci_home.cpp">
       <Filter>Source Files\system_env</Filter>
     </ClCompile>
-    <ClCompile Include="src\cpp\system_env\sci_ieee.cpp">
-      <Filter>Source Files\system_env</Filter>
-    </ClCompile>
-    <ClCompile Include="src\cpp\system_env\sci_mode.cpp">
-      <Filter>Source Files\system_env</Filter>
-    </ClCompile>
     <ClCompile Include="src\cpp\system_env\sci_path.cpp">
       <Filter>Source Files\system_env</Filter>
     </ClCompile>
-    <ClCompile Include="src\cpp\system_env\sci_simpMode.cpp">
-      <Filter>Source Files\system_env</Filter>
-    </ClCompile>
     <ClCompile Include="src\cpp\system_env\sci_tmpdir.cpp">
       <Filter>Source Files\system_env</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\system_env\setenvvar.cpp">
       <Filter>Source Files\system_env</Filter>
     </ClCompile>
-    <ClCompile Include="src\cpp\system_env\warningmode.cpp">
-      <Filter>Source Files\system_env</Filter>
-    </ClCompile>
     <ClCompile Include="src\cpp\parse\parser.cpp">
       <Filter>Source Files\parse</Filter>
     </ClCompile>
     <ClCompile Include="src\cpp\operations\types_dotdivide.cpp">
       <Filter>Source Files\operations</Filter>
     </ClCompile>
+    <ClCompile Include="src\cpp\system_env\configvariable_interface.cpp">
+      <Filter>Source Files\system_env</Filter>
+    </ClCompile>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
index 2db858a..433f985 100644 (file)
@@ -333,13 +333,16 @@ public :
     static void setCurrentClcg4(int _currentClcg4);
     static int getCurrentClcg4();
 
-    //Start finish flag
+    //Start and end finish flag
 private :
-    static bool m_bStartFinished;
+    static bool m_bStartProcessing;
+    static bool m_bEndProcessing;
 
 public :
-    static void setStartFinished(bool _bStartFinished);
-    static bool getStartFinished();
+    static void setStartProcessing(bool _bStartProcessing);
+    static bool getStartProcessing();
+    static void setEndProcessing(bool _bEndFinished);
+    static bool getEndProcessing();
 
     // ieee
 private :
diff --git a/scilab/modules/ast/includes/system_env/configvariable_interface.h b/scilab/modules/ast/includes/system_env/configvariable_interface.h
new file mode 100644 (file)
index 0000000..126b641
--- /dev/null
@@ -0,0 +1,73 @@
+/*
+*  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+*  Copyright (C) 2014 - Scilab Enterprises - 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
+*  http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+*
+*/
+
+#ifndef __CONFIGVARIABLE_INTERFACE_H__
+#define __CONFIGVARIABLE_INTERFACE_H__
+
+#include <string.h>
+#include <wchar.h>
+#include "dynlib_ast.h"
+
+#define PROMPTMODE_NORMAL   0   //show new values but not commands
+#define PROMPTMODE_SILENT   -1  //hide all
+#define PROMPTMODE_PROMPT   2   //show all
+#define PROMPTMODE_EXEC     1   //show all
+#define PROMPTMODE_EXEC3    3   //show all
+#define PROMPTMODE_STEP     4   //later ...
+#define PROMPTMODE_STEP7    7   //later ...
+
+#define SILENT_ERROR        1
+#define VERBOSE_ERROR       0
+
+typedef enum
+{
+    SCILAB_API = 1, /* Scilab is launch as an API */
+    SCILAB_STD, /* The standard Scilab (gui, plot ...) */
+    SCILAB_NW, /* Scilab in command line with the plots */
+    SCILAB_NWNI /* Scilab in command line without any graphics. What not mandataroy here */
+} scilabMode;
+
+EXTERN_AST int getSimpMode(void);
+EXTERN_AST void setSimpMode(int);
+EXTERN_AST int getStartProcessing();
+EXTERN_AST int getEndProcessing();
+
+EXTERN_AST void setFormatSize(int _iFormatSize);
+EXTERN_AST int getFormatSize(void);
+EXTERN_AST void setFormatMode(int _iFormatMode);
+EXTERN_AST int getFormatMode(void);
+EXTERN_AST void setConsoleWidth(int _iConsoleWidth);
+EXTERN_AST int getConsoleWidth(void);
+EXTERN_AST void setConsoleLines(int _iConsoleLines);
+EXTERN_AST int getConsoleLines(void);
+
+EXTERN_AST int getPromptMode(void);
+EXTERN_AST void setPromptMode(int _iMode);
+EXTERN_AST int isPromptShow(void);
+EXTERN_AST int getSilentError(void);
+EXTERN_AST void setSilentError(int _iSilent);
+
+EXTERN_AST int getieee(void);
+EXTERN_AST void setieee(int);
+
+EXTERN_AST scilabMode getScilabMode(void);
+EXTERN_AST void setScilabMode(scilabMode newmode);
+EXTERN_AST const char * getScilabModeString(void);
+
+EXTERN_AST int getWarningMode(void);
+EXTERN_AST void setWarningMode(int _iMode);
+
+EXTERN_AST int checkReferenceModule(const wchar_t* _module);
+EXTERN_AST void addReferenceModule(const wchar_t* _module);
+EXTERN_AST void removeReferenceModule(const wchar_t* _module);
+
+#endif /* !__CONFIGVARIABLE_INTERFACE_H__ */
diff --git a/scilab/modules/ast/includes/system_env/formatmode.h b/scilab/modules/ast/includes/system_env/formatmode.h
deleted file mode 100644 (file)
index 4124569..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-*  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-*  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
-*  http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
-*
-*/
-
-#ifndef __FORMATMODE_H__
-#define __FORMATMODE_H__
-
-#include "dynlib_ast.h"
-
-EXTERN_AST void setFormatSize(int _iFormatSize);
-EXTERN_AST int getFormatSize(void);
-EXTERN_AST void setFormatMode(int _iFormatMode);
-EXTERN_AST int getFormatMode(void);
-EXTERN_AST void setConsoleWidth(int _iConsoleWidth);
-EXTERN_AST int getConsoleWidth(void);
-EXTERN_AST void setConsoleLines(int _iConsoleLines);
-EXTERN_AST int getConsoleLines(void);
-
-#endif /* !__FORMATMODE_H__ */
\ No newline at end of file
diff --git a/scilab/modules/ast/includes/system_env/promptmode.h b/scilab/modules/ast/includes/system_env/promptmode.h
deleted file mode 100644 (file)
index 1de6461..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-*  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-*  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
-*  http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
-*
-*/
-
-#ifndef __PROMPTMODE_H__
-#define __PROMPTMODE_H__
-
-#include "dynlib_ast.h"
-
-#define PROMPTMODE_NORMAL   0   //show new values but not commands
-#define PROMPTMODE_SILENT   -1  //hide all
-#define PROMPTMODE_PROMPT   2   //show all
-#define PROMPTMODE_EXEC     1   //show all
-#define PROMPTMODE_EXEC3    3   //show all
-#define PROMPTMODE_STEP     4   //later ...
-#define PROMPTMODE_STEP7    7   //later ...
-
-#define SILENT_ERROR        1
-#define VERBOSE_ERROR       0
-
-EXTERN_AST int getPromptMode(void);
-EXTERN_AST void setPromptMode(int _iMode);
-EXTERN_AST int isPromptShow(void);
-
-EXTERN_AST int getSilentError(void);
-EXTERN_AST void setSilentError(int _iSilent);
-
-#endif // ! __PROMPTMODE_H__
diff --git a/scilab/modules/ast/includes/system_env/reference_modules.h b/scilab/modules/ast/includes/system_env/reference_modules.h
deleted file mode 100644 (file)
index eb0bdae..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-*  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-*  Copyright (C) 2014 - Scilab Enterprises - 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
-*  http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
-*
-*/
-
-#ifndef __REFERENCE_MODULES_H__
-#define __REFERENCE_MODULES_H__
-
-#include "dynlib_ast.h"
-
-EXTERN_AST int checkReferenceModule(const wchar_t* _module);
-EXTERN_AST void addReferenceModule(const wchar_t* _module);
-EXTERN_AST void removeReferenceModule(const wchar_t* _module);
-
-#endif // ! __REFERENCE_MODULES_H__
diff --git a/scilab/modules/ast/includes/system_env/sci_ieee.h b/scilab/modules/ast/includes/system_env/sci_ieee.h
deleted file mode 100644 (file)
index 6cf0b0d..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-*  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-*  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
-*  http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
-*
-*/
-
-#ifndef __SCI_IEEE_H__
-#define __SCI_IEEE_H__
-
-#include "dynlib_ast.h"
-
-EXTERN_AST int getieee(void);
-EXTERN_AST void setieee(int);
-
-#endif // ! __SCI_IEEE_H__
diff --git a/scilab/modules/ast/includes/system_env/sci_mode.h b/scilab/modules/ast/includes/system_env/sci_mode.h
deleted file mode 100644 (file)
index f2e49ee..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-*  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-*  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
-*  http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
-*
-*/
-
-#ifndef __SCI_MODE_H__
-#define __SCI_MODE_H__
-
-#include "dynlib_ast.h"
-
-typedef enum
-{
-    SCILAB_API = 1, /* Scilab is launch as an API */
-    SCILAB_STD, /* The standard Scilab (gui, plot ...) */
-    SCILAB_NW, /* Scilab in command line with the plots */
-    SCILAB_NWNI /* Scilab in command line without any graphics. What not mandataroy here */
-} scilabMode;
-
-EXTERN_AST scilabMode getScilabMode(void);
-EXTERN_AST void setScilabMode(scilabMode newmode);
-EXTERN_AST const char * getScilabModeString(void);
-
-#endif /* ! __SCI_MODE_H__ */
diff --git a/scilab/modules/ast/includes/system_env/sci_simpMode.h b/scilab/modules/ast/includes/system_env/sci_simpMode.h
deleted file mode 100644 (file)
index 86fb3d6..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-*  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-*  Copyright (C) 2012 - Scilab Enterprises - Cedric Delamarre
-*
-*  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
-*
-*/
-
-#ifndef __SCI_SIMPMODE_H__
-#define __SCI_SIMPMODE_H__
-
-#include "dynlib_ast.h"
-
-EXTERN_AST int getSimpMode(void);
-EXTERN_AST void setSimpMode(int);
-
-#endif // ! __SCI_SIMPMODE_H__
diff --git a/scilab/modules/ast/includes/system_env/warningmode.h b/scilab/modules/ast/includes/system_env/warningmode.h
deleted file mode 100644 (file)
index 29b5e51..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-*  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-*  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
-*  http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
-*
-*/
-
-#ifndef __SCI_HOME_H__
-#define __SCI_HOME_H__
-
-#include <wchar.h>
-#include "dynlib_ast.h"
-
-EXTERN_AST int getWarningMode(void);
-EXTERN_AST void setWarningMode(int _iMode);
-
-#endif // ! __SCI_HOME_H__
index 0331369..29f3256 100644 (file)
@@ -10,7 +10,7 @@
  *
  */
 
-#include "sci_ieee.h"
+#include "configvariable_interface.h"
 #include "matrix_division.h"
 #include <string.h>
 
index d56ab8c..411a43c 100644 (file)
@@ -22,7 +22,7 @@
 #include "invert_matrix.h"
 #include "sciprint.h"
 #include "localization.h"
-#include "warningmode.h"
+#include "configvariable_interface.h"
 
 /*
 r : real part
index 80a4739..9455ea3 100644 (file)
@@ -21,7 +21,7 @@ extern "C"
 #include "sciprint.h"
 #include "localization.h"
 #include "charEncoding.h"
-#include "warningmode.h"
+#include "configvariable_interface.h"
 #include "elem_common.h"
 }
 
index 76dfabd..633de77 100644 (file)
@@ -964,16 +964,27 @@ int ConfigVariable::getCurrentClcg4()
 ** Start finish flag
 ** \{
 */
-bool ConfigVariable::m_bStartFinished = false;
+bool ConfigVariable::m_bStartProcessing = false;
+bool ConfigVariable::m_bEndProcessing = false;
 
-void ConfigVariable::setStartFinished(bool _bStartFinished)
+void ConfigVariable::setStartProcessing(bool _bStartProcessing)
 {
-    m_bStartFinished = _bStartFinished;
+    m_bStartProcessing = _bStartProcessing;
 }
 
-bool ConfigVariable::getStartFinished()
+bool ConfigVariable::getStartProcessing()
 {
-    return m_bStartFinished;
+    return m_bStartProcessing;
+}
+
+void ConfigVariable::setEndProcessing(bool _bEndProcessing)
+{
+    m_bEndProcessing = _bEndProcessing;
+}
+
+bool ConfigVariable::getEndProcessing()
+{
+    return m_bEndProcessing;
 }
 /*
 ** \}
diff --git a/scilab/modules/ast/src/cpp/system_env/configvariable_interface.cpp b/scilab/modules/ast/src/cpp/system_env/configvariable_interface.cpp
new file mode 100644 (file)
index 0000000..e25e562
--- /dev/null
@@ -0,0 +1,183 @@
+/*
+* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+* Copyright (C) 2012 - Scilab Enterprises - Cedric DELAMARRE
+*
+* 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 "configvariable.hxx"
+
+extern "C"
+{
+#include "configvariable_interface.h"
+#include "setenvvar.h"
+}
+
+int getSimpMode()
+{
+    return ConfigVariable::getSimpMode();
+}
+
+void setSimpMode(int _isimpmd)
+{
+    ConfigVariable::setSimpMode(_isimpmd);
+}
+
+int getStartProcessing()
+{
+    return ConfigVariable::getStartProcessing() ? 1 : 0;
+}
+
+int getEndProcessing()
+{
+    return ConfigVariable::getEndProcessing() ? 1 : 0;
+}
+
+void setFormatSize(int _iFormatSize)
+{
+    ConfigVariable::setFormatSize(_iFormatSize);
+}
+
+int getFormatSize(void)
+{
+    return ConfigVariable::getFormatSize();
+}
+
+void setFormatMode(int _iFormatMode)
+{
+    ConfigVariable::setFormatSize(_iFormatMode);
+}
+
+int getFormatMode(void)
+{
+    return ConfigVariable::getFormatMode();
+}
+
+void setConsoleWidth(int _iConsoleWidth)
+{
+    ConfigVariable::setConsoleWidth(_iConsoleWidth);
+}
+
+int getConsoleWidth(void)
+{
+    return ConfigVariable::getConsoleWidth();
+}
+
+void setConsoleLines(int _iConsoleLines)
+{
+    ConfigVariable::setConsoleLines(_iConsoleLines);
+}
+
+int getConsoleLines(void)
+{
+    return ConfigVariable::getConsoleLines();
+}
+
+int getPromptMode(void)
+{
+    return static_cast<int>(ConfigVariable::getPromptMode());
+}
+
+void setPromptMode(int _iMode)
+{
+    ConfigVariable::setPromptMode(_iMode);
+}
+
+int isPromptShow(void)
+{
+    return static_cast<int>(ConfigVariable::isPromptShow());
+}
+
+int getSilentError(void)
+{
+    return static_cast<int>(ConfigVariable::getSilentError());
+}
+
+void setSilentError(int _iSilent)
+{
+    ConfigVariable::setSilentError(_iSilent);
+}
+
+int getieee()
+{
+    return ConfigVariable::getIeee();
+}
+
+void setieee(int _iIeee)
+{
+    ConfigVariable::setIeee(_iIeee);
+}
+
+scilabMode getScilabMode(void)
+{
+    return static_cast<scilabMode>(ConfigVariable::getScilabMode());
+}
+
+void setScilabMode(scilabMode newmode)
+{
+    ConfigVariable::setScilabMode(static_cast<int>(newmode));
+}
+
+const char * getScilabModeString(void)
+{
+    scilabMode smMode = getScilabMode();
+    switch (smMode)
+    {
+        case SCILAB_API:
+            return "API";
+            break;
+        case SCILAB_STD:
+            return "STD";
+            break;
+        case SCILAB_NW:
+            return "NW";
+            break;
+        case SCILAB_NWNI:
+            return "NWNI";
+            break;
+        default:
+            return "STD";
+            break;
+    }
+}
+
+int getWarningMode(void)
+{
+    if (ConfigVariable::getWarningMode())
+    {
+        return 1;
+    }
+    return 0;
+}
+
+void setWarningMode(int _iMode)
+{
+    if (_iMode == 0)
+    {
+        ConfigVariable::setWarningMode(false);
+    }
+    else
+    {
+        ConfigVariable::setWarningMode(true);
+    }
+}
+
+int checkReferenceModule(const wchar_t* _module)
+{
+    return (ConfigVariable::checkReferenceModule(_module) ? 1 : 0);
+}
+
+void addReferenceModule(const wchar_t* _module)
+{
+    ConfigVariable::addReferenceModule(_module);
+}
+
+void removeReferenceModule(const wchar_t* _module)
+{
+    ConfigVariable::removeReferenceModule(_module);
+}
diff --git a/scilab/modules/ast/src/cpp/system_env/formatmode.cpp b/scilab/modules/ast/src/cpp/system_env/formatmode.cpp
deleted file mode 100644 (file)
index f5ece2c..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-*  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-*  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
-*  http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
-*
-*/
-
-#include "configvariable.hxx"
-
-extern "C"
-{
-#include "formatmode.h"
-}
-
-void setFormatSize(int _iFormatSize)
-{
-    ConfigVariable::setFormatSize(_iFormatSize);
-}
-
-int getFormatSize(void)
-{
-    return ConfigVariable::getFormatSize();
-}
-
-void setFormatMode(int _iFormatMode)
-{
-    ConfigVariable::setFormatSize(_iFormatMode);
-}
-
-int getFormatMode(void)
-{
-    return ConfigVariable::getFormatMode();
-}
-
-void setConsoleWidth(int _iConsoleWidth)
-{
-    ConfigVariable::setConsoleWidth(_iConsoleWidth);
-}
-
-int getConsoleWidth(void)
-{
-    return ConfigVariable::getConsoleWidth();
-}
-
-void setConsoleLines(int _iConsoleLines)
-{
-    ConfigVariable::setConsoleLines(_iConsoleLines);
-}
-
-int getConsoleLines(void)
-{
-    return ConfigVariable::getConsoleLines();
-}
diff --git a/scilab/modules/ast/src/cpp/system_env/promptmode.cpp b/scilab/modules/ast/src/cpp/system_env/promptmode.cpp
deleted file mode 100644 (file)
index 3118f77..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- *  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
- *  http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
- *
- */
-
-#include <stdlib.h>
-
-#include "configvariable.hxx"
-#include "arrayof.hxx"
-#include "context.hxx"
-
-extern "C"
-{
-#include "promptmode.h"
-#include "setenvvar.h"
-}
-
-
-
-int getPromptMode(void)
-{
-    return static_cast<int>(ConfigVariable::getPromptMode());
-}
-
-void setPromptMode(int _iMode)
-{
-    ConfigVariable::setPromptMode(_iMode);
-}
-
-int isPromptShow(void)
-{
-    return static_cast<int>(ConfigVariable::isPromptShow());
-}
-
-int getSilentError(void)
-{
-    return static_cast<int>(ConfigVariable::getSilentError());
-}
-
-void setSilentError(int _iSilent)
-{
-    ConfigVariable::setSilentError(_iSilent);
-}
diff --git a/scilab/modules/ast/src/cpp/system_env/reference_modules.cpp b/scilab/modules/ast/src/cpp/system_env/reference_modules.cpp
deleted file mode 100644 (file)
index 183367b..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-*  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-*  Copyright (C) 2014 - Scilab Enterprises - 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
-*  http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
-*
-*/
-
-
-#include "configvariable.hxx"
-
-extern "C"
-{
-#include "reference_modules.h"
-}
-
-int checkReferenceModule(const wchar_t* _module)
-{
-    return (ConfigVariable::checkReferenceModule(_module) ? 1 : 0);
-}
-
-void addReferenceModule(const wchar_t* _module)
-{
-    ConfigVariable::addReferenceModule(_module);
-}
-
-void removeReferenceModule(const wchar_t* _module)
-{
-    ConfigVariable::removeReferenceModule(_module);
-}
diff --git a/scilab/modules/ast/src/cpp/system_env/sci_ieee.cpp b/scilab/modules/ast/src/cpp/system_env/sci_ieee.cpp
deleted file mode 100644 (file)
index 92c18dc..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-* Copyright (C) 2012 - Scilab Enterprises - Cedric DELAMARRE
-*
-* 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 "configvariable.hxx"
-
-extern "C"
-{
-#include "sci_ieee.h"
-}
-
-int getieee()
-{
-    return ConfigVariable::getIeee();
-}
-
-void setieee(int _iIeee)
-{
-    ConfigVariable::setIeee(_iIeee);
-}
diff --git a/scilab/modules/ast/src/cpp/system_env/sci_mode.cpp b/scilab/modules/ast/src/cpp/system_env/sci_mode.cpp
deleted file mode 100644 (file)
index 0e492aa..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-*  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-*  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
-*  http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
-*
-*/
-
-#include "configvariable.hxx"
-
-extern "C"
-{
-#include "sci_mode.h"
-}
-
-scilabMode getScilabMode(void)
-{
-    return static_cast<scilabMode>(ConfigVariable::getScilabMode());
-}
-
-void setScilabMode(scilabMode newmode)
-{
-    ConfigVariable::setScilabMode(static_cast<int>(newmode));
-}
-
-const char * getScilabModeString(void)
-{
-    scilabMode smMode = getScilabMode();
-    switch (smMode)
-    {
-        case SCILAB_API:
-            return "API";
-            break;
-        case SCILAB_STD:
-            return "STD";
-            break;
-        case SCILAB_NW:
-            return "NW";
-            break;
-        case SCILAB_NWNI:
-            return "NWNI";
-            break;
-        default:
-            return "STD";
-            break;
-    }
-}
diff --git a/scilab/modules/ast/src/cpp/system_env/sci_simpMode.cpp b/scilab/modules/ast/src/cpp/system_env/sci_simpMode.cpp
deleted file mode 100644 (file)
index 60c3df8..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-* Copyright (C) 2012 - Scilab Enterprises - Cedric DELAMARRE
-*
-* 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 "configvariable.hxx"
-
-extern "C"
-{
-#include "sci_simpMode.h"
-}
-
-int getSimpMode()
-{
-    return ConfigVariable::getSimpMode();
-}
-
-void setSimpMode(int _isimpmd)
-{
-    ConfigVariable::setSimpMode(_isimpmd);
-}
diff --git a/scilab/modules/ast/src/cpp/system_env/warningmode.cpp b/scilab/modules/ast/src/cpp/system_env/warningmode.cpp
deleted file mode 100644 (file)
index ea18689..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- *  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
- *  http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
- *
- */
-
-#include <stdlib.h>
-
-#include "configvariable.hxx"
-#include "arrayof.hxx"
-#include "context.hxx"
-
-extern "C"
-{
-#include "warningmode.h"
-#include "setenvvar.h"
-}
-
-int getWarningMode(void)
-{
-    if (ConfigVariable::getWarningMode())
-    {
-        return 1;
-    }
-    return 0;
-}
-
-void setWarningMode(int _iMode)
-{
-    if (_iMode == 0)
-    {
-        ConfigVariable::setWarningMode(false);
-    }
-    else
-    {
-        ConfigVariable::setWarningMode(true);
-    }
-}
index 3b25c7d..55fe30d 100644 (file)
@@ -18,7 +18,7 @@
 #include "call_scilab.h"
 #include "lasterror.h"          /* clearInternalLastError, getInternalLastErrorValue */
 #include "sci_malloc.h"
-#include "sci_mode.h"
+#include "configvariable_interface.h"
 #include "fromc.h"
 #include "LaunchScilabSignal.h"
 #include "isdir.h"
index f5716d9..edc0d96 100644 (file)
@@ -20,7 +20,7 @@ extern "C"
 #include "localization.h"
 #include "Scierror.h"
 #include "ConsoleIsWaitingForInput.h"
-#include "sci_mode.h"
+#include "configvariable_interface.h"
 }
 /*--------------------------------------------------------------------------*/
 
index f070047..bd52e9f 100644 (file)
@@ -23,7 +23,7 @@
 #include "BOOL.h"
 #include "ConsoleRead.h"
 #include "SetConsolePrompt.h"
-#include "sci_mode.h"
+#include "configvariable_interface.h"
 #include "sci_malloc.h"
 #include "prompt.h"
 #include "HistoryManager.h"
index 4917550..e9c0d56 100644 (file)
@@ -15,7 +15,7 @@
 /*--------------------------------------------------------------------------*/
 #include <stdio.h>
 #include "InitializeConsole.h"
-#include "sci_mode.h"
+#include "configvariable_interface.h"
 #include "ScilabLinesUpdate.h"
 #include "scilines.h"
 /*--------------------------------------------------------------------------*/
index bf0db87..22013ed 100644 (file)
@@ -14,7 +14,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include "clc.h"
-#include "sci_mode.h"
+#include "configvariable_interface.h"
 #include "ClearConsole.h"
 #include "ClearConsolePart.h"
 #ifdef _MSC_VER
index 696d9b8..b566af5 100644 (file)
@@ -16,7 +16,7 @@
 #endif
 #include <stdio.h>
 #include "more.h"
-#include "sci_mode.h"
+#include "configvariable_interface.h"
 #include "localization.h"
 #include "sciprint.h"
 #include "GetCharWithoutOutput.h"
index 5648b95..3e0f8e7 100644 (file)
@@ -14,7 +14,7 @@
 #include <string.h>
 #include "prompt.h"
 #include "sciprint.h"
-#include "warningmode.h"
+#include "configvariable_interface.h"
 #include "localization.h"
 #include "sci_malloc.h"
 #include "os_strdup.h"
index 605faf5..582ae81 100644 (file)
@@ -45,7 +45,7 @@
 #include "stack-def.h"
 #ifdef _MSC_VER
 #include "../../../windows_tools/src/c/scilab_windows/console.h"
-#include "sci_mode.h"
+#include "configvariable_interface.h"
 #endif
 /*--------------------------------------------------------------------------*/
 #define DEFAULT_NUMBERS_LINES 28
index e8df400..cf6562a 100644 (file)
@@ -12,7 +12,7 @@
 /*--------------------------------------------------------------------------*/
 #include <stdlib.h>
 #include "tohome.h"
-#include "sci_mode.h"
+#include "configvariable_interface.h"
 #include "PromptToHome.h"
 #ifndef _MSC_VER
 #include "others/clrscr_nw.h"
index f5e56ce..bce8075 100644 (file)
@@ -20,7 +20,7 @@ extern "C"
 #include "prompt.h"
 #include "TermReadAndProcess.h"
 #include "os_strdup.h"
-#include "sci_mode.h"
+#include "configvariable_interface.h"
 #include "localization.h"
 #include "diary.h"
 }
index a42fa53..e43fcf7 100644 (file)
@@ -20,7 +20,7 @@ extern "C"
 #include "localization.h"
 #include "Scierror.h"
 #include "sciprint.h"
-#include "sci_mode.h"
+#include "configvariable_interface.h"
 #include "createMainScilabObject.h"
 }
 
index a1428c9..71825fb 100644 (file)
@@ -16,7 +16,7 @@
 
 extern "C"
 {
-#include "sci_mode.h"
+#include "configvariable_interface.h"
 #include "Scierror.h"
 #include "localization.h"
 #include "os_strdup.h"
index 4b60cad..cf1cefd 100644 (file)
@@ -17,7 +17,7 @@
 
 extern "C"
 {
-#include "warningmode.h"
+#include "configvariable_interface.h"
 #include "charEncoding.h"
 #include "sciprint.h"
 #include "getos.h"
index 0dae77c..03322bf 100644 (file)
@@ -14,7 +14,7 @@
 #include "dynamic_gateways.h"
 #include "gw_dynamic_generic.h"
 #include "dynamic_parallel.h"
-#include "sci_mode.h"
+#include "configvariable_interface.h"
 #include "sci_malloc.h"
 /*--------------------------------------------------------------------------*/
 /* special_functions module */
index 3d574ea..45d119b 100644 (file)
@@ -13,7 +13,7 @@
 #include "dynamic_tclsci.h"
 //#include "callDynamicGateway.h"
 #include "gw_dynamic_generic.h"
-#include "sci_mode.h"
+#include "configvariable_interface.h"
 #include "with_module.h"
 #include "sci_malloc.h"
 /*--------------------------------------------------------------------------*/
index e10900c..7458a21 100644 (file)
 #include "parserConstant.h"
 #include "sciprint.h"
 #include "localization.h"
-#include "warningmode.h"
+#include "configvariable_interface.h"
 #include "sciprint.h"
 /* Table of constant values */
 #define EXPMAX 309
index 6ec959c..599a521 100644 (file)
@@ -13,7 +13,7 @@
 #include <string.h>
 #include "getversion.h"
 #include "version.h"
-#include "sci_mode.h"
+#include "configvariable_interface.h"
 #include "scilabDefaults.h"
 #include "getenvc.h"
 #include "os_strdup.h"
index 24f86c1..1d6ebde 100644 (file)
@@ -36,7 +36,7 @@
 #include "signal_mgmt.h"
 #include "Scierror.h"
 #include "suspendProcess.h"
-#include "sci_mode.h"
+#include "configvariable_interface.h"
 #include "backtrace_print.h"
 jmp_buf jmp_env;
 
index 81c2603..c6e7fa0 100644 (file)
@@ -14,7 +14,7 @@
 #include <stdio.h>
 #include <signal.h>
 
-#include "sci_mode.h"
+#include "configvariable_interface.h"
 #include "cliPrompt.h"
 #include "cliDisplayManagement.h"
 #include "HistoryManager.h"
index 7167d0a..a397286 100644 (file)
@@ -19,7 +19,7 @@
 #include "api_scilab.h"
 #include "sciprint.h"
 #include "localization.h"
-#include "warningmode.h"
+#include "configvariable_interface.h"
 /*--------------------------------------------------------------------------*/
 #if 0 /* to debug TeXmacs interface */
 #define DATA_BEGIN  ((char) 'B')
index ff2bf49..626bf23 100644 (file)
@@ -14,7 +14,7 @@
 #endif
 #include <stdio.h>
 #include "version.h"
-#include "sci_mode.h"
+#include "configvariable_interface.h"
 #include "localization.h"
 /*--------------------------------------------------------------------------*/
 void disp_scilab_version(void)
index c3ae7ff..b44cd16 100644 (file)
@@ -10,7 +10,7 @@
  *
  */
 #include "xscion.h"
-#include "sci_mode.h"
+#include "configvariable_interface.h"
 /*--------------------------------------------------------------------------*/
 int C2F(xscion) (int *i)
 {
index 3cbe1f0..dc6cdc3 100644 (file)
@@ -25,7 +25,7 @@ extern "C"
 #include "localization.h"
 #include "Scierror.h"
 #include "scifunctions.h"
-#include "warningmode.h"
+#include "configvariable_interface.h"
 #include "sciprint.h"
 }
 
index 8f8abbf..77e6859 100644 (file)
@@ -26,7 +26,7 @@ extern "C"
 #include "localization.h"
 #include "Scierror.h"
 #include "scifunctions.h"
-#include "warningmode.h"
+#include "configvariable_interface.h"
 #include "sciprint.h"
 }
 
index b64f56a..d462857 100644 (file)
@@ -26,7 +26,7 @@ extern "C"
 #include "localization.h"
 #include "Scierror.h"
 #include "scifunctions.h"
-#include "warningmode.h"
+#include "configvariable_interface.h"
 #include "sciprint.h"
 #include "matrix_division.h"
 #include "vfinite.h"
index c4147ec..8230a80 100644 (file)
@@ -27,7 +27,7 @@ extern "C"
 #include "Scierror.h"
 #include "scifunctions.h"
 #include "elem_common.h"
-#include "warningmode.h"
+#include "configvariable_interface.h"
 #include "sciprint.h"
 #include "common_structure.h"
 #include "checkodeerror.h"
index 0aa083c..a60d8e1 100644 (file)
@@ -27,7 +27,7 @@ extern "C"
 #include "localization.h"
 #include "Scierror.h"
 #include "elem_common.h"
-#include "warningmode.h"
+#include "configvariable_interface.h"
 #include "sciprint.h"
 #include "common_structure.h"
 #include "scifunctions.h"
index 410e45a..4598bd2 100644 (file)
@@ -15,7 +15,7 @@ extern "C" {
 #include "checkodeerror.h"
 #include "sciprint.h"
 #include "localization.h"
-#include "warningmode.h"
+#include "configvariable_interface.h"
 }
 // return 0 = ok, return 1 = error, return 2 = warning
 int checkOdeError(int meth, int istate)
index 3efb762..5bfb878 100644 (file)
@@ -23,7 +23,7 @@ extern "C"
 #include "dynamic_link.h"
 #include "men_Sutils.h"
 #include "sci_malloc.h" /* MALLOC */
-#include "warningmode.h"
+#include "configvariable_interface.h"
 #include "sciprint.h"
 #include "stack-c.h"
 #include "addinter.h"
index 8e2e52a..97f853d 100644 (file)
@@ -15,7 +15,7 @@
 #include "ScilabGateway.hxx"
 
 extern "C" {
-#include "warningmode.h"
+#include "configvariable_interface.h"
 #include "Scierror.h"
 #include "gw_external_objects_java.h"
 }
index 2163425..1ea8152 100644 (file)
@@ -23,7 +23,7 @@ extern "C"
 #include "createdirectory.h"
 #include "isdir.h"
 #include "expandPathVariable.h"
-#include "warningmode.h"
+#include "configvariable_interface.h"
 #include "sciprint.h"
 #include "Scierror.h"
 #include "localization.h"
index 9732d4f..779f21c 100644 (file)
@@ -23,7 +23,7 @@ extern "C"
 #include <stdio.h>
 #include <string.h>
 #include "expandPathVariable.h"
-#include "warningmode.h"
+#include "configvariable_interface.h"
 #include "sciprint.h"
 #include "Scierror.h"
 #include "localization.h"
index 9df30ca..b5a6fe4 100644 (file)
@@ -22,7 +22,7 @@ extern "C"
 {
 #include <stdio.h>
 #include "expandPathVariable.h"
-#include "warningmode.h"
+#include "configvariable_interface.h"
 #include "sciprint.h"
 #include "Scierror.h"
 #include "localization.h"
index 8ad1eef..afb60cd 100644 (file)
@@ -28,7 +28,7 @@ extern "C"
 #include "localization.h"
 #include "Scierror.h"
 #include "sci_malloc.h"
-#include "sci_mode.h"
+#include "configvariable_interface.h"
 #include "mputl.h"
 }
 /*--------------------------------------------------------------------------*/
index 91fbec0..684beaa 100644 (file)
@@ -23,7 +23,7 @@ extern "C"
 #include "removedir.h"
 #include "isdir.h"
 #include "expandPathVariable.h"
-#include "warningmode.h"
+#include "configvariable_interface.h"
 #include "sciprint.h"
 #include "Scierror.h"
 #include "localization.h"
index 92d00c1..d86f778 100644 (file)
@@ -26,7 +26,7 @@
 #include "sci_malloc.h"
 #include "localization.h"
 #include "charEncoding.h"
-#include "warningmode.h"
+#include "configvariable_interface.h"
 #include "PATH_MAX.h"
 /*--------------------------------------------------------------------------*/
 int scichdirW(wchar_t *wcpath)
index 404ff21..4461ae0 100644 (file)
@@ -21,10 +21,10 @@ extern "C"
 #include "core_math.h" /* Min Max */
 #include "sciprint.h"
 #include "localization.h"
-#include "warningmode.h"
+#include "configvariable_interface.h"
 #include "charEncoding.h"
 
-extern int C2F(clunit)(int* , const char*, int*, int);
+    extern int C2F(clunit)(int* , const char*, int*, int);
 }
 /*--------------------------------------------------------------------------*/
 int mcloseCurrentFile()
@@ -65,14 +65,14 @@ int mclose(int _iID)
     types::File* pFile = FileManager::getFile(_iID);
     if (pFile != NULL)
     {
-        if(pFile->getFileType() == 1)
+        if (pFile->getFileType() == 1)
         {
             int iFileNum = -_iID; // -_iID to close file _iID
             const char* stFilename = ""; // file will be closed by this num
             int iMode = 0; // not used in close mode
             return C2F(clunit)(&iFileNum, stFilename, &iMode, 1L);
         }
-        else if(pFile->getFileType() == 2)
+        else if (pFile->getFileType() == 2)
         {
             int iRet = fclose(pFile->getFiledesc());
 
@@ -110,7 +110,7 @@ void C2F(mclose) (int *fd, double *res)
         break;
         default :
         {
-            if(mclose(*fd))
+            if (mclose(*fd))
             {
                 *res = -1.0;
             }
index d66e06a..48bde28 100644 (file)
@@ -22,7 +22,7 @@ extern "C"
 #include "mopen.h"
 #include "sciprint.h"
 #include "charEncoding.h"
-#include "warningmode.h"
+#include "configvariable_interface.h"
 #include "isdir.h"
 #include "localization.h"
 #include "os_wfopen.h"
index bf5ae93..006a499 100644 (file)
@@ -27,7 +27,7 @@ extern "C"
 #include "islittleendian.h"
 #include "convert_tools.h"
 #include "localization.h"
-#include "warningmode.h"
+#include "configvariable_interface.h"
 #include "charEncoding.h"
 }
 /*--------------------------------------------------------------------------*/
index 8898bc8..3b619e2 100644 (file)
@@ -60,7 +60,7 @@ types::Function::ReturnValue sci_exec(types::typed_list &in, int _iRetCount, typ
     int iID             = 0;
     Parser parser;
 
-    if (ConfigVariable::getStartFinished())
+    if (ConfigVariable::getStartProcessing())
     {
         if (ConfigVariable::getVerbose())
         {
index 92a81f6..6cf1fc9 100644 (file)
@@ -21,7 +21,7 @@ extern "C"
 #include <libxml/xpath.h>
 #include <libxml/xmlreader.h>
 #include "sci_malloc.h"
-#include "sci_mode.h"
+#include "configvariable_interface.h"
 }
 
 using namespace types;
index 39fc57e..d65dcaf 100644 (file)
@@ -24,7 +24,7 @@
 #include <libxml/xmlreader.h>
 
 #include "sci_malloc.h"
-#include "sci_mode.h"
+#include "configvariable_interface.h"
 #include "funcmanager.hxx"
 #include "configvariable.hxx"
 #include "module_declaration.hxx"
index e12d109..ad58aab 100644 (file)
@@ -24,7 +24,7 @@
 #include "localization.h"
 #include "Scierror.h"
 #include "sciprint.h"
-#include "warningmode.h"
+#include "configvariable_interface.h"
 /*--------------------------------------------------------------------------*/
 
 int sci_relocate_handle(char * fname, void *pvApiCtx)
index 99f8c7f..f1fdd04 100644 (file)
@@ -45,7 +45,7 @@ extern "C"
 #include "AxesModel.h"
 #include "getGraphicObjectProperty.h"
 #include "deleteGraphicObject.h"
-#include "warningmode.h"
+#include "configvariable_interface.h"
 #include "sciprint.h"
 }
 /*--------------------------------------------------------------------------*/
index 3afc9d0..9ef0ea0 100644 (file)
@@ -26,7 +26,7 @@
 #include "localization.h"
 #include "SetPropertyStatus.h"
 #include "sciprint.h"
-#include "warningmode.h"
+#include "configvariable_interface.h"
 
 /*------------------------------------------------------------------------*/
 int set_line_style_property(void* _pvCtx, int iObjUID, void* _pvData, int valueType, int nbRow, int nbCol)
index b6ad734..e47e2df 100644 (file)
@@ -20,7 +20,7 @@
 #include "Scierror.h"
 #include "sci_malloc.h"
 #include "sciprint.h"
-#include "sci_mode.h"
+#include "configvariable_interface.h"
 #include "localization.h"
 #include "freeArrayOfString.h"
 #include "CallClipboard.h"
index d6db49d..1461fa9 100644 (file)
@@ -17,7 +17,7 @@
 #include "localization.h"
 #include "Scierror.h"
 #include "InitUIMenu.h"
-#include "sci_mode.h"
+#include "configvariable_interface.h"
 #include "FigureList.h"
 #include "getConsoleIdentifier.h"
 /*--------------------------------------------------------------------------*/
index 9a890d9..5786726 100644 (file)
@@ -24,7 +24,7 @@
 #include "createGraphicObject.h"
 #include "graphicObjectProperties.h"
 #include "setGraphicObjectProperty.h"
-#include "warningmode.h"
+#include "configvariable_interface.h"
 #include "sciprint.h"
 /*--------------------------------------------------------------------------*/
 int sci_mpopup(char *fname, void* pvApiCtx)
index 6c16e97..29cc7a5 100644 (file)
@@ -16,7 +16,7 @@
 #include "localization.h"
 #include "Scierror.h"
 #include "InitUIMenu.h"
-#include "sci_mode.h"
+#include "configvariable_interface.h"
 #include "FigureList.h"
 #include "getConsoleIdentifier.h"
 /*--------------------------------------------------------------------------*/
index b6a0705..bf87ef3 100644 (file)
@@ -22,7 +22,7 @@
 #include "GetProperty.h"
 #include "freeArrayOfString.h"
 #include "os_strdup.h"
-#include "sci_mode.h"
+#include "configvariable_interface.h"
 #include "getGraphicObjectProperty.h"
 #include "setGraphicObjectProperty.h"
 #include "graphicObjectProperties.h"
index fa6f618..2754914 100644 (file)
@@ -17,7 +17,7 @@
 #include "localization.h"
 #include "Scierror.h"
 #include "InitUIMenu.h"
-#include "sci_mode.h"
+#include "configvariable_interface.h"
 #include "FigureList.h"
 #include "getConsoleIdentifier.h"
 /*--------------------------------------------------------------------------*/
index 8938233..99c2002 100644 (file)
@@ -19,7 +19,7 @@ extern "C"
 {
 #include "api_scilab.h"
 #include "Scierror.h"
-#include "sci_mode.h"
+#include "configvariable_interface.h"
 #include "localization.h"
 #include "gw_gui.h"
 #include "getScilabJavaVM.h"
index 44f3e71..8d186e3 100644 (file)
@@ -29,7 +29,7 @@ extern "C"
 #include "getScilabJavaVM.h"
 #include "getFullFilename.h"
 #include "loadOnUseClassPath.h"
-#include "warningmode.h"
+#include "configvariable_interface.h"
 #include "FigureList.h"
 }
 /*--------------------------------------------------------------------------*/
index fd19adf..9812dbe 100644 (file)
@@ -12,7 +12,7 @@
 
 #include <stdlib.h>
 #include "InitializeGUI.h"
-#include "sci_mode.h"
+#include "configvariable_interface.h"
 #include "setMainWindowTitle.h"
 #include "sci_malloc.h"
 #include "buildMainWindowTitle.h"
index 4639239..0d6c2ac 100644 (file)
@@ -31,7 +31,7 @@ extern "C"
 #include "graphicObjectProperties.h"
 #include "CurrentFigure.h"
 #include "BuildObjects.h"
-#include "sci_mode.h"
+#include "configvariable_interface.h"
 #include "createGraphicObject.h"
 }
 
index 50e50c6..e6df17e 100644 (file)
@@ -32,7 +32,7 @@ extern "C"
 #include "h5_attributeConstants.h"
 #include "freeArrayOfString.h"
 #include "os_strdup.h"
-#include "sci_mode.h"
+#include "configvariable_interface.h"
 #include "splitpath.h"
 #include "scicurdir.h"
 }
index 8f2aad9..ef0a2c5 100644 (file)
@@ -17,7 +17,7 @@ extern "C"
 #include "getScilabJavaVM.h"
 #include "loadOnUseClassPath.h"
 #include "BOOL.h"
-#include "sci_mode.h"
+#include "configvariable_interface.h"
 };
 /*------------------------------------------------------------------------*/
 using namespace org_scilab_modules_history_browser;
index b75a48c..60f873a 100644 (file)
@@ -20,7 +20,7 @@ extern "C"
 #include "localization.h"
 #include "Scierror.h"
 #include "sciprint.h"
-#include "warningmode.h"
+#include "configvariable_interface.h"
 #include "interpolation_functions.h"
 #include "interpolation.h"
 #include "basic_functions.h" // vDset
index 633632e..27d686b 100644 (file)
@@ -22,7 +22,7 @@ extern "C"
 #include "system_getproperty.h"
 #include "Scierror.h"
 #include "localization.h"
-#include "sci_mode.h"
+#include "configvariable_interface.h"
 }
 /*--------------------------------------------------------------------------*/
 
index 3ef66f2..cf7d390 100644 (file)
@@ -17,7 +17,7 @@
 #include "getScilabJNIEnv.h"
 #include "getScilabJavaVM.h"
 #include "catchIfJavaException.h"
-#include "sci_mode.h"
+#include "configvariable_interface.h"
 #include "localization.h"
 /*--------------------------------------------------------------------------*/
 static jobject ScilabObject = NULL;
index d7df17e..15a25d7 100644 (file)
@@ -23,7 +23,7 @@
 #include "sci_path.h"
 #include "sci_malloc.h"
 #include "localization.h"
-#include "sci_mode.h"
+#include "configvariable_interface.h"
 #include "stricmp.h"
 #include "os_strdup.h"
 #include "getshortpathname.h"
index fdbdd34..19784cf 100644 (file)
@@ -24,7 +24,7 @@ extern "C"
 #include "Scierror.h"
 #include "sciprint.h"
 #include "invert_matrix.h"
-#include "warningmode.h"
+#include "configvariable_interface.h"
 #include "doublecomplex.h"
 }
 /*--------------------------------------------------------------------------*/
index a877ca4..c925e6a 100644 (file)
@@ -25,7 +25,7 @@ extern "C"
 #include "charEncoding.h"
 #include "setgetlanguage.h"
 #include "os_wcsdup.h"
-#include "warningmode.h"
+#include "configvariable_interface.h"
 #ifdef _MSC_VER
 #include "LanguagePreferences_Windows.h"
 #endif
index abf44c0..f302704 100644 (file)
@@ -22,7 +22,7 @@ extern "C"
 #include "localization.h"
 #include "charEncoding.h"
 #include "defaultlanguage.h"
-#include "warningmode.h"
+#include "configvariable_interface.h"
 #include "setgetlanguage.h"
 }
 
index c00173d..3a2aa60 100644 (file)
@@ -18,7 +18,7 @@
 #include "sci_malloc.h"
 #include "Scierror.h"
 #include "sciprint.h"
-#include "warningmode.h"
+#include "configvariable_interface.h"
 #include "localization.h"
 #include "scisparse.h"
 /*--------------------------------------------------------------------------*/
index 03cb98d..1789402 100644 (file)
@@ -17,7 +17,7 @@
 #include "spd.h"
 #include "sciprint.h"
 #include "localization.h"
-#include "warningmode.h"
+#include "configvariable_interface.h"
 /*--------------------------------------------------------------------------*/
 /* BLAS 1 */
 extern double F2C(dnrm2)( );
index bad0f6d..9989b88 100644 (file)
@@ -16,19 +16,19 @@ extern "C" {
 #include "sciprint.h"
 #include "Scierror.h"
 #include "localization.h"
-#include "warningmode.h"
+#include "configvariable_interface.h"
 }
 // return 0 = ok, return 1 = error
 int checkOptimError(int iarret, int indopt, int imp, double dEpsg)
 {
-    if(iarret || (imp == 0 && indopt > 0))
+    if (iarret || (imp == 0 && indopt > 0))
     {
         return 0;
     }
 
-    switch(indopt)
+    switch (indopt)
     {
-        // error
+            // error
         case 0 :
         {
             Scierror(131, _("%s: Stop requested by simulator (ind=0).\n"), "optim");
@@ -55,16 +55,36 @@ int checkOptimError(int iarret, int indopt, int imp, double dEpsg)
         break;
 
         // warning
-        case 1 : sciprint(_("%s: Norm of projected gradient lower than %lf.\n"), "optim", dEpsg);           break;
-        case 2 : sciprint(_("%s: at last iteration f decreases by less than %lf.\n"), "optim", dEpsg);      break;
-        case 3 : sciprint(_("%s: Optimization stops because too small variations for x.\n"), "optim");      break;
-        case 4 : sciprint(_("%s: Optim stops: maximum number of calls to f is reached.\n"), "optim");       break;
-        case 5 : sciprint(_("%s: Optim stops: maximum number of iterations is reached.\n"), "optim");       break;
-        case 6 : sciprint(_("%s: Optim stops: too small variations in gradient direction.\n"), "optim");    break;
-        case 7 : sciprint(_("%s: Stop during calculation of descent direction.\n"), "optim");               break;
-        case 8 : sciprint(_("%s: Stop during calculation of estimated hessian.\n"), "optim");               break;
-        case 9 : sciprint(_("%s: End of optimization.\n"), "optim");                                        break;
-        case 10 : sciprint(_("%s: End of optimization (linear search fails).\n"), "optim");                 break;
+        case 1 :
+            sciprint(_("%s: Norm of projected gradient lower than %lf.\n"), "optim", dEpsg);
+            break;
+        case 2 :
+            sciprint(_("%s: at last iteration f decreases by less than %lf.\n"), "optim", dEpsg);
+            break;
+        case 3 :
+            sciprint(_("%s: Optimization stops because too small variations for x.\n"), "optim");
+            break;
+        case 4 :
+            sciprint(_("%s: Optim stops: maximum number of calls to f is reached.\n"), "optim");
+            break;
+        case 5 :
+            sciprint(_("%s: Optim stops: maximum number of iterations is reached.\n"), "optim");
+            break;
+        case 6 :
+            sciprint(_("%s: Optim stops: too small variations in gradient direction.\n"), "optim");
+            break;
+        case 7 :
+            sciprint(_("%s: Stop during calculation of descent direction.\n"), "optim");
+            break;
+        case 8 :
+            sciprint(_("%s: Stop during calculation of estimated hessian.\n"), "optim");
+            break;
+        case 9 :
+            sciprint(_("%s: End of optimization.\n"), "optim");
+            break;
+        case 10 :
+            sciprint(_("%s: End of optimization (linear search fails).\n"), "optim");
+            break;
     }
 
     return 0;
index 8f85baa..a56bc3f 100644 (file)
@@ -11,7 +11,7 @@
  */
 
 #include <string.h>
-#include "warningmode.h"
+#include "configvariable_interface.h"
 #include "sciprint.h"
 #include "stack-def.h" /* C2F(cha1) */
 #include "stack-c.h" /* Fin */
index 90d2ebe..f6b50cd 100644 (file)
@@ -14,7 +14,7 @@
 #include "sciprint.h"
 #include "diary.h"
 #include "stack-def.h" /* bsiz */
-#include "sci_mode.h"
+#include "configvariable_interface.h"
 #include "ConsolePrintf.h"
 #ifdef _MSC_VER
 #include "TermPrintf.h"
index 80a0435..8d1f257 100644 (file)
 
 extern "C"
 {
-#include "promptmode.h"
+#include "configvariable_interface.h"
 #include <stdio.h>
 #include "charEncoding.h"
 #include "sci_malloc.h"
 #include "diary.h"
-#include "sci_mode.h"
+#include "configvariable_interface.h"
 }
 
 static SCILAB_OUTPUT_METHOD _writer;
index 2415750..286c9f8 100644 (file)
@@ -61,7 +61,7 @@
 #include "sciprint.h"
 #include "others_generators.h"
 #include "localization.h"
-#include "warningmode.h"
+#include "configvariable_interface.h"
 
 /***********************************************************************/
 /* Private part.                                                       */
index 8b9f17c..0d4d7c8 100644 (file)
@@ -20,7 +20,7 @@
 #include "expandPathVariable.h"
 #include "FileExist.h"
 #include "mclose.h"
-#include "warningmode.h"
+#include "configvariable_interface.h"
 #include "pcre_private.h"
 #include "sciprint.h"
 #include "splitLine.h"
index 4d56b43..0872748 100644 (file)
@@ -28,7 +28,7 @@ extern "C"
 #include "initMacOSXEnv.h"
 #endif
 #include "InitScilab.h"
-#include "sci_mode.h"
+#include "configvariable_interface.h"
 #include "scilabRead.h"
 #include "ConsoleRead.h"
 #include "version.h"
index 4e184b4..6da1766 100644 (file)
@@ -30,7 +30,7 @@ extern "C"
 #include "Scierror.h"
 #include "localization.h"
 #include "sciprint.h"
-#include "warningmode.h"
+#include "configvariable_interface.h"
 }
 
 /* Benchmark
index 60dbb41..ae8e9ca 100644 (file)
@@ -25,7 +25,7 @@
 #include "pcre_private.h"
 #include "os_strdup.h"
 #include "strsubst.h"
-#include "warningmode.h"
+#include "configvariable_interface.h"
 #include "sciprint.h"
 #include "charEncoding.h"
 #include "freeArrayOfString.h"
index 83c2234..3f57de2 100644 (file)
@@ -19,7 +19,7 @@
 #include "gw_tclsci.h"
 #include "api_scilab.h"
 #include "sci_malloc.h"
-#include "sci_mode.h"
+#include "configvariable_interface.h"
 #include "callFunctionFromGateway.h"
 #include "InitTclTk.h" /* isTkStarted */
 #include "InitializeTclTk.h"
index 8802922..12b5740 100644 (file)
@@ -22,7 +22,7 @@
 #include "GlobalTclInterp.h"
 #include "localization.h"
 #include "ConvertSlash.h"
-#include "sci_mode.h"
+#include "configvariable_interface.h"
 /*--------------------------------------------------------------------------*/
 extern void    TclSetLibraryPath(Tcl_Obj * pathPtr);
 /*--------------------------------------------------------------------------*/
index 0d84fbf..2d877dc 100644 (file)
@@ -26,7 +26,7 @@
 #include "sciprint.h"
 #include "Scierror.h"
 #include "localization.h"
-#include "sci_mode.h"
+#include "configvariable_interface.h"
 #include "ScilabEval.h"
 #include "TCL_Command.h"
 #include "GlobalTclInterp.h"
index fe5d8cd..3bc49ff 100644 (file)
@@ -12,7 +12,7 @@
 
 #include "InitializeTclTk.h"
 #include "InitTclTk.h"
-#include "sci_mode.h"
+#include "configvariable_interface.h"
 /*--------------------------------------------------------------------------*/
 BOOL InitializeTclTk(void)
 {
index 678c5af..289e7e4 100644 (file)
@@ -64,7 +64,7 @@
 #include "taucs_scilab.h"
 #include "common_umfpack.h"
 #include "localization.h"
-#include "warningmode.h"
+#include "configvariable_interface.h"
 
 CellAdr *ListNumeric = NULL;
 CellAdr *ListCholFactors = NULL;
index a4ba828..53f87ed 100644 (file)
@@ -21,7 +21,7 @@ extern "C"
 #include "sciprint.h"
 #include "localization.h"
 #include "WinConsole.h"
-#include "sci_mode.h"
+#include "configvariable_interface.h"
 }
 
 using namespace types;
index c993cff..2338e6a 100644 (file)
@@ -12,7 +12,7 @@
 
 /*--------------------------------------------------------------------------*/
 #include "TerminateWindows_tools.h"
-#include "sci_mode.h"
+#include "configvariable_interface.h"
 #include "console.h"
 #include "InnosetupMutex.h"
 /*--------------------------------------------------------------------------*/
index e7c9ebb..0c13137 100644 (file)
@@ -16,7 +16,7 @@
 #include <stdio.h>
 #include "WinConsole.h"
 #include "version.h"
-#include "sci_mode.h"
+#include "configvariable_interface.h"
 #include "sci_malloc.h"
 #include "scilab_windows/console.h"
 /*--------------------------------------------------------------------------*/
index 91c1182..be31291 100644 (file)
@@ -13,7 +13,7 @@
 /*--------------------------------------------------------------------------*/
 #include <windows.h>
 #include "dynlib_scilab_windows.h"
-#include "sci_mode.h"
+#include "configvariable_interface.h"
 /*--------------------------------------------------------------------------*/
 SCILAB_WINDOWS_IMPEXP void setFocusOnConsole(void)
 {
index 2ef7270..22ab92d 100644 (file)
@@ -17,7 +17,7 @@
 #include <signal.h>
 
 #include "scilab_main.h"
-#include "sci_mode.h"
+#include "configvariable_interface.h"
 #include "realmain.h"
 #include "sciprint.h"
 #include "LaunchScilabSignal.h"
index c9ca398..8dac0a3 100644 (file)
@@ -16,7 +16,7 @@
 #include "PATH_MAX.h"
 #include "sci_malloc.h"
 #include "FileExist.h"
-#include "sci_mode.h"
+#include "configvariable_interface.h"
 #include "sci_tmpdir.h"
 #include "spawncommand.h"
 #include "os_strdup.h"
index ec43340..17cd614 100644 (file)
@@ -25,7 +25,7 @@ extern "C"
 #include "sci_malloc.h"
 #include "freeArrayOfString.h"
 #include "getScilabJavaVM.h"
-#include "sci_mode.h"
+#include "configvariable_interface.h"
 }
 /*--------------------------------------------------------------------------*/
 using namespace org_scilab_modules_xcos;