exec fixed about errcatch and mode argument. 36/16036/4
Cedric Delamarre [Wed, 25 Feb 2015 13:13:25 +0000 (14:13 +0100)]
test_run differential_equations bug_10565

Change-Id: I6d96e08f197236fb20adc4283305d91d5bc0cb63

scilab/CHANGES_5.5.X
scilab/modules/differential_equations/tests/nonreg_tests/bug_10565.dia.ref
scilab/modules/differential_equations/tests/nonreg_tests/bug_10565.tst
scilab/modules/functions/sci_gateway/c/sci_exec.c

index 95ce8e0..420007c 100644 (file)
@@ -69,6 +69,14 @@ Scilab Bug Fixes
 * Bug #13752 fixed - The 'Supported compilers' page was outdated.
 
 
+Known incompatibilities
+=======================
+
+* Undocumented use of exec with "errcatch" as third input argument now returns an error:
+  exec(path, mode, 'errcatch') must be replaced by exec(path, 'errcatch', mode)
+
+
+
                      Changes between version 5.5.0 and 5.5.1
                      =======================================
 
index 6d7156a..bf12b28 100644 (file)
@@ -14,7 +14,7 @@
 //
 // <-- Short Description -->
 // demo simulation --> bicycle simulation --> unstable trajectory failed
-ierr = exec('SCI/modules/differential_equations/demos/bike/bike1.dem.sce', -1, 'errcatch');
+ierr = exec("SCI/modules/differential_equations/demos/bike/bike1.dem.sce", "errcatch", -1);
 assert_checkequal(ierr, 0);
-ierr = exec('SCI/modules/differential_equations/demos/bike/bike2.dem.sce', -1, 'errcatch');
+ierr = exec("SCI/modules/differential_equations/demos/bike/bike2.dem.sce", "errcatch", -1);
 assert_checkequal(ierr, 0);
index ad935b0..ddd48d4 100644 (file)
@@ -15,8 +15,8 @@
 // <-- Short Description -->
 // demo simulation --> bicycle simulation --> unstable trajectory failed
 
-ierr = exec('SCI/modules/differential_equations/demos/bike/bike1.dem.sce', -1, 'errcatch');
+ierr = exec("SCI/modules/differential_equations/demos/bike/bike1.dem.sce", "errcatch", -1);
 assert_checkequal(ierr, 0);
 
-ierr = exec('SCI/modules/differential_equations/demos/bike/bike2.dem.sce', -1, 'errcatch');
+ierr = exec("SCI/modules/differential_equations/demos/bike/bike2.dem.sce", "errcatch", -1);
 assert_checkequal(ierr, 0);
index f0fb8fa..37c754b 100644 (file)
@@ -283,10 +283,6 @@ int C2F(sci_exec)(char *fname, unsigned long fname_len)
                     }
                 }
 
-                if ((iType2 == sci_matrix) && (iType3 == sci_strings))
-                {
-                    bCombo = TRUE;
-                }
                 if ((iType2 == sci_strings) && (iType3 == sci_matrix))
                 {
                     bCombo = TRUE;