bug_11077 fixed. 12/21312/4
Cedric Delamarre [Wed, 12 Feb 2020 15:40:23 +0000 (16:40 +0100)]
     now, rlist() return an error
     test_run data_structures bug_11077

Change-Id: If93e962e93072c1f81771558ef7d948506e88795

scilab/modules/data_structures/help/en_US/rlist.xml
scilab/modules/data_structures/help/fr_FR/rlist.xml
scilab/modules/data_structures/help/ja_JP/rlist.xml
scilab/modules/data_structures/help/pt_BR/rlist.xml
scilab/modules/data_structures/help/ru_RU/rlist.xml
scilab/modules/data_structures/sci_gateway/cpp/sci_rlist.cpp
scilab/modules/data_structures/tests/nonreg_tests/bug_11077.dia.ref [deleted file]
scilab/modules/data_structures/tests/nonreg_tests/bug_11077.tst

index c9801ef..bd4bcd3 100644 (file)
@@ -20,7 +20,7 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
-        <synopsis>[r] = rlist()
+        <synopsis>
             [r] = rlist(N, D [,dom])
         </synopsis>
     </refsynopsisdiv>
@@ -98,4 +98,13 @@ r == S1bis
             </member>
         </simplelist>
     </refsection>
+    <refsection>
+            <title>History</title>
+            <revhistory>
+                <revision>
+                    <revnumber>6.1</revnumber>
+                    <revremark>rlist() removed.</revremark>
+                </revision>
+            </revhistory>
+    </refsection>
 </refentry>
index dcefa4f..33dd446 100644 (file)
@@ -6,7 +6,7 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>Séquence d'appel</title>
-        <synopsis>[r] = rlist()
+        <synopsis>
             [r] = rlist(N, D [,dom])
         </synopsis>
     </refsynopsisdiv>
@@ -84,4 +84,13 @@ r == S1bis
             </member>
         </simplelist>
     </refsection>
+    <refsection>
+            <title>History</title>
+            <revhistory>
+                <revision>
+                    <revnumber>6.1</revnumber>
+                    <revremark>rlist() removed.</revremark>
+                </revision>
+            </revhistory>
+    </refsection>
 </refentry>
index e5b51d7..e806525 100644 (file)
@@ -20,7 +20,7 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>呼び出し手順</title>
-        <synopsis>rlist()
+        <synopsis>
             rlist(a1,....an)
         </synopsis>
     </refsynopsisdiv>
             </member>
         </simplelist>
     </refsection>
+    <refsection>
+            <title>History</title>
+            <revhistory>
+                <revision>
+                    <revnumber>6.1</revnumber>
+                    <revremark>rlist() removed.</revremark>
+                </revision>
+            </revhistory>
+    </refsection>
 </refentry>
index d1f1514..3dec73a 100644 (file)
@@ -20,7 +20,7 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>Seqüência de Chamamento</title>
-        <synopsis>rlist()
+        <synopsis>
             rlist(a1,....an)
         </synopsis>
     </refsynopsisdiv>
             </member>
         </simplelist>
     </refsection>
+    <refsection>
+            <title>History</title>
+            <revhistory>
+                <revision>
+                    <revnumber>6.1</revnumber>
+                    <revremark>rlist() removed.</revremark>
+                </revision>
+            </revhistory>
+    </refsection>
 </refentry>
index 8a8234d..647ba8d 100644 (file)
@@ -22,7 +22,7 @@
     </refnamediv>
     <refsynopsisdiv>
         <title>Синтаксис</title>
-        <synopsis>rlist()
+        <synopsis>
             rlist(a1 ,..., an)
         </synopsis>
     </refsynopsisdiv>
@@ -61,5 +61,14 @@ rlist(Num,Den,[])
             </member>
         </simplelist>
     </refsection>
+    <refsection>
+            <title>History</title>
+            <revhistory>
+                <revision>
+                    <revnumber>6.1</revnumber>
+                    <revremark>rlist() removed.</revremark>
+                </revision>
+            </revhistory>
+    </refsection>
 </refentry>
 
index 9a4988f..f5cb5a2 100644 (file)
@@ -29,9 +29,9 @@ extern "C"
 /*-----------------------------------------------------------------------------------*/
 types::Function::ReturnValue sci_rlist(types::typed_list &in, int _iRetCount, types::typed_list &out)
 {
-    if (in.size() == 1)
+    if (in.size() != 2 && in.size() != 3)
     {
-        Scierror(77, _("%s: Wrong number of input argument(s): At most %d expected.\n"), "rlist", 2);
+        Scierror(77, _("%s: Wrong number of input argument(s): %d or %d expected.\n"), "rlist", 2, 3);
         return types::Function::Error;
     }
 
diff --git a/scilab/modules/data_structures/tests/nonreg_tests/bug_11077.dia.ref b/scilab/modules/data_structures/tests/nonreg_tests/bug_11077.dia.ref
deleted file mode 100644 (file)
index e90a0cb..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-// =============================================================================
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2012 - DIGITEO - Allan CORNET
-//
-//  This file is distributed under the same license as the Scilab package.
-// =============================================================================
-// <-- CLI SHELL MODE -->
-// <-- Non-regression test for bug 11077 -->
-//
-// <-- Bugzilla URL -->
-// http://bugzilla.scilab.org/show_bug.cgi?id=11077
-//
-// <-- Short Description -->
-// rlist() returned an error
-rlist()
- ans  =
index a62b2fb..adff9c8 100644 (file)
@@ -6,6 +6,7 @@
 // =============================================================================
 
 // <-- CLI SHELL MODE -->
+// <-- NO CHECK REF -->
 
 // <-- Non-regression test for bug 11077 -->
 //
@@ -15,7 +16,5 @@
 // <-- Short Description -->
 // rlist() returned an error
 
-
-rlist()
-
-
+msg = msprintf(gettext("%s: Wrong number of input argument(s): %d or %d expected.\n"),"rlist",2,3);
+assert_checkerror("rlist()", msg);