One typo correction, in many files 80/10480/3
Paul BIGNIER [Fri, 15 Feb 2013 15:43:28 +0000 (16:43 +0100)]
Change-Id: I756e23c5479c90b6c64a9b8067cd78d59e28c488

51 files changed:
scilab/CHANGES_5.4.X
scilab/modules/differential_equations/src/fortran/ddassl.f
scilab/modules/external_objects/includes/OptionsHelper.hxx
scilab/modules/external_objects/src/cpp/OptionsHelper.cpp
scilab/modules/external_objects/src/cpp/ScilabObjects.cpp
scilab/modules/external_objects/src/cpp/addNamedVariable.cpp
scilab/modules/external_objects/src/cpp/addToClasspath.cpp
scilab/modules/external_objects/src/cpp/array.cpp
scilab/modules/external_objects/src/cpp/cast.cpp
scilab/modules/external_objects/src/cpp/classExtract.cpp
scilab/modules/external_objects/src/cpp/compile.cpp
scilab/modules/external_objects/src/cpp/convMatrixMethod.cpp
scilab/modules/external_objects/src/cpp/deff.cpp
scilab/modules/external_objects/src/cpp/display.cpp
scilab/modules/external_objects/src/cpp/doubleExclam_invoke.cpp
scilab/modules/external_objects/src/cpp/evalString.cpp
scilab/modules/external_objects/src/cpp/exists.cpp
scilab/modules/external_objects/src/cpp/getClassName.cpp
scilab/modules/external_objects/src/cpp/getClasspath.cpp
scilab/modules/external_objects/src/cpp/getEnvId.cpp
scilab/modules/external_objects/src/cpp/getEnvironmentInfos.cpp
scilab/modules/external_objects/src/cpp/getEnvironmentName.cpp
scilab/modules/external_objects/src/cpp/getField.cpp
scilab/modules/external_objects/src/cpp/getFields.cpp
scilab/modules/external_objects/src/cpp/getMethods.cpp
scilab/modules/external_objects/src/cpp/getNamedVariable.cpp
scilab/modules/external_objects/src/cpp/getRepresentation.cpp
scilab/modules/external_objects/src/cpp/getsetOptions.cpp
scilab/modules/external_objects/src/cpp/import.cpp
scilab/modules/external_objects/src/cpp/invoke.cpp
scilab/modules/external_objects/src/cpp/invoke_lu.cpp
scilab/modules/external_objects/src/cpp/invoker.cpp
scilab/modules/external_objects/src/cpp/newInstance.cpp
scilab/modules/external_objects/src/cpp/objectExtract.cpp
scilab/modules/external_objects/src/cpp/objectInsert.cpp
scilab/modules/external_objects/src/cpp/objectPrint.cpp
scilab/modules/external_objects/src/cpp/operation.cpp
scilab/modules/external_objects/src/cpp/remove.cpp
scilab/modules/external_objects/src/cpp/setField.cpp
scilab/modules/external_objects/src/cpp/trace.cpp
scilab/modules/external_objects/src/cpp/unwrap.cpp
scilab/modules/external_objects/src/cpp/unwrapremove.cpp
scilab/modules/external_objects/src/cpp/wrap.cpp
scilab/modules/external_objects/src/cpp/wrapAsRef.cpp
scilab/modules/helptools/src/java/org/scilab/modules/helptools/CHMDocbookTagConverter.java
scilab/modules/helptools/src/java/org/scilab/modules/helptools/DocbookTagConverter.java
scilab/modules/helptools/src/java/org/scilab/modules/helptools/JavaHelpDocbookTagConverter.java
scilab/modules/helptools/src/java/org/scilab/modules/helptools/scilab/ScilabLexer.java
scilab/modules/scicos/src/scicos_sundials/include/cvode/cvode.h
scilab/modules/scicos/src/scicos_sundials/include/ida/ida.h
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/ScilabLexer.java

index 4dfcc3d..8ecc246 100644 (file)
@@ -248,7 +248,7 @@ Bug fixes
 * Bug #11941 fixed - show_margins() failed in 'nyquist' mode if the system is
                      in state-space form.
 
-* Bug #11952 fixed - In SciNotes, a Java exception occured on selection of text
+* Bug #11952 fixed - In SciNotes, a Java exception occurred on selection of text
                     containing a \E.
 
 * Bug #11958 fixed - axesflag=0 was not taken into account in plot2d3.
index 40b947e..c0c58fa 100644 (file)
@@ -2705,7 +2705,7 @@ C
 C     THE NEWTON ITERATION FAILED TO CONVERGE FOR A REASON
 C     OTHER THAN A SINGULAR ITERATION MATRIX.  IF IRES = -2, THEN
 C     RETURN.  OTHERWISE, REDUCE THE STEPSIZE AND TRY AGAIN, UNLESS
-C     TOO MANY FAILURES HAVE OCCURED.
+C     TOO MANY FAILURES HAVE OCCURRED.
 650   CONTINUE
       IF (IRES .GT. -2) GO TO 655
       IDID = -11
