summaryrefslogtreecommitdiffstats
path: root/scilab
diff options
context:
space:
mode:
authorSamuel GOUGEON <sgougeon@free.fr>2020-12-12 23:38:15 +0100
committerClément David <clement.david@esi-group.com>2021-02-18 17:52:57 +0100
commit613bf779f5469b5286398d1fd42fbeeefa5147fa (patch)
treebe548db9f764a336699fb888b1ef8064802ee9ee /scilab
parent321f8cd00067cd7cc93fe8490a87ae6d202cd6e6 (diff)
downloadscilab-613bf779f5469b5286398d1fd42fbeeefa5147fa.zip
scilab-613bf779f5469b5286398d1fd42fbeeefa5147fa.tar.gz
* Bug 13985 fixed: lists are nicely displayed
http://bugzilla.scilab.org/13985 + Unit tests about display are gathered in [console] + Some .dia.ref about lists are removed Change-Id: I1c3bc505b7fc2aa165de0774abd66642d520a900
Diffstat (limited to 'scilab')
-rw-r--r--scilab/CHANGES.md4
-rw-r--r--scilab/modules/ast/src/cpp/types/list.cpp24
-rw-r--r--scilab/modules/ast/src/cpp/types/overload.cpp2
-rw-r--r--scilab/modules/ast/src/cpp/types/struct.cpp22
-rw-r--r--scilab/modules/ast/src/cpp/types/tlist.cpp34
-rw-r--r--scilab/modules/ast/src/cpp/types/types_tools.cpp2
-rw-r--r--scilab/modules/ast/tests/nonreg_tests/bug_16373.dia.ref3
-rw-r--r--scilab/modules/ast/tests/unit_tests/newtype.dia.ref18
-rw-r--r--scilab/modules/cacsd/tests/nonreg_tests/bug_13816.dia.ref3
-rw-r--r--scilab/modules/cacsd/tests/unit_tests/lqe.dia.ref2
-rw-r--r--scilab/modules/console/etc/XConfiguration-general.xsl2
-rw-r--r--scilab/modules/console/tests/unit_tests/disp.dia.ref (renamed from scilab/modules/output_stream/tests/unit_tests/disp.dia.ref)0
-rw-r--r--scilab/modules/console/tests/unit_tests/disp.tst (renamed from scilab/modules/output_stream/tests/unit_tests/disp.tst)0
-rw-r--r--scilab/modules/console/tests/unit_tests/disp_complex.dia.ref (renamed from scilab/modules/ast/tests/unit_tests/displaycomplex.dia.ref)0
-rw-r--r--scilab/modules/console/tests/unit_tests/disp_complex.tst (renamed from scilab/modules/ast/tests/unit_tests/displaycomplex.tst)0
-rw-r--r--scilab/modules/console/tests/unit_tests/disp_lists.dia.ref123
-rw-r--r--scilab/modules/console/tests/unit_tests/disp_lists.tst55
-rw-r--r--scilab/modules/console/tests/unit_tests/disp_structures.dia.ref (renamed from scilab/modules/data_structures/tests/unit_tests/struct_display.dia.ref)0
-rw-r--r--scilab/modules/console/tests/unit_tests/disp_structures.tst (renamed from scilab/modules/data_structures/tests/unit_tests/struct_display.tst)0
-rw-r--r--scilab/modules/console/tests/unit_tests/display.dia.ref (renamed from scilab/modules/core/tests/unit_tests/display.dia.ref)131
-rw-r--r--scilab/modules/console/tests/unit_tests/display.tst (renamed from scilab/modules/core/tests/unit_tests/display.tst)21
-rw-r--r--scilab/modules/core/tests/nonreg_tests/bug_474.dia.ref16
-rw-r--r--scilab/modules/core/tests/nonreg_tests/bug_6730.dia.ref4
-rw-r--r--scilab/modules/core/tests/nonreg_tests/bug_6891.dia.ref2
-rw-r--r--scilab/modules/core/tests/unit_tests/comment.dia.ref12
-rw-r--r--scilab/modules/core/tests/unit_tests/parse.dia.ref17
-rw-r--r--scilab/modules/data_structures/tests/nonreg_tests/bug_1604.dia.ref2
-rw-r--r--scilab/modules/data_structures/tests/nonreg_tests/bug_4171.dia.ref34
-rw-r--r--scilab/modules/data_structures/tests/unit_tests/list.dia.ref72
-rw-r--r--scilab/modules/data_structures/tests/unit_tests/list.tst5
-rw-r--r--scilab/modules/data_structures/tests/unit_tests/listextraction.dia.ref76
-rw-r--r--scilab/modules/data_structures/tests/unit_tests/listextraction.tst1
-rw-r--r--scilab/modules/data_structures/tests/unit_tests/listinsertion.dia.ref341
-rw-r--r--scilab/modules/data_structures/tests/unit_tests/listinsertion.tst1
-rw-r--r--scilab/modules/data_structures/tests/unit_tests/lstops.dia.ref111
-rw-r--r--scilab/modules/data_structures/tests/unit_tests/lstops.tst1
-rw-r--r--scilab/modules/development_tools/tests/unit_tests/assert/checkfilesequal.dia.ref2
-rw-r--r--scilab/modules/differential_equations/tests/nonreg_tests/bug_4948.dia.ref2
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_2119.win.dia.ref11
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/G_make.win.dia.ref2
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/schur_external.win.dia.ref8
-rw-r--r--scilab/modules/elementary_functions/tests/unit_tests/IEEEcompatibility.dia.ref2
-rw-r--r--scilab/modules/external_objects_java/tests/unit_tests/jallowClassReloading.dia.ref3
-rw-r--r--scilab/modules/external_objects_java/tests/unit_tests/jinvoke_db.dia.ref3
-rw-r--r--scilab/modules/fileio/tests/nonreg_tests/bug_1693.win.dia.ref1
-rw-r--r--scilab/modules/graphic_export/tests/nonreg_tests/bug_13676.dia.ref3
-rw-r--r--scilab/modules/graphic_export/tests/nonreg_tests/bug_4231.dia.ref2
-rw-r--r--scilab/modules/graphic_export/tests/nonreg_tests/bug_4273.dia.ref2
-rw-r--r--scilab/modules/graphic_export/tests/nonreg_tests/bug_4437.dia.ref2
-rw-r--r--scilab/modules/graphic_export/tests/nonreg_tests/bug_4944.dia.ref2
-rw-r--r--scilab/modules/graphic_export/tests/unit_tests/gif_non_empty_file.dia.ref1
-rw-r--r--scilab/modules/graphic_export/tests/unit_tests/ps_non_empty_file.dia.ref2
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_1134.dia.ref4
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_1201.dia.ref2
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_12119.dia.ref23
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_12163.dia.ref2
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_13402.dia.ref2
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_13441.dia.ref1
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_13733.dia.ref2
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_14036.dia.ref2
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_1448.dia.ref2
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_1560.dia.ref8
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_1582.dia.ref2
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_1696.dia.ref2
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_1720.dia.ref2
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_174.dia.ref2
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_1839.dia.ref2
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_1873.dia.ref2
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_2141.dia.ref2
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_2175.dia.ref2
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_2210.dia.ref4
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_2222.dia.ref4
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_2255.dia.ref4
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_2365.dia.ref4
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_2540.dia.ref2
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_2631.dia.ref2
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_2797.dia.ref2
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_2813.dia.ref2
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_2814.dia.ref2
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_2870.dia.ref2
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_2888.dia.ref10
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_2934.dia.ref2
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_2936.dia.ref2
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_2953.dia.ref3
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_2983.dia.ref3
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_3101.dia.ref2
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_3118.dia.ref2
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_3184.dia.ref3
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_3204.dia.ref2
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_3225.dia.ref2
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_3390.dia.ref4
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_3454.dia.ref2
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_3470.dia.ref2
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_3475.dia.ref2
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_3527.dia.ref2
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_3572.dia.ref2
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_3608.dia.ref2
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_3621.dia.ref2
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_3800.dia.ref2
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_3952.dia.ref2
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_3953.dia.ref2
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_3954.dia.ref2
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_4093.dia.ref4
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_4106.dia.ref4
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_4236.dia.ref2
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_4463.dia.ref2
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_4640.dia.ref2
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_5844.dia.ref2
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_6531.dia.ref3
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_6720.dia.ref1
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_6959.dia.ref2
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_7509.dia.ref2
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_7998.dia.ref2
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_8786.dia.ref2
-rw-r--r--scilab/modules/graphics/tests/unit_tests/Matplot.dia.ref21
-rw-r--r--scilab/modules/graphics/tests/unit_tests/arc.dia.ref14
-rw-r--r--scilab/modules/graphics/tests/unit_tests/fec.dia.ref11
-rw-r--r--scilab/modules/graphics/tests/unit_tests/figure.resizefcn.dia.ref2
-rw-r--r--scilab/modules/graphics/tests/unit_tests/gce.dia.ref3
-rw-r--r--scilab/modules/graphics/tests/unit_tests/glue_unglue.dia.ref30
-rw-r--r--scilab/modules/graphics/tests/unit_tests/grayplot.dia.ref33
-rw-r--r--scilab/modules/graphics/tests/unit_tests/is_handle_valid.dia.ref28
-rw-r--r--scilab/modules/graphics/tests/unit_tests/line_style.dia.ref8
-rw-r--r--scilab/modules/graphics/tests/unit_tests/mesh.dia.ref60
-rw-r--r--scilab/modules/graphics/tests/unit_tests/polyline.dia.ref28
-rw-r--r--scilab/modules/graphics/tests/unit_tests/rectangle.dia.ref20
-rw-r--r--scilab/modules/graphics/tests/unit_tests/segs.dia.ref54
-rw-r--r--scilab/modules/graphics/tests/unit_tests/ticks.dia.ref72
-rw-r--r--scilab/modules/graphics/tests/unit_tests/xstring.dia.ref66
-rw-r--r--scilab/modules/gui/tests/nonreg_tests/bug_2565.dia.ref2
-rw-r--r--scilab/modules/gui/tests/nonreg_tests/bug_8827.dia.ref1
-rw-r--r--scilab/modules/hdf5/tests/nonreg_tests/bug_15501.dia.ref2
-rw-r--r--scilab/modules/helptools/tests/nonreg_tests/bug_10505.win.dia.ref2
-rw-r--r--scilab/modules/helptools/tests/nonreg_tests/bug_1768.win.dia.ref5
-rw-r--r--scilab/modules/helptools/tests/nonreg_tests/bug_8756.win.dia.ref2
-rw-r--r--scilab/modules/helptools/tests/unit_tests/xmltohtml.win.dia.ref12
-rw-r--r--scilab/modules/helptools/tests/unit_tests/xmltojar.win.dia.ref12
-rw-r--r--scilab/modules/helptools/tests/unit_tests/xmltopdf.win.dia.ref12
-rw-r--r--scilab/modules/helptools/tests/unit_tests/xmltops.win.dia.ref12
-rw-r--r--scilab/modules/io/tests/nonreg_tests/bug_12296.dia.ref2
-rw-r--r--scilab/modules/io/tests/nonreg_tests/bug_3453.dia.ref4
-rw-r--r--scilab/modules/localization/tests/nonreg_tests/bug_13986.dia.ref32
-rw-r--r--scilab/modules/localization/tests/unit_tests/UTF-8_Identifiers.dia.ref32
-rw-r--r--scilab/modules/localization/tests/unit_tests/setlanguage.dia.ref10
-rw-r--r--scilab/modules/localization/tests/unit_tests/unicode_io.win.dia.ref24
-rw-r--r--scilab/modules/m2sci/tests/nonreg_tests/bug_1636.dia.ref2
-rw-r--r--scilab/modules/m2sci/tests/nonreg_tests/bug_2656.dia.ref12
-rw-r--r--scilab/modules/m2sci/tests/nonreg_tests/compat_functions/bug_1725.dia.ref16
-rw-r--r--scilab/modules/matio/tests/nonreg_tests/bug_8783.dia.ref2
-rw-r--r--scilab/modules/matio/tests/unit_tests/loadmatfile.dia.ref328
-rw-r--r--scilab/modules/modules_manager/tests/unit_tests/tbx_make.win.dia.ref10
-rw-r--r--scilab/modules/optimization/tests/nonreg_tests/bug_3056.dia.ref4
-rw-r--r--scilab/modules/output_stream/tests/nonreg_tests/bug_11138.dia.ref2
-rw-r--r--scilab/modules/output_stream/tests/nonreg_tests/bug_15640.dia.ref2
-rw-r--r--scilab/modules/overloading/macros/%l_p.sci28
-rw-r--r--scilab/modules/overloading/macros/%l_p_inc.sci241
-rw-r--r--scilab/modules/overloading/macros/%st_p.sci244
-rw-r--r--scilab/modules/overloading/tests/nonreg_tests/bug_10396.dia.ref4
-rw-r--r--scilab/modules/overloading/tests/nonreg_tests/bug_9783.dia.ref6
-rw-r--r--scilab/modules/overloading/tests/unit_tests/overloadingName.dia.ref74
-rw-r--r--scilab/modules/overloading/tests/unit_tests/sparse.dia.ref5
-rw-r--r--scilab/modules/polynomials/tests/nonreg_tests/bug_16158.dia.ref15
-rw-r--r--scilab/modules/randlib/tests/unit_tests/grand_plot.dia.ref20
-rw-r--r--scilab/modules/renderer/tests/nonreg_tests/bug_15984.dia.ref20
-rw-r--r--scilab/modules/renderer/tests/nonreg_tests/bug_7286.dia.ref3
-rw-r--r--scilab/modules/scicos/tests/unit_tests/model/Block.dia.ref246
-rw-r--r--scilab/modules/scicos/tests/unit_tests/model/Clone_SuperBlock_in_Diagram.dia.ref100
-rw-r--r--scilab/modules/scicos/tests/unit_tests/model/Deep_cloning.dia.ref56
-rw-r--r--scilab/modules/scicos/tests/unit_tests/model/Delete_objects.dia.ref20
-rw-r--r--scilab/modules/scicos/tests/unit_tests/model/Diagram.dia.ref408
-rw-r--r--scilab/modules/scicos/tests/unit_tests/model/Diagram_cloning.dia.ref28
-rw-r--r--scilab/modules/scicos/tests/unit_tests/model/Insert_in_SuperBlock.dia.ref112
-rw-r--r--scilab/modules/scicos/tests/unit_tests/model/SuperBlock.dia.ref290
-rw-r--r--scilab/modules/scicos/tests/unit_tests/model/SuperBlock_in_SuperBlock.dia.ref2
-rw-r--r--scilab/modules/scicos/tests/unit_tests/model/SuperBlock_misconnected.dia.ref750
-rw-r--r--scilab/modules/scicos/tests/unit_tests/model/from_mlist.dia.ref42
-rw-r--r--scilab/modules/scicos/tests/unit_tests/model/link_preservation.dia.ref14
-rw-r--r--scilab/modules/scicos/tests/unit_tests/sciblk2.dia.ref6
-rw-r--r--scilab/modules/string/tests/nonreg_tests/bug_14524.dia.ref2
-rw-r--r--scilab/modules/tclsci/tests/nonreg_tests/bug_1566.dia.ref18
-rw-r--r--scilab/modules/tclsci/tests/nonreg_tests/bug_1591.dia.ref12
-rw-r--r--scilab/modules/windows_tools/tests/unit_tests/findfileassociation.dia.ref1
-rw-r--r--scilab/modules/xcos/tests/nonreg_tests/bug_13011.win.dia.ref42
-rw-r--r--scilab/modules/xcos/tests/unit_tests/Integer/dflipflop.dia.ref10
-rw-r--r--scilab/modules/xcos/tests/unit_tests/Integer/dlatch.dia.ref10
-rw-r--r--scilab/modules/xcos/tests/unit_tests/blocks_set.dia.ref1
186 files changed, 1498 insertions, 3692 deletions
diff --git a/scilab/CHANGES.md b/scilab/CHANGES.md
index 2f9a160..7b1f48b 100644
--- a/scilab/CHANGES.md
+++ b/scilab/CHANGES.md
@@ -197,6 +197,7 @@ Feature changes and additions
197 - Any hypermatrix can be sorted along a dimension > 2. 197 - Any hypermatrix can be sorted along a dimension > 2.
198* `unique` is enabled for any 2D sparse arrays, in simple, 'c' and 'r' modes. 198* `unique` is enabled for any 2D sparse arrays, in simple, 'c' and 'r' modes.
199* %chars constant added, to easily access to some selected sets of unicode symbols. 199* %chars constant added, to easily access to some selected sets of unicode symbols.
200* Lists are displayed in a more compact and comprehensive way.
200 201
201Help pages: 202Help pages:
202----------- 203-----------
@@ -287,9 +288,10 @@ Bug Fixes
287* [#12532](https://bugzilla.scilab.org/12532): From `browsevar`, clicking on any function did not edit it with `edit`. The content of libraries could not be displayed either. 288* [#12532](https://bugzilla.scilab.org/12532): From `browsevar`, clicking on any function did not edit it with `edit`. The content of libraries could not be displayed either.
288* [#12719](https://bugzilla.scilab.org/12719): `A(%s)` gave the same result as `A($)`. 289* [#12719](https://bugzilla.scilab.org/12719): `A(%s)` gave the same result as `A($)`.
289* [#12889](https://bugzilla.scilab.org/12889): In the help browser, add a menu allowing to select the language of help pages, regardless of the language of the session. 290* [#12889](https://bugzilla.scilab.org/12889): In the help browser, add a menu allowing to select the language of help pages, regardless of the language of the session.
291* [#13417](https://bugzilla.scilab.org/13417): `csvRead` page did not document the way to use the `range` up to the last row/column.
290* [#13593](https://bugzilla.scilab.org/13593): `csvRead()` did not take the `range` into account when `header` is provided. `[]` could not be used as default `range`. 292* [#13593](https://bugzilla.scilab.org/13593): `csvRead()` did not take the `range` into account when `header` is provided. `[]` could not be used as default `range`.
291* [#13762](https://bugzilla.scilab.org/13762): In the `fft` page, the formula for the inverse FFT missed the 1/n normalization factor. 293* [#13762](https://bugzilla.scilab.org/13762): In the `fft` page, the formula for the inverse FFT missed the 1/n normalization factor.
292* [#13417](https://bugzilla.scilab.org/13417): `csvRead` page did not document the way to use the `range` up to the last row/column. 294* [#13985](https://bugzilla.scilab.org/13985): The display of lists was very loose and poor.
293* [#14435](https://bugzilla.scilab.org/14435): Errors were not well handled in overloaded functions. 295* [#14435](https://bugzilla.scilab.org/14435): Errors were not well handled in overloaded functions.
294* [#14488](https://bugzilla.scilab.org/14488): The `frameflag=9` and `strf=".9."` values of these `plot2d` options were no longer accepted. Their documentation was ambiguous. 296* [#14488](https://bugzilla.scilab.org/14488): The `frameflag=9` and `strf=".9."` values of these `plot2d` options were no longer accepted. Their documentation was ambiguous.
295* [#14718](https://bugzilla.scilab.org/14718): `user` is removed for a while but was still documented. 297* [#14718](https://bugzilla.scilab.org/14718): `user` is removed for a while but was still documented.
diff --git a/scilab/modules/ast/src/cpp/types/list.cpp b/scilab/modules/ast/src/cpp/types/list.cpp
index d6fcb39..c5c1295 100644
--- a/scilab/modules/ast/src/cpp/types/list.cpp
+++ b/scilab/modules/ast/src/cpp/types/list.cpp
@@ -14,7 +14,9 @@
14*/ 14*/
15 15
16#include <sstream> 16#include <sstream>
17#include "configvariable.hxx"
17#include "double.hxx" 18#include "double.hxx"
19#include "overload.hxx"
18#include "list.hxx" 20#include "list.hxx"
19#include "void.hxx" 21#include "void.hxx"
20#include "listinsert.hxx" 22#include "listinsert.hxx"
@@ -23,6 +25,7 @@
23#include "scilabWrite.hxx" 25#include "scilabWrite.hxx"
24#include "types_tools.hxx" 26#include "types_tools.hxx"
25#include "function.hxx" 27#include "function.hxx"
28#include "scilabWrite.hxx"
26 29
27#ifndef NDEBUG 30#ifndef NDEBUG
28#include "inspector.hxx" 31#include "inspector.hxx"
@@ -150,6 +153,27 @@ List *List::clone()
150*/ 153*/
151bool List::toString(std::wostringstream& ostr) 154bool List::toString(std::wostringstream& ostr)
152{ 155{
156 //call overload %type_p if exists
157 types::typed_list in;
158 types::typed_list out;
159
160 IncreaseRef();
161 in.push_back(this);
162 switch (Overload::generateNameAndCall(L"p", in, 1, out, false, false)) {
163 case Function::OK_NoResult:
164 // unresolved function, fallback to a basic display
165 break;
166 case Function::Error:
167 ConfigVariable::setError();
168 // fallthrough
169 case Function::OK:
170 ostr.str(L"");
171 DecreaseRef();
172 return true;
173 };
174 DecreaseRef();
175
176 // otherwise, display basic information
153 if (getSize() == 0) 177 if (getSize() == 0)
154 { 178 {
155 ostr.str(L""); 179 ostr.str(L"");
diff --git a/scilab/modules/ast/src/cpp/types/overload.cpp b/scilab/modules/ast/src/cpp/types/overload.cpp
index 8caf65f..cc056ed 100644
--- a/scilab/modules/ast/src/cpp/types/overload.cpp
+++ b/scilab/modules/ast/src/cpp/types/overload.cpp
@@ -63,7 +63,7 @@ types::Function::ReturnValue Overload::generateNameAndCall(const std::wstring& _
63 } 63 }
64 64
65 // if overload doesn't existe try with short name 65 // if overload doesn't existe try with short name
66 std::wstring stFunc2 = buildOverloadName(_stFunctionName, in, _iRetCount, _isOperator, errorOnUndefined); 66 std::wstring stFunc2 = buildOverloadName(_stFunctionName, in, _iRetCount, _isOperator, true);
67 if (symbol::Context::getInstance()->get(symbol::Symbol(stFunc))) 67 if (symbol::Context::getInstance()->get(symbol::Symbol(stFunc)))
68 { 68 {
69 types::Function::ReturnValue ret = call(stFunc, in, _iRetCount, out, _isOperator, errorOnUndefined, _Location); 69 types::Function::ReturnValue ret = call(stFunc, in, _iRetCount, out, _isOperator, errorOnUndefined, _Location);
diff --git a/scilab/modules/ast/src/cpp/types/struct.cpp b/scilab/modules/ast/src/cpp/types/struct.cpp
index 2f975c6..64fc468 100644
--- a/scilab/modules/ast/src/cpp/types/struct.cpp
+++ b/scilab/modules/ast/src/cpp/types/struct.cpp
@@ -18,6 +18,7 @@
18#include "list.hxx" 18#include "list.hxx"
19#include "int.hxx" 19#include "int.hxx"
20#include "localization.hxx" 20#include "localization.hxx"
21#include "overload.hxx"
21#include "scilabWrite.hxx" 22#include "scilabWrite.hxx"
22#include "exp.hxx" 23#include "exp.hxx"
23#include "types_tools.hxx" 24#include "types_tools.hxx"
@@ -506,6 +507,27 @@ Struct* Struct::removeField(const std::wstring& _sKey)
506 507
507bool Struct::toString(std::wostringstream& ostr) 508bool Struct::toString(std::wostringstream& ostr)
508{ 509{
510 //call overload %type_p if exists
511 types::typed_list in;
512 types::typed_list out;
513
514 IncreaseRef();
515 in.push_back(this);
516 switch (Overload::generateNameAndCall(L"p", in, 1, out, false, false)) {
517 case Function::OK_NoResult:
518 // unresolved function, fallback to a basic display
519 break;
520 case Function::Error:
521 ConfigVariable::setError();
522 // fallthrough
523 case Function::OK:
524 ostr.str(L"");
525 DecreaseRef();
526 return true;
527 };
528 DecreaseRef();
529
530 // otherwise, display basic information
509 if (getSize() == 0) 531 if (getSize() == 0)
510 { 532 {
511 ostr << L"0x0 struct array with no field."; 533 ostr << L"0x0 struct array with no field.";
diff --git a/scilab/modules/ast/src/cpp/types/tlist.cpp b/scilab/modules/ast/src/cpp/types/tlist.cpp
index f7c99ef..3e6c281 100644
--- a/scilab/modules/ast/src/cpp/types/tlist.cpp
+++ b/scilab/modules/ast/src/cpp/types/tlist.cpp
@@ -340,32 +340,18 @@ bool TList::toString(std::wostringstream& ostr)
340 340
341 IncreaseRef(); 341 IncreaseRef();
342 in.push_back(this); 342 in.push_back(this);
343 343 switch (Overload::generateNameAndCall(L"p", in, 1, out, false, false)) {
344 try 344 case Function::OK_NoResult:
345 { 345 // unresolved function, fallback to a basic display
346 if (Overload::generateNameAndCall(L"p", in, 1, out) == Function::Error) 346 break;
347 { 347 case Function::Error:
348 ConfigVariable::setError(); 348 ConfigVariable::setError();
349 } 349 // fallthrough
350 350 case Function::OK:
351 ostr.str(L""); 351 ostr.str(L"");
352 DecreaseRef();
353 return true;
354 }
355 catch (ast::InternalError& e)
356 {
357 if (e.GetErrorType() == ast::TYPE_ERROR)
358 {
359 DecreaseRef(); 352 DecreaseRef();
360 throw e; 353 return true;
361 } 354 };
362
363 // avoid error message about undefined overload %type_p
364 ConfigVariable::resetError();
365 // reset where error filled by generateNameAndCall
366 ConfigVariable::resetWhereError();
367 }
368
369 DecreaseRef(); 355 DecreaseRef();
370 356
371 // special case for lss 357 // special case for lss
diff --git a/scilab/modules/ast/src/cpp/types/types_tools.cpp b/scilab/modules/ast/src/cpp/types/types_tools.cpp
index 56576fc..87629cf 100644
--- a/scilab/modules/ast/src/cpp/types/types_tools.cpp
+++ b/scilab/modules/ast/src/cpp/types/types_tools.cpp
@@ -952,7 +952,7 @@ int getIndexWithDims(int* _piIndexes, const int* _piDims, int _iDims)
952 952
953types::Function::ReturnValue VariableToString(types::InternalType* pIT, const wchar_t* wcsVarName) 953types::Function::ReturnValue VariableToString(types::InternalType* pIT, const wchar_t* wcsVarName)
954{ 954{
955 if (pIT->hasToString() == false || pIT->isStruct()) 955 if (pIT->hasToString() == false)
956 { 956 {
957 types::Function::ReturnValue ret = types::Function::Error; 957 types::Function::ReturnValue ret = types::Function::Error;
958 //call overload %type_p 958 //call overload %type_p
diff --git a/scilab/modules/ast/tests/nonreg_tests/bug_16373.dia.ref b/scilab/modules/ast/tests/nonreg_tests/bug_16373.dia.ref
index 6dc97d4..e5c6b79 100644
--- a/scilab/modules/ast/tests/nonreg_tests/bug_16373.dia.ref
+++ b/scilab/modules/ast/tests/nonreg_tests/bug_16373.dia.ref
@@ -14,9 +14,6 @@
14// 14//
15// <-- Short Description --> 15// <-- Short Description -->
16//fix issue of crashing in arm when displaying 0 16//fix issue of crashing in arm when displaying 0
17
18a = 0 17a = 0
19 a = 18 a =
20
21 0. 19 0.
22
diff --git a/scilab/modules/ast/tests/unit_tests/newtype.dia.ref b/scilab/modules/ast/tests/unit_tests/newtype.dia.ref
index 41b8985..2a0dfda 100644
--- a/scilab/modules/ast/tests/unit_tests/newtype.dia.ref
+++ b/scilab/modules/ast/tests/unit_tests/newtype.dia.ref
@@ -26,12 +26,9 @@ disp(a)
26This is my type. 26This is my type.
27l=list(2, a, "test") 27l=list(2, a, "test")
28 l = 28 l =
29 l(1) 29 (1) = 2
30 2. 30 (2) : NewType
31 l(2) 31 (3) = "test"
32This is my type.
33 l(3)
34 "test"
35// overload call 32// overload call
36b = newtype(%f); 33b = newtype(%f);
37function %nt_p(h) 34function %nt_p(h)
@@ -44,9 +41,6 @@ disp(b)
44 "%nt_p: This is my type." 41 "%nt_p: This is my type."
45l=list(2, b, "test") 42l=list(2, b, "test")
46 l = 43 l =
47 l(1) 44 (1) = 2
48 2. 45 (2) : NewType
49 l(2) 46 (3) = "test"
50 "%nt_p: This is my type."
51 l(3)
52 "test"
diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_13816.dia.ref b/scilab/modules/cacsd/tests/nonreg_tests/bug_13816.dia.ref
index 92e2ca0..413c6ec 100644
--- a/scilab/modules/cacsd/tests/nonreg_tests/bug_13816.dia.ref
+++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_13816.dia.ref
@@ -7,8 +7,7 @@
7// <-- TEST WITH GRAPHIC --> 7// <-- TEST WITH GRAPHIC -->
8s=poly(0,"s") 8s=poly(0,"s")
9 s = 9 s =
10 10 s
11 s
12num=10*s+20; 11num=10*s+20;
13den=s^3+14*s^2+35*s-50; 12den=s^3+14*s^2+35*s-50;
14h=syslin("c",num/den); 13h=syslin("c",num/den);
diff --git a/scilab/modules/cacsd/tests/unit_tests/lqe.dia.ref b/scilab/modules/cacsd/tests/unit_tests/lqe.dia.ref
index 2a4c256..5248975 100644
--- a/scilab/modules/cacsd/tests/unit_tests/lqe.dia.ref
+++ b/scilab/modules/cacsd/tests/unit_tests/lqe.dia.ref
@@ -29,7 +29,7 @@ H = [0.14,0.42;
29 0.5,0.86]; 29 0.5,0.86];
30//The noises covariance matrices 30//The noises covariance matrices
31Q_e=eye(ne,ne); 31Q_e=eye(ne,ne);
32R_v=diag(1:ny); 32R_v=diag(1:ny);
33S_ev=zeros(ne,ny); 33S_ev=zeros(ne,ny);
34S_ev(1,1)=0.8; 34S_ev(1,1)=0.8;
35// |. |. 35// |. |.
diff --git a/scilab/modules/console/etc/XConfiguration-general.xsl b/scilab/modules/console/etc/XConfiguration-general.xsl
index 39a0ee2..6896a2e 100644
--- a/scilab/modules/console/etc/XConfiguration-general.xsl
+++ b/scilab/modules/console/etc/XConfiguration-general.xsl
@@ -70,7 +70,7 @@
70 <NumericalSpinner gridx="3" gridy="5" 70 <NumericalSpinner gridx="3" gridy="5"
71 weightx="0" 71 weightx="0"
72 min-value="0" 72 min-value="0"
73 max-value="10" 73 max-value="30"
74 increment="1" 74 increment="1"
75 length="2" 75 length="2"
76 listener="ActionListener" 76 listener="ActionListener"
diff --git a/scilab/modules/output_stream/tests/unit_tests/disp.dia.ref b/scilab/modules/console/tests/unit_tests/disp.dia.ref
index bdd0d9f..bdd0d9f 100644
--- a/scilab/modules/output_stream/tests/unit_tests/disp.dia.ref
+++ b/scilab/modules/console/tests/unit_tests/disp.dia.ref
diff --git a/scilab/modules/output_stream/tests/unit_tests/disp.tst b/scilab/modules/console/tests/unit_tests/disp.tst
index d266f62..d266f62 100644
--- a/scilab/modules/output_stream/tests/unit_tests/disp.tst
+++ b/scilab/modules/console/tests/unit_tests/disp.tst
diff --git a/scilab/modules/ast/tests/unit_tests/displaycomplex.dia.ref b/scilab/modules/console/tests/unit_tests/disp_complex.dia.ref
index 86b08be..86b08be 100644
--- a/scilab/modules/ast/tests/unit_tests/displaycomplex.dia.ref
+++ b/scilab/modules/console/tests/unit_tests/disp_complex.dia.ref
diff --git a/scilab/modules/ast/tests/unit_tests/displaycomplex.tst b/scilab/modules/console/tests/unit_tests/disp_complex.tst
index 9efa6c3..9efa6c3 100644
--- a/scilab/modules/ast/tests/unit_tests/displaycomplex.tst
+++ b/scilab/modules/console/tests/unit_tests/disp_complex.tst
diff --git a/scilab/modules/console/tests/unit_tests/disp_lists.dia.ref b/scilab/modules/console/tests/unit_tests/disp_lists.dia.ref
new file mode 100644
index 0000000..2811309
--- /dev/null
+++ b/scilab/modules/console/tests/unit_tests/disp_lists.dia.ref
@@ -0,0 +1,123 @@
1// =============================================================================
2// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3// Copyright (C) ????-2008 - INRIA
4// Copyright (C) 2020 - Samuel GOUGEON
5//
6// This file is distributed under the same license as the Scilab package.
7// =============================================================================
8// <-- CLI SHELL MODE -->
9//
10// <-- Short Description -->
11// Display of lists unitary tests
12%l_p(list())
13 empty list()
14%l_p(list(1,2,3))
15 (1) = 1
16 (2) = 2
17 (3) = 3
18%l_p(list(list(1,list()),2))
19 (1) : list:
20 (1) = 1
21 (2) : empty list()
22 (2) = 2
23[p, q] = (poly(rand(5,1),"z"), poly(rand(6,1),"z"));
24%l_p(list(rlist(q,p), 1.23))
25 (1) : [1x1 rational] of z
26 (2) = 1.23
27%l_p(list(1,1:$))
28 (1) = 1
29 (2) = 1:$
30%l_p(list(list(1:$)))
31 (1) : list:
32 (1) = 1:$
33%l_p(list(list(1,$),list()))
34 (1) : list:
35 (1) = 1
36 (2) = $
37 (2) : empty list()
38//
39films = struct("Title", "A.I. Artificial Intelligence",..
40 "Year", 2001, ..
41 "Director", "Steven Spielberg", ..
42 "Duration", 140);
43L = list([%t %f %f]', ..
44 $:-1:3, ..
45 int8([1 2 3 ; 4 5 6]), ..
46 [-%inf, -1, 0, %i, 7.1, 3.3e20, %inf, %nan], ..
47 sparse([0 1 2; 3 0 4]), ..
48 ["This" "is" "some" "text"], ..
49 , ..
50 sin, ..
51 logspace, ..
52 iolib, ..
53 {%pi, "abcd" ;
54 list(,)(1),(%i-%s)^3}, ..
55 {}, ..
56 list(["Hello" "Allo" "Hé"], uint64(12345678)^(1:3), ,grand(2,4,"uin",0,10)), ..
57 list(), ..
58 films);
59%l_p(L)
60 (1) : [3x1 boolean]
61 (2) = $:-1:3
62 (3) : [2x3 int8]
63 (4) = [-%inf,-1,0,%i,7.1,3.300D+20,%inf,%nan]
64 (5) : [2x3 sparse]
65 (6) = ["This","is","some","text"]
66 (7) = (void)
67 (8) : fptr
68 (9) : logspace(d1,d2,n) => [y] (42 lines)
69 (10) : iolib library with 5 functions @ SCI\modules\io\macros\
70 (11) : [2x2 cell]
71 (12) = {}
72 (13) : list:
73 (1) = ["Hello","Allo","Hé"]
74 (2) = uint64([12345678,1.524D+14,9.223D+18])
75 (3) = (void)
76 (4) : [2x4 constant]
77 (14) : empty list()
78 (15) : struct with fields:
79 Title = "A.I. Artificial Intelligence"
80 Year = 2001
81 Director = "Steven Spielberg"
82 Duration = 140
83// Tlist overloaded display
84TL = tlist("x",1,2)
85 TL =
86 TL(1)
87 "x"
88 TL(2)
89 1.
90 TL(3)
91 2.
92deff("%x_p(x)","disp(''Mydisplay'',x(2),x(3))")
93TL
94 TL =
95 "Mydisplay"
96 1.
97 2.
98list(TL)
99 ans =
100 (1) : [x] tlist without field.
101list(list(TL))
102 ans =
103 (1) : list:
104 (1) : [x] tlist without field.
105TL = tlist("x",1:$,2)
106 TL =
107 "Mydisplay"
108 1:1:$
109 2.
110list(TL)
111 ans =
112 (1) : [x] tlist without field.
113list(list(TL))
114 ans =
115 (1) : list:
116 (1) : [x] tlist without field.
117TL(2) = TL
118 TL =
119 "Mydisplay"
120 "Mydisplay"
121 1:1:$
122 2.
123 2.
diff --git a/scilab/modules/console/tests/unit_tests/disp_lists.tst b/scilab/modules/console/tests/unit_tests/disp_lists.tst
new file mode 100644
index 0000000..5ecaaad
--- /dev/null
+++ b/scilab/modules/console/tests/unit_tests/disp_lists.tst
@@ -0,0 +1,55 @@
1// =============================================================================
2// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3// Copyright (C) ????-2008 - INRIA
4// Copyright (C) 2020 - Samuel GOUGEON
5//
6// This file is distributed under the same license as the Scilab package.
7// =============================================================================
8// <-- CLI SHELL MODE -->
9//
10// <-- Short Description -->
11// Display of lists unitary tests
12
13%l_p(list())
14%l_p(list(1,2,3))
15%l_p(list(list(1,list()),2))
16[p, q] = (poly(rand(5,1),"z"), poly(rand(6,1),"z"));
17%l_p(list(rlist(q,p), 1.23))
18%l_p(list(1,1:$))
19%l_p(list(list(1:$)))
20%l_p(list(list(1,$),list()))
21
22//
23films = struct("Title", "A.I. Artificial Intelligence",..
24 "Year", 2001, ..
25 "Director", "Steven Spielberg", ..
26 "Duration", 140);
27L = list([%t %f %f]', ..
28 $:-1:3, ..
29 int8([1 2 3 ; 4 5 6]), ..
30 [-%inf, -1, 0, %i, 7.1, 3.3e20, %inf, %nan], ..
31 sparse([0 1 2; 3 0 4]), ..
32 ["This" "is" "some" "text"], ..
33 , ..
34 sin, ..
35 logspace, ..
36 iolib, ..
37 {%pi, "abcd" ;
38 list(,)(1),(%i-%s)^3}, ..
39 {}, ..
40 list(["Hello" "Allo" "Hé"], uint64(12345678)^(1:3), ,grand(2,4,"uin",0,10)), ..
41 list(), ..
42 films);
43%l_p(L)
44
45
46// Tlist overloaded display
47TL = tlist("x",1,2)
48deff("%x_p(x)","disp(''Mydisplay'',x(2),x(3))")
49TL
50list(TL)
51list(list(TL))
52TL = tlist("x",1:$,2)
53list(TL)
54list(list(TL))
55TL(2) = TL
diff --git a/scilab/modules/data_structures/tests/unit_tests/struct_display.dia.ref b/scilab/modules/console/tests/unit_tests/disp_structures.dia.ref
index 38f3bd7..38f3bd7 100644
--- a/scilab/modules/data_structures/tests/unit_tests/struct_display.dia.ref
+++ b/scilab/modules/console/tests/unit_tests/disp_structures.dia.ref
diff --git a/scilab/modules/data_structures/tests/unit_tests/struct_display.tst b/scilab/modules/console/tests/unit_tests/disp_structures.tst
index 4054421..4054421 100644
--- a/scilab/modules/data_structures/tests/unit_tests/struct_display.tst
+++ b/scilab/modules/console/tests/unit_tests/disp_structures.tst
diff --git a/scilab/modules/core/tests/unit_tests/display.dia.ref b/scilab/modules/console/tests/unit_tests/display.dia.ref
index 32f21d5..4c07383 100644
--- a/scilab/modules/core/tests/unit_tests/display.dia.ref
+++ b/scilab/modules/console/tests/unit_tests/display.dia.ref
@@ -16,7 +16,7 @@ x=[2.6533333 -0.0002]
16x' 16x'
17 ans = 17 ans =
18 2.6533333 18 2.6533333
19 -0.0002 19 -0.0002
20x=[] 20x=[]
21 x = 21 x =
22 [] 22 []
@@ -91,61 +91,50 @@ d3=[1+z**10 z**15];
91//display of rationals 91//display of rationals
92r=num./den 92r=num./den
93 r = 93 r =
94
95 1 1 94 1 1
96 - - 95 - -
97 1 1 96 1 1
98r' 97r'
99 ans = 98 ans =
100
101 1 99 1
102 - 100 -
103 1 101 1
104
105 1 102 1
106 - 103 -
107 1 104 1
108rlist(d,n) 105rlist(d,n)
109 ans = 106 ans =
110
111 1 +2z +z² 107 1 +2z +z²
112 --------- 108 ---------
113 1 +z 109 1 +z
114rlist(n,d) 110rlist(n,d)
115 ans = 111 ans =
116
117 1 +z 112 1 +z
118 --------- 113 ---------
119 1 +2z +z² 114 1 +2z +z²
120rlist(d2,n2) 115rlist(d2,n2)
121 ans = 116 ans =
122
123 1 +2z +z² 1 +4z +6z² +4z³ +z⁴ 117 1 +2z +z² 1 +4z +6z² +4z³ +z⁴
124 --------- ------------------- 118 --------- -------------------
125 1 +z 1 +2z +z² 119 1 +z 1 +2z +z²
126
127 1 +z 1 +2z +z² 120 1 +z 1 +2z +z²
128 --------- ------------------- 121 --------- -------------------
129 1 +2z +z² 1 +4z +6z² +4z³ +z⁴ 122 1 +2z +z² 1 +4z +6z² +4z³ +z⁴
130rlist(n2,d2) 123rlist(n2,d2)
131 ans = 124 ans =
132
133 1 +z 1 +2z +z² 125 1 +z 1 +2z +z²
134 --------- ------------------- 126 --------- -------------------
135 1 +2z +z² 1 +4z +6z² +4z³ +z⁴ 127 1 +2z +z² 1 +4z +6z² +4z³ +z⁴
136
137 1 +2z +z² 1 +4z +6z² +4z³ +z⁴ 128 1 +2z +z² 1 +4z +6z² +4z³ +z⁴
138 --------- ------------------- 129 --------- -------------------
139 1 +z 1 +2z +z² 130 1 +z 1 +2z +z²
140rlist(den,num) 131rlist(den,num)
141 ans = 132 ans =
142
143 1 +2z +z² 1 +4z +6z² +4z³ +z⁴ 133 1 +2z +z² 1 +4z +6z² +4z³ +z⁴
144 --------- ------------------- 134 --------- -------------------
145 1 +2z +z² 1 +4z +6z² +4z³ +z⁴ 135 1 +2z +z² 1 +4z +6z² +4z³ +z⁴
146rlist(num,den) 136rlist(num,den)
147 ans = 137 ans =
148
149 1 +2z +z² 1 +4z +6z² +4z³ +z⁴ 138 1 +2z +z² 1 +4z +6z² +4z³ +z⁴
150 --------- ------------------- 139 --------- -------------------
151 1 +2z +z² 1 +4z +6z² +4z³ +z⁴ 140 1 +2z +z² 1 +4z +6z² +4z³ +z⁴
@@ -154,7 +143,6 @@ rlist(p1,q1)
154 143
155 column 1 144 column 1
156 145
157
158 -0.0000078 +0.0351988z -0.3720034z² +1.3432153z³ -1.9632981z⁴ +z⁵ 146 -0.0000078 +0.0351988z -0.3720034z² +1.3432153z³ -1.9632981z⁴ +z⁵
159 ----------------------------------------------------------------- 147 -----------------------------------------------------------------
160 0.0123314 -0.2684985z +1.5393672z² -4.0114366z³ +5.4004179z⁴ 148 0.0123314 -0.2684985z +1.5393672z² -4.0114366z³ +5.4004179z⁴
@@ -162,7 +150,6 @@ rlist(p1,q1)
162 150
163 column 2 151 column 2
164 152
165
166 0.1 +2.35z -5.05z³ 153 0.1 +2.35z -5.05z³
167 ------------------------ 154 ------------------------
168 2.56 +0.03z -10.01z² +z⁵ 155 2.56 +0.03z -10.01z² +z⁵
@@ -172,7 +159,6 @@ rlist(q1,p1)
172 159
173 column 1 160 column 1
174 161
175
176 0.0123314 -0.2684985z +1.5393672z² -4.0114366z³ +5.4004179z⁴ 162 0.0123314 -0.2684985z +1.5393672z² -4.0114366z³ +5.4004179z⁴
177 -3.6713072z⁵ +z⁶ 163 -3.6713072z⁵ +z⁶
178 ----------------------------------------------------------------- 164 -----------------------------------------------------------------
@@ -180,46 +166,39 @@ rlist(q1,p1)
180 166
181 column 2 167 column 2
182 168
183
184 2.56 +0.03z -10.01z² +z⁵ 169 2.56 +0.03z -10.01z² +z⁵
185 ------------------------ 170 ------------------------
186 0.1 +2.35z -5.05z³ 171 0.1 +2.35z -5.05z³
187 172
188rlist(p,q) 173rlist(p,q)
189 ans = 174 ans =
190
191 -0.0000078 +0.0351988z -0.3720034z² +1.3432153z³ -1.9632981z⁴ +z⁵ 175 -0.0000078 +0.0351988z -0.3720034z² +1.3432153z³ -1.9632981z⁴ +z⁵
192 ----------------------------------------------------------------- 176 -----------------------------------------------------------------
193 0.0123314 -0.2684985z +1.5393672z² -4.0114366z³ +5.4004179z⁴ 177 0.0123314 -0.2684985z +1.5393672z² -4.0114366z³ +5.4004179z⁴
194 -3.6713072z⁵ +z⁶ 178 -3.6713072z⁵ +z⁶
195rlist(q,p) 179rlist(q,p)
196 ans = 180 ans =
197
198 0.0123314 -0.2684985z +1.5393672z² -4.0114366z³ +5.4004179z⁴ 181 0.0123314 -0.2684985z +1.5393672z² -4.0114366z³ +5.4004179z⁴
199 -3.6713072z⁵ +z⁶ 182 -3.6713072z⁵ +z⁶
200 ----------------------------------------------------------------- 183 -----------------------------------------------------------------
201 -0.0000078 +0.0351988z -0.3720034z² +1.3432153z³ -1.9632981z⁴ +z⁵ 184 -0.0000078 +0.0351988z -0.3720034z² +1.3432153z³ -1.9632981z⁴ +z⁵
202rlist(p,z) 185rlist(p,z)
203 ans = 186 ans =
204
205 -0.0000078 +0.0351988z -0.3720034z² +1.3432153z³ -1.9632981z⁴ +z⁵ 187 -0.0000078 +0.0351988z -0.3720034z² +1.3432153z³ -1.9632981z⁴ +z⁵
206 ----------------------------------------------------------------- 188 -----------------------------------------------------------------
207 z 189 z
208rlist(z,p) 190rlist(z,p)
209 ans = 191 ans =
210
211 z 192 z
212 ----------------------------------------------------------------- 193 -----------------------------------------------------------------
213 -0.0000078 +0.0351988z -0.3720034z² +1.3432153z³ -1.9632981z⁴ +z⁵ 194 -0.0000078 +0.0351988z -0.3720034z² +1.3432153z³ -1.9632981z⁴ +z⁵
214rlist(d1,n1) 195rlist(d1,n1)
215 ans = 196 ans =
216
217 1 +2z +z² 1 +4z +6z² +4z³ +z⁴ 1 +2z +z² 1 +4z +6z² +4z³ +z⁴ 197 1 +2z +z² 1 +4z +6z² +4z³ +z⁴ 1 +2z +z² 1 +4z +6z² +4z³ +z⁴
218 --------- ------------------- --------- ------------------- 198 --------- ------------------- --------- -------------------
219 1 +z 1 +2z +z² 1 +z 1 +2z +z² 199 1 +z 1 +2z +z² 1 +z 1 +2z +z²
220rlist(n1,d1) 200rlist(n1,d1)
221 ans = 201 ans =
222
223 1 +z 1 +2z +z² 1 +z 1 +2z +z² 202 1 +z 1 +2z +z² 1 +z 1 +2z +z²
224 --------- ------------------- --------- ------------------- 203 --------- ------------------- --------- -------------------
225 1 +2z +z² 1 +4z +6z² +4z³ +z⁴ 1 +2z +z² 1 +4z +6z² +4z³ +z⁴ 204 1 +2z +z² 1 +4z +6z² +4z³ +z⁴ 1 +2z +z² 1 +4z +6z² +4z³ +z⁴
@@ -448,114 +427,6 @@ dn = [d n];
448 "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz" 427 "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz"
449 "1234567890" 428 "1234567890"
450lines(oldlines); 429lines(oldlines);
451// display of list
452list()
453 ans =
454 ()
455list(1,2,3)
456 ans =
457 ans(1)
458 1.
459 ans(2)
460 2.
461 ans(3)
462 3.
463list(list(1,list()),2)
464 ans =
465 ans(1)
466 ans(1)(1)
467 1.
468 ans(1)(2)
469 ()
470 ans(2)
471 2.
472list(rlist(q,p),1.23)
473 ans =
474 ans(1)
475
476 0.0123314 -0.2684985z +1.5393672z² -4.0114366z³ +5.4004179z⁴
477 -3.6713072z⁵ +z⁶
478 -----------------------------------------------------------------
479 -0.0000078 +0.0351988z -0.3720034z² +1.3432153z³ -1.9632981z⁴ +z⁵
480 ans(2)
481 1.23
482// overloading of display
4831:$
484 ans =
485 1:1:$
486list(1,1:$)
487 ans =
488 ans(1)
489 1.
490 ans(2)
491 1:1:$
492list(list(1:$))
493 ans =
494 ans(1)
495 ans(1)(1)
496 1:1:$
497list(list(1,$),list())
498 ans =
499 ans(1)
500 ans(1)(1)
501 1.
502 ans(1)(2)
503 $
504 ans(2)
505 ()
506// Tlist overloaded display
507TL=tlist("x",1,2)
508 TL =
509 TL(1)
510 "x"
511 TL(2)
512 1.
513 TL(3)
514 2.
515deff("%x_p(x)","disp(''Mydisplay'',x(2),x(3))")
516TL
517 TL =
518 "Mydisplay"
519 1.
520 2.
521list(TL)
522 ans =
523 ans(1)
524 "Mydisplay"
525 1.
526 2.
527list(list(TL))
528 ans =
529 ans(1)
530 ans(1)(1)
531 "Mydisplay"
532 1.
533 2.
534TL=tlist("x",1:$,2)
535 TL =
536 "Mydisplay"
537 1:1:$
538 2.
539list(TL)
540 ans =
541 ans(1)
542 "Mydisplay"
543 1:1:$
544 2.
545list(list(TL))
546 ans =
547 ans(1)
548 ans(1)(1)
549 "Mydisplay"
550 1:1:$
551 2.
552TL(2)=TL
553 TL =
554 "Mydisplay"
555 "Mydisplay"
556 1:1:$
557 2.
558 2.
559// boolean 430// boolean
560%t 431%t
561 ans = 432 ans =
diff --git a/scilab/modules/core/tests/unit_tests/display.tst b/scilab/modules/console/tests/unit_tests/display.tst
index e221603..e8708c9 100644
--- a/scilab/modules/core/tests/unit_tests/display.tst
+++ b/scilab/modules/console/tests/unit_tests/display.tst
@@ -114,27 +114,6 @@ dn = [d n];
114 114
115lines(oldlines); 115lines(oldlines);
116 116
117// display of list
118list()
119list(1,2,3)
120list(list(1,list()),2)
121list(rlist(q,p),1.23)
122// overloading of display
1231:$
124list(1,1:$)
125list(list(1:$))
126list(list(1,$),list())
127// Tlist overloaded display
128TL=tlist("x",1,2)
129deff("%x_p(x)","disp(''Mydisplay'',x(2),x(3))")
130TL
131list(TL)
132list(list(TL))
133TL=tlist("x",1:$,2)
134list(TL)
135list(list(TL))
136TL(2)=TL
137
138// boolean 117// boolean
139%t 118%t
140%f 119%f
diff --git a/scilab/modules/core/tests/nonreg_tests/bug_474.dia.ref b/scilab/modules/core/tests/nonreg_tests/bug_474.dia.ref
index eff3fa6..c6a7b70 100644
--- a/scilab/modules/core/tests/nonreg_tests/bug_474.dia.ref
+++ b/scilab/modules/core/tests/nonreg_tests/bug_474.dia.ref
@@ -39,30 +39,30 @@ a=matrix(1:9,3,3)
39 2. 5. 8. 39 2. 5. 8.
40 3. 6. 9. 40 3. 6. 9.
41[mia,kia]=min(a) 41[mia,kia]=min(a)
42 kia =
43 1. 1.
44 mia = 42 mia =
45 1. 43 1.
44 kia =
45 1. 1.
46[maa,kaa]=max(a) 46[maa,kaa]=max(a)
47 kaa =
48 3. 3.
49 maa = 47 maa =
50 9. 48 9.
49 kaa =
50 3. 3.
51b=int16(matrix(1:9,3,3)) 51b=int16(matrix(1:9,3,3))
52 b = 52 b =
53 1 4 7 53 1 4 7
54 2 5 8 54 2 5 8
55 3 6 9 55 3 6 9
56[mib,kib]=min(b) 56[mib,kib]=min(b)
57 kib =
58 1. 1.
59 mib = 57 mib =
60 1 58 1
59 kib =
60 1. 1.
61[mab,kab]=max(b) 61[mab,kab]=max(b)
62 kab =
63 3. 3.
64 mab = 62 mab =
65 9 63 9
64 kab =
65 3. 3.
66if mia<>mib then bugmes();quit;end 66if mia<>mib then bugmes();quit;end
67if or(kia<>kib) then bugmes();quit;end 67if or(kia<>kib) then bugmes();quit;end
68if maa<>mab then bugmes();quit;end 68if maa<>mab then bugmes();quit;end
diff --git a/scilab/modules/core/tests/nonreg_tests/bug_6730.dia.ref b/scilab/modules/core/tests/nonreg_tests/bug_6730.dia.ref
index e310ef9..0145468 100644
--- a/scilab/modules/core/tests/nonreg_tests/bug_6730.dia.ref
+++ b/scilab/modules/core/tests/nonreg_tests/bug_6730.dia.ref
@@ -19,7 +19,7 @@ b=mlist(['foo','hello'],myfun);
19c=mlist(['foo','hello'],list('xxxx','yyyyy','zzzzz')); 19c=mlist(['foo','hello'],list('xxxx','yyyyy','zzzzz'));
20[x,y,z]=b.hello() 20[x,y,z]=b.hello()
21 x = 21 x =
22 () 22 empty list()
23 y = 23 y =
24 2. 24 2.
25 z = 25 z =
@@ -27,7 +27,7 @@ c=mlist(['foo','hello'],list('xxxx','yyyyy','zzzzz'));
27if x<>list()|y<>2|z<>3 then bugmes();quit;end 27if x<>list()|y<>2|z<>3 then bugmes();quit;end
28[x,y,z]=a.hello() 28[x,y,z]=a.hello()
29 x = 29 x =
30 () 30 empty list()
31 y = 31 y =
32 2. 32 2.
33 z = 33 z =
diff --git a/scilab/modules/core/tests/nonreg_tests/bug_6891.dia.ref b/scilab/modules/core/tests/nonreg_tests/bug_6891.dia.ref
index 2782414..9d3bebc 100644
--- a/scilab/modules/core/tests/nonreg_tests/bug_6891.dia.ref
+++ b/scilab/modules/core/tests/nonreg_tests/bug_6891.dia.ref
@@ -22,7 +22,7 @@ Name Type Size Bytes
22whos -name corel 22whos -name corel
23Name Type Size Bytes 23Name Type Size Bytes
24 24
25corelib library 1184 25corelib library 1248
26whos -type polynomial 26whos -type polynomial
27Name Type Size Bytes 27Name Type Size Bytes
28 28
diff --git a/scilab/modules/core/tests/unit_tests/comment.dia.ref b/scilab/modules/core/tests/unit_tests/comment.dia.ref
index ff08b8d..da6bcdc 100644
--- a/scilab/modules/core/tests/unit_tests/comment.dia.ref
+++ b/scilab/modules/core/tests/unit_tests/comment.dia.ref
@@ -357,12 +357,12 @@ T=macr2tree(foo);
357 "hhh hh" 357 "hhh hh"
358 "loop end" 358 "loop end"
359 L = 359 L =
360 1. 360 1.
361 3. 361 3.
362 5. 362 5.
363 6. 363 6.
364 8. 364 8.
365 9. 365 9.
366 10. 366 10.
367 11. 367 11.
368 12. 368 12.
diff --git a/scilab/modules/core/tests/unit_tests/parse.dia.ref b/scilab/modules/core/tests/unit_tests/parse.dia.ref
index 1d3c53a..070049c 100644
--- a/scilab/modules/core/tests/unit_tests/parse.dia.ref
+++ b/scilab/modules/core/tests/unit_tests/parse.dia.ref
@@ -181,10 +181,8 @@ str_l=list();str_l(1)=1;str_l(1)
181 1. 181 1.
182l=list(1,2,3);l(3)=null() 182l=list(1,2,3);l(3)=null()
183 l = 183 l =
184 l(1) 184 (1) = 1
185 1. 185 (2) = 2
186 l(2)
187 2.
188function []=foo() 186function []=foo()
189 [noeuds,triang]=resume(1,2) 187 [noeuds,triang]=resume(1,2)
190endfunction 188endfunction
@@ -212,8 +210,7 @@ deff("t1=foo()","t1(2)= 1");foo()
212 1. 210 1.
213deff("t1=foo()","t1=list();t1(1)= 44;");foo() 211deff("t1=foo()","t1=list();t1(1)= 44;");foo()
214 ans = 212 ans =
215 ans(1) 213 (1) = 44
216 44.
217deff("[a,b,x]=foo()","[a(1),b(1,2),x]=(3,4,5);");[a,b,x]=foo() 214deff("[a,b,x]=foo()","[a(1),b(1,2),x]=(3,4,5);");[a,b,x]=foo()
218 a = 215 a =
219 3. 216 3.
@@ -224,7 +221,7 @@ deff("[a,b,x]=foo()","[a(1),b(1,2),x]=(3,4,5);");[a,b,x]=foo()
224function [a,b,x]=foo(),u=5;[a(1),b(1,2),x]=(3,4,u),a(2)=44,endfunction 221function [a,b,x]=foo(),u=5;[a(1),b(1,2),x]=(3,4,u),a(2)=44,endfunction
225[a,b,x]=foo() 222[a,b,x]=foo()
226 a = 223 a =
227 3. 224 3.
228 44. 225 44.
229 b = 226 b =
230 0. 4. 227 0. 4.
@@ -252,8 +249,6 @@ foo()
252function l=foo(),l=list(1,2,3);l(3)=null();endfunction 249function l=foo(),l=list(1,2,3);l(3)=null();endfunction
253foo() 250foo()
254 ans = 251 ans =
255 ans(1) 252 (1) = 1
256 1. 253 (2) = 2
257 ans(2)
258 2.
259funcprot(1); 254funcprot(1);
diff --git a/scilab/modules/data_structures/tests/nonreg_tests/bug_1604.dia.ref b/scilab/modules/data_structures/tests/nonreg_tests/bug_1604.dia.ref
index 493c028..a53a28b 100644
--- a/scilab/modules/data_structures/tests/nonreg_tests/bug_1604.dia.ref
+++ b/scilab/modules/data_structures/tests/nonreg_tests/bug_1604.dia.ref
@@ -13,7 +13,7 @@
13// 13//
14// <-- Short Description --> 14// <-- Short Description -->
15//Bug in parser while manipulating tlist inside list. 15//Bug in parser while manipulating tlist inside list.
16//Note that the bug is only visible/reproducible in release mode under 16//Note that the bug is only visible/reproducible in release mode under
17//Windows. It should also happen in debug but can't be easily seen... 17//Windows. It should also happen in debug but can't be easily seen...
18t=list(gca());//create the data 18t=list(gca());//create the data
19R = t(1).data_bounds(:,1); //crash 19R = t(1).data_bounds(:,1); //crash
diff --git a/scilab/modules/data_structures/tests/nonreg_tests/bug_4171.dia.ref b/scilab/modules/data_structures/tests/nonreg_tests/bug_4171.dia.ref
index 81994e9..6a619da 100644
--- a/scilab/modules/data_structures/tests/nonreg_tests/bug_4171.dia.ref
+++ b/scilab/modules/data_structures/tests/nonreg_tests/bug_4171.dia.ref
@@ -35,12 +35,12 @@ tl2 = tlist("X", tl1, tl1)
35l1 = list(stru); 35l1 = list(stru);
36l2 = list(l1, l1) 36l2 = list(l1, l1)
37 l2 = 37 l2 =
38 l2(1) 38 (1) : list:
39 l2(1)(1) 39 (1) : struct with fields:
40 field = "value" 40 field = "value"
41 l2(2) 41 (2) : list:
42 l2(2)(1) 42 (1) : struct with fields:
43 field = "value" 43 field = "value"
44// Bug 11484 (duplicate) 44// Bug 11484 (duplicate)
45// --------- 45// ---------
46x = struct('a',4,'b',3); 46x = struct('a',4,'b',3);
@@ -50,14 +50,14 @@ list_c = list();
50list_c(0) = list(x,y); 50list_c(0) = list(x,y);
51list_c(0) = list(z) 51list_c(0) = list(z)
52 list_c = 52 list_c =
53 list_c(1) 53 (1) : list:
54 list_c(1)(1) 54 (1) : struct with fields:
55 a = 7 55 a = 7
56 b = 2 56 b = 2
57 list_c(2) 57 (2) : list:
58 list_c(2)(1) 58 (1) : struct with fields:
59 a = 4 59 a = 4
60 b = 3 60 b = 3
61 list_c(2)(2) 61 (2) : struct with fields:
62 a = 5 62 a = 5
63 b = 6 63 b = 6
diff --git a/scilab/modules/data_structures/tests/unit_tests/list.dia.ref b/scilab/modules/data_structures/tests/unit_tests/list.dia.ref
deleted file mode 100644
index a9e129f..0000000
--- a/scilab/modules/data_structures/tests/unit_tests/list.dia.ref
+++ /dev/null
@@ -1,72 +0,0 @@
1// =============================================================================
2// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3// Copyright (C) 2014-2014 - Scilab Enterprises - Bruno JOFRET
4//
5// This file is distributed under the same license as the Scilab package.
6// =============================================================================
7// <-- CLI SHELL MODE -->
8// test de creation des listes avec des elements null()
9l = list(,);
10m = l(1);
11n = l(2);
12assert_checkfalse(isdef("m"));
13assert_checkfalse(isdef("n"));
14l = list(1,);
15n = l(2);
16assert_checkfalse(isdef("n"));
17assert_checkequal(l(1), 1);
18l = list(,1);
19m = l(1);
20assert_checkfalse(isdef("m"));
21assert_checkequal(l(2), 1);
22l = list(,,);
23m = l(1);
24n = l(2);
25p = l(3);
26assert_checkfalse(isdef("m"));
27assert_checkfalse(isdef("n"));
28assert_checkfalse(isdef("p"));
29l = list(1,,);
30n = l(2);
31p = l(3);
32assert_checkequal(l(1), 1);
33assert_checkfalse(isdef("n"));
34assert_checkfalse(isdef("p"));
35l = list(,1,);
36m = l(1);
37p = l(3);
38assert_checkfalse(isdef("m"));
39assert_checkequal(l(2), 1);
40assert_checkfalse(isdef("p"));
41l = list(,,1);
42m = l(1);
43n = l(2);
44assert_checkfalse(isdef("m"));
45assert_checkfalse(isdef("n"));
46assert_checkequal(l(3), 1);
47l = list(1,1,);
48p = l(3);
49assert_checkequal(l(1), 1);
50assert_checkequal(l(2), 1);
51assert_checkfalse(isdef("p"));
52l = list(1,,1);
53n = l(2);
54assert_checkequal(l(1), 1);
55assert_checkfalse(isdef("n"));
56assert_checkequal(l(3), 1);
57l = list(,1,1);
58m = l(1);
59assert_checkfalse(isdef("m"));
60assert_checkequal(l(2), 1);
61assert_checkequal(l(3), 1);
62a=list(list(1));
63b=a;
64b(1)(1) = 2;
65// a must not be modified !
66assert_checkequal(a, list(list(1)));
67// check error in print overload
68ml=mlist(["test" "f1"], 15);
69function %test_p(varargin)
70 error("overload error");
71end
72assert_checkerror("disp(ml)", "overload error");
diff --git a/scilab/modules/data_structures/tests/unit_tests/list.tst b/scilab/modules/data_structures/tests/unit_tests/list.tst
index b576434..7d7fadb 100644
--- a/scilab/modules/data_structures/tests/unit_tests/list.tst
+++ b/scilab/modules/data_structures/tests/unit_tests/list.tst
@@ -1,11 +1,12 @@
1// ============================================================================= 1// =============================================================================
2// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab 2// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3// Copyright (C) 2014-2014 - Scilab Enterprises - Bruno JOFRET 3// Copyright (C) 2014 - Scilab Enterprises - Bruno JOFRET
4// 4//
5// This file is distributed under the same license as the Scilab package. 5// This file is distributed under the same license as the Scilab package.
6// ============================================================================= 6// =============================================================================
7// <-- CLI SHELL MODE --> 7// <-- CLI SHELL MODE -->
8 8// <-- NO CHECK REF -->
9//
9// test de creation des listes avec des elements null() 10// test de creation des listes avec des elements null()
10 11
11l = list(,); 12l = list(,);
diff --git a/scilab/modules/data_structures/tests/unit_tests/listextraction.dia.ref b/scilab/modules/data_structures/tests/unit_tests/listextraction.dia.ref
deleted file mode 100644
index 3382df0..0000000
--- a/scilab/modules/data_structures/tests/unit_tests/listextraction.dia.ref
+++ /dev/null
@@ -1,76 +0,0 @@
1// =============================================================================
2// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3// Copyright (C) ????-2008 - INRIA
4//
5// This file is distributed under the same license as the Scilab package.
6// =============================================================================
7// <-- CLI SHELL MODE -->
8// test des insertions dans les listes
9a=1,b=3;c=2;d=[1 2 3];e=[3 4 5];f=[10;20];g=[44 55];
10 a =
11 1.
12h=5;i=4;a0=10;c0=20;b0=30;g0=[44 55 66; 10 20 30];
13l=list(a);if l(1)<>a then bugmes();quit;end
14l=list(a);if l(1)(1)<>a(1) then bugmes();quit;end
15l=list(a);if l(1)(1,1)<>a(1,1) then bugmes();quit;end
16l=list(a,d,b);if l(2)<>d then bugmes();quit;end
17l=list(a,d,b);if l(2)(1:2)<>d(1:2) then bugmes();quit;end
18l=list(a,d,b);if l(2)(1,2)<>d(1,2) then bugmes();quit;end
19//
20l=list(a,list(b,c,d));if l(2)(3)<>d then bugmes();quit;end
21l=list(a,list(b,c,d));if l(2)(3)(3)<>d(3) then bugmes();quit;end
22l=list(a,list(b,c,d));if l(2)(3)([3 1])<>d([3 1]) then bugmes();quit;end
23l=list(a,list(b,c,d));if l(2)(3)(1,[3 1])<>d(1,[3 1]) then bugmes();quit;end
24l=list(a,list(b,c,d));if l(2)(3)(:,[3 1])<>d(:,[3 1]) then bugmes();quit;end
25l=list(a,list(b,c,d));if l(2)(3)(:,[$ 1])<>d(:,[$ 1]) then bugmes();quit;end
26l=list(a,list(b,c,d));if l(2)(3)($,[$ 1])<>d($,[$ 1]) then bugmes();quit;end
27//
28l=list(a,list(b,c,d),h);if l(2)(3)<>d then bugmes();quit;end
29l=list(a,list(b,c,d),h);if l(2)(3)(3)<>d(3) then bugmes();quit;end
30l=list(a,list(b,c,d),h);if l(2)(3)([3 1])<>d([3 1]) then bugmes();quit;end
31l=list(a,list(b,c,d),h);if l(2)(3)(1,[3 1])<>d(1,[3 1]) then bugmes();quit;end
32l=list(a,list(b,c,d),h);if l(2)(3)(:,[3 1])<>d(:,[3 1]) then bugmes();quit;end
33l=list(a,list(b,c,d),h);if l(2)(3)(:,[$ 1])<>d(:,[$ 1]) then bugmes();quit;end
34l=list(a,list(b,c,d),h);if l(2)(3)($,[$ 1])<>d($,[$ 1]) then bugmes();quit;end
35//
36l=list(a,1/%s);if l(2)<>1/%s then bugmes();quit;end
37l=list(a,1/%s);if l(2)('num')<>1 then bugmes();quit;end
38l=list(a,1/%s,g);if l(2)('den')(1,1)<>%s then bugmes();quit;end
39l=list(a,1/%s,g);if l(2)<>1/%s then bugmes();quit;end
40l=list(a,1/%s,g);if l(2)('num')<>1 then bugmes();quit;end
41l=list(a,1/%s,g);if l(2)('den')(1,1)<>%s then bugmes();quit;end
42a=1:10,b=3:2:33;c=(-10:0)';d=[1 2+%s 3];e=['1';'2';'3';'4'];
43 a =
44 1. 2. 3. 4. 5. 6. 7. 8. 9. 10.
45f=[%t %t %f];g=['12345','abcdefghijk'];
46h=rand(3,3);i=eye(10,10);a0=10+%s;c0=20;b0=sparse(eye(30,30));
47l=list(a);if l(1)<>a then bugmes();quit;end
48l=list(a);if l(1)(1)<>a(1) then bugmes();quit;end
49l=list(a);if l(1)(1,1)<>a(1,1) then bugmes();quit;end
50l=list(a,d,b);if l(2)<>d then bugmes();quit;end
51l=list(a,d,b);if l(2)(1:2)<>d(1:2) then bugmes();quit;end
52l=list(a,d,b);if l(2)(1,2)<>d(1,2) then bugmes();quit;end
53//
54l=list(a,list(b,c,d));if l(2)(3)<>d then bugmes();quit;end
55l=list(a,list(b,c,d));if l(2)(3)(3)<>d(3) then bugmes();quit;end
56l=list(a,list(b,c,d));if l(2)(3)([3 1])<>d([3 1]) then bugmes();quit;end
57l=list(a,list(b,c,d));if l(2)(3)(1,[3 1])<>d(1,[3 1]) then bugmes();quit;end
58l=list(a,list(b,c,d));if l(2)(3)(:,[3 1])<>d(:,[3 1]) then bugmes();quit;end
59l=list(a,list(b,c,d));if l(2)(3)(:,[$ 1])<>d(:,[$ 1]) then bugmes();quit;end
60l=list(a,list(b,c,d));if l(2)(3)($,[$ 1])<>d($,[$ 1]) then bugmes();quit;end
61//
62l=list(a,list(b,c,d),h);if l(2)(3)<>d then bugmes();quit;end
63l=list(a,list(b,c,d),h);if l(2)(3)(3)<>d(3) then bugmes();quit;end
64l=list(a,list(b,c,d),h);if l(2)(3)([3 1])<>d([3 1]) then bugmes();quit;end
65l=list(a,list(b,c,d),h);if l(2)(3)(1,[3 1])<>d(1,[3 1]) then bugmes();quit;end
66l=list(a,list(b,c,d),h);if l(2)(3)(:,[3 1])<>d(:,[3 1]) then bugmes();quit;end
67l=list(a,list(b,c,d),h);if l(2)(3)(:,[$ 1])<>d(:,[$ 1]) then bugmes();quit;end
68l=list(a,list(b,c,d),h);if l(2)(3)($,[$ 1])<>d($,[$ 1]) then bugmes();quit;end
69//
70N=[1 2 3];
71l=list(a,N/%s);if l(2)<>N/%s then bugmes();quit;end
72l=list(a,N/%s);if l(2)('num')<>N then bugmes();quit;end
73l=list(a,N/%s,g);if l(2)('den')(1,1)<>%s then bugmes();quit;end
74l=list(a,N/%s,g);if l(2)<>N/%s then bugmes();quit;end
75l=list(a,N/%s,g);if l(2)('num')<>N then bugmes();quit;end
76l=list(a,N/%s,g);if l(2)('den')(1,1)<>%s then bugmes();quit;end
diff --git a/scilab/modules/data_structures/tests/unit_tests/listextraction.tst b/scilab/modules/data_structures/tests/unit_tests/listextraction.tst
index 0f5c308..bd9f8e9 100644
--- a/scilab/modules/data_structures/tests/unit_tests/listextraction.tst
+++ b/scilab/modules/data_structures/tests/unit_tests/listextraction.tst
@@ -5,6 +5,7 @@
5// This file is distributed under the same license as the Scilab package. 5// This file is distributed under the same license as the Scilab package.
6// ============================================================================= 6// =============================================================================
7// <-- CLI SHELL MODE --> 7// <-- CLI SHELL MODE -->
8// <-- NO CHECK REF -->
8 9
9// test des insertions dans les listes 10// test des insertions dans les listes
10a=1,b=3;c=2;d=[1 2 3];e=[3 4 5];f=[10;20];g=[44 55]; 11a=1,b=3;c=2;d=[1 2 3];e=[3 4 5];f=[10;20];g=[44 55];
diff --git a/scilab/modules/data_structures/tests/unit_tests/listinsertion.dia.ref b/scilab/modules/data_structures/tests/unit_tests/listinsertion.dia.ref
deleted file mode 100644
index 60b124b..0000000
--- a/scilab/modules/data_structures/tests/unit_tests/listinsertion.dia.ref
+++ /dev/null
@@ -1,341 +0,0 @@
1// =============================================================================
2// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3// Copyright (C) ????-2008 - INRIA
4//
5// This file is distributed under the same license as the Scilab package.
6// =============================================================================
7// <-- CLI SHELL MODE -->
8// test des insertions dans les listes
9a=1;b=3;c=2;d=[1 2 3];e=[3 4 5];f=[10;20];g=[44 55];
10h=5;i=4;a0=10;c0=20;b0=30;g0=[44 55 66; 10 20 30];
11l=list();l(0)=a;if l<>list(a) then bugmes();quit;end
12l=list();l(1)=a;if l<>list(a) then bugmes();quit;end
13l=list(a);l(2)=b;if l<>list(a,b) then bugmes();quit;end
14l=list(a);l(0)=b;if l<>list(b,a) then bugmes();quit;end
15l=list(a);l(1)=c;if l<>list(c) then bugmes();quit;end
16l=list(a);l(1)=d;if l<>list(d) then bugmes();quit;end
17l=list(d);l(1)=a;if l<>list(a) then bugmes();quit;end
18l=list(a);l(1)=null();if l<>list() then bugmes();quit;end
19l=list(a,c);l(1)=null();if l<>list(c) then bugmes();quit;end
20l=list(a,c);l(2)=null();if l<>list(a) then bugmes();quit;end
21l=list(a,c,b);l(2)=null();if l<>list(a,b) then bugmes();quit;end
22l=list(a,c,b);l(2)=e;if l<>list(a,e,b) then bugmes();quit;end
23l=list(a,e,b);l(2)=a;if l<>list(a,c,b) then bugmes();quit;end
24l=list();l(0)=null();if l<>list() then bugmes();quit;end
25l=list();l(1)=null();if l<>list() then bugmes();quit;end
26//
27l=list(a);l(0)=list(c,b);if l<>list(list(c,b),a) then bugmes();quit;end
28l=list(a);l(2)=list(c,b);if l<>list(a,list(c,b)) then bugmes();quit;end
29l=list(a,list(c,b));l(3)=i;if l<>list(a,list(c,b),i) then bugmes();quit;end
30l=list(a,list(c,b),i);l(1)=null();if l<>list(list(c,b),i) then bugmes();quit;end
31l=list(a,list(c,b),i);l(2)=null();if l<>list(a,i) then bugmes();quit;end
32l=list(a,list(c,b),i);l(3)=null();if l<>list(a,list(c,b)) then bugmes();quit;end
33//
34l=list(a,list(c,b,i),h);l(2)(2)=a0;if l<>list(a,list(c,a0,i),h) then bugmes();quit;end
35l=list(a,list(c,b,i),h);l(2)(2)=f;if l<>list(a,list(c,f,i),h) then bugmes();quit;end
36l=list(a,list(c,f,i),h);l(2)(2)=b;if l<>list(a,list(c,b,i),h) then bugmes();quit;end
37l=list(a,list(c,b,i),h);l(2)(3)=a0;if l<>list(a,list(c,b,a0),h) then bugmes();quit;end
38l=list(a,list(c,b,i),h);l(2)(3)=f;if l<>list(a,list(c,b,f),h) then bugmes();quit;end
39l=list(a,list(c,b,f),h);l(2)(3)=i;if l<>list(a,list(c,b,i),h) then bugmes();quit;end
40l=list(a,list(c,b),h);l(2)(3)=i;if l<>list(a,list(c,b,i),h) then bugmes();quit;end
41l=list(a,list(c,b),h);l(2)(0)=a;if l<>list(a,list(a,c,b),h) then bugmes();quit;end
42l=list(a,list(c,b,i),h);l(2)(2)=null();if l<>list(a,list(c,i),h) then bugmes();quit;end
43l=list(a,list(c,b,i),h);l(2)(1)=null();if l<>list(a,list(b,i),h) then bugmes();quit;end
44l=list(a,list(c,b,i),h);l(2)(3)=null();if l<>list(a,list(c,b),h) then bugmes();quit;end
45l=list(a,list(c,b),h);l(2)(3)=g;if l<>list(a,list(c,b,g),h) then bugmes();quit;end
46l=list(a,list(c,b),h);l(2)(0)=e;if l<>list(a,list(e,c,b),h) then bugmes();quit;end
47l=list(a,list(c,list(a0,c0,b0),b),h);
48l(2)(2)(1)=0;if l<>list(a,list(c,list(0,c0,b0),b),h); then bugmes();quit;end
49l=list(a,list(c,list(a0,c0,b0),b),h);
50l(2)(2)(1)=null();if l<>list(a,list(c,list(c0,b0),b),h); then bugmes();quit;end
51l=list(a,list(c,list(a0,c0,b0),b),h);
52l(2)(2)(1)=g;if l<>list(a,list(c,list(g,c0,b0),b),h); then bugmes();quit;end
53l=list(a,list(c,list(a0,c0,b0),b),h);
54l(2)(2)(0)=g;if l<>list(a,list(c,list(g,a0,c0,b0),b),h); then bugmes();quit;end
55l=list(a,list(c,list(a0,c0,b0),b),h);
56l(2)(2)(3)=g;if l<>list(a,list(c,list(a0,c0,g),b),h); then bugmes();quit;end
57l=list(a,list(c,list(a0,c0,b0),b),h);
58l(2)(2)(3)=null();if l<>list(a,list(c,list(a0,c0),b),h); then bugmes();quit;end
59l=list(a,list(c,list(a0,c0,b0),b),h);
60l(2)(2)(4)=g;if l<>list(a,list(c,list(a0,c0,b0,g),b),h); then bugmes();quit;end
61l=list();l(5)=33;
62ll=l;
63l=list(a,1/%s);l(2)("num")=33;if l<>list(a,33/%s) then bugmes();quit;end
64l=list(a,1/%s);l(2)("num")=%s+1;if l<>list(a,((%s+1)/%s)) then bugmes();quit;end
65l=list(a,1/%s);l(2)("den")=%s^1+1;if l<>list(a,1/(%s^2+1)) then bugmes();quit;end
66l=list(a,1/%s);l(2)("num")(1)=33;if l<>list(a,33/%s) then bugmes();quit;end
67l=list(a,1/%s);l(2)("num")(1)=%s+1;if l<>list(a,((%s+1)/%s)) then bugmes();quit;end
68l=list(a,1/%s);l(2)("den")(1)=%s^1+1;if l<>list(a,1/(%s^2+1)) then bugmes();quit;end
69l=list(a,1/%s);l(2)("num")(1,1)=33;if l<>list(a,33/%s) then bugmes();quit;end
70l=list(a,1/%s);l(2)("num")(1,1)=%s+1;if l<>list(a,((%s+1)/%s)) then bugmes();quit;end
71l=list(a,1/%s);l(2)("den")(1,1)=%s^1+1;if l<>list(a,1/(%s^2+1)) then bugmes();quit;end
72l=list(a,1/%s,g);l(2)("num")=33;if l<>list(a,33/%s,g) then bugmes();quit;end
73l=list(a,1/%s,g);l(2)("num")=%s+1;if l<>list(a,(%s+1)/%s,g) then bugmes();quit;end
74l=list(a,1/%s,g);l(2)("den")=%s^1+1;if l<>list(a,1/(%s^2+1),g) then bugmes();quit;end
75l=list(a,1/%s,g);l(2)("num")(1)=33;if l<>list(a,33/%s,g) then bugmes();quit;end
76l=list(a,1/%s,g);l(2)("num")(1)=%s+1;if l<>list(a,(%s+1)/%s,g) then bugmes();quit;end
77l=list(a,1/%s,g);l(2)("den")(1)=%s^1+1;if l<>list(a,1/(%s^2+1),g) then bugmes();quit;end
78l=list(a,1/%s,g);l(2)("num")(1,1)=33;if l<>list(a,33/%s,g) then bugmes();quit;end
79l=list(a,1/%s,g);l(2)("num")(1,1)=%s+1;if l<>list(a,(%s+1)/%s,g) then bugmes();quit;end
80l=list(a,1/%s,g);l(2)("den")(1,1)=%s^1+1;if l<>list(a,1/(%s^2+1),g) then bugmes();quit;end
81l=list(a,1/%s,g);l(2)("num")(1,2)=33;l(2)("den")(1,2)=%s+1;
82if l<>list(a,[1 33]./[%s %s+1],g) then bugmes();quit;end
83//a=1;b=3;c=2;d=[1 2 3];e=[3 4 5];f=[10;20];g=[44 55];
84//h=5;i=4;a0=10;c0=20;b0=30;g0=[44 55 66; 10 20 30];
85l=list(a);l(1)(1)=3;x=a;x(1)=3;if l<>list(x) then bugmes();quit;end
86l=list(e);l(1)(2)=[];x=e;x(2)=[];if l<>list(x) then bugmes();quit;end
87l=list(a);l(1)(1,1)=3;x=a;x(1,1)=3;if l<>list(x) then bugmes();quit;end
88l=list(e);l(1)(1,2)=[];x=e;x(1,2)=[];if l<>list(x) then bugmes();quit;end
89l=list(a);l(1)(5,5)=3;x=a;x(5,5)=3;if l<>list(x) then bugmes();quit;end
90l=list(g0);l(1)(2,3)=3;x=g0;x(2,3)=3;if l<>list(x) then bugmes();quit;end
91l=list(b,a);l(2)(1)=3;x=a;x(1)=3;if l<>list(b,x) then bugmes();quit;end
92l=list(b,e);l(2)(2)=[];x=e;x(2)=[];if l<>list(b,x) then bugmes();quit;end
93l=list(b,a);l(2)(1,1)=3;x=a;x(1,1)=3;if l<>list(b,x) then bugmes();quit;end
94l=list(b,e);l(2)(1,2)=[];x=e;x(1,2)=[];if l<>list(b,x) then bugmes();quit;end
95l=list(b,a);l(2)(5,5)=3;x=a;x(5,5)=3;if l<>list(b,x) then bugmes();quit;end
96l=list(b,g0);l(2)(2,3)=3;x=g0;x(2,3)=3;if l<>list(b,x) then bugmes();quit;end
97l=list(b,g0);l(2)(2,2:3)=[1 3];x=g0;x(2,2:3)=[1 3];if l<>list(b,x) then bugmes();quit;end
98a=1:10;b=3:2:33;c=(-10:0)';d=[1 2+%s 3];e=["1";"2";"3";"4"];
99f=[%t %t %f];g=["12345","abcdefghijk"];
100h=rand(3,3);i=eye(10,10);a0=10+%s;c0=20;b0=sparse(eye(30,30));
101l=list();l(0)=a;if l<>list(a) then bugmes();quit;end
102l=list();l(1)=a;if l<>list(a) then bugmes();quit;end
103l=list(a);l(2)=b;if l<>list(a,b) then bugmes();quit;end
104l=list(a);l(0)=b;if l<>list(b,a) then bugmes();quit;end
105l=list(a);l(1)=c;if l<>list(c) then bugmes();quit;end
106l=list(a);l(1)=d;if l<>list(d) then bugmes();quit;end
107l=list(d);l(1)=a;if l<>list(a) then bugmes();quit;end
108l=list(a);l(1)=null();if l<>list() then bugmes();quit;end
109l=list(a,c);l(1)=null();if l<>list(c) then bugmes();quit;end
110l=list(a,c);l(2)=null();if l<>list(a) then bugmes();quit;end
111l=list(a,c,b);l(2)=null();if l<>list(a,b) then bugmes();quit;end
112l=list(a,c,b);l(2)=e;if l<>list(a,e,b) then bugmes();quit;end
113l=list(a,e,b);l(2)=a;if l<>list(a,c,b) then bugmes();quit;end
114l=list();l(0)=null();if l<>list() then bugmes();quit;end
115l=list();l(1)=null();if l<>list() then bugmes();quit;end
116//
117l=list(a);l(0)=list(c,b);if l<>list(list(c,b),a) then bugmes();quit;end
118l=list(a);l(2)=list(c,b);if l<>list(a,list(c,b)) then bugmes();quit;end
119l=list(a,list(c,b));l(3)=i;if l<>list(a,list(c,b),i) then bugmes();quit;end
120l=list(a,list(c,b),i);l(1)=null();if l<>list(list(c,b),i) then bugmes();quit;end
121l=list(a,list(c,b),i);l(2)=null();if l<>list(a,i) then bugmes();quit;end
122l=list(a,list(c,b),i);l(3)=null();if l<>list(a,list(c,b)) then bugmes();quit;end
123//
124l=list(a,list(c,b,i),h);l(2)(2)=a0;if l<>list(a,list(c,a0,i),h) then bugmes();quit;end
125l=list(a,list(c,b,i),h);l(2)(2)=f;if l<>list(a,list(c,f,i),h) then bugmes();quit;end
126l=list(a,list(c,f,i),h);l(2)(2)=b;if l<>list(a,list(c,b,i),h) then bugmes();quit;end
127l=list(a,list(c,b,i),h);l(2)(3)=a0;if l<>list(a,list(c,b,a0),h) then bugmes();quit;end
128l=list(a,list(c,b,i),h);l(2)(3)=f;if l<>list(a,list(c,b,f),h) then bugmes();quit;end
129l=list(a,list(c,b,f),h);l(2)(3)=i;if l<>list(a,list(c,b,i),h) then bugmes();quit;end
130l=list(a,list(c,b),h);l(2)(3)=i;if l<>list(a,list(c,b,i),h) then bugmes();quit;end
131l=list(a,list(c,b),h);l(2)(0)=a;if l<>list(a,list(a,c,b),h) then bugmes();quit;end
132l=list(a,list(c,b,i),h);l(2)(2)=null();if l<>list(a,list(c,i),h) then bugmes();quit;end
133l=list(a,list(c,b,i),h);l(2)(1)=null();if l<>list(a,list(b,i),h) then bugmes();quit;end
134l=list(a,list(c,b,i),h);l(2)(3)=null();if l<>list(a,list(c,b),h) then bugmes();quit;end
135l=list(a,list(c,b),h);l(2)(3)=g;if l<>list(a,list(c,b,g),h) then bugmes();quit;end
136l=list(a,list(c,b),h);l(2)(0)=e;if l<>list(a,list(e,c,b),h) then bugmes();quit;end
137l=list(a,list(c,list(a0,c0,b0),b),h);
138l(2)(2)(1)=0;if l<>list(a,list(c,list(0,c0,b0),b),h); then bugmes();quit;end
139l=list(a,list(c,list(a0,c0,b0),b),h);
140l(2)(2)(1)=null();if l<>list(a,list(c,list(c0,b0),b),h); then bugmes();quit;end
141l=list(a,list(c,list(a0,c0,b0),b),h);
142l(2)(2)(1)=g;if l<>list(a,list(c,list(g,c0,b0),b),h); then bugmes();quit;end
143l=list(a,list(c,list(a0,c0,b0),b),h);
144l(2)(2)(0)=g;if l<>list(a,list(c,list(g,a0,c0,b0),b),h); then bugmes();quit;end
145l=list(a,list(c,list(a0,c0,b0),b),h);
146l(2)(2)(3)=g;if l<>list(a,list(c,list(a0,c0,g),b),h); then bugmes();quit;end
147l=list(a,list(c,list(a0,c0,b0),b),h);
148l(2)(2)(3)=null();if l<>list(a,list(c,list(a0,c0),b),h); then bugmes();quit;end
149l=list(a,list(c,list(a0,c0,b0),b),h);
150l(2)(2)(4)=g;if l<>list(a,list(c,list(a0,c0,b0,g),b),h); then bugmes();quit;end
151l=list(a,1/%s);l(2)("num")=33;if l<>list(a,33/%s) then bugmes();quit;end
152l=list(a,1/%s);l(2)("num")=%s+1;if l<>list(a,((%s+1)/%s)) then bugmes();quit;end
153l=list(a,1/%s);l(2)("den")=%s^1+1;if l<>list(a,1/(%s^2+1)) then bugmes();quit;end
154l=list(a,1/%s);l(2)("num")(1)=33;if l<>list(a,33/%s) then bugmes();quit;end
155l=list(a,1/%s);l(2)("num")(1)=%s+1;if l<>list(a,((%s+1)/%s)) then bugmes();quit;end
156l=list(a,1/%s);l(2)("den")(1)=%s^1+1;if l<>list(a,1/(%s^2+1)) then bugmes();quit;end
157l=list(a,1/%s);l(2)("num")(1,1)=33;if l<>list(a,33/%s) then bugmes();quit;end
158l=list(a,1/%s);l(2)("num")(1,1)=%s+1;if l<>list(a,((%s+1)/%s)) then bugmes();quit;end
159l=list(a,1/%s);l(2)("den")(1,1)=%s^1+1;if l<>list(a,1/(%s^2+1)) then bugmes();quit;end
160l=list(a,1/%s,g);l(2)("num")=33;if l<>list(a,33/%s,g) then bugmes();quit;end
161l=list(a,1/%s,g);l(2)("num")=%s+1;if l<>list(a,(%s+1)/%s,g) then bugmes();quit;end
162l=list(a,1/%s,g);l(2)("den")=%s^1+1;if l<>list(a,1/(%s^2+1),g) then bugmes();quit;end
163l=list(a,1/%s,g);l(2)("num")(1)=33;if l<>list(a,33/%s,g) then bugmes();quit;end
164l=list(a,1/%s,g);l(2)("num")(1)=%s+1;if l<>list(a,(%s+1)/%s,g) then bugmes();quit;end
165l=list(a,1/%s,g);l(2)("den")(1)=%s^1+1;if l<>list(a,1/(%s^2+1),g) then bugmes();quit;end
166l=list(a,1/%s,g);l(2)("num")(1,1)=33;if l<>list(a,33/%s,g) then bugmes();quit;end
167l=list(a,1/%s,g);l(2)("num")(1,1)=%s+1;if l<>list(a,(%s+1)/%s,g) then bugmes();quit;end
168l=list(a,1/%s,g);l(2)("den")(1,1)=%s^1+1;if l<>list(a,1/(%s^2+1),g) then bugmes();quit;end
169l=list(a,1/%s,g);l(2)("num")(1,2)=33;l(2)("den")(1,2)=%s+1;
170if l<>list(a,[1 33]./[%s %s+1],g) then bugmes();quit;end
171//test with field names not defined in the structure here row1 and row2
172function M=%to_e(varargin)
173 M = varargin($),
174 select varargin(1)
175 case "row2" then
176 M.N = M.N(2, eye())
177 M.V = M.V(2, eye())
178 case "row1" then
179 M.N = M.N(1, eye())
180 M.V = M.V(1, eye())
181 else
182 M.N = M.N(varargin(1:$ - 1))
183 M.V = M.V(varargin(1:$ - 1))
184 end
185endfunction
186%to_6=%to_e;
187function M=%to_i_to(varargin)
188 M=varargin($);N=varargin($-1)
189 select varargin(1)
190 case "row2"
191 M.N(2,:)=N.N
192 M.V(2,:)=N.V
193 case "row1"
194 M.N(1,:)=N.N
195 M.V(1,:)=N.V
196 else
197 M.N(varargin(1:$-2))=N.N
198 M.V(varargin(1:$-2))=N.V
199 end
200endfunction
201M=mlist(["to","V","N"],[1 2 3;4 5 6],["a","b","c";"d","e","f"]);
202M.row1(2)=M.row2(1);
203assert_checkequal(M.V, [1 4 3;4 5 6]);
204assert_checkequal(M.N, ["a","d","c";"d","e","f"]);
205l=list(1,M,2);
206l(2).row1(2)=M.row1(1);
207assert_checkequal(l(1), 1);
208assert_checkequal(l(2).V, [1 1 3;4 5 6]);
209assert_checkequal(l(2).N, ["a","a","c";"d","e","f"]);
210assert_checkequal(M.V, [1 4 3;4 5 6]);
211assert_checkequal(M.N, ["a","d","c";"d","e","f"]);
212l(1)="foo";
213assert_checkequal(l(1), "foo");
214//test of insertion in structs (a particular mlist)
215clear S;
216S.a=11;
217S(2).a=12;
218assert_checkequal(S.a, list(11,12));
219clear S;
220S.a=11;
221S.a(2,2)=12;
222assert_checkequal(S.a, diag([11,12]));
223clear S;
224S.a=11;
225S(2).b=12;
226assert_checkequal(S.a, list(11,[]));
227assert_checkequal(S.b, list([],12));
228clear S S1 S2;
229S.a=11;
230S(2).b=12;
231S1.a=33;
232S1.b="toto";
233S(1)=S1;
234assert_checkequal(S.a, list(33,[]));
235assert_checkequal(S.b, list("toto",12));
236S(2,2)=S1;
237assert_checkequal(S.a, list(33,[],[],33));
238assert_checkequal(S.b, list("toto",12,[],"toto"));
239S2.a=-5;
240S2.c=8;
241S(2,2,2)=S2;
242assert_checkequal(S.a, list(33,[],[],33,[],[],[],-5));
243assert_checkequal(S.b, list("toto",12,[],"toto",[],[],[],[]));
244assert_checkequal(S.c, list([],[],[],[],[],[],[],8));
245S1=S(:,1,1);
246assert_checkequal(S1.a, list(33,[]));
247assert_checkequal(S1.b, list("toto",12));
248assert_checkequal(S1.c, list([],[]));
249S1=S(1:2,1,1);
250assert_checkequal(S1.a, list(33,[]));
251assert_checkequal(S1.b, list("toto",12));
252assert_checkequal(S1.c, list([],[]));
253S1=S([1 1],1,1);
254assert_checkequal(S1.a, list(33,33));
255assert_checkequal(S1.b, list("toto","toto"));
256assert_checkequal(S1.c, list([],[]));
257S1=S([1 2 1],1,1);
258assert_checkequal(S1.a, list(33,[],33));
259assert_checkequal(S1.b, list("toto",12,"toto"));
260assert_checkequal(S1.c, list([],[],[]));
261S1=S(1,:,1);
262assert_checkequal(S1.a, list(33,[]));
263assert_checkequal(S1.b, list("toto",[]));
264assert_checkequal(S1.c, list([],[]));
265S1=S(:,:);
266assert_checkequal(S1.a, list(33,[],[],33,[],[],[],-5));
267assert_checkequal(S1.b, list("toto",12,[],"toto",[],[],[],[]));
268assert_checkequal(S1.c, list([],[],[],[],[],[],[],8));
269S=struct();
270S.a(2).b=1;
271assert_checkequal(S.a.b, list([],1));
272clear S;
273S.a(2).b=1;
274assert_checkequal(S.a.b, list([],1));
275S=struct();
276S(2).a.b=1;
277assert_checkequal(S(1).a, []);
278assert_checkequal(S(2).a.b, 1);
279clear S;
280S(2).a.b=1;
281assert_checkequal(S(1).a, []);
282assert_checkequal(S(2).a.b, 1);
283clear S;
284S(2).a(3).b=1;
285assert_checkequal(S(1).a, []);
286assert_checkequal(S(2).a.b, list([],[], 1));
287//
288S = struct("a", "1");
289S(1,1,2).a = "2";
290S(1).b = 2;
291assert_checkequal(S.a, list("1", "2"));
292assert_checkequal(S.b, list(2, []));
293S(2).a=5;
294assert_checkequal(S.a, list("1", 5));
295S(1,3,2).a="foo";
296assert_checkequal(S.a, list("1",[],[],5,[],"foo"));
297assert_checkequal(S.b, list(2,[],[],[],[],[]));
298S(1,3,2,2).b=[33 44];
299assert_checkequal(S.a, list("1",[],[],5,[],"foo" ,[],[],[],[],[],[]));
300assert_checkequal(S.b, list(2,[],[],[],[],[],[],[],[],[],[],[33,44]));
301clear S;S(1,2).a=3;S(3).a=44 ;
302assert_checkequal(S.a, list([],3,44));
303clear S;S.a=3;S(3).a=44;
304assert_checkequal(S.a, list(3,[],44));
305clear S;S(4).a=3;
306assert_checkequal(S.a, list([],[],[],3));
307clear S;
308S(1).a(1,1:4)=1;
309S(1).b(1:3)=5;
310assert_checkequal(S.a, [1,1,1,1]);
311assert_checkequal(S.b, [5;5;5]);
312S=struct();
313S.b(1,1)=3;
314assert_checkequal(S.b, 3);
315clear S;
316S(1,1).a(1,1:4)=1;
317S(1,1).b(1,1:3)=5;
318assert_checkequal(S.a, [1,1,1,1]);
319assert_checkequal(S.b, [5,5,5]);
320clear S;
321S(1,1).a(1:4)=1;
322S(1,1).b(1:3)=5;
323assert_checkequal(S.a, [1;1;1;1]);
324assert_checkequal(S.b, [5;5;5]);
325clear S;
326S(1,2).a(1:4)=1;
327S(2,1).b(1:3)=5;
328assert_checkequal(S.a, list([],[],[1,1,1,1]',[]));
329assert_checkequal(S.b, list([],[5,5,5]',[],[]));
330clear S;
331S(1,2).a(2).b(1,2)=1;
332assert_checkequal(S(1).a, []);
333assert_checkequal(S(2).a.b, list([],[0,1]));
334clear S;
335S(1,2).a(1,2).b(1,2,3)=4;
336assert_checkequal(S(1).a, []);
337assert_checkequal(S(2).a.b, list([], matrix( [0;0;0;0;0;4], [1 2 3])));
338tl=tlist(["ltype" "f1"], 12);
339assert_checkequal(typeof(tl), "ltype");
340tl(1) = 12;
341assert_checkequal(typeof(tl), "list");
diff --git a/scilab/modules/data_structures/tests/unit_tests/listinsertion.tst b/scilab/modules/data_structures/tests/unit_tests/listinsertion.tst
index 5bae097..70dfdd8 100644
--- a/scilab/modules/data_structures/tests/unit_tests/listinsertion.tst
+++ b/scilab/modules/data_structures/tests/unit_tests/listinsertion.tst
@@ -5,6 +5,7 @@
5// This file is distributed under the same license as the Scilab package. 5// This file is distributed under the same license as the Scilab package.
6// ============================================================================= 6// =============================================================================
7// <-- CLI SHELL MODE --> 7// <-- CLI SHELL MODE -->
8// <-- NO CHECK REF -->
8 9
9// test des insertions dans les listes 10// test des insertions dans les listes
10a=1;b=3;c=2;d=[1 2 3];e=[3 4 5];f=[10;20];g=[44 55]; 11a=1;b=3;c=2;d=[1 2 3];e=[3 4 5];f=[10;20];g=[44 55];
diff --git a/scilab/modules/data_structures/tests/unit_tests/lstops.dia.ref b/scilab/modules/data_structures/tests/unit_tests/lstops.dia.ref
deleted file mode 100644
index 1e28d67..0000000
--- a/scilab/modules/data_structures/tests/unit_tests/lstops.dia.ref
+++ /dev/null
@@ -1,111 +0,0 @@
1// =============================================================================
2// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3// Copyright (C) ????-2008 - INRIA
4//
5// This file is distributed under the same license as the Scilab package.
6// =============================================================================
7// <-- CLI SHELL MODE -->
8funcprot(0);
9//-----------------------
10//-- extractions tests --
11//-----------------------
12l=list(1,2,-4);
13if l(1)<>1 then bugmes();quit;end
14if l(3)<>-4 then bugmes();quit;end
15[x1,x2]=l([1 3]);
16if x1<>l(1)|x2<>l(3) then bugmes();quit;end
17[x2,x1]=l([3 1]);
18if x1<>l(1)|x2<>l(3) then bugmes();quit;end
19[x1,x2]=l([1;3]);
20if x1<>l(1)|x2<>l(3) then bugmes();quit;end
21[x2,x1]=l([3;1]);
22if x1<>l(1)|x2<>l(3) then bugmes();quit;end
23[x1,x2,x3]=l(:);
24if x1<>l(1)|x2<>l(2)|x3<>l(3) then bugmes();quit;end
25//with full tlists
26l=tlist(["t","a","b","c"],1,-2,5);
27if l(2)<>1 then bugmes();quit;end
28if l(4)<>5 then bugmes();quit;end
29[x1,x2]=l([2 4]);
30if x1<>l(2)|x2<>l(4) then bugmes();quit;end
31[x2,x1]=l([4 2]);
32if x1<>l(2)|x2<>l(4) then bugmes();quit;end
33if l("a")<>1 then bugmes();quit;end
34if l("c")<>5 then bugmes();quit;end
35[x1,x2]=l(["a" "c"]);
36if x1<>l("a")|x2<>l("c") then bugmes();quit;end
37[x2,x1]=l(["c" "a"]);
38if x1<>l("a")|x2<>l("c") then bugmes();quit;end
39[x1,x2]=l(["a";"c"]);
40if x1<>l("a")|x2<>l("c") then bugmes();quit;end
41[x2,x1]=l(["c";"a"]);
42if x1<>l("a")|x2<>l("c") then bugmes();quit;end
43//with partial tlists (no elements formal names)
44l=tlist("t",1,-2,5);
45deff("[f1,f2,f3,f4,f5,f6,f7]=%t_e(i,j,f)",[
46"nams=[''a'',''b'',''c''];"
47"for k=1:prod(size(i))";
48" kf=find(i(k)==nams);";
49" if kf==[] then error(""%s: Invalid index.\n""),end;"
50" execstr(''f''+string(k)+''=j(kf+1)'');"
51" end;"])
52if l(2)<>1 then bugmes();quit;end
53if l(4)<>5 then bugmes();quit;end
54[x1,x2]=l([2 4]);
55if x1<>l(2)|x2<>l(4) then bugmes();quit;end
56[x2,x1]=l([4 2]);
57if x1<>l(2)|x2<>l(4) then bugmes();quit;end
58if l("a")<>1 then bugmes();quit;end
59if l("c")<>5 then bugmes();quit;end
60[x1,x2]=l(["a" "c"]);
61if x1<>l("a")|x2<>l("c") then bugmes();quit;end
62[x2,x1]=l(["c" "a"]);
63if x1<>l("a")|x2<>l("c") then bugmes();quit;end
64[x1,x2]=l(["a";"c"]);
65if x1<>l("a")|x2<>l("c") then bugmes();quit;end
66[x2,x1]=l(["c";"a"]);
67if x1<>l("a")|x2<>l("c") then bugmes();quit;end
68// extraction inside a input argument list
69a=list(1,2,3,4);
70if or(list(a(1:2))<>list(1,2)) then bugmes();quit;end
71if type(list(a(1:2)))<>15 then bugmes();quit;end
72deff("[a,b]=foo(x,y)","a=x;b=y")
73[u,v]=foo(a(1:2));if u<>a(1)|v<>a(2) then bugmes();quit;end
74deff("[a]=foo(x,y)","a=x+y")
75if abs(foo(a(1:2)))<>3 then bugmes();quit;end
76//---------------------
77//-- insertion tests --
78//---------------------
79l=list(2,"a",-1);
80l(1)=[1 2];
81if l<>list([1 2],"a",-1) then bugmes();quit;end
82l(1)=33;
83if l<>list(33,"a",-1) then bugmes();quit;end
84l(1)=33;
85if l<>list(33,"a",-1) then bugmes();quit;end
86l(0)=1.25;
87if l<>list(1.25,33,"a",-1) then bugmes();quit;end
88l(5)=[1 2 3];
89if l<>list(1.25,33,"a",-1,[1 2 3]) then bugmes();quit;end
90l(3)=null();
91if l<>list(1.25,33,-1,[1 2 3]) then bugmes();quit;end
92l(3)=null();
93if l<>list(1.25,33,[1 2 3]) then bugmes();quit;end
94l(4)=null();
95if l<>list(1.25,33,[1 2 3]) then bugmes();quit;end
96l(0)=null();
97if l<>list(1.25,33,[1 2 3]) then bugmes();quit;end
98l=tlist("t",2,"a",-1);
99l(2)=[1 2 3];
100if %l_n_l(l,tlist("t",[1 2 3],"a",-1)) then bugmes();quit;end
101l(2)=33;
102if %l_n_l(l,tlist("t",33,"a",-1)) then bugmes();quit;end
103l(2)=33;
104if %l_n_l(l,tlist("t",33,"a",-1)) then bugmes();quit;end
105l(4)=[1 2];
106if %l_n_l(l,tlist("t",33,"a",[1,2])) then bugmes();quit;end
107l(2)=null();
108if %l_n_l(l,tlist("t","a",[1,2])) then bugmes();quit;end
109l(1)=null();
110if %l_n_l(l,list("a",[1,2])) then bugmes();quit;end
111funcprot(1);
diff --git a/scilab/modules/data_structures/tests/unit_tests/lstops.tst b/scilab/modules/data_structures/tests/unit_tests/lstops.tst
index 3898ac1..8d7c921 100644
--- a/scilab/modules/data_structures/tests/unit_tests/lstops.tst
+++ b/scilab/modules/data_structures/tests/unit_tests/lstops.tst
@@ -5,6 +5,7 @@
5// This file is distributed under the same license as the Scilab package. 5// This file is distributed under the same license as the Scilab package.
6// ============================================================================= 6// =============================================================================
7// <-- CLI SHELL MODE --> 7// <-- CLI SHELL MODE -->
8// <-- NO CHECK REF -->
8funcprot(0); 9funcprot(0);
9 10
10//----------------------- 11//-----------------------
diff --git a/scilab/modules/development_tools/tests/unit_tests/assert/checkfilesequal.dia.ref b/scilab/modules/development_tools/tests/unit_tests/assert/checkfilesequal.dia.ref
index 753cb0f..2ac27c0 100644
--- a/scilab/modules/development_tools/tests/unit_tests/assert/checkfilesequal.dia.ref
+++ b/scilab/modules/development_tools/tests/unit_tests/assert/checkfilesequal.dia.ref
@@ -249,7 +249,7 @@ endfunction
249// This is the pattern for a comment line of the form "// blabla" 249// This is the pattern for a comment line of the form "// blabla"
250pattern = "/\/\/.*/" 250pattern = "/\/\/.*/"
251 pattern = 251 pattern =
252 /\/\/.*/ 252 "/\/\/.*/"
253itxt = [ 253itxt = [
254"bla 1" 254"bla 1"
255"// bla 2" 255"// bla 2"
diff --git a/scilab/modules/differential_equations/tests/nonreg_tests/bug_4948.dia.ref b/scilab/modules/differential_equations/tests/nonreg_tests/bug_4948.dia.ref
index 5adcfdd..4fc67fe 100644
--- a/scilab/modules/differential_equations/tests/nonreg_tests/bug_4948.dia.ref
+++ b/scilab/modules/differential_equations/tests/nonreg_tests/bug_4948.dia.ref
@@ -21,7 +21,7 @@ clear;
21funcprot(0); 21funcprot(0);
22v0 = 0;// INITIAL CONDITIONS OF THE DIFFERENTIAL EQUATION 22v0 = 0;// INITIAL CONDITIONS OF THE DIFFERENTIAL EQUATION
23u0 = 0;// INITIAL CONDITIONS OF THE DIFFERENTIAL EQUATION 23u0 = 0;// INITIAL CONDITIONS OF THE DIFFERENTIAL EQUATION
24y0 = [v0; u0]; 24y0 = [v0; u0];
25F = 1; // system's parameters 25F = 1; // system's parameters
26m = 1; // system's parameters 26m = 1; // system's parameters
27c = 0.5; // system's parameters 27c = 0.5; // system's parameters
diff --git a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_2119.win.dia.ref b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_2119.win.dia.ref
index a7bab11..0caba67 100644
--- a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_2119.win.dia.ref
+++ b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_2119.win.dia.ref
@@ -52,25 +52,18 @@ endfunction
52chdir(TMPDIR); 52chdir(TMPDIR);
53libn=ilib_for_link('dgesvtst','dgesvtst.f',[],'f'); 53libn=ilib_for_link('dgesvtst','dgesvtst.f',[],'f');
54 Generate a loader file 54 Generate a loader file
55
56 Generate a Makefile 55 Generate a Makefile
57
58 Running the Makefile 56 Running the Makefile
59
60 Compilation of dgesvtst.f 57 Compilation of dgesvtst.f
61
62 Building shared library (be patient) 58 Building shared library (be patient)
63
64 Generate a cleaner file 59 Generate a cleaner file
65
66exec loader.sce; 60exec loader.sce;
67Shared archive loaded. 61Shared archive loaded.
68Link done. 62Link done.
69chdir(curdir), 63chdir(curdir),
70 ans = 64 ans =
71 65 T
72 T
73n=44; 66n=44;
74A=eye(n,n);B=(1:n)'; 67A=eye(n,n);B=(1:n)';
75[X, LU, IPIV, INFO] = msolve(A,B); 68[X, LU, IPIV, INFO] = msolve(A,B);
76if norm(A*X-B)>1d-15 then bugmes();quit;end 69if norm(A*X-B)>1d-15 then bugmes();quit;end
diff --git a/scilab/modules/dynamic_link/tests/unit_tests/G_make.win.dia.ref b/scilab/modules/dynamic_link/tests/unit_tests/G_make.win.dia.ref
index f2d4d65..21994fb 100644
--- a/scilab/modules/dynamic_link/tests/unit_tests/G_make.win.dia.ref
+++ b/scilab/modules/dynamic_link/tests/unit_tests/G_make.win.dia.ref
@@ -13,7 +13,7 @@ if getos() == 'Windows' then
13 ' @echo ------------------------------------------', 13 ' @echo ------------------------------------------',
14 ' ']; 14 ' '];
15 mputl(txt,TMPDIR+'/makefile.mak'); 15 mputl(txt,TMPDIR+'/makefile.mak');
16 current_dir = pwd(); 16 current_dir = pwd();
17 cd TMPDIR; 17 cd TMPDIR;
18 files = G_make(['',''],'message'); 18 files = G_make(['',''],'message');
19 cd(current_dir); 19 cd(current_dir);
diff --git a/scilab/modules/dynamic_link/tests/unit_tests/schur_external.win.dia.ref b/scilab/modules/dynamic_link/tests/unit_tests/schur_external.win.dia.ref
index 69a1bfc..cab56d6 100644
--- a/scilab/modules/dynamic_link/tests/unit_tests/schur_external.win.dia.ref
+++ b/scilab/modules/dynamic_link/tests/unit_tests/schur_external.win.dia.ref
@@ -23,18 +23,12 @@ mputl(C,TMPDIR+'/schur_test/mytest.c');
23//build and link 23//build and link
24lp=ilib_for_link('mytest','mytest.c',[],'c'); 24lp=ilib_for_link('mytest','mytest.c',[],'c');
25 Generate a loader file 25 Generate a loader file
26
27 Generate a Makefile 26 Generate a Makefile
28
29 Running the Makefile 27 Running the Makefile
30
31 Compilation of mytest.c 28 Compilation of mytest.c
32
33 Building shared library (be patient) 29 Building shared library (be patient)
34
35 Generate a cleaner file 30 Generate a cleaner file
36 31link(lp,'mytest','c');
37link(lp,'mytest','c');
38Shared archive loaded. 32Shared archive loaded.
39Link done. 33Link done.
40//run it 34//run it
diff --git a/scilab/modules/elementary_functions/tests/unit_tests/IEEEcompatibility.dia.ref b/scilab/modules/elementary_functions/tests/unit_tests/IEEEcompatibility.dia.ref
index 9e44bf5..5cb6e65 100644
--- a/scilab/modules/elementary_functions/tests/unit_tests/IEEEcompatibility.dia.ref
+++ b/scilab/modules/elementary_functions/tests/unit_tests/IEEEcompatibility.dia.ref
@@ -74,7 +74,7 @@ expecteddiv = [
74%nan %nan %nan %nan %nan %nan %nan]; 74%nan %nan %nan %nan %nan %nan %nan];
75// See http://bugzilla.scilab.org/show_bug.cgi?id=2409 75// See http://bugzilla.scilab.org/show_bug.cgi?id=2409
76// We must use imult(%inf) to get the mathematical number i * inf 76// We must use imult(%inf) to get the mathematical number i * inf
77// since %i * %inf produces imult(%inf), as expected by the 77// since %i * %inf produces imult(%inf), as expected by the
78// intermediate multiplication 0*%inf = %nan. 78// intermediate multiplication 0*%inf = %nan.
79expectedsqrt = [ 79expectedsqrt = [
80imult(%inf) 80imult(%inf)
diff --git a/scilab/modules/external_objects_java/tests/unit_tests/jallowClassReloading.dia.ref b/scilab/modules/external_objects_java/tests/unit_tests/jallowClassReloading.dia.ref
index 5d101ea..a307e85 100644
--- a/scilab/modules/external_objects_java/tests/unit_tests/jallowClassReloading.dia.ref
+++ b/scilab/modules/external_objects_java/tests/unit_tests/jallowClassReloading.dia.ref
@@ -16,5 +16,4 @@
16jallowClassReloading(%t); 16jallowClassReloading(%t);
17jallowClassReloading() 17jallowClassReloading()
18 ans = 18 ans =
19 19 T
20 T
diff --git a/scilab/modules/external_objects_java/tests/unit_tests/jinvoke_db.dia.ref b/scilab/modules/external_objects_java/tests/unit_tests/jinvoke_db.dia.ref
index fc4259c..3a2002c 100644
--- a/scilab/modules/external_objects_java/tests/unit_tests/jinvoke_db.dia.ref
+++ b/scilab/modules/external_objects_java/tests/unit_tests/jinvoke_db.dia.ref
@@ -11,8 +11,7 @@ c = jcompile("TestDirectBuffer",["import java.nio.DoubleBuffer;";
11"for (int i = 0; i < x.capacity(); i++) x.put(i, x.get(i) + 1);"; 11"for (int i = 0; i < x.capacity(); i++) x.put(i, x.get(i) + 1);";
12"}"; 12"}";
13"}"]) 13"}"])
14 c = 14 c =
15
16class TestDirectBuffer 15class TestDirectBuffer
17a = 1:10000; 16a = 1:10000;
18b = a + 1; // only used to compare with the following... 17b = a + 1; // only used to compare with the following...
diff --git a/scilab/modules/fileio/tests/nonreg_tests/bug_1693.win.dia.ref b/scilab/modules/fileio/tests/nonreg_tests/bug_1693.win.dia.ref
index a31c65e..9b73af1 100644
--- a/scilab/modules/fileio/tests/nonreg_tests/bug_1693.win.dia.ref
+++ b/scilab/modules/fileio/tests/nonreg_tests/bug_1693.win.dia.ref
@@ -16,6 +16,7 @@
16// ================== Test 1 ================== 16// ================== Test 1 ==================
17cd('\'); 17cd('\');
18if getos() == 'Windows' 18if getos() == 'Windows'
19
19 if ~or(getdrives() == pwd()) then bugmes();quit;end 20 if ~or(getdrives() == pwd()) then bugmes();quit;end
20else 21else
21 if pwd() <> '/' then bugmes();quit;end 22 if pwd() <> '/' then bugmes();quit;end
diff --git a/scilab/modules/graphic_export/tests/nonreg_tests/bug_13676.dia.ref b/scilab/modules/graphic_export/tests/nonreg_tests/bug_13676.dia.ref
index f59b432..61965e1 100644
--- a/scilab/modules/graphic_export/tests/nonreg_tests/bug_13676.dia.ref
+++ b/scilab/modules/graphic_export/tests/nonreg_tests/bug_13676.dia.ref
@@ -28,5 +28,4 @@ jremove ImageIO URL url bi
28// Check if the image is not fully white 28// Check if the image is not fully white
29assert_checkfalse(and(data == (uint32(2^32 - 1)))) 29assert_checkfalse(and(data == (uint32(2^32 - 1))))
30 ans = 30 ans =
31 31 T
32 T
diff --git a/scilab/modules/graphic_export/tests/nonreg_tests/bug_4231.dia.ref b/scilab/modules/graphic_export/tests/nonreg_tests/bug_4231.dia.ref
index 482540d..59bafce 100644
--- a/scilab/modules/graphic_export/tests/nonreg_tests/bug_4231.dia.ref
+++ b/scilab/modules/graphic_export/tests/nonreg_tests/bug_4231.dia.ref
@@ -12,7 +12,7 @@
12// 12//
13// <-- Short Description --> 13// <-- Short Description -->
14// plot();xs2png(0,TMPDIR+filesep()+'toto.png') crashs !!! 14// plot();xs2png(0,TMPDIR+filesep()+'toto.png') crashs !!!
15// 15//
16plot(); 16plot();
17ierr = execstr('xs2png(0,TMPDIR+filesep()+''bug_4231.png'');','errcatch'); 17ierr = execstr('xs2png(0,TMPDIR+filesep()+''bug_4231.png'');','errcatch');
18if fileinfo(TMPDIR+filesep()+'bug_4231.png') == [] then bugmes();quit;end 18if fileinfo(TMPDIR+filesep()+'bug_4231.png') == [] then bugmes();quit;end
diff --git a/scilab/modules/graphic_export/tests/nonreg_tests/bug_4273.dia.ref b/scilab/modules/graphic_export/tests/nonreg_tests/bug_4273.dia.ref
index f0a52ee..c25723a 100644
--- a/scilab/modules/graphic_export/tests/nonreg_tests/bug_4273.dia.ref
+++ b/scilab/modules/graphic_export/tests/nonreg_tests/bug_4273.dia.ref
@@ -12,7 +12,7 @@
12// 12//
13// <-- Short Description --> 13// <-- Short Description -->
14// xs2file crashs 14// xs2file crashs
15// 15//
16scf(10); 16scf(10);
17plot3d(); 17plot3d();
18title('Title in bold-italic'); 18title('Title in bold-italic');
diff --git a/scilab/modules/graphic_export/tests/nonreg_tests/bug_4437.dia.ref b/scilab/modules/graphic_export/tests/nonreg_tests/bug_4437.dia.ref
index c9a564e..7ca5474 100644
--- a/scilab/modules/graphic_export/tests/nonreg_tests/bug_4437.dia.ref
+++ b/scilab/modules/graphic_export/tests/nonreg_tests/bug_4437.dia.ref
@@ -12,7 +12,7 @@
12// 12//
13// <-- Short Description --> 13// <-- Short Description -->
14// Exporting an empty figure crashes Scilab 14// Exporting an empty figure crashes Scilab
15// 15//
16figure(0); 16figure(0);
17xs2eps(0, TMPDIR + 'name'); 17xs2eps(0, TMPDIR + 'name');
18// should not crash 18// should not crash
diff --git a/scilab/modules/graphic_export/tests/nonreg_tests/bug_4944.dia.ref b/scilab/modules/graphic_export/tests/nonreg_tests/bug_4944.dia.ref
index 0948ecd..2d76729 100644
--- a/scilab/modules/graphic_export/tests/nonreg_tests/bug_4944.dia.ref
+++ b/scilab/modules/graphic_export/tests/nonreg_tests/bug_4944.dia.ref
@@ -13,7 +13,7 @@
13// 13//
14// <-- Short Description --> 14// <-- Short Description -->
15// If the extension is not provided, some functions adds the extension, some others don't 15// If the extension is not provided, some functions adds the extension, some others don't
16// 16//
17plot3d(); 17plot3d();
18filename=TMPDIR+"/nonreg_test_bug4944"; 18filename=TMPDIR+"/nonreg_test_bug4944";
19f=gcf(); 19f=gcf();
diff --git a/scilab/modules/graphic_export/tests/unit_tests/gif_non_empty_file.dia.ref b/scilab/modules/graphic_export/tests/unit_tests/gif_non_empty_file.dia.ref
index e0b544f..1509760 100644
--- a/scilab/modules/graphic_export/tests/unit_tests/gif_non_empty_file.dia.ref
+++ b/scilab/modules/graphic_export/tests/unit_tests/gif_non_empty_file.dia.ref
@@ -15,6 +15,7 @@ fig = gcf();
15figIndex =fig.figure_id; 15figIndex =fig.figure_id;
16// check that file size is greater than 10K 16// check that file size is greater than 10K
17minimumSize = 10000; 17minimumSize = 10000;
18// bitmap export
18// gif format 19// gif format
19xs2gif(figIndex, TMPDIR+"/textExport.gif") 20xs2gif(figIndex, TMPDIR+"/textExport.gif")
20fileSize = fileinfo(TMPDIR+"/textExport.gif"); 21fileSize = fileinfo(TMPDIR+"/textExport.gif");
diff --git a/scilab/modules/graphic_export/tests/unit_tests/ps_non_empty_file.dia.ref b/scilab/modules/graphic_export/tests/unit_tests/ps_non_empty_file.dia.ref
index 88495ef..82cb21a 100644
--- a/scilab/modules/graphic_export/tests/unit_tests/ps_non_empty_file.dia.ref
+++ b/scilab/modules/graphic_export/tests/unit_tests/ps_non_empty_file.dia.ref
@@ -14,7 +14,7 @@ plot3d;
14fig = gcf(); 14fig = gcf();
15figIndex =fig.figure_id; 15figIndex =fig.figure_id;
16// vectorial export 16// vectorial export
17// check that file size is greater than 10M 17// check that file size is greater than 100K
18// increase minimum size 18// increase minimum size
19minimumSize = 100000; 19minimumSize = 100000;
20xs2ps(figIndex, TMPDIR+"/textExport.ps") 20xs2ps(figIndex, TMPDIR+"/textExport.ps")
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_1134.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_1134.dia.ref
index e4c81c8..b211fb8 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_1134.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_1134.dia.ref
@@ -11,8 +11,8 @@
11// http://bugzilla.scilab.org/show_bug.cgi?id=1134 11// http://bugzilla.scilab.org/show_bug.cgi?id=1134
12// 12//
13// <-- Short Description --> 13// <-- Short Description -->
14// strf="120" in grayplot disables graphics title 14// strf="120" in grayplot disables graphics title
15// strf= "122" doesn't create a box without tics 15// strf= "122" doesn't create a box without tics
16grayTitle = ["My grayplot"; "with strf=120"]; 16grayTitle = ["My grayplot"; "with strf=120"];
17x = 1:10; 17x = 1:10;
18m = rand(10,10); 18m = rand(10,10);
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_1201.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_1201.dia.ref
index 5c90a75..ebc5ffd 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_1201.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_1201.dia.ref
@@ -12,7 +12,7 @@
12// 12//
13// <-- Short Description --> 13// <-- Short Description -->
14// Legends are not updated when observed polylines are modified. 14// Legends are not updated when observed polylines are modified.
15// 15//
16// create a polylines 16// create a polylines
17plot(1:10); 17plot(1:10);
18p1 = gce(); 18p1 = gce();
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_12119.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_12119.dia.ref
index 9ee64de..4cbab81 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_12119.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_12119.dia.ref
@@ -17,18 +17,17 @@ H = [
17 8. 0.1006 17 8. 0.1006
18 9. 0.0982 18 9. 0.0982
19] 19]
20 H = 20 H =
21 21 0. 0.1007
22 0. 0.1007 22 1. 0.0965
23 1. 0.0965 23 2. 0.0996
24 2. 0.0996 24 3. 0.1019
25 3. 0.1019 25 4. 0.0974
26 4. 0.0974 26 5. 0.1019
27 5. 0.1019 27 6. 0.0977
28 6. 0.0977 28 7. 0.1055
29 7. 0.1055 29 8. 0.1006
30 8. 0.1006 30 9. 0.0982
31 9. 0.0982
32scf(); 31scf();
33bar(H(:,1),H(:,2)); 32bar(H(:,1),H(:,2));
34scf(); 33scf();
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_12163.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_12163.dia.ref
index 2cc3936..835bce3 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_12163.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_12163.dia.ref
@@ -17,6 +17,6 @@
17clf() 17clf()
18plot(); 18plot();
19rect=[3 -2 7 10]; 19rect=[3 -2 7 10];
20zoom_rect(rect); 20zoom_rect(rect);
21assert_checktrue(execstr("unzoom(gcf())","errcatch")==0); 21assert_checktrue(execstr("unzoom(gcf())","errcatch")==0);
22delete(); 22delete();
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_13402.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_13402.dia.ref
index 7955ad8..f47e442 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_13402.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_13402.dia.ref
@@ -11,7 +11,7 @@
11// http://bugzilla.scilab.org/13402 11// http://bugzilla.scilab.org/13402
12// 12//
13// <-- Short Description --> 13// <-- Short Description -->
14// Bounding boxes of xarcs were not correct 14// Bounding boxes of xarcs were not correct
15xarc(0, 0, 2, 1, 64 * 0, 64 * 360); 15xarc(0, 0, 2, 1, 64 * 0, 64 * 360);
16a = gca(); 16a = gca();
17assert_checkequal(a.data_bounds, [0 -1 ; 2 0]); 17assert_checkequal(a.data_bounds, [0 -1 ; 2 0]);
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_13441.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_13441.dia.ref
index 0cfa278..8f68251 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_13441.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_13441.dia.ref
@@ -57,7 +57,6 @@ tmp = gettext("Wrong type for "'%s"' property: An empty matrix or a tlist expect
57errmsgFromSetBorder = msprintf(tmp, "border"); 57errmsgFromSetBorder = msprintf(tmp, "border");
58tmp = gettext("%s: Could not set property "'%s"'.\n"); 58tmp = gettext("%s: Could not set property "'%s"'.\n");
59errmsgFromUicontrol = msprintf(tmp, "uicontrol", "border"); 59errmsgFromUicontrol = msprintf(tmp, "uicontrol", "border");
60
61checkValues = list("border", [1, 2, 3, 4], [1 ,2; 1, 2], ... 60checkValues = list("border", [1, 2, 3, 4], [1 ,2; 1, 2], ...
62[1:10], [1:10]', list(), ... 61[1:10], [1:10]', list(), ...
63list(1, 2, 3), ... 62list(1, 2, 3), ...
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_13733.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_13733.dia.ref
index 59300a1..2a1794d 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_13733.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_13733.dia.ref
@@ -15,4 +15,4 @@
15// Optional arguments did not work properly. e.g colorbar(1,10,fmt="%d"). 15// Optional arguments did not work properly. e.g colorbar(1,10,fmt="%d").
16colorbar(1,10,fmt="%d"); 16colorbar(1,10,fmt="%d");
17colorbar(1,10,[1,10],fmt="%d"); 17colorbar(1,10,[1,10],fmt="%d");
18colorbar(1,10,fmt="%d", colminmax=[1,10]); \ No newline at end of file 18colorbar(1,10,fmt="%d", colminmax=[1,10]);
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_14036.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_14036.dia.ref
index dd1d647..08c9d3e 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_14036.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_14036.dia.ref
@@ -16,7 +16,7 @@ l = light();
16l.userdata = "Source 1"; 16l.userdata = "Source 1";
17l.tag = "LS1"; 17l.tag = "LS1";
18l 18l
19l = 19 l =
20Handle of type "Light" with properties: 20Handle of type "Light" with properties:
21======================================= 21=======================================
22parent: Axes 22parent: Axes
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_1448.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_1448.dia.ref
index 9773921..7afbb40 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_1448.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_1448.dia.ref
@@ -14,7 +14,7 @@
14// Bug detected in 3.1.1 under Windows XP. 14// Bug detected in 3.1.1 under Windows XP.
15// Bug relative to function rotate 15// Bug relative to function rotate
16// 16//
17// A positive angle corresponds to a clockwise rotation, then in the 17// A positive angle corresponds to a clockwise rotation, then in the
18// negative mathematical way. 18// negative mathematical way.
19// 19//
20// Jacques-Deric 20// Jacques-Deric
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_1560.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_1560.dia.ref
index 9d34a86..809de36 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_1560.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_1560.dia.ref
@@ -30,15 +30,15 @@ hs10.data (2,1) = 0.70; // x2
30hs10.data (2,2) = 0.45; // y2 30hs10.data (2,2) = 0.45; // y2
31hs10.data, 31hs10.data,
32 ans = 32 ans =
33 1. 0.6 0. 33 1. 0.6 0.
34 0.7 0.45 0. 34 0.7 0.45 0.
35ha.rotation_angles = [0,270]; 35ha.rotation_angles = [0,270];
36hs10.data (1,3) =-0.30; // z1 36hs10.data (1,3) =-0.30; // z1
37hs10.data (2,3) =-0.40; // z2 37hs10.data (2,3) =-0.40; // z2
38hs10.data, 38hs10.data,
39 ans = 39 ans =
40 1. 0.6 40 1. 0.6
41 0.7 0.45 41 0.7 0.45
42ha.rotation_angles = [0,0]; 42ha.rotation_angles = [0,0];
43reference = [ 1, 0.6, -0.3 ; 0.7, 0.45, -0.4 ] ; 43reference = [ 1, 0.6, -0.3 ; 0.7, 0.45, -0.4 ] ;
44// check that the segment z coordinates are modified 44// check that the segment z coordinates are modified
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_1582.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_1582.dia.ref
index 19848e3..87ff270 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_1582.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_1582.dia.ref
@@ -12,7 +12,7 @@
12// 12//
13// <-- Short Description --> 13// <-- Short Description -->
14// If parametric 3d curve values are out of given ebox of 3d axes, this curve values are netherveless plotted. 14// If parametric 3d curve values are out of given ebox of 3d axes, this curve values are netherveless plotted.
15// 15//
16xv = 1:10; 16xv = 1:10;
17yv = rand(1, length(xv))*20-10; 17yv = rand(1, length(xv))*20-10;
18param3d1(xv, yv, ... 18param3d1(xv, yv, ...
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_1696.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_1696.dia.ref
index 5d9055a..0be6963 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_1696.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_1696.dia.ref
@@ -12,7 +12,7 @@
12// 12//
13// <-- Short Description --> 13// <-- Short Description -->
14// zoom_box properties only applies on X and Y axis. 14// zoom_box properties only applies on X and Y axis.
15// 15//
16xSize = 10; 16xSize = 10;
17x = 1:xSize; 17x = 1:xSize;
18plot3d(x,x,rand(xSize, xSize)); 18plot3d(x,x,rand(xSize, xSize));
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_1720.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_1720.dia.ref
index 0d5902c..b984153 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_1720.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_1720.dia.ref
@@ -13,7 +13,7 @@
13// <-- Short Description --> 13// <-- Short Description -->
14// Scilab 4.0-RC1 14// Scilab 4.0-RC1
15// Different default behavior of xfrect and xfarc 15// Different default behavior of xfrect and xfarc
16// xfrec does not draw the limit of the rectangle 16// xfrec does not draw the limit of the rectangle
17// xfarc draws the limit of the circle 17// xfarc draws the limit of the circle
18// 18//
19// I don't know which is right and which is wrong, but there is an obvious 19// I don't know which is right and which is wrong, but there is an obvious
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_174.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_174.dia.ref
index a5f3f77..7c672f8 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_174.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_174.dia.ref
@@ -10,6 +10,6 @@
10// http://bugzilla.scilab.org/show_bug.cgi?id=174 10// http://bugzilla.scilab.org/show_bug.cgi?id=174
11// 11//
12// <-- Short Description --> 12// <-- Short Description -->
13// Sur des images de grandes tailles, Matplot trace plein de lignes blanches, ce qui est assez genant. 13// Sur des images de grandes tailles, Matplot trace plein de lignes blanches, ce qui est assez genant.
14// <-- TEST WITH GRAPHIC --> 14// <-- TEST WITH GRAPHIC -->
15Matplot(3*rand(64,64)); 15Matplot(3*rand(64,64));
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_1839.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_1839.dia.ref
index 7064ece..9dff4f0 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_1839.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_1839.dia.ref
@@ -19,7 +19,7 @@ e=gce();
19f=e.data; 19f=e.data;
20TL = tlist(["3d" "x" "y" "z" "color"],f.x,f.y,f.z,6*rand(f.z)); // random color matrix 20TL = tlist(["3d" "x" "y" "z" "color"],f.x,f.y,f.z,6*rand(f.z)); // random color matrix
21h=gce(); //get handle on current entity (here the surface) 21h=gce(); //get handle on current entity (here the surface)
22f=gcf();//get the handle of the parent figure 22f=gcf();//get the handle of the parent figure
23f.color_map=hotcolormap(512); 23f.color_map=hotcolormap(512);
24c=[1:400,1:400]; 24c=[1:400,1:400];
25TL.color = [c;c+1;c+2;c+3]; 25TL.color = [c;c+1;c+2;c+3];
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_1873.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_1873.dia.ref
index 4f97c98..ccd6ebd 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_1873.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_1873.dia.ref
@@ -11,7 +11,7 @@
11// http://bugzilla.scilab.org/show_bug.cgi?id=1873 11// http://bugzilla.scilab.org/show_bug.cgi?id=1873
12// 12//
13// <-- Short Description --> 13// <-- Short Description -->
14// grid space between dash dash line elements is filled with white 14// grid space between dash dash line elements is filled with white
15// background color. 15// background color.
16xv = 1:10; yv=xv; s = rand(length(xv), length(yv)); 16xv = 1:10; yv=xv; s = rand(length(xv), length(yv));
17min_z = min(s); max_z = max(s); 17min_z = min(s); max_z = max(s);
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_2141.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_2141.dia.ref
index 78b4873..e91e43d 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_2141.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_2141.dia.ref
@@ -19,4 +19,4 @@ X=[0;1;1;1;1;0;0;0];
19Y=[0;0;0;1;1;1;1;0]; 19Y=[0;0;0;1;1;1;1;0];
20g=color("red"); 20g=color("red");
21xpolys(X,Y,g*ones(1,8)); 21xpolys(X,Y,g*ones(1,8));
22// the top segment of the axes box was red and the right one is black. 22// the top segment of the axes box was red and the right one is black.
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_2175.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_2175.dia.ref
index a26fd5e..3bf691b 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_2175.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_2175.dia.ref
@@ -12,7 +12,7 @@
12// 12//
13// <-- Short Description --> 13// <-- Short Description -->
14// "contour2d" prints level numbers partially outside the rect. 14// "contour2d" prints level numbers partially outside the rect.
15// 15//
16bounds = [1,1,10,10]; 16bounds = [1,1,10,10];
17contour2d(1:10,1:10,rand(10,10),5,rect=bounds); 17contour2d(1:10,1:10,rand(10,10),5,rect=bounds);
18// check that texts created by contour2d are inside the box 18// check that texts created by contour2d are inside the box
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_2210.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_2210.dia.ref
index 1d11f67..37692d0 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_2210.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_2210.dia.ref
@@ -14,12 +14,12 @@
14// Display error when merging several 3d polylines. 14// Display error when merging several 3d polylines.
15// In 3d mode, some unwanted segment are drawn from the polylines. 15// In 3d mode, some unwanted segment are drawn from the polylines.
16// In 2d mode, some unwanted curves somtimes appears. 16// In 2d mode, some unwanted curves somtimes appears.
17// 17//
18x = 1:3 ; 18x = 1:3 ;
19param3d(x,x,x) ; 19param3d(x,x,x) ;
20y = 2:5 ; 20y = 2:5 ;
21param3d(y,y,y+1); 21param3d(y,y,y+1);
22a =gca() ; 22a =gca() ;
23a.rotation_angles = [60,10] ; // bug in 3D 23a.rotation_angles = [60,10] ; // bug in 3D
24a.view = "2d" ; // bug in 2D 24a.view = "2d" ; // bug in 2D
25// Check that there is only two displayed lines. 25// Check that there is only two displayed lines.
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_2222.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_2222.dia.ref
index b10b3a2..175358a 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_2222.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_2222.dia.ref
@@ -16,11 +16,11 @@ data=ones(30000,100);
16subplot(231) 16subplot(231)
17plot(data) 17plot(data)
18xgrid 18xgrid
19//now 19//now
20subplot(232) 20subplot(232)
21plot(data) 21plot(data)
22xgrid 22xgrid
23//and then until 23//and then until
24subplot(236) 24subplot(236)
25xgrid 25xgrid
26plot(data) 26plot(data)
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_2255.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_2255.dia.ref
index 69db65b..400af66 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_2255.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_2255.dia.ref
@@ -11,8 +11,8 @@
11// http://bugzilla.scilab.org/show_bug.cgi?id=2255 11// http://bugzilla.scilab.org/show_bug.cgi?id=2255
12// 12//
13// <-- Short Description --> 13// <-- Short Description -->
14// plot command fails to verify that x and y data have the same length in certain cases. 14// plot function fails to verify that x and y data have the same length in certain cases.
15// 15//
16err = execstr('plot(ones(1,2048),ones(1,1024))','errcatch','n'); 16err = execstr('plot(ones(1,2048),ones(1,1024))','errcatch','n');
17// should produce an error message 17// should produce an error message
18if (err == 0) then bugmes();quit;end 18if (err == 0) then bugmes();quit;end
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_2365.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_2365.dia.ref
index 75e344f..97e03e4 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_2365.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_2365.dia.ref
@@ -11,8 +11,8 @@
11// http://bugzilla.scilab.org/show_bug.cgi?id=2365 11// http://bugzilla.scilab.org/show_bug.cgi?id=2365
12// 12//
13// <-- Short Description --> 13// <-- Short Description -->
14// plot3d3 removes ticks. 14// plot3d3 without flags option removes ticks.
15// 15//
16plot3d3( [ 0,0; 10,10 ],[ 1,2;3,4 ],[ 0,2; 0,2 ] ); 16plot3d3( [ 0,0; 10,10 ],[ 1,2;3,4 ],[ 0,2; 0,2 ] );
17// check that ticks are present 17// check that ticks are present
18axes = gca(); 18axes = gca();
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_2540.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_2540.dia.ref
index fb6b053..d1a5fa2 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_2540.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_2540.dia.ref
@@ -12,7 +12,7 @@
12// 12//
13// <-- Short Description --> 13// <-- Short Description -->
14// plot3d hangs scilab when plotting a matrix full with NaN 14// plot3d hangs scilab when plotting a matrix full with NaN
15// 15//
16dummy = ones(10,10); 16dummy = ones(10,10);
17dummy2 = dummy*%nan; 17dummy2 = dummy*%nan;
18plot3d(1:10,1:10,dummy2); 18plot3d(1:10,1:10,dummy2);
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_2631.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_2631.dia.ref
index 28c2f0d..4401b33 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_2631.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_2631.dia.ref
@@ -13,7 +13,7 @@
13// <-- Short Description --> 13// <-- Short Description -->
14// Change the <figure_handle>.figure_name property not modify the window title like 14// Change the <figure_handle>.figure_name property not modify the window title like
15// with scilab-4.1.2 15// with scilab-4.1.2
16// 16//
17name = 'Something'; 17name = 'Something';
18my_figure_handle = scf(10); 18my_figure_handle = scf(10);
19my_figure_handle.figure_name = name; 19my_figure_handle.figure_name = name;
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_2797.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_2797.dia.ref
index 400d640..1fb7ee8 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_2797.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_2797.dia.ref
@@ -22,7 +22,7 @@ curFig = gcf();
22curFig.immediate_drawing = "on"; 22curFig.immediate_drawing = "on";
23// evaluation of f will fail 23// evaluation of f will fail
24// it use to keep current figure in drawlater mode 24// it use to keep current figure in drawlater mode
25// plot(x,f) 25//plot(x,f)
26//the error will not be printed in the console 26//the error will not be printed in the console
27ierr = execstr('plot(x,f)','errcatch'); 27ierr = execstr('plot(x,f)','errcatch');
28plot(x,x) 28plot(x,x)
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_2813.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_2813.dia.ref
index bd7b143..552a9ea 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_2813.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_2813.dia.ref
@@ -11,7 +11,7 @@
11// http://bugzilla.scilab.org/show_bug.cgi?id=2813 11// http://bugzilla.scilab.org/show_bug.cgi?id=2813
12// 12//
13// <-- Short Description --> 13// <-- Short Description -->
14// 14//
15// - xtitle clips y axis label 15// - xtitle clips y axis label
16// - xtitle adds @ in labels instead of displaying them on several lines 16// - xtitle adds @ in labels instead of displaying them on several lines
17axes = gca(); 17axes = gca();
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_2814.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_2814.dia.ref
index 0409765..a0e2c28 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_2814.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_2814.dia.ref
@@ -19,7 +19,7 @@ drawlater;
19clf(); 19clf();
20ax=gca(); 20ax=gca();
21ax.data_bounds=[-180,-50;180,90]; 21ax.data_bounds=[-180,-50;180,90];
22ax.box='on'; 22ax.box='on';
23ax.axes_visible=["on","on"]; 23ax.axes_visible=["on","on"];
24ax.tight_limits="on"; 24ax.tight_limits="on";
25a=5*ones(51,50); 25a=5*ones(51,50);
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_2870.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_2870.dia.ref
index cb06acc..08fa91e 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_2870.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_2870.dia.ref
@@ -12,7 +12,7 @@
12// 12//
13// <-- Short Description --> 13// <-- Short Description -->
14// plzr demo not correct 14// plzr demo not correct
15// 15//
16x=0:0.1:4*%pi; 16x=0:0.1:4*%pi;
17subplot(2,1,1); 17subplot(2,1,1);
18plot2d(x,[sin(x)' sin(2*x)'],leg="sin x@sin 2x"); 18plot2d(x,[sin(x)' sin(2*x)'],leg="sin x@sin 2x");
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_2888.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_2888.dia.ref
index cd22e58..a8b5325 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_2888.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_2888.dia.ref
@@ -13,9 +13,9 @@
13// <-- Short Description --> 13// <-- Short Description -->
14// Set font_size with a big value freeze Scilab 14// Set font_size with a big value freeze Scilab
15alphabet=["a" "b" "c" "d" "e" "f" "g" .. 15alphabet=["a" "b" "c" "d" "e" "f" "g" ..
16 "h" "i" "j" "k" "l" "m" "n" .. 16"h" "i" "j" "k" "l" "m" "n" ..
17 "o" "p" "q" "r" "s" "t" "u" .. 17"o" "p" "q" "r" "s" "t" "u" ..
18 "v" "w" "x" "y" "z"]; 18"v" "w" "x" "y" "z"];
19s = scf(); 19s = scf();
20a = gca(); 20a = gca();
21a.view = "3d"; 21a.view = "3d";
@@ -25,11 +25,11 @@ e = gce();
25e.font_size = 100; 25e.font_size = 100;
26// rotate 26// rotate
27for i=1:360, 27for i=1:360,
28 a.rotation_angles(2) = i; 28 a.rotation_angles(2) = i;
29end 29end
30// use fractional fonts 30// use fractional fonts
31e.fractional_font = "on"; 31e.fractional_font = "on";
32// rotate again 32// rotate again
33for i=1:360, 33for i=1:360,
34 a.rotation_angles(2) = i; 34 a.rotation_angles(2) = i;
35end 35end
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_2934.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_2934.dia.ref
index 230b14c..d683310 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_2934.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_2934.dia.ref
@@ -11,7 +11,7 @@
11// http://bugzilla.scilab.org/show_bug.cgi?id=2934 11// http://bugzilla.scilab.org/show_bug.cgi?id=2934
12// 12//
13// <-- Short Description --> 13// <-- Short Description -->
14//In the "Bezier surface test" demo, the graphics titles are inverted compared to Scilab 4.1.2 14//In the "Bezier surface test" demo, the graphics titles are inverted compared to Scilab 4.1.2
15subplot(211); 15subplot(211);
16a = gca(); 16a = gca();
17a.title.text = "top axes"; 17a.title.text = "top axes";
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_2936.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_2936.dia.ref
index b62b8d6..80cf03c 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_2936.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_2936.dia.ref
@@ -12,7 +12,7 @@
12// 12//
13// <-- Short Description --> 13// <-- Short Description -->
14// The demo "Surface with hole 1" is not colorized (just blue, not multi-colored as in Scilab 4.1.2) 14// The demo "Surface with hole 1" is not colorized (just blue, not multi-colored as in Scilab 4.1.2)
15// 15//
16t = linspace(-%pi,%pi,40); 16t = linspace(-%pi,%pi,40);
17z = sin(t)'*cos(t); 17z = sin(t)'*cos(t);
18z1 = find(abs(z) > 0.5); 18z1 = find(abs(z) > 0.5);
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_2953.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_2953.dia.ref
index 6dae694..5d8a047 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_2953.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_2953.dia.ref
@@ -5,6 +5,7 @@
5// This file is distributed under the same license as the Scilab package. 5// This file is distributed under the same license as the Scilab package.
6// ============================================================================= 6// =============================================================================
7// <-- TEST WITH GRAPHIC --> 7// <-- TEST WITH GRAPHIC -->
8// <-- NO CHECK ERROR OUTPUT -->
8// <-- Non-regression test for bug 2953 --> 9// <-- Non-regression test for bug 2953 -->
9// 10//
10// <-- Bugzilla URL --> 11// <-- Bugzilla URL -->
@@ -12,7 +13,7 @@
12// 13//
13// <-- Short Description --> 14// <-- Short Description -->
14// we lost axes with plot3d and box = 2 15// we lost axes with plot3d and box = 2
15t=[0:0.1:2*%pi]'; z=sin(t)*cos(t'); 16t=[0:0.1:2*%pi]'; z=sin(t)*cos(t');
16f=gcf();f.color_map=hsvcolormap(64); 17f=gcf();f.color_map=hsvcolormap(64);
17plot3d1(t,t,z,35,45,"X@Y@Z",[-2,2,2]) 18plot3d1(t,t,z,35,45,"X@Y@Z",[-2,2,2])
18// with box = 2 we should have only the back thriedron drawn 19// with box = 2 we should have only the back thriedron drawn
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_2983.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_2983.dia.ref
index dd9c825..ecd64c0 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_2983.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_2983.dia.ref
@@ -24,8 +24,7 @@ plot3d(x,x,z)
24a = gca(); 24a = gca();
25a.children(1).hiddencolor 25a.children(1).hiddencolor
26 ans = 26 ans =
27 27 4.
28 4.
29a.children(1).hiddencolor = 5; 28a.children(1).hiddencolor = 5;
30// check that no hidden facets appears. 29// check that no hidden facets appears.
31// Might be updated when image processing will be integrated in Scilab. 30// Might be updated when image processing will be integrated in Scilab.
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_3101.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_3101.dia.ref
index a712bde..852db99 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_3101.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_3101.dia.ref
@@ -12,7 +12,7 @@
12// 12//
13// <-- Short Description --> 13// <-- Short Description -->
14// plot3d() => seg fault, occurs rarely. 14// plot3d() => seg fault, occurs rarely.
15// 15//
16for i=1:100, 16for i=1:100,
17 plot3d(); 17 plot3d();
18end 18end
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_3118.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_3118.dia.ref
index e3b77c9..2fe8105 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_3118.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_3118.dia.ref
@@ -12,7 +12,7 @@
12// 12//
13// <-- Short Description --> 13// <-- Short Description -->
14// The edit/current axes properties menu of the graphic window fails 14// The edit/current axes properties menu of the graphic window fails
15// 15//
16// create a figure 16// create a figure
17scf(0); 17scf(0);
18// figure property 18// figure property
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_3184.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_3184.dia.ref
index a14cf9f..ddb3c51 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_3184.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_3184.dia.ref
@@ -13,5 +13,4 @@
13// <-- Short Description --> 13// <-- Short Description -->
14// Misaligned ticks labels in colorbar. 14// Misaligned ticks labels in colorbar.
15colorbar(-200,100) 15colorbar(-200,100)
16// Now expand the window to see ticks along the color bar 16// Labels should be here with ticks
17// Labels should be in front of them.
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_3204.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_3204.dia.ref
index 3d2fc06..4e756d3 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_3204.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_3204.dia.ref
@@ -12,7 +12,7 @@
12// 12//
13// <-- Short Description --> 13// <-- Short Description -->
14// Axes box drawign disappeared in histplot demo. 14// Axes box drawign disappeared in histplot demo.
15// 15//
16// first check axes 16// first check axes
17subplot(2,2,1); 17subplot(2,2,1);
18histplot(); 18histplot();
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_3225.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_3225.dia.ref
index 917efdb..71f147d 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_3225.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_3225.dia.ref
@@ -12,7 +12,7 @@
12// 12//
13// <-- Short Description --> 13// <-- Short Description -->
14// The "symbol" font (number 1) is broken 14// The "symbol" font (number 1) is broken
15// 15//
16xstring(0.2,0.2,['abcdefghijklmnopqrstuvwxyz';'ABCDEFGHIJKLMNOPQRSTUVWXYZ']); 16xstring(0.2,0.2,['abcdefghijklmnopqrstuvwxyz';'ABCDEFGHIJKLMNOPQRSTUVWXYZ']);
17e=gce(); 17e=gce();
18e.font_style=1; 18e.font_style=1;
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_3390.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_3390.dia.ref
index 0e3bf4b..897a4b5 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_3390.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_3390.dia.ref
@@ -14,10 +14,10 @@
14// Scilab 5 14// Scilab 5
15// When sca() is called with a bad number of argument, the returned error is not clear at all. 15// When sca() is called with a bad number of argument, the returned error is not clear at all.
16// -->sca() 16// -->sca()
17// !--error 4 17// !--error 4
18// Undefined variable: h 18// Undefined variable: h
19// 19//
20// at line 2 of function sca called by : 20// at line 2 of function sca called by :
21// sca() 21// sca()
22execstr("sca();","errcatch"); 22execstr("sca();","errcatch");
23if lasterror() <> msprintf(gettext("%s: Wrong number of input arguments: %d expected.\n"), "sca",1) then bugmes();quit;end 23if lasterror() <> msprintf(gettext("%s: Wrong number of input arguments: %d expected.\n"), "sca",1) then bugmes();quit;end
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_3454.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_3454.dia.ref
index c6dc8c9..3dbcf7d 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_3454.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_3454.dia.ref
@@ -12,7 +12,7 @@
12// 12//
13// <-- Short Description --> 13// <-- Short Description -->
14// figure.axes_size and figure.figure_size might not be updated immediately. 14// figure.axes_size and figure.figure_size might not be updated immediately.
15// 15//
16// Test 1 : axes_size, auto_resize = "on" 16// Test 1 : axes_size, auto_resize = "on"
17// =========================== 17// ===========================
18// Create a default figure 18// Create a default figure
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_3470.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_3470.dia.ref
index 7c7fab8..3f116e2 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_3470.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_3470.dia.ref
@@ -12,7 +12,7 @@
12// 12//
13// <-- Short Description --> 13// <-- Short Description -->
14// plot2d(), followed by legends produce an unexpected error. 14// plot2d(), followed by legends produce an unexpected error.
15// 15//
16plot2d(); 16plot2d();
17legends(string([1:3]),[-1 -2 3],1); 17legends(string([1:3]),[-1 -2 3],1);
18// plot2d used to corrupt the stack and legends was producing an error 18// plot2d used to corrupt the stack and legends was producing an error
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_3475.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_3475.dia.ref
index 86e03ab..38a1e2b 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_3475.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_3475.dia.ref
@@ -12,7 +12,7 @@
12// 12//
13// <-- Short Description --> 13// <-- Short Description -->
14// After open and close a graphic window, scilab is crashing if a new window is opened. 14// After open and close a graphic window, scilab is crashing if a new window is opened.
15// 15//
16plot3d(); 16plot3d();
17delete(gcf()); 17delete(gcf());
18plot3d(); 18plot3d();
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_3527.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_3527.dia.ref
index ac65c63..b25c7a8 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_3527.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_3527.dia.ref
@@ -12,7 +12,7 @@
12// 12//
13// <-- Short Description --> 13// <-- Short Description -->
14// Graphic windows created by figure are unable to display plots. 14// Graphic windows created by figure are unable to display plots.
15// 15//
16h1 = figure(1); 16h1 = figure(1);
17plot([1,2,5,4,5,2,1]); 17plot([1,2,5,4,5,2,1]);
18// check that the plot is visible 18// check that the plot is visible
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_3572.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_3572.dia.ref
index b9ffc5d..a67ebb1 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_3572.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_3572.dia.ref
@@ -13,7 +13,7 @@
13// 13//
14// <-- Short Description --> 14// <-- Short Description -->
15// When using grayplot, you cannot have different dimensions in entry. 15// When using grayplot, you cannot have different dimensions in entry.
16// 16//
17x=1:2000; y=1:1000; m=rand(1000,2000); 17x=1:2000; y=1:1000; m=rand(1000,2000);
18grayplot(x,y,m'); 18grayplot(x,y,m');
19// used to crash violently 19// used to crash violently
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_3608.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_3608.dia.ref
index 8de6436..8e4736e 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_3608.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_3608.dia.ref
@@ -12,7 +12,7 @@
12// 12//
13// <-- Short Description --> 13// <-- Short Description -->
14// Scilab freezes when executing a combination of "eventhandler", "xchange" and "plot". 14// Scilab freezes when executing a combination of "eventhandler", "xchange" and "plot".
15// 15//
16function follow(win,x,y,ibut) 16function follow(win,x,y,ibut)
17 [xx,yy]=xchange(x,y,"i2f"); 17 [xx,yy]=xchange(x,y,"i2f");
18endfunction 18endfunction
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_3621.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_3621.dia.ref
index 6062e3f..613bb0d 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_3621.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_3621.dia.ref
@@ -12,7 +12,7 @@
12// 12//
13// <-- Short Description --> 13// <-- Short Description -->
14// Wrong setting of figure_position in the default figure. 14// Wrong setting of figure_position in the default figure.
15// 15//
16defaultFig = gdf(); 16defaultFig = gdf();
17defaultPos = [200,300]; 17defaultPos = [200,300];
18defaultFig.figure_position = defaultPos; 18defaultFig.figure_position = defaultPos;
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_3800.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_3800.dia.ref
index f9d9bc1..6e88de2 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_3800.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_3800.dia.ref
@@ -12,7 +12,7 @@
12// 12//
13// <-- Short Description --> 13// <-- Short Description -->
14// After using surf giving a stacksize error, the figure saty in drawlater mode. 14// After using surf giving a stacksize error, the figure saty in drawlater mode.
15// 15//
16fig = gcf(); 16fig = gcf();
17fig.immediate_drawing = "on"; 17fig.immediate_drawing = "on";
18// will require too much stack 18// will require too much stack
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_3952.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_3952.dia.ref
index 6da1028..a45e0b0 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_3952.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_3952.dia.ref
@@ -12,7 +12,7 @@
12// 12//
13// <-- Short Description --> 13// <-- Short Description -->
14// legend only works when the number of strings equals the number of polylines 14// legend only works when the number of strings equals the number of polylines
15// 15//
16x = 1:10; 16x = 1:10;
17plot(x,x); 17plot(x,x);
18p1 = gce(); 18p1 = gce();
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_3953.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_3953.dia.ref
index 5a93001..dbf8605 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_3953.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_3953.dia.ref
@@ -12,7 +12,7 @@
12// 12//
13// <-- Short Description --> 13// <-- Short Description -->
14// delete() always modify the current object handle. 14// delete() always modify the current object handle.
15// 15//
16x = 1:10; 16x = 1:10;
17// create two polylines 17// create two polylines
18plot(x,x); 18plot(x,x);
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_3954.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_3954.dia.ref
index cc7b1c3..16b3886 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_3954.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_3954.dia.ref
@@ -12,7 +12,7 @@
12// 12//
13// <-- Short Description --> 13// <-- Short Description -->
14// Graphic demos launched using functions without arguments (such as plot3d()) may modify variables. 14// Graphic demos launched using functions without arguments (such as plot3d()) may modify variables.
15// 15//
16f = gdf(); 16f = gdf();
17backupF = f; 17backupF = f;
18x = 10; 18x = 10;
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_4093.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_4093.dia.ref
index 72f53e9..f11693d 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_4093.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_4093.dia.ref
@@ -12,9 +12,9 @@
12// 12//
13// <-- Short Description --> 13// <-- Short Description -->
14// plot2d overrides Y axis location set in default axes. 14// plot2d overrides Y axis location set in default axes.
15// 15//
16x = [0:0.1:2*%pi]'; 16x = [0:0.1:2*%pi]';
17da = gda(); // get the handle of the model axes 17da = gda(); // get the handle of the model axes
18da.x_location = "origin"; 18da.x_location = "origin";
19da.y_location = "origin"; 19da.y_location = "origin";
20plot2d(x-2,sin(x)) 20plot2d(x-2,sin(x))
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_4106.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_4106.dia.ref
index 5638993..86e6b2d 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_4106.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_4106.dia.ref
@@ -11,8 +11,8 @@
11// http://bugzilla.scilab.org/show_bug.cgi?id=4106 11// http://bugzilla.scilab.org/show_bug.cgi?id=4106
12// 12//
13// <-- Short Description --> 13// <-- Short Description -->
14// bar and barh overrides drawlater/drawnow mode. 14// bar and barh override drawlater/drawnow mode.
15// 15//
16x = 1:10; 16x = 1:10;
17curFig = gcf(); 17curFig = gcf();
18// drawlater 18// drawlater
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_4236.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_4236.dia.ref
index e0a0c97..7f96c54 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_4236.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_4236.dia.ref
@@ -12,7 +12,7 @@
12// 12//
13// <-- Short Description --> 13// <-- Short Description -->
14// move called with an already deleted handle crashes Scilab. 14// move called with an already deleted handle crashes Scilab.
15// 15//
16xpoly(1,1); 16xpoly(1,1);
17point = gce(); 17point = gce();
18delete(point); // the handle is no longer valid 18delete(point); // the handle is no longer valid
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_4463.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_4463.dia.ref
index dc27d6e..f6e618d 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_4463.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_4463.dia.ref
@@ -12,7 +12,7 @@
12// 12//
13// <-- Short Description --> 13// <-- Short Description -->
14// Creating an one-colored Sgrayplot generate some exceptions and does not plot anything. 14// Creating an one-colored Sgrayplot generate some exceptions and does not plot anything.
15// 15//
16x=-10:10; y=-10:10; m = zeros(21,21); 16x=-10:10; y=-10:10; m = zeros(21,21);
17for ix=1:21 17for ix=1:21
18 for iy=1:21 18 for iy=1:21
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_4640.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_4640.dia.ref
index 79fb188..a842bfe 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_4640.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_4640.dia.ref
@@ -22,4 +22,4 @@ v0 = a.x_ticks.labels;
22drawaxis(x=a.x_ticks.locations,y=0.5,dir="u",tics="v",val=v0); 22drawaxis(x=a.x_ticks.locations,y=0.5,dir="u",tics="v",val=v0);
23e=gce(); 23e=gce();
24v1="$"+v0+"$"; 24v1="$"+v0+"$";
25e.tics_labels=v1'; 25e.tics_labels=v1';
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_5844.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_5844.dia.ref
index 719b65a..7b98841 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_5844.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_5844.dia.ref
@@ -11,7 +11,7 @@
11// http://bugzilla.scilab.org/5844 11// http://bugzilla.scilab.org/5844
12// 12//
13// <-- Short Description --> 13// <-- Short Description -->
14// grayplot had not logflag option 14// grayplot had not a logflag option
15x=1:10; 15x=1:10;
16y=1:10; 16y=1:10;
17m=rand(10,10); 17m=rand(10,10);
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_6531.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_6531.dia.ref
index 43239f1..e4c0743 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_6531.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_6531.dia.ref
@@ -18,8 +18,7 @@ p=e.children(1);
18c=captions(p,'foo'); 18c=captions(p,'foo');
19c.background //-->-2 ok 19c.background //-->-2 ok
20 ans = 20 ans =
21 21 -2.
22 - 2.
23p.foreground=color(200,128,33); 22p.foreground=color(200,128,33);
24// The caption's background color should remain equal to -2 23// The caption's background color should remain equal to -2
25if (c.background <> -2) then bugmes();quit;end 24if (c.background <> -2) then bugmes();quit;end
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_6720.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_6720.dia.ref
index 4c31653..16a47bd 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_6720.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_6720.dia.ref
@@ -5,6 +5,7 @@
5// This file is distributed under the same license as the Scilab package. 5// This file is distributed under the same license as the Scilab package.
6// ============================================================================= 6// =============================================================================
7// <-- TEST WITH GRAPHIC --> 7// <-- TEST WITH GRAPHIC -->
8// <-- NO CHECK ERROR OUTPUT -->
8// <-- Non-regression test for bug 6720 --> 9// <-- Non-regression test for bug 6720 -->
9// 10//
10// <-- Bugzilla URL --> 11// <-- Bugzilla URL -->
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_6959.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_6959.dia.ref
index c5cec72..30288d2 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_6959.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_6959.dia.ref
@@ -20,4 +20,4 @@ v0=a.x_ticks.labels;
20drawaxis(x=a.x_ticks.locations,y=0.5,dir="u",tics="v",val=v0); 20drawaxis(x=a.x_ticks.locations,y=0.5,dir="u",tics="v",val=v0);
21e=gce(); 21e=gce();
22v1="$"+v0+"$"; 22v1="$"+v0+"$";
23e.tics_labels=v1'; 23e.tics_labels=v1';
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_7509.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_7509.dia.ref
index 0fdf7e7..593580b 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_7509.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_7509.dia.ref
@@ -14,7 +14,7 @@
14// 14//
15t=linspace(0,%pi,20); 15t=linspace(0,%pi,20);
16drawlater() 16drawlater()
17clf();plot2d(t,[cos(t'),cos(2*t'),cos(3*t')],[-5,2 3]); 17clf();plot2d(t,[cos(t'),cos(2*t'),cos(3*t')],[-5,2 3]);
18ax=gca(); 18ax=gca();
19C=ax.children.children; 19C=ax.children.children;
20hl=legend(['cos(t)';'cos(2*t)';'cos(3*t)']); 20hl=legend(['cos(t)';'cos(2*t)';'cos(3*t)']);
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_7998.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_7998.dia.ref
index 74c3af7..dd403f9 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_7998.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_7998.dia.ref
@@ -13,7 +13,7 @@
13// http://bugzilla.scilab.org/show_bug.cgi?id=7998 13// http://bugzilla.scilab.org/show_bug.cgi?id=7998
14// 14//
15// <-- Short Description --> 15// <-- Short Description -->
16//%h_get failed with heterogen handle matrix 16//%h_get failed on heterogeneous handle matrix
17cols = [1 2 3 4 5]; 17cols = [1 2 3 4 5];
18lgd = []; 18lgd = [];
19for k = 1 : 5 19for k = 1 : 5
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_8786.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_8786.dia.ref
index 41ce1eb..c6cf921 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_8786.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_8786.dia.ref
@@ -13,7 +13,7 @@
13// http://bugzilla.scilab.org/show_bug.cgi?id=8786 13// http://bugzilla.scilab.org/show_bug.cgi?id=8786
14// 14//
15// <-- Short Description --> 15// <-- Short Description -->
16// When entering wrong input arguments in getcolor function..the error message is very strange... 16// When entering wrong input arguments in 'getcolor' function, the error message has no sense.
17ierr = execstr("getcolor(10)", "errcatch"); 17ierr = execstr("getcolor(10)", "errcatch");
18errmsg = lasterror(); 18errmsg = lasterror();
19if ierr==0 then bugmes();quit;end 19if ierr==0 then bugmes();quit;end
diff --git a/scilab/modules/graphics/tests/unit_tests/Matplot.dia.ref b/scilab/modules/graphics/tests/unit_tests/Matplot.dia.ref
index 8306e66..038c18e 100644
--- a/scilab/modules/graphics/tests/unit_tests/Matplot.dia.ref
+++ b/scilab/modules/graphics/tests/unit_tests/Matplot.dia.ref
@@ -13,32 +13,25 @@ Matplot([1 2 3;4 5 6])
13e = gce(); 13e = gce();
14assert_checkequal(e.parent.type, "Axes") 14assert_checkequal(e.parent.type, "Axes")
15 ans = 15 ans =
16 16 T
17 T
18assert_checkequal(e.children, []) 17assert_checkequal(e.children, [])
19 ans = 18 ans =
20 19 T
21 T
22assert_checkequal(e.visible, "on") 20assert_checkequal(e.visible, "on")
23 ans = 21 ans =
24 22 T
25 T
26assert_checkequal(e.data, [1, 2, 3 ; 4, 5, 6]) 23assert_checkequal(e.data, [1, 2, 3 ; 4, 5, 6])
27 ans = 24 ans =
28 25 T
29 T
30assert_checkequal(e.clip_state, "clipgrf") 26assert_checkequal(e.clip_state, "clipgrf")
31 ans = 27 ans =
32 28 T
33 T
34assert_checkequal(e.clip_box, []) 29assert_checkequal(e.clip_box, [])
35 ans = 30 ans =
36 31 T
37 T
38assert_checkequal(e.user_data, []) 32assert_checkequal(e.user_data, [])
39 ans = 33 ans =
40 34 T
41 T
42// used to crash Scilab 35// used to crash Scilab
43clf(); 36clf();
44Matplot(1:32); 37Matplot(1:32);
diff --git a/scilab/modules/graphics/tests/unit_tests/arc.dia.ref b/scilab/modules/graphics/tests/unit_tests/arc.dia.ref
index 98199e9..e587785 100644
--- a/scilab/modules/graphics/tests/unit_tests/arc.dia.ref
+++ b/scilab/modules/graphics/tests/unit_tests/arc.dia.ref
@@ -11,57 +11,43 @@ xarc(-1,1,2,2,0,90*64);
11e = gce(); 11e = gce();
12assert_checkequal(e.parent.type, "Axes") 12assert_checkequal(e.parent.type, "Axes")
13 ans = 13 ans =
14
15 T 14 T
16assert_checkequal(e.children, []) 15assert_checkequal(e.children, [])
17 ans = 16 ans =
18
19 T 17 T
20assert_checkequal(e.thickness, 1) 18assert_checkequal(e.thickness, 1)
21 ans = 19 ans =
22
23 T 20 T
24assert_checkequal(e.line_style, 1) 21assert_checkequal(e.line_style, 1)
25 ans = 22 ans =
26
27 T 23 T
28assert_checkequal(e.line_mode, "on") 24assert_checkequal(e.line_mode, "on")
29 ans = 25 ans =
30
31 T 26 T
32assert_checkequal(e.fill_mode, "off") 27assert_checkequal(e.fill_mode, "off")
33 ans = 28 ans =
34
35 T 29 T
36assert_checkequal(e.foreground, -1) 30assert_checkequal(e.foreground, -1)
37 ans = 31 ans =
38
39 T 32 T
40assert_checkequal(e.background, -2) 33assert_checkequal(e.background, -2)
41 ans = 34 ans =
42
43 T 35 T
44assert_checkequal(e.data, [-1 1 2 2 0 90]) 36assert_checkequal(e.data, [-1 1 2 2 0 90])
45 ans = 37 ans =
46
47 T 38 T
48assert_checkequal(e.visible, "on") 39assert_checkequal(e.visible, "on")
49 ans = 40 ans =
50
51 T 41 T
52assert_checkequal(e.arc_drawing_method, "lines") 42assert_checkequal(e.arc_drawing_method, "lines")
53 ans = 43 ans =
54
55 T 44 T
56assert_checkequal(e.clip_state, "off") 45assert_checkequal(e.clip_state, "off")
57 ans = 46 ans =
58
59 T 47 T
60assert_checkequal(e.clip_box, []) 48assert_checkequal(e.clip_box, [])
61 ans = 49 ans =
62
63 T 50 T
64assert_checkequal(e.user_data, []) 51assert_checkequal(e.user_data, [])
65 ans = 52 ans =
66
67 T 53 T
diff --git a/scilab/modules/graphics/tests/unit_tests/fec.dia.ref b/scilab/modules/graphics/tests/unit_tests/fec.dia.ref
index ba592bf..bb2f14f 100644
--- a/scilab/modules/graphics/tests/unit_tests/fec.dia.ref
+++ b/scilab/modules/graphics/tests/unit_tests/fec.dia.ref
@@ -15,12 +15,11 @@ a = [1 1;
15 2 1; 15 2 1;
16 2 2; 16 2 2;
17 1 2] 17 1 2]
18 a = 18 a =
19 19 1. 1.
20 1. 1. 20 2. 1.
21 2. 1. 21 2. 2.
22 2. 2. 22 1. 2.
23 1. 2.
24x = a(:,1); 23x = a(:,1);
25y = a(:,2); 24y = a(:,2);
26triangle = [1 1 2 3 4 0]; 25triangle = [1 1 2 3 4 0];
diff --git a/scilab/modules/graphics/tests/unit_tests/figure.resizefcn.dia.ref b/scilab/modules/graphics/tests/unit_tests/figure.resizefcn.dia.ref
index c129f67..26f04de 100644
--- a/scilab/modules/graphics/tests/unit_tests/figure.resizefcn.dia.ref
+++ b/scilab/modules/graphics/tests/unit_tests/figure.resizefcn.dia.ref
@@ -7,7 +7,7 @@
7// <-- TEST WITH GRAPHIC --> 7// <-- TEST WITH GRAPHIC -->
8// Create a default figure 8// Create a default figure
9function resizeMe() 9function resizeMe()
10 disp("resize"); 10 disp("resize");
11endfunction 11endfunction
12f = scf(); 12f = scf();
13assert_checkequal(f.resizefcn, ""); 13assert_checkequal(f.resizefcn, "");
diff --git a/scilab/modules/graphics/tests/unit_tests/gce.dia.ref b/scilab/modules/graphics/tests/unit_tests/gce.dia.ref
index fb0c897..a840dad 100644
--- a/scilab/modules/graphics/tests/unit_tests/gce.dia.ref
+++ b/scilab/modules/graphics/tests/unit_tests/gce.dia.ref
@@ -11,8 +11,7 @@ a = gca();
11e = gce(); 11e = gce();
12assert_checkequal(e, a) 12assert_checkequal(e, a)
13 ans = 13 ans =
14 14 T
15 T
16plot(1:10); 15plot(1:10);
17e = gce(); 16e = gce();
18assert_checkequal(e.type, "Compound"); 17assert_checkequal(e.type, "Compound");
diff --git a/scilab/modules/graphics/tests/unit_tests/glue_unglue.dia.ref b/scilab/modules/graphics/tests/unit_tests/glue_unglue.dia.ref
index 6becea3..99bae9b 100644
--- a/scilab/modules/graphics/tests/unit_tests/glue_unglue.dia.ref
+++ b/scilab/modules/graphics/tests/unit_tests/glue_unglue.dia.ref
@@ -12,48 +12,38 @@ xrect(-1,1,2,2);
12xarc(-0.5,0.5,2,2,0,360*64); 12xarc(-0.5,0.5,2,2,0,360*64);
13assert_checkequal(a.children(1).type, "Arc") 13assert_checkequal(a.children(1).type, "Arc")
14 ans = 14 ans =
15 15 T
16 T
17assert_checkequal(a.children(2).type, "Rectangle") 16assert_checkequal(a.children(2).type, "Rectangle")
18 ans = 17 ans =
19 18 T
20 T
21e = gce(); 19e = gce();
22assert_checkequal(e.type, "Arc") 20assert_checkequal(e.type, "Arc")
23 ans = 21 ans =
24 22 T
25 T
26arc_child=a.children(1); 23arc_child=a.children(1);
27rect_child=a.children(2); 24rect_child=a.children(2);
28glue([arc_child, rect_child]); 25glue([arc_child, rect_child]);
29assert_checkequal(a.children(1).type, "Compound") 26assert_checkequal(a.children(1).type, "Compound")
30 ans = 27 ans =
31 28 T
32 T
33e = gce(); 29e = gce();
34assert_checkequal(e.type, "Compound") 30assert_checkequal(e.type, "Compound")
35 ans = 31 ans =
36 32 T
37 T
38assert_checkequal(e.children(1).type, "Rectangle") 33assert_checkequal(e.children(1).type, "Rectangle")
39 ans = 34 ans =
40 35 T
41 T
42assert_checkequal(e.children(2).type, "Arc") 36assert_checkequal(e.children(2).type, "Arc")
43 ans = 37 ans =
44 38 T
45 T
46unglue(e); 39unglue(e);
47assert_checkequal(a.children(1).type, "Rectangle") 40assert_checkequal(a.children(1).type, "Rectangle")
48 ans = 41 ans =
49 42 T
50 T
51assert_checkequal(a.children(2).type, "Arc") 43assert_checkequal(a.children(2).type, "Arc")
52 ans = 44 ans =
53 45 T
54 T
55e = gce(); 46e = gce();
56assert_checkequal(e.type, "Axes") 47assert_checkequal(e.type, "Axes")
57 ans = 48 ans =
58 49 T
59 T
diff --git a/scilab/modules/graphics/tests/unit_tests/grayplot.dia.ref b/scilab/modules/graphics/tests/unit_tests/grayplot.dia.ref
index a550464..8a54642 100644
--- a/scilab/modules/graphics/tests/unit_tests/grayplot.dia.ref
+++ b/scilab/modules/graphics/tests/unit_tests/grayplot.dia.ref
@@ -14,45 +14,34 @@ grayplot(x,y,z);
14e = gce(); 14e = gce();
15assert_checkequal(e.type, "Grayplot") 15assert_checkequal(e.type, "Grayplot")
16 ans = 16 ans =
17 17 T
18 T
19assert_checkequal(e.parent.type, "Axes") 18assert_checkequal(e.parent.type, "Axes")
20 ans = 19 ans =
21 20 T
22 T
23assert_checkequal(e.children, []) 21assert_checkequal(e.children, [])
24 ans = 22 ans =
25 23 T
26 T
27assert_checkequal(e.visible, "on") 24assert_checkequal(e.visible, "on")
28 ans = 25 ans =
29 26 T
30 T
31assert_checkequal(e.data.x, x') 27assert_checkequal(e.data.x, x')
32 ans = 28 ans =
33 29 T
34 T
35assert_checkequal(e.data.y, y') 30assert_checkequal(e.data.y, y')
36 ans = 31 ans =
37 32 T
38 T
39assert_checkequal(e.data.z, z) 33assert_checkequal(e.data.z, z)
40 ans = 34 ans =
41 35 T
42 T
43assert_checkequal(e.data_mapping, "scaled") 36assert_checkequal(e.data_mapping, "scaled")
44 ans = 37 ans =
45 38 T
46 T
47assert_checkequal(e.clip_state, "clipgrf") 39assert_checkequal(e.clip_state, "clipgrf")
48 ans = 40 ans =
49 41 T
50 T
51assert_checkequal(e.clip_box, []) 42assert_checkequal(e.clip_box, [])
52 ans = 43 ans =
53 44 T
54 T
55assert_checkequal(e.user_data, []) 45assert_checkequal(e.user_data, [])
56 ans = 46 ans =
57 47 T
58 T
diff --git a/scilab/modules/graphics/tests/unit_tests/is_handle_valid.dia.ref b/scilab/modules/graphics/tests/unit_tests/is_handle_valid.dia.ref
index 2877dbe..5da9802d 100644
--- a/scilab/modules/graphics/tests/unit_tests/is_handle_valid.dia.ref
+++ b/scilab/modules/graphics/tests/unit_tests/is_handle_valid.dia.ref
@@ -14,8 +14,7 @@ plot([0:10; 0:10; 0:10], [0:10; 0:0.5:5; 0:2:20]);
14// check polylines validity 14// check polylines validity
15axes = gca(); 15axes = gca();
16polylines = axes.children(1).children 16polylines = axes.children(1).children
17 polylines = 17 polylines =
18
1911 by 1 matrix of handles: 1811 by 1 matrix of handles:
20========================== 19==========================
21Polyline 20Polyline
@@ -35,17 +34,16 @@ assert_checkequal(test, [%t; %t; %t; %t; %t; %t; %t; %t; %t; %t; %t]);
35delete(polylines(3:7)); 34delete(polylines(3:7));
36// print validity 35// print validity
37test = is_handle_valid(polylines) 36test = is_handle_valid(polylines)
38 test = 37 test =
39 38 T
40 T 39 T
41 T 40 F
42 F 41 F
43 F 42 F
44 F 43 F
45 F 44 F
46 F 45 T
47 T 46 T
48 T 47 T
49 T 48 T
50 T
51assert_checkequal(test, [%t; %t; %f; %f; %f; %f; %f; %t; %t; %t; %t]); 49assert_checkequal(test, [%t; %t; %f; %f; %f; %f; %f; %t; %t; %t; %t]);
diff --git a/scilab/modules/graphics/tests/unit_tests/line_style.dia.ref b/scilab/modules/graphics/tests/unit_tests/line_style.dia.ref
index 93546a8..c7a22ad 100644
--- a/scilab/modules/graphics/tests/unit_tests/line_style.dia.ref
+++ b/scilab/modules/graphics/tests/unit_tests/line_style.dia.ref
@@ -12,9 +12,9 @@
12// Check line_style correctness 12// Check line_style correctness
13// Try this : 13// Try this :
14for i = [1:11] do 14for i = [1:11] do
15 plot([i,i]); 15 plot([i,i]);
16 e=gce(); 16 e=gce();
17 e=e.children(); 17 e=e.children();
18 e.line_style = i; 18 e.line_style = i;
19end 19end
20// check that you have bottom to up : dash, dash dot, longdash dot, bigdash dot, bigdash longdash, dot, double dot, longblank dot, bigblank dot. 20// check that you have bottom to up : dash, dash dot, longdash dot, bigdash dot, bigdash longdash, dot, double dot, longblank dot, bigblank dot.
diff --git a/scilab/modules/graphics/tests/unit_tests/mesh.dia.ref b/scilab/modules/graphics/tests/unit_tests/mesh.dia.ref
index 383dcf3..4d4c77a 100644
--- a/scilab/modules/graphics/tests/unit_tests/mesh.dia.ref
+++ b/scilab/modules/graphics/tests/unit_tests/mesh.dia.ref
@@ -13,85 +13,65 @@ mesh(X,Y,Z);
13e = gce(); 13e = gce();
14assert_checkequal(e.type, "Fac3d") 14assert_checkequal(e.type, "Fac3d")
15 ans = 15 ans =
16 16 T
17 T
18assert_checkequal(e.parent.type, "Axes") 17assert_checkequal(e.parent.type, "Axes")
19 ans = 18 ans =
20 19 T
21 T
22assert_checkequal(e.children, []) 20assert_checkequal(e.children, [])
23 ans = 21 ans =
24 22 T
25 T
26assert_checkequal(e.visible, "on") 23assert_checkequal(e.visible, "on")
27 ans = 24 ans =
28 25 T
29 T
30assert_checkequal(e.surface_mode, "on") 26assert_checkequal(e.surface_mode, "on")
31 ans = 27 ans =
32 28 T
33 T
34assert_checkequal(e.foreground, -1) 29assert_checkequal(e.foreground, -1)
35 ans = 30 ans =
36 31 T
37 T