summaryrefslogtreecommitdiffstats
path: root/scilab
diff options
context:
space:
mode:
authorSamuel GOUGEON <sgougeon@free.fr>2021-02-11 18:23:22 +0100
committerClément David <clement.david@esi-group.com>2021-02-18 14:42:30 +0100
commitf2d68bb1444b2b3bfdb46d171ac3a96d7ba6ad3a (patch)
tree7b7e944e57faa66563a1f9a69cf106c6e24a6f15 /scilab
parent8fb13c8d6ea21535b5afa9a7e35f6d7413e38eb9 (diff)
downloadscilab-f2d68bb1444b2b3bfdb46d171ac3a96d7ba6ad3a.zip
scilab-f2d68bb1444b2b3bfdb46d171ac3a96d7ba6ad3a.tar.gz
* Bug 16644 fixed: input('Message:') wrong mprintf error message
http://bugzilla.scilab.org/16644 Interactive test: --> input("Message: ") Message: "100" euros x="100" euros ^~~~~^ Error: syntax error, unexpected identifier, expecting end of file Message: ans = [] Change-Id: I674e52444efcd54347c1028570c5f070dd52adad
Diffstat (limited to 'scilab')
-rw-r--r--scilab/CHANGES.md1
-rw-r--r--scilab/modules/console/macros/input.sci2
2 files changed, 2 insertions, 1 deletions
diff --git a/scilab/CHANGES.md b/scilab/CHANGES.md
index 28937f0..b6c266f 100644
--- a/scilab/CHANGES.md
+++ b/scilab/CHANGES.md
@@ -350,6 +350,7 @@ Bug Fixes
350* [#16557](https://bugzilla.scilab.org/16557): `macr2tree` + `tree2code` translated `e={2}` into `"e=1"` and `e={2,"ab"}` into `"e=[2,"ab"]"`. 350* [#16557](https://bugzilla.scilab.org/16557): `macr2tree` + `tree2code` translated `e={2}` into `"e=1"` and `e={2,"ab"}` into `"e=[2,"ab"]"`.
351* [#16559](https://bugzilla.scilab.org/16553): `isempty(A)` was true for sparse matrix of dimension 2^16 or larger. 351* [#16559](https://bugzilla.scilab.org/16553): `isempty(A)` was true for sparse matrix of dimension 2^16 or larger.
352* [#16623](https://bugzilla.scilab.org/16623): `rand(2,2,2)^2` yielded a wrong result instead of trying to call the `%s_p_s` overload for input hypermatrices. 352* [#16623](https://bugzilla.scilab.org/16623): `rand(2,2,2)^2` yielded a wrong result instead of trying to call the `%s_p_s` overload for input hypermatrices.
353* [#16644](https://bugzilla.scilab.org/16644): `input("message:")` yielded a wrong error message about `mprintf` in case of non-interpretable input.
353 354
354 355
355### Bugs fixed in 6.1.0: 356### Bugs fixed in 6.1.0:
diff --git a/scilab/modules/console/macros/input.sci b/scilab/modules/console/macros/input.sci
index 832bb22..2980b0e 100644
--- a/scilab/modules/console/macros/input.sci
+++ b/scilab/modules/console/macros/input.sci
@@ -65,7 +65,7 @@ function [x] = input(msg, flag)
65 if ierr == 0 then 65 if ierr == 0 then
66 break; 66 break;
67 end 67 end
68 mprintf(lasterror()); 68 mprintf("%s\n",lasterror());
69 mprintf("\n"); 69 mprintf("\n");
70 end 70 end
71 end 71 end