Revert "fix bug 1412"

Breaks %s - 1 (modification must be done in insertion and not here)

This reverts commit 4a7498a65b9d728371c6808a8005f77ad197c79c.

Change-Id: Idf6f2de542cb29623aa6b372a341840f2d35f3da

diff --git a/scilab/modules/ast/src/cpp/types/polynom.cpp b/scilab/modules/ast/src/cpp/types/polynom.cpp
index 46c12b0..2f2f1b3 100644 (file)
--- a/scilab/modules/ast/src/cpp/types/polynom.cpp
+++ b/scilab/modules/ast/src/cpp/types/polynom.cpp
@@ -30,7 +30,6 @@ Polynom::Polynom()
 
 Polynom::Polynom(wstring _szVarName, int _iRows, int _iCols)
 {
-
     int piDims[2]   = {_iRows, _iCols};
     createPoly(_szVarName, 2, piDims, NULL);
 }
@@ -83,18 +82,6 @@ void Polynom::createPoly(std::wstring _szVarName, int _iDims, int* _piDims, cons
 
 bool Polynom::set(int _iPos, SinglePoly* _pS)
 {
-    Polynom *pIn = new Polynom();
-    pIn->set(&_pS);
-    if ((getMaxRank() != 0) && (m_szVarName.c_str() != pIn->getVariableName().c_str()))
-    {
-        char szError[512];
-        os_sprintf(szError, _("Input arguments should have the same formal variable name.\n"));
-        wchar_t* pwstError = to_wide_string(szError);
-        std::wstring wstError(pwstError);
-        FREE(pwstError);
-
-        throw ast::ScilabError(wstError, 999, *new Location());
-    }
     bool bComplex = isComplex();
     if (m_pRealData == NULL || _iPos >= m_iSize)
     {

diff --git a/scilab/modules/output_stream/tests/nonreg_tests/bug_1412.dia.ref b/scilab/modules/output_stream/tests/nonreg_tests/bug_1412.dia.ref
index c3747d8..dad38af 100644 (file)
--- a/scilab/modules/output_stream/tests/nonreg_tests/bug_1412.dia.ref
+++ b/scilab/modules/output_stream/tests/nonreg_tests/bug_1412.dia.ref
@@ -14,4 +14,4 @@
 // and display a incorrect error
 A(3,3)=%s;
 ierr = execstr('A(:)=%z;','errcatch');
-if ierr <> 999 then bugmes();quit;end
+if ierr <> 278 then bugmes();quit;end

diff --git a/scilab/modules/output_stream/tests/nonreg_tests/bug_1412.tst b/scilab/modules/output_stream/tests/nonreg_tests/bug_1412.tst
index 68a6a65..d1c8538 100644 (file)
--- a/scilab/modules/output_stream/tests/nonreg_tests/bug_1412.tst
+++ b/scilab/modules/output_stream/tests/nonreg_tests/bug_1412.tst
@@ -16,5 +16,5 @@
 // and display a incorrect error
 
 A(3,3)=%s;
-ierr = execstr("A(:)=%z;","errcatch");
-if ierr <> 999 then pause,end
+ierr = execstr('A(:)=%z;','errcatch');
+if ierr <> 278 then pause,end
\ No newline at end of file