index fa02a8e..acab34b 100644 (file)
@@ -23,7 +23,7 @@ namespace org_modules_external_objects
 
 class EXTERNAL_OBJECTS_SCILAB_IMPEXP OptionsHelper
 {
-    static bool copyOccured;
+    static bool copyOccurred;
     static int envId;
 
     bool useLastName;
@@ -40,14 +40,14 @@ public:
 
     ~OptionsHelper() { }
 
-    static void setCopyOccured(const bool _copyOccured)
+    static void setCopyOccurred(const bool _copyOccurred)
     {
-        copyOccured = _copyOccured;
+        copyOccurred = _copyOccurred;
     }
 
-    static bool getCopyOccured()
+    static bool getCopyOccurred()
     {
-        return copyOccured;
+        return copyOccurred;
     }
 
     static void setEnvId(const int _envId)
index 0437dec..95b3cf5 100644 (file)
@@ -17,7 +17,7 @@
 namespace org_modules_external_objects
 {
 
-bool OptionsHelper::copyOccured = false;
+bool OptionsHelper::copyOccurred = false;
 int OptionsHelper::envId = -1;
 
 }
index 5534aa8..69de8b0 100644 (file)
@@ -21,34 +21,34 @@ extern "C" {
 
 namespace org_modules_external_objects
 {
-    bool ScilabObjects::isInit = false;
-    const char * ScilabObjects::_EOBJ[] = {"_EObj", "_EnvId", "_id"};
-    const char * ScilabObjects::_ECLASS[] = {"_EClass", "_EnvId", "_id"};
-    const char * ScilabObjects::_EVOID[] = {"_EVoid", "_EnvId", "_id"};
-    const char * ScilabObjects::_INVOKE_ = "!!_invoke_";
+bool ScilabObjects::isInit = false;
+const char * ScilabObjects::_EOBJ[] = {"_EObj", "_EnvId", "_id"};
+const char * ScilabObjects::_ECLASS[] = {"_EClass", "_EnvId", "_id"};
+const char * ScilabObjects::_EVOID[] = {"_EVoid", "_EnvId", "_id"};
+const char * ScilabObjects::_INVOKE_ = "!!_invoke_";
 
-    void ScilabObjects::initialization(ScilabAbstractEnvironment & env, void * pvApiCtx)
+void ScilabObjects::initialization(ScilabAbstractEnvironment & env, void * pvApiCtx)
+{
+    if (!isInit)
     {
-        if (!isInit)
-        {
-            isInit = true;
-            //createNamedEnvironmentObject(EXTERNAL_OBJECT, "enull", 0, 0, pvApiCtx);
-        }
+        isInit = true;
+        //createNamedEnvironmentObject(EXTERNAL_OBJECT, "enull", 0, 0, pvApiCtx);
     }
+}
 
-    int ScilabObjects::createNamedEnvironmentObject(int type, const char * name, int id, const int envId, void * pvApiCtx)
-    {
-        const char ** fields;
-        int * mlistaddr = 0;
-        SciErr err;
+int ScilabObjects::createNamedEnvironmentObject(int type, const char * name, int id, const int envId, void * pvApiCtx)
+{
+    const char ** fields;
+    int * mlistaddr = 0;
+    SciErr err;
 
-        if (envId < 0)
-        {
-            throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Invalid environment"));
-        }
+    if (envId < 0)
+    {
+        throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Invalid environment"));
+    }
 
-        switch (type)
-        {
+    switch (type)
+    {
         case EXTERNAL_OBJECT:
             fields = static_cast<const char **>(_EOBJ);
             break;
@@ -61,53 +61,53 @@ namespace org_modules_external_objects
         default :
             fields = static_cast<const char **>(_EOBJ);
             break;
-        }
-
-        err = createNamedMList(pvApiCtx, name, FIELDS_LENGTH, &mlistaddr);
-        if (err.iErr)
-        {
-            if (err.iErr == API_ERROR_INVALID_NAME)
-            {
-                throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Invalid variable name: %s"), name);
-            }
-
-            throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Cannot allocate memory"));
-        }
+    }
 
-        err = createMatrixOfStringInNamedList(pvApiCtx, name, mlistaddr, 1, 1, FIELDS_LENGTH, fields);
-        if (err.iErr)
+    err = createNamedMList(pvApiCtx, name, FIELDS_LENGTH, &mlistaddr);
+    if (err.iErr)
+    {
+        if (err.iErr == API_ERROR_INVALID_NAME)
         {
-            throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Cannot allocate memory"));
+            throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Invalid variable name: %s"), name);
         }
 
-        err = createMatrixOfInteger32InNamedList(pvApiCtx, name, mlistaddr, EXTERNAL_ENV_ID_POSITION, 1, 1, &envId);
-        if (err.iErr)
-        {
-            throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Cannot allocate memory"));
-        }
+        throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Cannot allocate memory"));
+    }
 
-        err = createMatrixOfInteger32InNamedList(pvApiCtx, name, mlistaddr, EXTERNAL_OBJ_ID_POSITION, 1, 1, &id);
-        if (err.iErr)
-        {
-            throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Cannot allocate memory"));
-        }
+    err = createMatrixOfStringInNamedList(pvApiCtx, name, mlistaddr, 1, 1, FIELDS_LENGTH, fields);
+    if (err.iErr)
+    {
+        throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Cannot allocate memory"));
+    }
 
-        return 1;
+    err = createMatrixOfInteger32InNamedList(pvApiCtx, name, mlistaddr, EXTERNAL_ENV_ID_POSITION, 1, 1, &envId);
+    if (err.iErr)
+    {
+        throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Cannot allocate memory"));
     }
 
-    void ScilabObjects::createEnvironmentObjectAtPos(int type, int pos, int id, const int envId, void * pvApiCtx)
+    err = createMatrixOfInteger32InNamedList(pvApiCtx, name, mlistaddr, EXTERNAL_OBJ_ID_POSITION, 1, 1, &id);
+    if (err.iErr)
     {
-        const char ** fields = 0;
-        int * mlistaddr = 0;
-        SciErr err;
+        throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Cannot allocate memory"));
+    }
 
-        if (envId < 0)
-        {
-            throw ScilabAbstractEnvironmentException("Invalid environment");
-        }
+    return 1;
+}
 
-        switch (type)
-        {
+void ScilabObjects::createEnvironmentObjectAtPos(int type, int pos, int id, const int envId, void * pvApiCtx)
+{
+    const char ** fields = 0;
+    int * mlistaddr = 0;
+    SciErr err;
+
+    if (envId < 0)
+    {
+        throw ScilabAbstractEnvironmentException("Invalid environment");
+    }
+
+    switch (type)
+    {
         case EXTERNAL_OBJECT:
             fields = static_cast<const char **>(_EOBJ);
             break;
@@ -120,98 +120,134 @@ namespace org_modules_external_objects
         default :
             fields = static_cast<const char **>(_EOBJ);
             break;
-        }
+    }
 
-        err = createMList(pvApiCtx, pos, FIELDS_LENGTH, &mlistaddr);
-        if (err.iErr)
-        {
-            throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Cannot allocate memory"));
-        }
+    err = createMList(pvApiCtx, pos, FIELDS_LENGTH, &mlistaddr);
+    if (err.iErr)
+    {
+        throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Cannot allocate memory"));
+    }
 
-        err = createMatrixOfStringInList(pvApiCtx, pos, mlistaddr, 1, 1, FIELDS_LENGTH, fields);
-        if (err.iErr)
-        {
-            throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Cannot allocate memory"));
-        }
+    err = createMatrixOfStringInList(pvApiCtx, pos, mlistaddr, 1, 1, FIELDS_LENGTH, fields);
+    if (err.iErr)
+    {
+        throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Cannot allocate memory"));
+    }
 
-        err = createMatrixOfInteger32InList(pvApiCtx, pos, mlistaddr, EXTERNAL_ENV_ID_POSITION, 1, 1, &envId);
-        if (err.iErr)
-        {
-            throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Cannot allocate memory"));
-        }
+    err = createMatrixOfInteger32InList(pvApiCtx, pos, mlistaddr, EXTERNAL_ENV_ID_POSITION, 1, 1, &envId);
+    if (err.iErr)
+    {
+        throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Cannot allocate memory"));
+    }
 
-        err = createMatrixOfInteger32InList(pvApiCtx, pos, mlistaddr, EXTERNAL_OBJ_ID_POSITION, 1, 1, &id);
-        if (err.iErr)
-        {
-            throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Cannot allocate memory"));
-        }
+    err = createMatrixOfInteger32InList(pvApiCtx, pos, mlistaddr, EXTERNAL_OBJ_ID_POSITION, 1, 1, &id);
+    if (err.iErr)
+    {
+        throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Cannot allocate memory"));
+    }
+}
+
+void ScilabObjects::copyInvocationMacroToStack(int pos, ScilabAbstractEnvironment & env, void * pvApiCtx)
+{
+    static bool init = false;
+    static int id[nsiz];
+    static int interf = 0;
+    static int funnumber = 0;
+
+    if (!init)
+    {
+        init = true;
+        C2F(str2name)(const_cast<char *>(_INVOKE_), id, strlen(_INVOKE_));
+        int fins = Fin;
+        int funs = C2F(com).fun;
+        Fin = -1;
+        C2F(funs)(id);
+        funnumber = Fin;
+        interf = C2F(com).fun;
+        C2F(com).fun = funs;
+        Fin = fins;
     }
 
-    void ScilabObjects::copyInvocationMacroToStack(int pos, ScilabAbstractEnvironment & env, void * pvApiCtx)
+    int tops = Top;
+    // Remove 1 since varfunptr will increment Top
+    Top = Top - Rhs + pos - 1;
+
+    // Create a function pointer variable
+    C2F(varfunptr)(id, &interf, &funnumber);
+    C2F(intersci).ntypes[pos - 1] = '$';
+
+    Top = tops;
+
+    OptionsHelper::setCopyOccurred(true);
+}
+
+void ScilabObjects::removeTemporaryVars(const int envId, int * tmpvar)
+{
+    if (tmpvar && *tmpvar)
     {
-        static bool init = false;
-        static int id[nsiz];
-        static int interf = 0;
-        static int funnumber = 0;
+        ScilabAbstractEnvironment & env = ScilabEnvironments::getEnvironment(envId);
 
-        if (!init)
+        for (int i = 1; i <= *tmpvar; i++)
         {
-            init = true;
-            C2F(str2name)(const_cast<char *>(_INVOKE_), id, strlen(_INVOKE_));
-            int fins = Fin;
-            int funs = C2F(com).fun;
-            Fin = -1;
-            C2F(funs)(id);
-            funnumber = Fin;
-            interf = C2F(com).fun;
-            C2F(com).fun = funs;
-            Fin = fins;
+            env.removeobject(tmpvar[i]);
         }
 
-        int tops = Top;
-        // Remove 1 since varfunptr will increment Top
-        Top = Top - Rhs + pos - 1;
-
-        // Create a function pointer variable
-        C2F(varfunptr)(id, &interf, &funnumber);
-        C2F(intersci).ntypes[pos - 1] = '$';
+        *tmpvar = 0;
+    }
+}
 
-        Top = tops;
+void ScilabObjects::removeVar(int * addr, void * pvApiCtx)
+{
+    SciErr err;
+    int type, row, col, * id;
 
-        OptionsHelper::setCopyOccured(true);
+    err = getVarType(pvApiCtx, addr, &type);
+    if (err.iErr)
+    {
+        throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Invalid variable: cannot retrieve the data"));
     }
 
-    void ScilabObjects::removeTemporaryVars(const int envId, int * tmpvar)
+    if (type == sci_mlist && (isExternalObjOrClass(addr, pvApiCtx)))
     {
-        if (tmpvar && *tmpvar)
+        err = getMatrixOfInteger32InList(pvApiCtx, addr, EXTERNAL_OBJ_ID_POSITION, &row, &col, &id);
+        if (err.iErr)
         {
-            ScilabAbstractEnvironment & env = ScilabEnvironments::getEnvironment(envId);
+            throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Invalid variable: cannot retrieve the data"));
+        }
 
-            for (int i = 1; i <= *tmpvar; i++)
-            {
-                env.removeobject(tmpvar[i]);
-            }
+        int envId = getEnvironmentId(addr, pvApiCtx);
+        ScilabAbstractEnvironment & env = ScilabEnvironments::getEnvironment(envId);
 
-            *tmpvar = 0;
-        }
+        env.removeobject(*id);
     }
-
-    void ScilabObjects::removeVar(int * addr, void * pvApiCtx)
+    else if (type == sci_strings)
     {
-        SciErr err;
-        int type, row, col, * id;
+        char * varName = 0;
+        if (getAllocatedSingleString(pvApiCtx, addr, &varName))
+        {
+            throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Invalid variable: cannot retrieve the data"));
+        }
+
+        err = getVarAddressFromName(pvApiCtx, varName, &addr);
+        if (err.iErr)
+        {
+            freeAllocatedSingleString(varName);
+            return;
+        }
 
         err = getVarType(pvApiCtx, addr, &type);
         if (err.iErr)
         {
+            freeAllocatedSingleString(varName);
             throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Invalid variable: cannot retrieve the data"));
         }
 
-        if (type == sci_mlist && (isExternalObjOrClass(addr, pvApiCtx)))
+        if (type == sci_mlist && isExternalObjOrClass(addr, pvApiCtx))
         {
             err = getMatrixOfInteger32InList(pvApiCtx, addr, EXTERNAL_OBJ_ID_POSITION, &row, &col, &id);
             if (err.iErr)
             {
+                freeAllocatedSingleString(varName);
                 throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Invalid variable: cannot retrieve the data"));
             }
 
@@ -219,67 +255,31 @@ namespace org_modules_external_objects
             ScilabAbstractEnvironment & env = ScilabEnvironments::getEnvironment(envId);
 
             env.removeobject(*id);
-        }
-        else if (type == sci_strings)
-        {
-            char * varName = 0;
-            if (getAllocatedSingleString(pvApiCtx, addr, &varName))
-            {
-                throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Invalid variable: cannot retrieve the data"));
-            }
-
-            err = getVarAddressFromName(pvApiCtx, varName, &addr);
-            if (err.iErr)
-            {
-                freeAllocatedSingleString(varName);
-                return;
-            }
-
-            err = getVarType(pvApiCtx, addr, &type);
-            if (err.iErr)
-            {
-                freeAllocatedSingleString(varName);
-                throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Invalid variable: cannot retrieve the data"));
-            }
-
-            if (type == sci_mlist && isExternalObjOrClass(addr, pvApiCtx))
-            {
-                err = getMatrixOfInteger32InList(pvApiCtx, addr, EXTERNAL_OBJ_ID_POSITION, &row, &col, &id);
-                if (err.iErr)
-                {
-                    freeAllocatedSingleString(varName);
-                    throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Invalid variable: cannot retrieve the data"));
-                }
-
-                int envId = getEnvironmentId(addr, pvApiCtx);
-                ScilabAbstractEnvironment & env = ScilabEnvironments::getEnvironment(envId);
-
-                env.removeobject(*id);
-                deleteNamedVariable(pvApiCtx, varName);
-                freeAllocatedSingleString(varName);
-            }
+            deleteNamedVariable(pvApiCtx, varName);
+            freeAllocatedSingleString(varName);
         }
     }
+}
 
-    bool ScilabObjects::unwrap(int idObj, int pos, const int envId, void * pvApiCtx)
+bool ScilabObjects::unwrap(int idObj, int pos, const int envId, void * pvApiCtx)
+{
+    if (idObj == 0)
     {
-        if (idObj == 0)
+        if (createEmptyMatrix(pvApiCtx, pos))
         {
-            if (createEmptyMatrix(pvApiCtx, pos))
-            {
-                throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Invalid variable: cannot create data"));
-            }
-            return true;
+            throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Invalid variable: cannot create data"));
         }
+        return true;
+    }
 
-        VariableType type = Nothing;
-        ScilabAbstractEnvironment & env = ScilabEnvironments::getEnvironment(envId);
-        const ScilabAbstractEnvironmentWrapper & wrapper = env.getWrapper();
+    VariableType type = Nothing;
+    ScilabAbstractEnvironment & env = ScilabEnvironments::getEnvironment(envId);
+    const ScilabAbstractEnvironmentWrapper & wrapper = env.getWrapper();
 
-        type = env.isunwrappable(idObj);
+    type = env.isunwrappable(idObj);
 
-        switch (type)
-        {
+    switch (type)
+    {
         case Nothing:
             return false;
         case Null:
@@ -406,62 +406,62 @@ namespace org_modules_external_objects
             break;
         default:
             return false;
-        }
-
-        return true;
     }
 
-    int ScilabObjects::getEnvironmentId(int * addr, void * pvApiCtx)
-    {
-        SciErr err;
-        int row = 0, col = 0;
-        int * envId = 0;
+    return true;
+}
 
-        err = getMatrixOfInteger32InList(pvApiCtx, addr, EXTERNAL_ENV_ID_POSITION, &row, &col, &envId);
-        if (err.iErr)
-        {
-            throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Invalid variable: cannot retrieve the data"));
-        }
+int ScilabObjects::getEnvironmentId(int * addr, void * pvApiCtx)
+{
+    SciErr err;
+    int row = 0, col = 0;
+    int * envId = 0;
 
-        return *envId;
+    err = getMatrixOfInteger32InList(pvApiCtx, addr, EXTERNAL_ENV_ID_POSITION, &row, &col, &envId);
+    if (err.iErr)
+    {
+        throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Invalid variable: cannot retrieve the data"));
     }
 
-    int ScilabObjects::getExternalId(int * addr, void * pvApiCtx)
-    {
-        SciErr err;
-        int row = 0, col = 0;
-        int * id = 0;
+    return *envId;
+}
 
-        err = getMatrixOfInteger32InList(pvApiCtx, addr, EXTERNAL_OBJ_ID_POSITION, &row, &col, &id);
-        if (err.iErr)
-        {
-            throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Invalid variable: cannot retrieve the data"));
-        }
+int ScilabObjects::getExternalId(int * addr, void * pvApiCtx)
+{
+    SciErr err;
+    int row = 0, col = 0;
+    int * id = 0;
 
-        return *id;
+    err = getMatrixOfInteger32InList(pvApiCtx, addr, EXTERNAL_OBJ_ID_POSITION, &row, &col, &id);
+    if (err.iErr)
+    {
+        throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Invalid variable: cannot retrieve the data"));
     }
 
-    int ScilabObjects::getArgumentId(int * addr, int * tmpvars, const bool isRef, const bool isClass, const int envId, void * pvApiCtx)
-    {
-        SciErr err;
-        int typ, row = 0, col = 0, returnId;
-        const ScilabAbstractEnvironmentWrapper & wrapper = ScilabEnvironments::getEnvironment(envId).getWrapper();
+    return *id;
+}
 
-        err = getVarType(pvApiCtx, addr, &typ);
-        if (err.iErr)
-        {
-            removeTemporaryVars(envId, tmpvars);
-            throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Invalid variable: cannot retrieve the data"));
-        }
+int ScilabObjects::getArgumentId(int * addr, int * tmpvars, const bool isRef, const bool isClass, const int envId, void * pvApiCtx)
+{
+    SciErr err;
+    int typ, row = 0, col = 0, returnId;
+    const ScilabAbstractEnvironmentWrapper & wrapper = ScilabEnvironments::getEnvironment(envId).getWrapper();
 
-        if (isClass && typ != sci_mlist)
-        {
-            removeTemporaryVars(envId, tmpvars);
-            throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("External Class expected"));
-        }
+    err = getVarType(pvApiCtx, addr, &typ);
+    if (err.iErr)
+    {
+        removeTemporaryVars(envId, tmpvars);
+        throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Invalid variable: cannot retrieve the data"));
+    }
 
-        switch (typ)
-        {
+    if (isClass && typ != sci_mlist)
+    {
+        removeTemporaryVars(envId, tmpvars);
+        throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("External Class expected"));
+    }
+
+    switch (typ)
+    {
         case sci_matrix :
         {
             double * mat = 0;
@@ -508,96 +508,96 @@ namespace org_modules_external_objects
 
             switch (prec)
             {
-            case SCI_INT8 :
-                err = getMatrixOfInteger8(pvApiCtx, addr, &row, &col, (char**)(&ints));
-                if (err.iErr)
-                {
-                    removeTemporaryVars(envId, tmpvars);
-                    throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Invalid variable: cannot retrieve the data"));
-                }
+                case SCI_INT8 :
+                    err = getMatrixOfInteger8(pvApiCtx, addr, &row, &col, (char**)(&ints));
+                    if (err.iErr)
+                    {
+                        removeTemporaryVars(envId, tmpvars);
+                        throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Invalid variable: cannot retrieve the data"));
+                    }
 
-                returnId = wrap<char>(row, col, static_cast<char *>(ints), wrapper, isRef);
-                tmpvars[++tmpvars[0]] = returnId;
-                return returnId;
-            case SCI_UINT8 :
-                err = getMatrixOfUnsignedInteger8(pvApiCtx, addr, &row, &col, (unsigned char**)(&ints));
-                if (err.iErr)
-                {
-                    removeTemporaryVars(envId, tmpvars);
-                    throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Invalid variable: cannot retrieve the data"));
-                }
+                    returnId = wrap<char>(row, col, static_cast<char *>(ints), wrapper, isRef);
+                    tmpvars[++tmpvars[0]] = returnId;
+                    return returnId;
+                case SCI_UINT8 :
+                    err = getMatrixOfUnsignedInteger8(pvApiCtx, addr, &row, &col, (unsigned char**)(&ints));
+                    if (err.iErr)
+                    {
+                        removeTemporaryVars(envId, tmpvars);
+                        throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Invalid variable: cannot retrieve the data"));
+                    }
 
-                returnId = wrap<unsigned char>(row, col, static_cast<unsigned char *>(ints), wrapper, isRef);
-                tmpvars[++tmpvars[0]] = returnId;
-                return returnId;
-            case SCI_INT16 :
-                err = getMatrixOfInteger16(pvApiCtx, addr, &row, &col, (short**)(&ints));
-                if (err.iErr)
-                {
-                    removeTemporaryVars(envId, tmpvars);
-                    throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Invalid variable: cannot retrieve the data"));
-                }
+                    returnId = wrap<unsigned char>(row, col, static_cast<unsigned char *>(ints), wrapper, isRef);
+                    tmpvars[++tmpvars[0]] = returnId;
+                    return returnId;
+                case SCI_INT16 :
+                    err = getMatrixOfInteger16(pvApiCtx, addr, &row, &col, (short**)(&ints));
+                    if (err.iErr)
+                    {
+                        removeTemporaryVars(envId, tmpvars);
+                        throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Invalid variable: cannot retrieve the data"));
+                    }
 
-                returnId = wrap<short>(row, col, static_cast<short *>(ints), wrapper, isRef);
-                tmpvars[++tmpvars[0]] = returnId;
-                return returnId;
-            case SCI_UINT16 :
-                err = getMatrixOfUnsignedInteger16(pvApiCtx, addr, &row, &col, (unsigned short**)(&ints));
-                if (err.iErr)
-                {
-                    removeTemporaryVars(envId, tmpvars);
-                    throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Invalid variable: cannot retrieve the data"));
-                }
+                    returnId = wrap<short>(row, col, static_cast<short *>(ints), wrapper, isRef);
+                    tmpvars[++tmpvars[0]] = returnId;
+                    return returnId;
+                case SCI_UINT16 :
+                    err = getMatrixOfUnsignedInteger16(pvApiCtx, addr, &row, &col, (unsigned short**)(&ints));
+                    if (err.iErr)
+                    {
+                        removeTemporaryVars(envId, tmpvars);
+                        throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Invalid variable: cannot retrieve the data"));
+                    }
 
-                returnId = wrap<unsigned short>(row, col, static_cast<unsigned short *>(ints), wrapper, isRef);
-                tmpvars[++tmpvars[0]] = returnId;
-                return returnId;
-            case SCI_INT32 :
-                err = getMatrixOfInteger32(pvApiCtx, addr, &row, &col, (int**)(&ints));
-                if (err.iErr)
-                {
-                    removeTemporaryVars(envId, tmpvars);
-                    throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Invalid variable: cannot retrieve the data"));
-                }
+                    returnId = wrap<unsigned short>(row, col, static_cast<unsigned short *>(ints), wrapper, isRef);
+                    tmpvars[++tmpvars[0]] = returnId;
+                    return returnId;
+                case SCI_INT32 :
+                    err = getMatrixOfInteger32(pvApiCtx, addr, &row, &col, (int**)(&ints));
+                    if (err.iErr)
+                    {
+                        removeTemporaryVars(envId, tmpvars);
+                        throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Invalid variable: cannot retrieve the data"));
+                    }
 
-                returnId = wrap<int>(row, col, static_cast<int *>(ints), wrapper, isRef);
-                tmpvars[++tmpvars[0]] = returnId;
-                return returnId;
-            case SCI_UINT32 :
-                err = getMatrixOfUnsignedInteger32(pvApiCtx, addr, &row, &col, (unsigned int**)(&ints));
-                if (err.iErr)
-                {
-                    removeTemporaryVars(envId, tmpvars);
-                    throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Invalid variable: cannot retrieve the data"));
-                }
+                    returnId = wrap<int>(row, col, static_cast<int *>(ints), wrapper, isRef);
+                    tmpvars[++tmpvars[0]] = returnId;
+                    return returnId;
+                case SCI_UINT32 :
+                    err = getMatrixOfUnsignedInteger32(pvApiCtx, addr, &row, &col, (unsigned int**)(&ints));
+                    if (err.iErr)
+                    {
+                        removeTemporaryVars(envId, tmpvars);
+                        throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Invalid variable: cannot retrieve the data"));
+                    }
 
-                returnId = wrap<unsigned int>(row, col, static_cast<unsigned int *>(ints), wrapper, isRef);
-                tmpvars[++tmpvars[0]] = returnId;
-                return returnId;
+                    returnId = wrap<unsigned int>(row, col, static_cast<unsigned int *>(ints), wrapper, isRef);
+                    tmpvars[++tmpvars[0]] = returnId;
+                    return returnId;
 
 #ifdef __SCILAB_INT64__
-            case SCI_INT64 :
-                err = getMatrixOfInteger64(pvApiCtx, addr, &row, &col, (long long**)(&ints));
-                if (err.iErr)
-                {
-                    removeTemporaryVars(envId, tmpvars);
-                    throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Invalid variable: cannot retrieve the data"));
-                }
+                case SCI_INT64 :
+                    err = getMatrixOfInteger64(pvApiCtx, addr, &row, &col, (long long**)(&ints));
+                    if (err.iErr)
+                    {
+                        removeTemporaryVars(envId, tmpvars);
+                        throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Invalid variable: cannot retrieve the data"));
+                    }
 
-                returnId = wrap<long long>(row, col, static_cast<long long *>(ints), wrapper, isRef);
-                tmpvars[++tmpvars[0]] = returnId;
-                return returnId;
-            case SCI_UINT64 :
-                err = getMatrixOfUnsignedInteger64(pvApiCtx, addr, &row, &col, (unsigned long long**)(&ints));
-                if (err.iErr)
-                {
-                    removeTemporaryVars(envId, tmpvars);
-                    throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Invalid variable: cannot retrieve the data"));
-                }
+                    returnId = wrap<long long>(row, col, static_cast<long long *>(ints), wrapper, isRef);
+                    tmpvars[++tmpvars[0]] = returnId;
+                    return returnId;
+                case SCI_UINT64 :
+                    err = getMatrixOfUnsignedInteger64(pvApiCtx, addr, &row, &col, (unsigned long long**)(&ints));
+                    if (err.iErr)
+                    {
+                        removeTemporaryVars(envId, tmpvars);
+                        throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Invalid variable: cannot retrieve the data"));
+                    }
 
-                returnId = wrap<unsigned long long>(row, col, static_cast<unsigned long long *>(ints), wrapper, isRef);
-                tmpvars[++tmpvars[0]] = returnId;
-                return returnId;
+                    returnId = wrap<unsigned long long>(row, col, static_cast<unsigned long long *>(ints), wrapper, isRef);
+                    tmpvars[++tmpvars[0]] = returnId;
+                    return returnId;
 #endif
             }
         }
@@ -686,161 +686,161 @@ namespace org_modules_external_objects
             removeTemporaryVars(envId, tmpvars);
             throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Unable to wrap. Unmanaged datatype ?"));
         }
-        }
     }
+}
 
-    int ScilabObjects::getMListType(int * mlist, void * pvApiCtx)
+int ScilabObjects::getMListType(int * mlist, void * pvApiCtx)
+{
+    char * mlist_type[3];
+    char * mtype = 0;
+    int lengths[3];
+    int rows, cols;
+    int type;
+
+    SciErr err = getVarType(pvApiCtx, mlist, &type);
+    if (err.iErr || type != sci_mlist)
     {
-        char * mlist_type[3];
-        char * mtype = 0;
-        int lengths[3];
-        int rows, cols;
-        int type;
-
-        SciErr err = getVarType(pvApiCtx, mlist, &type);
-        if (err.iErr || type != sci_mlist)
-        {
-            return EXTERNAL_INVALID;
-        }
-
-        err = getMatrixOfStringInList(pvApiCtx, mlist, 1, &rows, &cols, NULL, NULL);
-        if (err.iErr || rows != 1 || cols != 3)
-        {
-            return EXTERNAL_INVALID;
-        }
-
-        err = getMatrixOfStringInList(pvApiCtx, mlist, 1, &rows, &cols, lengths, NULL);
-        if (err.iErr)
-        {
-            return EXTERNAL_INVALID;
-        }
-
-        for (int i = 0; i < 3; i++)
-        {
-            mlist_type[i] = new char[lengths[i] + 1];
-        }
+        return EXTERNAL_INVALID;
+    }
 
-        err = getMatrixOfStringInList(pvApiCtx, mlist, 1, &rows, &cols, lengths, mlist_type);
-        mtype = mlist_type[0];
-        for (int i = 1; i < 3; i++)
-        {
-            delete[] mlist_type[i];
-        }
+    err = getMatrixOfStringInList(pvApiCtx, mlist, 1, &rows, &cols, NULL, NULL);
+    if (err.iErr || rows != 1 || cols != 3)
+    {
+        return EXTERNAL_INVALID;
+    }
 
-        type = EXTERNAL_INVALID;
+    err = getMatrixOfStringInList(pvApiCtx, mlist, 1, &rows, &cols, lengths, NULL);
+    if (err.iErr)
+    {
+        return EXTERNAL_INVALID;
+    }
 
-        if (err.iErr)
-        {
-            return EXTERNAL_INVALID;
-        }
+    for (int i = 0; i < 3; i++)
+    {
+        mlist_type[i] = new char[lengths[i] + 1];
+    }
 
-        if (!std::strcmp("_EObj", mtype))
-        {
-            type = EXTERNAL_OBJECT;
-        }
-        else if (!std::strcmp("_EClass", mtype))
-        {
-            type = EXTERNAL_CLASS;
-        }
-        else if (!std::strcmp("_EVoid", mtype))
-        {
-            type = EXTERNAL_VOID;
-        }
+    err = getMatrixOfStringInList(pvApiCtx, mlist, 1, &rows, &cols, lengths, mlist_type);
+    mtype = mlist_type[0];
+    for (int i = 1; i < 3; i++)
+    {
+        delete[] mlist_type[i];
+    }
 
-        delete[] mtype;
+    type = EXTERNAL_INVALID;
 
-        return type;
+    if (err.iErr)
+    {
+        return EXTERNAL_INVALID;
     }
 
-    bool ScilabObjects::isValidExternal(int * mlist, void * pvApiCtx)
+    if (!std::strcmp("_EObj", mtype))
     {
-        int type = getMListType(mlist, pvApiCtx);
-        return type == EXTERNAL_OBJECT || type == EXTERNAL_CLASS || type == EXTERNAL_VOID;
+        type = EXTERNAL_OBJECT;
     }
-
-    bool ScilabObjects::isExternalObj(int * mlist, void * pvApiCtx)
+    else if (!std::strcmp("_EClass", mtype))
     {
-        return getMListType(mlist, pvApiCtx) == EXTERNAL_OBJECT;
+        type = EXTERNAL_CLASS;
     }
-
-    bool ScilabObjects::isExternalClass(int * mlist, void * pvApiCtx)
+    else if (!std::strcmp("_EVoid", mtype))
     {
-        return getMListType(mlist, pvApiCtx) == EXTERNAL_CLASS;
+        type = EXTERNAL_VOID;
     }
 
-    bool ScilabObjects::isExternalObjOrClass(int * mlist, void * pvApiCtx)
+    delete[] mtype;
+
+    return type;
+}
+
+bool ScilabObjects::isValidExternal(int * mlist, void * pvApiCtx)
+{
+    int type = getMListType(mlist, pvApiCtx);
+    return type == EXTERNAL_OBJECT || type == EXTERNAL_CLASS || type == EXTERNAL_VOID;
+}
+
+bool ScilabObjects::isExternalObj(int * mlist, void * pvApiCtx)
+{
+    return getMListType(mlist, pvApiCtx) == EXTERNAL_OBJECT;
+}
+
+bool ScilabObjects::isExternalClass(int * mlist, void * pvApiCtx)
+{
+    return getMListType(mlist, pvApiCtx) == EXTERNAL_CLASS;
+}
+
+bool ScilabObjects::isExternalObjOrClass(int * mlist, void * pvApiCtx)
+{
+    int type = getMListType(mlist, pvApiCtx);
+    return type == EXTERNAL_OBJECT || type == EXTERNAL_CLASS;
+}
+
+bool ScilabObjects::isExternalVoid(int * mlist, void * pvApiCtx)
+{
+    return getMListType(mlist, pvApiCtx) == EXTERNAL_VOID;
+}
+
+char * ScilabObjects::getSingleString(int pos, void * pvApiCtx)
+{
+    SciErr err;
+    int * addr = 0;
+    char * str = 0;
+
+    err = getVarAddressFromPosition(pvApiCtx, pos, &addr);
+    if (err.iErr)
     {
-        int type = getMListType(mlist, pvApiCtx);
-        return type == EXTERNAL_OBJECT || type == EXTERNAL_CLASS;
+        throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Invalid String"));
     }
 
-    bool ScilabObjects::isExternalVoid(int * mlist, void * pvApiCtx)
+    if (!isStringType(pvApiCtx, addr))
     {
-        return getMListType(mlist, pvApiCtx) == EXTERNAL_VOID;
+        throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("A single string expected"));
     }
 
-    char * ScilabObjects::getSingleString(int pos, void * pvApiCtx)
+    if (!isScalar(pvApiCtx, addr))
     {
-        SciErr err;
-        int * addr = 0;
-        char * str = 0;
-
-        err = getVarAddressFromPosition(pvApiCtx, pos, &addr);
-        if (err.iErr)
-        {
-            throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Invalid String"));
-        }
+        throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("A single String expected"));
+    }
 
-        if (!isStringType(pvApiCtx, addr))
-        {
-            throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("A single string expected"));
-        }
+    if (getAllocatedSingleString(pvApiCtx, addr, &str))
+    {
+        throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Invalid String"));
+    }
 
-        if (!isScalar(pvApiCtx, addr))
-        {
-            throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("A single String expected"));
-        }
+    return str;
+}
 
-        if (getAllocatedSingleString(pvApiCtx, addr, &str))
-        {
-            throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Invalid String"));
-        }
+int ScilabObjects::isPositiveIntegerAtAddress(int * addr, void * pvApiCtx)
+{
+    SciErr err;
+    int typ = 0, row, col, prec;
+    int * id = 0;
 
-        return str;
+    err = getVarDimension(pvApiCtx, addr, &row, &col);
+    if (err.iErr)
+    {
+        return -1;
     }
 
-    int ScilabObjects::isPositiveIntegerAtAddress(int * addr, void * pvApiCtx)
+    if (row != 1 || col != 1)
     {
-        SciErr err;
-        int typ = 0, row, col, prec;
-        int * id = 0;
-
-        err = getVarDimension(pvApiCtx, addr, &row, &col);
-        if (err.iErr)
-        {
-            return -1;
-        }
+        return -1;
+    }
 
-        if (row != 1 || col != 1)
-        {
-            return -1;
-        }
+    err = getVarType(pvApiCtx, addr, &typ);
+    if (err.iErr)
+    {
+        return -1;
+    }
 
-        err = getVarType(pvApiCtx, addr, &typ);
+    if (typ == sci_ints)
+    {
+        err = getMatrixOfIntegerPrecision(pvApiCtx, addr, &prec);
         if (err.iErr)
         {
             return -1;
         }
-
-        if (typ == sci_ints)
+        switch (prec)
         {
-            err = getMatrixOfIntegerPrecision(pvApiCtx, addr, &prec);
-            if (err.iErr)
-            {
-                return -1;
-            }
-            switch (prec)
-            {
             case SCI_INT8:
             {
                 char * cvalue = 0;
@@ -933,29 +933,29 @@ namespace org_modules_external_objects
 #endif
             default:
                 return -1;
-            }
         }
-        else if (typ == sci_matrix)
-        {
-            double * dvalue = 0;
-
-            if (isVarComplex(pvApiCtx, addr))
-            {
-                return -1;
-            }
+    }
+    else if (typ == sci_matrix)
+    {
+        double * dvalue = 0;
 
-            err = getMatrixOfDouble(pvApiCtx, addr, &row, &col, &dvalue);
-            if (err.iErr)
-            {
-                return -1;
-            }
+        if (isVarComplex(pvApiCtx, addr))
+        {
+            return -1;
+        }
 
-            if (*dvalue - (double)(int)(*dvalue) == 0.0)
-            {
-                return (int)(*dvalue);
-            }
+        err = getMatrixOfDouble(pvApiCtx, addr, &row, &col, &dvalue);
+        if (err.iErr)
+        {
+            return -1;
         }
 
-        return -1;
+        if (*dvalue - (double)(int)(*dvalue) == 0.0)
+        {
+            return (int)(*dvalue);
+        }
     }
+
+    return -1;
+}
 }
index b63defe..ee99c80 100644 (file)
@@ -28,7 +28,7 @@ int ScilabGateway::addNamedVariable(char * fname, const int envId, void * pvApiC
 
     ScilabAbstractEnvironment & env = ScilabEnvironments::getEnvironment(envId);
     ScilabGatewayOptions & options = env.getGatewayOptions();
-    OptionsHelper::setCopyOccured(false);
+    OptionsHelper::setCopyOccurred(false);
     ScilabObjects::initialization(env, pvApiCtx);
     options.setIsNew(false);
 
index 9710c45..fe95f35 100644 (file)
@@ -34,7 +34,7 @@ int ScilabGateway::addToClasspath(char * fname, const int envId, void * pvApiCtx
 
     ScilabAbstractEnvironment & env = ScilabEnvironments::getEnvironment(envId);
     ScilabGatewayOptions & options = env.getGatewayOptions();
-    OptionsHelper::setCopyOccured(false);
+    OptionsHelper::setCopyOccurred(false);
     ScilabObjects::initialization(env, pvApiCtx);
     options.setIsNew(false);
 
index 220e795..6f24b18 100644 (file)
@@ -31,7 +31,7 @@ int ScilabGateway::array(char * fname, const int envId, void * pvApiCtx)
         throw ScilabAbstractEnvironmentException(__LINE__, __FILE__, gettext("Wrong number of arguments : more than %d expected."), 2);
     }
 
-    OptionsHelper::setCopyOccured(false);
+    OptionsHelper::setCopyOccurred(false);
     ScilabObjects::initialization(env, pvApiCtx);
     env.getGatewayOptions().setIsNew(false);
 
index 45ad0c2..3191fcb 100644 (file)
@@ -32,7 +32,7 @@ int ScilabGateway::cast(char * fname, const int envId, void * pvApiCtx)
     ScilabAbstractEnvironment & env = ScilabEnvironments::getEnvironment(envId);
     OptionsHelper & helper = env.getOptionsHelper();
     ScilabGatewayOptions & options = env.getGatewayOptions();
-    OptionsHelper::setCopyOccured(false);
+    OptionsHelper::setCopyOccurred(false);
     ScilabObjects::initialization(env, pvApiCtx);
     options.setIsNew(false);
 
index 3bfe4f8..36a43b8 100644 (file)
@@ -40,7 +40,7 @@ int ScilabGateway::classExtract(char * fname, const int envId, void * pvApiCtx)
     ScilabAbstractEnvironment & env = ScilabEnvironments::getEnvironment(eId);
     OptionsHelper & helper = env.getOptionsHelper();
     ScilabGatewayOptions & options = env.getGatewayOptions();
-    OptionsHelper::setCopyOccured(false);
+    OptionsHelper::setCopyOccurred(false);
     ScilabObjects::initialization(env, pvApiCtx);
     options.setIsNew(false);
 
index 175f62a..8245a1e 100644 (file)
@@ -29,7 +29,7 @@ int ScilabGateway::compile(char * fname, const int envId, void * pvApiCtx)
 
     ScilabAbstractEnvironment & env = ScilabEnvironments::getEnvironment(envId);
     ScilabGatewayOptions & options = env.getGatewayOptions();
-    OptionsHelper::setCopyOccured(false);
+    OptionsHelper::setCopyOccurred(false);
     ScilabObjects::initialization(env, pvApiCtx);
     options.setIsNew(false);
 
index f131bae..b72998e 100644 (file)
@@ -27,7 +27,7 @@ int ScilabGateway::convMatrixMethod(char * fname, const int envId, void * pvApiC
     ScilabAbstractEnvironment & env = ScilabEnvironments::getEnvironment(envId);
     OptionsHelper & helper = env.getOptionsHelper();
     ScilabGatewayOptions & options = env.getGatewayOptions();
-    OptionsHelper::setCopyOccured(false);
+    OptionsHelper::setCopyOccurred(false);
     ScilabObjects::initialization(env, pvApiCtx);
     options.setIsNew(false);
 
index 6475067..a0a687c 100644 (file)
@@ -41,7 +41,7 @@ int ScilabGateway::deff(char * fname, const int envId, void * pvApiCtx)
     ScilabAbstractEnvironment & env = ScilabEnvironments::getEnvironment(envId);
     ScilabGatewayOptions & options = env.getGatewayOptions();
     OptionsHelper & helper = env.getOptionsHelper();
-    OptionsHelper::setCopyOccured(false);
+    OptionsHelper::setCopyOccurred(false);
     ScilabObjects::initialization(env, pvApiCtx);
     options.setIsNew(false);
 
index 37743a3..e28a2b2 100644 (file)
@@ -27,7 +27,7 @@ int ScilabGateway::display(char * fname, const int envId, void * pvApiCtx)
 
     ScilabAbstractEnvironment & env = ScilabEnvironments::getEnvironment(envId);
     ScilabGatewayOptions & options = env.getGatewayOptions();
-    OptionsHelper::setCopyOccured(false);
+    OptionsHelper::setCopyOccurred(false);
     ScilabObjects::initialization(env, pvApiCtx);
     options.setIsNew(false);
 
index cb546f5..52b1db5 100644 (file)
@@ -39,7 +39,7 @@ int ScilabGateway::doubleExclam_invoke(char * fname, const int envId, void * pvA
     OptionsHelper & helper = env.getOptionsHelper();
     ScilabObjects::initialization(env, pvApiCtx);
 
-    if (!OptionsHelper::getCopyOccured()) // if the function is called outside a method context, then return null
+    if (!OptionsHelper::getCopyOccurred()) // if the function is called outside a method context, then return null
     {
         //TODO: get null for environment
         ScilabObjects::unwrap(0, Rhs + 1, eId, pvApiCtx);
@@ -50,7 +50,7 @@ int ScilabGateway::doubleExclam_invoke(char * fname, const int envId, void * pvA
         return 0;
     }
 
-    OptionsHelper::setCopyOccured(false);
+    OptionsHelper::setCopyOccurred(false);
 
     if (!options.getMethodName())
     {
index 336dbe1..790037d 100644 (file)
@@ -29,7 +29,7 @@ int ScilabGateway::evalString(char * fname, const int envId, void * pvApiCtx)
 
     ScilabAbstractEnvironment & env = ScilabEnvironments::getEnvironment(envId);
     ScilabGatewayOptions & options = env.getGatewayOptions();
-    OptionsHelper::setCopyOccured(false);
+    OptionsHelper::setCopyOccurred(false);
     ScilabObjects::initialization(env, pvApiCtx);
     options.setIsNew(false);
 
index e7354bb..2b40b0b 100644 (file)
@@ -29,7 +29,7 @@ int ScilabGateway::exists(char * fname, const int envId, void * pvApiCtx)
 
     ScilabAbstractEnvironment & env = ScilabEnvironments::getEnvironment(envId);
     ScilabGatewayOptions & options = env.getGatewayOptions();
-    OptionsHelper::setCopyOccured(false);
+    OptionsHelper::setCopyOccurred(false);
     ScilabObjects::initialization(env, pvApiCtx);
     options.setIsNew(false);
 
index d807a96..bdb4de7 100644 (file)
@@ -28,7 +28,7 @@ int ScilabGateway::getClassName(char * fname, const int envId, void * pvApiCtx)
 
     ScilabAbstractEnvironment & env = ScilabEnvironments::getEnvironment(envId);
     ScilabGatewayOptions & options = env.getGatewayOptions();
-    OptionsHelper::setCopyOccured(false);
+    OptionsHelper::setCopyOccurred(false);
     ScilabObjects::initialization(env, pvApiCtx);
     options.setIsNew(false);
 
index a8d83cb..6f018dc 100644 (file)
@@ -21,7 +21,7 @@ int ScilabGateway::getClasspath(char * fname, const int envId, void * pvApiCtx)
 
     ScilabAbstractEnvironment & env = ScilabEnvironments::getEnvironment(envId);
     ScilabGatewayOptions & options = env.getGatewayOptions();
-    OptionsHelper::setCopyOccured(false);
+    OptionsHelper::setCopyOccurred(false);
     ScilabObjects::initialization(env, pvApiCtx);
     options.setIsNew(false);
 
index d20480b..04c190e 100644 (file)
@@ -26,7 +26,7 @@ int ScilabGateway::getEnvId(char * fname, const int envId, void * pvApiCtx)
 
     ScilabAbstractEnvironment & env = ScilabEnvironments::getEnvironment(envId);
     ScilabGatewayOptions & options = env.getGatewayOptions();
-    OptionsHelper::setCopyOccured(false);
+    OptionsHelper::setCopyOccurred(false);
     ScilabObjects::initialization(env, pvApiCtx);
     options.setIsNew(false);
 
index bfa002e..4fdd1a1 100644 (file)
@@ -21,7 +21,7 @@ int ScilabGateway::getEnvironmentInfos(char * fname, const int envId, void * pvA
 
     ScilabAbstractEnvironment & env = ScilabEnvironments::getEnvironment(envId);
     ScilabGatewayOptions & options = env.getGatewayOptions();
-    OptionsHelper::setCopyOccured(false);
+    OptionsHelper::setCopyOccurred(false);
     ScilabObjects::initialization(env, pvApiCtx);
     options.setIsNew(false);
 
index b03afaa..8148a11 100644 (file)
@@ -42,7 +42,7 @@ int ScilabGateway::getEnvironmentName(char * fname, const int envId, void * pvAp
 
     ScilabAbstractEnvironment & env = ScilabEnvironments::getEnvironment(eId);
     ScilabGatewayOptions & options = env.getGatewayOptions();
-    OptionsHelper::setCopyOccured(false);
+    OptionsHelper::setCopyOccurred(false);
     ScilabObjects::initialization(env, pvApiCtx);
     options.setIsNew(false);
 
index 46f8e18..7e19318 100644 (file)
@@ -30,7 +30,7 @@ int ScilabGateway::getField(char * fname, const int envId, void * pvApiCtx)
 
     ScilabAbstractEnvironment & env = ScilabEnvironments::getEnvironment(envId);
     ScilabGatewayOptions & options = env.getGatewayOptions();
-    OptionsHelper::setCopyOccured(false);
+    OptionsHelper::setCopyOccurred(false);
     ScilabObjects::initialization(env, pvApiCtx);
     options.setIsNew(false);
 
index f8e8fec..83fece9 100644 (file)
@@ -28,7 +28,7 @@ int ScilabGateway::getFields(char * fname, const int envId, void * pvApiCtx)
 
     ScilabAbstractEnvironment & env = ScilabEnvironments::getEnvironment(envId);
     ScilabGatewayOptions & options = env.getGatewayOptions();
-    OptionsHelper::setCopyOccured(false);
+    OptionsHelper::setCopyOccurred(false);
     ScilabObjects::initialization(env, pvApiCtx);
     options.setIsNew(false);
 
index 7ac509e..5dfb3dd 100644 (file)
@@ -27,7 +27,7 @@ int ScilabGateway::getMethods(char * fname, const int envId, void * pvApiCtx)
 
     ScilabAbstractEnvironment & env = ScilabEnvironments::getEnvironment(envId);
     ScilabGatewayOptions & options = env.getGatewayOptions();
-    OptionsHelper::setCopyOccured(false);
+    OptionsHelper::setCopyOccurred(false);
     ScilabObjects::initialization(env, pvApiCtx);
     options.setIsNew(false);
 
index 96d72b9..ece6dc7 100644 (file)
@@ -27,7 +27,7 @@ int ScilabGateway::getNamedVariable(char * fname, const int envId, void * pvApiC
 
     ScilabAbstractEnvironment & env = ScilabEnvironments::getEnvironment(envId);
     ScilabGatewayOptions & options = env.getGatewayOptions();
-    OptionsHelper::setCopyOccured(false);
+    OptionsHelper::setCopyOccurred(false);
     ScilabObjects::initialization(env, pvApiCtx);
     options.setIsNew(false);
 
index 27b1a4f..189ca35 100644 (file)
@@ -27,7 +27,7 @@ int ScilabGateway::getRepresentation(char * fname, const int envId, void * pvApi
 
     ScilabAbstractEnvironment & env = ScilabEnvironments::getEnvironment(envId);
     ScilabGatewayOptions & options = env.getGatewayOptions();
-    OptionsHelper::setCopyOccured(false);
+    OptionsHelper::setCopyOccurred(false);
     ScilabObjects::initialization(env, pvApiCtx);
     options.setIsNew(false);
 
index 9150b7d..22a8d27 100644 (file)
@@ -27,7 +27,7 @@ int ScilabGateway::getsetOptions(char * fname, const int envId, ScilabAbstractOp
     ScilabAbstractEnvironment & env = ScilabEnvironments::getEnvironment(envId);
     OptionsHelper & helper = env.getOptionsHelper();
     ScilabGatewayOptions & options = env.getGatewayOptions();
-    OptionsHelper::setCopyOccured(false);
+    OptionsHelper::setCopyOccurred(false);
     ScilabObjects::initialization(env, pvApiCtx);
     options.setIsNew(false);
 
index 4358022..3dfcada 100644 (file)
@@ -37,7 +37,7 @@ int ScilabGateway::import(char * fname, const int envId, void * pvApiCtx)
     ScilabAbstractEnvironment & env = ScilabEnvironments::getEnvironment(envId);
     OptionsHelper & helper = env.getOptionsHelper();
     ScilabGatewayOptions & options = env.getGatewayOptions();
-    OptionsHelper::setCopyOccured(false);
+    OptionsHelper::setCopyOccurred(false);
     ScilabObjects::initialization(env, pvApiCtx);
     options.setIsNew(false);
 
index 34f4922..dab6fae 100644 (file)
@@ -33,7 +33,7 @@ int ScilabGateway::invoke(char * fname, const int envId, void * pvApiCtx)
     ScilabAbstractEnvironment & env = ScilabEnvironments::getEnvironment(envId);
     ScilabGatewayOptions & options = env.getGatewayOptions();
     OptionsHelper & helper = env.getOptionsHelper();
-    OptionsHelper::setCopyOccured(false);
+    OptionsHelper::setCopyOccurred(false);
     ScilabObjects::initialization(env, pvApiCtx);
     options.setIsNew(false);
 
index 1caa7f1..9c36546 100644 (file)
@@ -97,7 +97,7 @@ int ScilabGateway::invoke_lu(char * fname, const int envId, void * pvApiCtx)
 
     ScilabAbstractEnvironment & env = ScilabEnvironments::getEnvironment(*eId);
     ScilabGatewayOptions & options = env.getGatewayOptions();
-    OptionsHelper::setCopyOccured(false);
+    OptionsHelper::setCopyOccurred(false);
     ScilabObjects::initialization(env, pvApiCtx);
     options.setIsNew(false);
 
index 84d7b3e..626c527 100644 (file)
@@ -28,7 +28,7 @@ int ScilabGateway::invoke(char * fname, const int envId, ScilabAbstractInvoker &
     ScilabAbstractEnvironment & env = ScilabEnvironments::getEnvironment(envId);
     ScilabGatewayOptions & options = env.getGatewayOptions();
     OptionsHelper & helper = env.getOptionsHelper();
-    OptionsHelper::setCopyOccured(false);
+    OptionsHelper::setCopyOccurred(false);
     ScilabObjects::initialization(env, pvApiCtx);
     options.setIsNew(false);
 
index fdb0c15..e587add 100644 (file)
@@ -39,7 +39,7 @@ int ScilabGateway::newInstance(char * fname, const int envId, void * pvApiCtx)
     ScilabAbstractEnvironment & env = ScilabEnvironments::getEnvironment(envId);
     ScilabGatewayOptions & options = env.getGatewayOptions();
     OptionsHelper & helper = env.getOptionsHelper();
-    OptionsHelper::setCopyOccured(false);
+    OptionsHelper::setCopyOccurred(false);
     ScilabObjects::initialization(env, pvApiCtx);
     options.setIsNew(false);
 
index 4eb3fff..5d9d90f 100644 (file)
@@ -38,7 +38,7 @@ int ScilabGateway::objectExtract(char * fname, const int envId, void * pvApiCtx)
     ScilabAbstractEnvironment & env = ScilabEnvironments::getEnvironment(eId);
     OptionsHelper & helper = env.getOptionsHelper();
     ScilabGatewayOptions & options = env.getGatewayOptions();
-    OptionsHelper::setCopyOccured(false);
+    OptionsHelper::setCopyOccurred(false);
     ScilabObjects::initialization(env, pvApiCtx);
     options.setIsNew(false);
     const int inc = helper.getUseScilabIndex() ? -1 : 0;
index ecb8b43..4164a32 100644 (file)
@@ -38,7 +38,7 @@ int ScilabGateway::objectInsert(char * fname, const int envId, void * pvApiCtx)
     ScilabAbstractEnvironment & env = ScilabEnvironments::getEnvironment(envIdA);
     OptionsHelper & helper = env.getOptionsHelper();
     ScilabGatewayOptions & options = env.getGatewayOptions();
-    OptionsHelper::setCopyOccured(false);
+    OptionsHelper::setCopyOccurred(false);
     ScilabObjects::initialization(env, pvApiCtx);
     options.setIsNew(false);
     const int inc = helper.getUseScilabIndex() ? -1 : 0;
index ffd67e8..170eee6 100644 (file)
@@ -36,7 +36,7 @@ int ScilabGateway::objectPrint(char * fname, const int envId, void * pvApiCtx)
 
     ScilabAbstractEnvironment & env = ScilabEnvironments::getEnvironment(eId);
     ScilabGatewayOptions & options = env.getGatewayOptions();
-    OptionsHelper::setCopyOccured(false);
+    OptionsHelper::setCopyOccurred(false);
     ScilabObjects::initialization(env, pvApiCtx);
     options.setIsNew(false);
 
index 59c497f..c0e5dce 100644 (file)
@@ -51,7 +51,7 @@ int ScilabGateway::operation(char * fname, const int envId, const OperatorsType
     ScilabAbstractEnvironment & env = ScilabEnvironments::getEnvironment(eId);
     OptionsHelper & helper = env.getOptionsHelper();
     ScilabGatewayOptions & options = env.getGatewayOptions();
-    OptionsHelper::setCopyOccured(false);
+    OptionsHelper::setCopyOccurred(false);
     ScilabObjects::initialization(env, pvApiCtx);
     options.setIsNew(false);
 
index 619ce4a..e1201c9 100644 (file)
@@ -22,7 +22,7 @@ int ScilabGateway::remove(char * fname, const int envId, void * pvApiCtx)
 
     ScilabAbstractEnvironment & env = ScilabEnvironments::getEnvironment(envId);
     ScilabGatewayOptions & options = env.getGatewayOptions();
-    OptionsHelper::setCopyOccured(false);
+    OptionsHelper::setCopyOccurred(false);
     ScilabObjects::initialization(env, pvApiCtx);
     options.setIsNew(false);
 
index 8d697e5..df8f911 100644 (file)
@@ -28,7 +28,7 @@ int ScilabGateway::setField(char * fname, const int envId, void * pvApiCtx)
 
     ScilabAbstractEnvironment & env = ScilabEnvironments::getEnvironment(envId);
     ScilabGatewayOptions & options = env.getGatewayOptions();
-    OptionsHelper::setCopyOccured(false);
+    OptionsHelper::setCopyOccurred(false);
     ScilabObjects::initialization(env, pvApiCtx);
     options.setIsNew(false);
 
index 7d29936..e2c2acd 100644 (file)
@@ -32,7 +32,7 @@ int ScilabGateway::trace(char * fname, const int envId, void * pvApiCtx)
 
     ScilabAbstractEnvironment & env = ScilabEnvironments::getEnvironment(envId);
     ScilabGatewayOptions & options = env.getGatewayOptions();
-    OptionsHelper::setCopyOccured(false);
+    OptionsHelper::setCopyOccurred(false);
     ScilabObjects::initialization(env, pvApiCtx);
     options.setIsNew(false);
 
index 1954ff9..fa810bc 100644 (file)
@@ -31,7 +31,7 @@ int ScilabGateway::unwrap(char * fname, const int envId, void * pvApiCtx)
 
     ScilabAbstractEnvironment & env = ScilabEnvironments::getEnvironment(envId);
     ScilabGatewayOptions & options = env.getGatewayOptions();
-    OptionsHelper::setCopyOccured(false);
+    OptionsHelper::setCopyOccurred(false);
     ScilabObjects::initialization(env, pvApiCtx);
     options.setIsNew(false);
 
index d0a1a2c..e966169 100644 (file)
@@ -31,7 +31,7 @@ int ScilabGateway::unwrapremove(char * fname, const int envId, void * pvApiCtx)
 
     ScilabAbstractEnvironment & env = ScilabEnvironments::getEnvironment(envId);
     ScilabGatewayOptions & options = env.getGatewayOptions();
-    OptionsHelper::setCopyOccured(false);
+    OptionsHelper::setCopyOccurred(false);
     ScilabObjects::initialization(env, pvApiCtx);
     options.setIsNew(false);
 
index 60f790c..4aeae96 100644 (file)
@@ -29,7 +29,7 @@ int ScilabGateway::wrap(char * fname, const int envId, void * pvApiCtx)
 
     ScilabAbstractEnvironment & env = ScilabEnvironments::getEnvironment(envId);
     ScilabGatewayOptions & options = env.getGatewayOptions();
-    OptionsHelper::setCopyOccured(false);
+    OptionsHelper::setCopyOccurred(false);
     ScilabObjects::initialization(env, pvApiCtx);
     options.setIsNew(false);
 
index 3f3471a..86f67bb 100644 (file)
@@ -30,7 +30,7 @@ int ScilabGateway::wrapAsRef(char * fname, const int envId, void * pvApiCtx)
 
     ScilabAbstractEnvironment & env = ScilabEnvironments::getEnvironment(envId);
     ScilabGatewayOptions & options = env.getGatewayOptions();
-    OptionsHelper::setCopyOccured(false);
+    OptionsHelper::setCopyOccurred(false);
     ScilabObjects::initialization(env, pvApiCtx);
     options.setIsNew(false);
 
index f8bcdcb..193023d 100644 (file)
@@ -173,7 +173,7 @@ public class CHMDocbookTagConverter extends HTMLDocbookTagConverter {
             outFiles.flush();
             outFiles.close();
         } catch (IOException e) {
-            fatalExceptionOccured(e);
+            fatalExceptionOccurred(e);
         }
     }
 
index 5286372..e6a8c7c 100644 (file)
@@ -216,7 +216,7 @@ public class DocbookTagConverter extends DefaultHandler {
             //parser.setProperty("http://xml.org/sax/properties/lexical-handler", this);
             parser.parse(in, this);
         } catch (ParserConfigurationException e) {
-            exceptionOccured(e);
+            exceptionOccurred(e);
         } catch (SAXException e) {
             System.err.println(e);
         } catch (IOException e) {
@@ -282,7 +282,7 @@ public class DocbookTagConverter extends DefaultHandler {
         } else {
             ExternalXMLHandler h = externalHandlers.get(uri);
             if (h == null) {
-                exceptionOccured(new SAXException("uri " + uri + " not handled"));
+                exceptionOccurred(new SAXException("uri " + uri + " not handled"));
                 return;
             }
             StringBuilder buf = h.startExternalXML(localName, attributes);
@@ -307,7 +307,7 @@ public class DocbookTagConverter extends DefaultHandler {
         if (uri.equals(DOCBOOKURI)) {
             DocbookElement elem = stack.pop();
             if (!elem.getName().equals(localName)) {
-                exceptionOccured(new SAXException("tag " + elem.getName() + " is closed with tag " + localName));
+                exceptionOccurred(new SAXException("tag " + elem.getName() + " is closed with tag " + localName));
                 return;
             }
             try {
@@ -322,13 +322,13 @@ public class DocbookTagConverter extends DefaultHandler {
                     elemp.getStringBuilder().append(str);
                 }
             } catch (SAXException e) {
-                exceptionOccured(e);
+                exceptionOccurred(e);
                 return;
             }
         } else {
             ExternalXMLHandler h = externalHandlers.get(uri);
             if (h == null) {
-                exceptionOccured(new SAXException("uri " + uri + " not handled"));
+                exceptionOccurred(new SAXException("uri " + uri + " not handled"));
                 return;
             }
             String str = h.endExternalXML(localName);
@@ -430,7 +430,7 @@ public class DocbookTagConverter extends DefaultHandler {
      * @param e the exception to handle
      * @throws SAXException if problem
      */
-    protected void fatalExceptionOccured(Exception e) throws SAXException {
+    protected void fatalExceptionOccurred(Exception e) throws SAXException {
         throw new SAXException(errors + "\nFATAL error:\n" + e.getMessage());
     }
 
@@ -439,7 +439,7 @@ public class DocbookTagConverter extends DefaultHandler {
      * @param e the exception to handle
      * @throws SAXException if problem
      */
-    protected void exceptionOccured(Exception e) {
+    protected void exceptionOccurred(Exception e) {
         if (!hasError) {
             hasError = true;
         }
index e4b2076..09140ab 100644 (file)
@@ -46,9 +46,9 @@ public class JavaHelpDocbookTagConverter extends HTMLDocbookTagConverter {
      */
     public JavaHelpDocbookTagConverter(String inName, String outName, String[] primConf, String[] macroConf, String template, String version, String imageDir, boolean isToolbox, String urlBase, String language) throws IOException, SAXException {
         super(inName, outName, primConf, macroConf, template, version, imageDir, isToolbox, urlBase, language, HTMLDocbookTagConverter.GenerationType.JAVAHELP);
-       if (!isToolbox) {
-           this.outImages = ScilabConstants.SCI.getPath() + "/modules/helptools/images";
-       }
+        if (!isToolbox) {
+            this.outImages = ScilabConstants.SCI.getPath() + "/modules/helptools/images";
+        }
         prependToProgramListing = "<table border=\"0\" width=\"100%\"><tr><td width=\"98%\">";
         appendToProgramListing = "</td><td valign=\"top\"><a href=\"scilab://scilab.execexample/\"><img src=\"" + getBaseImagePath() + "ScilabExecute.png\" border=\"0\"/></a></td><td valign=\"top\"><a href=\"scilab://scilab.editexample/\"><img src=\"" + getBaseImagePath() + "ScilabEdit.png\" border=\"0\"/></a></td><td></td></tr></table>";
         appendForExecToProgramListing = "</td><td valign=\"top\"><a href=\"scilab://scilab.execexample/\"><img src=\"" + getBaseImagePath() + "ScilabExecute.png\" border=\"0\"/></a></td><td></td></tr></table>";
@@ -98,7 +98,7 @@ public class JavaHelpDocbookTagConverter extends HTMLDocbookTagConverter {
             outIndex.flush();
             outIndex.close();
         } catch (IOException e) {
-            fatalExceptionOccured(e);
+            fatalExceptionOccurred(e);
         }
     }
 
index 8e26418..df4df93 100644 (file)
@@ -486,7 +486,7 @@ public final class ScilabLexer {
 
 
     /**
-     * Reports an error that occured while scanning.
+     * Reports an error that occurred while scanning.
      *
      * In a wellformed scanner (no or only correct usage of
      * yypushback(int) and a match-all fallback rule) this method
index 619606f..11c142e 100644 (file)
@@ -150,10 +150,10 @@ extern "C" {
  * every time it is called.
  *
  * A CVRhsFn should return 0 if successful, a negative value if
- * an unrecoverable error occured, and a positive value if a 
- * recoverable error (e.g. invalid y values) occured. 
- * If an unrecoverable occured, the integration is halted. 
- * If a recoverable error occured, then (in most cases) CVODE
+ * an unrecoverable error occurred, and a positive value if a 
+ * recoverable error (e.g. invalid y values) occurred. 
+ * If an unrecoverable occurred, the integration is halted. 
+ * If a recoverable error occurred, then (in most cases) CVODE
  * will try to correct and retry.
  * -----------------------------------------------------------------
  */
@@ -176,7 +176,7 @@ typedef int (*CVRhsFn)(realtype t, N_Vector y,
  * passed to the user's g function every time it is called.
  *
  * A CVRootFn should return 0 if successful or a non-zero value
- * if an error occured (in which case the integration will be halted).
+ * if an error occurred (in which case the integration will be halted).
  * -----------------------------------------------------------------
  */
 
@@ -671,7 +671,7 @@ SUNDIALS_EXPORT int CVodeGetDky(void *cvode_mem, realtype t, int k, N_Vector dky
  * CVodeGetNumLinSolvSetups returns the number of calls made to
  *                          the linear solver's setup routine
  * CVodeGetNumErrTestFails returns the number of local error test
- *                         failures that have occured
+ *                         failures that have occurred
  * CVodeGetLastOrder returns the order used during the last
  *                   internal step
  * CVodeGetCurrentOrder returns the order to be used on the next
index b7b8411..39a57b4 100644 (file)
@@ -115,9 +115,9 @@ extern "C" {
  * to provide access in res to user data.                                    
  *                                                                
  * A IDAResFn res should return a value of 0 if successful, a positive
- * value if a recoverable error occured (e.g. yy has an illegal value),
- * or a negative value if a nonrecoverable error occured. In the latter
- * case, the program halts. If a recoverable error occured, the integrator
+ * value if a recoverable error occurred (e.g. yy has an illegal value),
+ * or a negative value if a nonrecoverable error occurred. In the latter
+ * case, the program halts. If a recoverable error occurred, the integrator
  * will attempt to correct and retry.
  * ----------------------------------------------------------------
  */
@@ -140,7 +140,7 @@ typedef int (*IDAResFn)(realtype tt, N_Vector yy, N_Vector yp,
  * passed to the user's g function every time it is called.
  *
  * An IDARootFn should return 0 if successful or a non-zero value
- * if an error occured (in which case the integration will be halted).
+ * if an error occurred (in which case the integration will be halted).
  * -----------------------------------------------------------------
  */
 
@@ -811,7 +811,7 @@ SUNDIALS_EXPORT int IDAGetDky(void *ida_mem, realtype t, int k, N_Vector dky);
  * IDAGetNumLinSolvSetups returns the number of calls made to     
  *       the linear solver's setup routine                        
  * IDAGetNumErrTestFails returns the number of local error test   
- *       failures that have occured                               
+ *       failures that have occurred                               
  * IDAGetNumBacktrackOps returns the number of backtrack          
  *       operations done in the linesearch algorithm in IDACalcIC 
  * IDAGetConsistentIC returns the consistent initial conditions
index 90b8c54..96c2556 100644 (file)
@@ -494,7 +494,7 @@ public final class ScilabLexer extends ScilabLexerConstants {
 
 
     /**
-     * Reports an error that occured while scanning.
+     * Reports an error that occurred while scanning.
      *
      * In a wellformed scanner (no or only correct usage of
      * yypushback(int) and a match-all fallback rule) this method