From: Samuel GOUGEON Date: Sat, 23 May 2020 08:46:55 +0000 (+0200) Subject: rm duplicate test after fced82 & 56cd2 X-Git-Url: http://gitweb.scilab.org/?p=scilab.git;a=commitdiff_plain;h=0f5e5e2289640a98817ae17ecf4aee44e5d8064f rm duplicate test after fced82 & 56cd2 bug_14361.tst is already completely included in parser.tst. Testing twice exactly the same thing is useless. parser.tst has been updated after https://codereview.scilab.org/#/c/21136/ @ https://codereview.scilab.org/#/c/21375 This commit removes the duplicate instead of updating it. This is indicated in the bugzilla thread. Change-Id: I56d1224f92641c79e949be785d43c26ccbb008f8 --- diff --git a/scilab/modules/ast/tests/nonreg_tests/bug_14361.dia.ref b/scilab/modules/ast/tests/nonreg_tests/bug_14361.dia.ref deleted file mode 100644 index ee84e75..0000000 --- a/scilab/modules/ast/tests/nonreg_tests/bug_14361.dia.ref +++ /dev/null @@ -1,356 +0,0 @@ -// ============================================================================= -// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab -// Copyright (C) 2016 - Scilab Enterprises - Pierre-Aime Agnel -// -// This file is distributed under the same license as the Scilab package. -// ============================================================================= -// <-- CLI SHELL MODE --> -// -// <-- Non-regression test for bug 14361 --> -// -// <-- Bugzilla URL --> -// http://bugzilla.scilab.org/14361 -// -// <-- Short Description --> -// Parser did not manage comments after line continuation ... in matrix environnement -// bug_14361 -colvect(1,1) = 1; -colvect(2,1) = -2; -linevect = colvect'; -a=[1; .../* a comment */ --2]; -assert_checkequal(a, colvect); -a=[1;.../* a comment */ --2]; -assert_checkequal(a, colvect); -a=[1; .../* a comment */ - -2]; -assert_checkequal(a, colvect); -a=[1;.../* a comment */ - -2]; -assert_checkequal(a, colvect); -a=[1; .../* a comment */ -- 2]; -assert_checkequal(a, colvect); -a=[1;.../* a comment */ -- 2]; -assert_checkequal(a, colvect); -a=[1 .../* a comment */ --2]; -assert_checkequal(a, linevect); -a=[1.../* a comment */ --2]; -assert_checkequal(a, -1); -a=[1 .../* a comment */ - -2]; -assert_checkequal(a, linevect); -a=[1.../* a comment */ - -2]; -assert_checkequal(a, linevect); -a=[1 .../* a comment */ -- 2]; -assert_checkequal(a, -1); -a=[1.../* a comment */ -- 2]; -assert_checkequal(a, -1); -// Operators within matrices -// DOTTIMES -a = [[2 3] .* ... /* a comment */ --3]; -expected = [-6 -9]; -assert_checkequal(a, expected); -//DOTRDIVIDE -a = [[2 3] ./ ... /* a comment */ --3]; -expected = [-2/3 -1]; -assert_checkequal(a, expected); -//DOTLDIVIDE -a = [[2 3] .\ ... /* a comment */ --3]; -expected = [-3/2 -1]; -assert_checkequal(a, expected); -//DOTPOWER -a = [[2 3] .^ ... /* a comment */ --3]; -expected = [(2^(-3)), (3^(-3))]; -assert_checkequal(a, expected); -//MINUS -a = [[2 3] - ... /* a comment */ --3]; -expected = [(2-(-3)), (3-(-3))]; -assert_checkequal(a, expected); -//PLUS -a = [[2 3] + ... /* a comment */ --3]; -expected = [(2+(-3)), (3+(-3))]; -assert_checkequal(a, expected); -//TIMES -a = [2 * ... /* a comment */ - -3]; -expected = [(2*(-3))]; -assert_checkequal(a, expected); -//RDIVIDE -a = [2 / ... /* a comment */ - -3]; -expected = [(2/(-3))]; -assert_checkequal(a, expected); -//LDIVIDE -a = [2 \ ... /* a comment */ - -3]; -expected = [(2\(-3))]; -assert_checkequal(a, expected); -//POWER -a = [2 ^ ... /* a comment */ - -3]; -expected = [(2^(-3))]; -assert_checkequal(a, expected); -//KRONTIMES -a = [[2 3] .*. ... /* a comment */ - -3]; -expected = [([2, 3].*.(-3))]; -assert_checkequal(a, expected); -//kronrdivide -a = [[2 3] ./. ... /* a comment */ - -3]; -expected = [([2, 3]./.(-3))]; -assert_checkequal(a, expected); -//KRONLDIVIDE -a = [[2 3] .\. ... /* a comment */ - -3]; -expected = [([2, 3].\.(-3))]; -assert_checkequal(a, expected); -//EQ -a = [[2 3] == ... /* a comment */ - -3]; -expected = [([2, 3]==(-3))]; -assert_checkequal(a, expected); -//NE -a = [[2 3] ~= ... /* a comment */ - -3]; -expected = [([2, 3]~=(-3))]; -assert_checkequal(a, expected); -//LT -a = [[2 3] < ... /* a comment */ - -3]; -expected = [([2, 3]<(-3))]; -assert_checkequal(a, expected); -//GT -a = [[2 3] > ... /* a comment */ - -3]; -expected = [([2, 3]>(-3))]; -assert_checkequal(a, expected); -//LE -a = [[2 3] <= ... /* a comment */ - -3]; -expected = [([2, 3]<=(-3))]; -assert_checkequal(a, expected); -//GE -a = [[2 3] >= ... /* a comment */ - -3]; -expected = [([2, 3]>=(-3))]; -assert_checkequal(a, expected); -// Comments on several lines -a=[1; .../* a comment - on several lines */ --2]; -assert_checkequal(a, colvect); -a=[1;.../* a comment - on several lines */ --2]; -assert_checkequal(a, colvect); -a=[1; .../* a comment - on several lines */ - -2]; -assert_checkequal(a, colvect); -a=[1;.../* a comment - on several lines */ - -2]; -assert_checkequal(a, colvect); -a=[1; .../* a comment - on several lines */ -- 2]; -assert_checkequal(a, colvect); -a=[1;.../* a comment - on several lines */ -- 2]; -assert_checkequal(a, colvect); -a=[1 .../* a comment - on several lines */ --2]; -assert_checkequal(a, linevect); -a=[1.../* a comment - on several lines */ --2]; -assert_checkequal(a, -1); -a=[1 .../* a comment - on several lines */ - -2]; -assert_checkequal(a, linevect); -a=[1.../* a comment - on several lines */ - -2]; -assert_checkequal(a, linevect); -a=[1 .../* a comment - on several lines */ -- 2]; -assert_checkequal(a, -1); -a=[1.../* a comment - on several lines */ -- 2]; -assert_checkequal(a, -1); -// Operators within matrices -// DOTTIMES -a = [[2 3] .* ... /* a comment - on several lines */ --3]; -expected = [-6 -9]; -assert_checkequal(a, expected); -//DOTRDIVIDE -a = [[2 3] ./ ... /* a comment - on several lines */ --3]; -expected = [-2/3 -1]; -assert_checkequal(a, expected); -//DOTLDIVIDE -a = [[2 3] .\ ... /* a comment - on several lines */ --3]; -expected = [-3/2 -1]; -assert_checkequal(a, expected); -//DOTPOWER -a = [[2 3] .^ ... /* a comment - on several lines */ --3]; -expected = [(2^(-3)), (3^(-3))]; -assert_checkequal(a, expected); -//MINUS -a = [[2 3] - ... /* a comment - on several lines */ --3]; -expected = [(2-(-3)), (3-(-3))]; -assert_checkequal(a, expected); -//PLUS -a = [[2 3] + ... /* a comment - on several lines */ --3]; -expected = [(2+(-3)), (3+(-3))]; -assert_checkequal(a, expected); -//TIMES -a = [2 * ... /* a comment - on several lines */ - -3]; -expected = [(2*(-3))]; -assert_checkequal(a, expected); -//RDIVIDE -a = [2 / ... /* a comment - on several lines */ - -3]; -expected = [(2/(-3))]; -assert_checkequal(a, expected); -//LDIVIDE -a = [2 \ ... /* a comment - on several lines */ - -3]; -expected = [(2\(-3))]; -assert_checkequal(a, expected); -//POWER -a = [2 ^ ... /* a comment - on several lines */ - -3]; -expected = [(2^(-3))]; -assert_checkequal(a, expected); -//KRONTIMES -a = [[2 3] .*. ... /* a comment - on several lines */ - -3]; -expected = [([2, 3].*.(-3))]; -assert_checkequal(a, expected); -//KRONRDIVIDE -a = [[2 3] ./. ... /* a comment - on several lines */ - -3]; -expected = [([2, 3]./.(-3))]; -assert_checkequal(a, expected); -//KRONLDIVIDE -a = [[2 3] .\. ... /* a comment - on several lines */ - -3]; -expected = [([2, 3].\.(-3))]; -assert_checkequal(a, expected); -//EQ -a = [[2 3] == ... /* a comment - on several lines */ - -3]; -expected = [([2, 3]==(-3))]; -assert_checkequal(a, expected); -//NE -a = [[2 3] ~= ... /* a comment - on several lines */ - -3]; -expected = [([2, 3]~=(-3))]; -assert_checkequal(a, expected); -//LT -a = [[2 3] < ... /* a comment - on several lines */ - -3]; -expected = [([2, 3]<(-3))]; -assert_checkequal(a, expected); -//GT -a = [[2 3] > ... /* a comment - on several lines */ - -3]; -expected = [([2, 3]>(-3))]; -assert_checkequal(a, expected); -//LE -a = [[2 3] <= ... /* a comment - on several lines */ - -3]; -expected = [([2, 3]<=(-3))]; -assert_checkequal(a, expected); -//GE -a = [[2 3] >= ... /* a comment - on several lines */ - -3]; -expected = [([2, 3]>=(-3))]; -assert_checkequal(a, expected); -// Special behaviour of ... with + and - -a = [1 +... -2] - a = - 3. -expected = 3; -assert_checkequal(a, expected); -a = [1 +... - 2] - a = - 3. -expected = 3; -assert_checkequal(a, expected); -a = [1 +... - +2] - a = - 3. -expected = 3; -assert_checkequal(a, expected); -a = [1 -... -2] - a = - -1. -expected = -1; -assert_checkequal(a, expected); -a = [1 -... - 2] - a = - -1. -expected = -1; -assert_checkequal(a, expected); -a = [1 -... - -2] - a = - 3. -expected = 3; -assert_checkequal(a, expected); -// Case with multiline comment -str_cmd = ["a = [1 -... /* the start of a"; - "multiline comment */ 2 3]"]; // this currently generates an error -assert_checktrue(execstr(str_cmd, "errcatch") <> 0); diff --git a/scilab/modules/ast/tests/nonreg_tests/bug_14361.tst b/scilab/modules/ast/tests/nonreg_tests/bug_14361.tst deleted file mode 100644 index 44c47c3..0000000 --- a/scilab/modules/ast/tests/nonreg_tests/bug_14361.tst +++ /dev/null @@ -1,395 +0,0 @@ -// ============================================================================= -// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab -// Copyright (C) 2016 - Scilab Enterprises - Pierre-Aime Agnel -// -// This file is distributed under the same license as the Scilab package. -// ============================================================================= -// <-- CLI SHELL MODE --> -// -// <-- Non-regression test for bug 14361 --> -// -// <-- Bugzilla URL --> -// http://bugzilla.scilab.org/14361 -// -// <-- Short Description --> -// Parser did not manage comments after line continuation ... in matrix environnement - -// bug_14361 -colvect(1,1) = 1; -colvect(2,1) = -2; -linevect = colvect'; - -a=[1; .../* a comment */ --2]; -assert_checkequal(a, colvect); -a=[1;.../* a comment */ --2]; -assert_checkequal(a, colvect); -a=[1; .../* a comment */ - -2]; -assert_checkequal(a, colvect); -a=[1;.../* a comment */ - -2]; -assert_checkequal(a, colvect); -a=[1; .../* a comment */ -- 2]; -assert_checkequal(a, colvect); -a=[1;.../* a comment */ -- 2]; -assert_checkequal(a, colvect); - -a=[1 .../* a comment */ --2]; -assert_checkequal(a, linevect); -a=[1.../* a comment */ --2]; -assert_checkequal(a, -1); -a=[1 .../* a comment */ - -2]; -assert_checkequal(a, linevect); -a=[1.../* a comment */ - -2]; -assert_checkequal(a, linevect); -a=[1 .../* a comment */ -- 2]; -assert_checkequal(a, -1); -a=[1.../* a comment */ -- 2]; -assert_checkequal(a, -1); - -// Operators within matrices -// DOTTIMES -a = [[2 3] .* ... /* a comment */ --3]; -expected = [-6 -9]; -assert_checkequal(a, expected); - -//DOTRDIVIDE - -a = [[2 3] ./ ... /* a comment */ --3]; -expected = [-2/3 -1]; -assert_checkequal(a, expected); - -//DOTLDIVIDE -a = [[2 3] .\ ... /* a comment */ --3]; -expected = [-3/2 -1]; -assert_checkequal(a, expected); - -//DOTPOWER -a = [[2 3] .^ ... /* a comment */ --3]; -expected = [(2^(-3)), (3^(-3))]; -assert_checkequal(a, expected); - -//MINUS -a = [[2 3] - ... /* a comment */ --3]; -expected = [(2-(-3)), (3-(-3))]; -assert_checkequal(a, expected); - -//PLUS -a = [[2 3] + ... /* a comment */ --3]; -expected = [(2+(-3)), (3+(-3))]; -assert_checkequal(a, expected); - -//TIMES -a = [2 * ... /* a comment */ - -3]; -expected = [(2*(-3))]; -assert_checkequal(a, expected); - -//RDIVIDE -a = [2 / ... /* a comment */ - -3]; -expected = [(2/(-3))]; -assert_checkequal(a, expected); - -//LDIVIDE -a = [2 \ ... /* a comment */ - -3]; -expected = [(2\(-3))]; -assert_checkequal(a, expected); - -//POWER -a = [2 ^ ... /* a comment */ - -3]; -expected = [(2^(-3))]; -assert_checkequal(a, expected); - -//KRONTIMES -a = [[2 3] .*. ... /* a comment */ - -3]; -expected = [([2, 3].*.(-3))]; -assert_checkequal(a, expected); - -//kronrdivide -a = [[2 3] ./. ... /* a comment */ - -3]; -expected = [([2, 3]./.(-3))]; -assert_checkequal(a, expected); - -//KRONLDIVIDE -a = [[2 3] .\. ... /* a comment */ - -3]; -expected = [([2, 3].\.(-3))]; -assert_checkequal(a, expected); - -//EQ -a = [[2 3] == ... /* a comment */ - -3]; -expected = [([2, 3]==(-3))]; -assert_checkequal(a, expected); - -//NE -a = [[2 3] ~= ... /* a comment */ - -3]; -expected = [([2, 3]~=(-3))]; -assert_checkequal(a, expected); - -//LT -a = [[2 3] < ... /* a comment */ - -3]; -expected = [([2, 3]<(-3))]; -assert_checkequal(a, expected); - -//GT -a = [[2 3] > ... /* a comment */ - -3]; -expected = [([2, 3]>(-3))]; -assert_checkequal(a, expected); - -//LE -a = [[2 3] <= ... /* a comment */ - -3]; -expected = [([2, 3]<=(-3))]; -assert_checkequal(a, expected); - -//GE -a = [[2 3] >= ... /* a comment */ - -3]; -expected = [([2, 3]>=(-3))]; -assert_checkequal(a, expected); - -// Comments on several lines -a=[1; .../* a comment - on several lines */ --2]; -assert_checkequal(a, colvect); -a=[1;.../* a comment - on several lines */ --2]; -assert_checkequal(a, colvect); -a=[1; .../* a comment - on several lines */ - -2]; -assert_checkequal(a, colvect); -a=[1;.../* a comment - on several lines */ - -2]; -assert_checkequal(a, colvect); -a=[1; .../* a comment - on several lines */ -- 2]; -assert_checkequal(a, colvect); -a=[1;.../* a comment - on several lines */ -- 2]; -assert_checkequal(a, colvect); - -a=[1 .../* a comment - on several lines */ --2]; -assert_checkequal(a, linevect); -a=[1.../* a comment - on several lines */ --2]; -assert_checkequal(a, -1); -a=[1 .../* a comment - on several lines */ - -2]; -assert_checkequal(a, linevect); -a=[1.../* a comment - on several lines */ - -2]; -assert_checkequal(a, linevect); -a=[1 .../* a comment - on several lines */ -- 2]; -assert_checkequal(a, -1); -a=[1.../* a comment - on several lines */ -- 2]; -assert_checkequal(a, -1); - -// Operators within matrices -// DOTTIMES -a = [[2 3] .* ... /* a comment - on several lines */ --3]; -expected = [-6 -9]; -assert_checkequal(a, expected); - -//DOTRDIVIDE -a = [[2 3] ./ ... /* a comment - on several lines */ --3]; -expected = [-2/3 -1]; -assert_checkequal(a, expected); - -//DOTLDIVIDE -a = [[2 3] .\ ... /* a comment - on several lines */ --3]; -expected = [-3/2 -1]; -assert_checkequal(a, expected); - -//DOTPOWER -a = [[2 3] .^ ... /* a comment - on several lines */ --3]; -expected = [(2^(-3)), (3^(-3))]; -assert_checkequal(a, expected); - -//MINUS -a = [[2 3] - ... /* a comment - on several lines */ --3]; -expected = [(2-(-3)), (3-(-3))]; -assert_checkequal(a, expected); - -//PLUS -a = [[2 3] + ... /* a comment - on several lines */ --3]; -expected = [(2+(-3)), (3+(-3))]; -assert_checkequal(a, expected); - -//TIMES -a = [2 * ... /* a comment - on several lines */ - -3]; -expected = [(2*(-3))]; -assert_checkequal(a, expected); - -//RDIVIDE -a = [2 / ... /* a comment - on several lines */ - -3]; -expected = [(2/(-3))]; -assert_checkequal(a, expected); - -//LDIVIDE -a = [2 \ ... /* a comment - on several lines */ - -3]; -expected = [(2\(-3))]; -assert_checkequal(a, expected); - -//POWER -a = [2 ^ ... /* a comment - on several lines */ - -3]; -expected = [(2^(-3))]; -assert_checkequal(a, expected); - -//KRONTIMES -a = [[2 3] .*. ... /* a comment - on several lines */ - -3]; -expected = [([2, 3].*.(-3))]; -assert_checkequal(a, expected); - -//KRONRDIVIDE -a = [[2 3] ./. ... /* a comment - on several lines */ - -3]; -expected = [([2, 3]./.(-3))]; -assert_checkequal(a, expected); - -//KRONLDIVIDE -a = [[2 3] .\. ... /* a comment - on several lines */ - -3]; -expected = [([2, 3].\.(-3))]; -assert_checkequal(a, expected); - -//EQ -a = [[2 3] == ... /* a comment - on several lines */ - -3]; -expected = [([2, 3]==(-3))]; -assert_checkequal(a, expected); - -//NE -a = [[2 3] ~= ... /* a comment - on several lines */ - -3]; -expected = [([2, 3]~=(-3))]; -assert_checkequal(a, expected); - -//LT -a = [[2 3] < ... /* a comment - on several lines */ - -3]; -expected = [([2, 3]<(-3))]; -assert_checkequal(a, expected); - -//GT -a = [[2 3] > ... /* a comment - on several lines */ - -3]; -expected = [([2, 3]>(-3))]; -assert_checkequal(a, expected); - -//LE -a = [[2 3] <= ... /* a comment - on several lines */ - -3]; -expected = [([2, 3]<=(-3))]; -assert_checkequal(a, expected); - -//GE -a = [[2 3] >= ... /* a comment - on several lines */ - -3]; -expected = [([2, 3]>=(-3))]; -assert_checkequal(a, expected); - -// Special behaviour of ... with + and - -a = [1 +... -2] -expected = 3; -assert_checkequal(a, expected); - -a = [1 +... - 2] -expected = 3; -assert_checkequal(a, expected); - -a = [1 +... - +2] -expected = 3; -assert_checkequal(a, expected); - -a = [1 -... -2] -expected = -1; -assert_checkequal(a, expected); - -a = [1 -... - 2] -expected = -1; -assert_checkequal(a, expected); - -a = [1 -... - -2] -expected = 3; -assert_checkequal(a, expected); - -// Case with multiline comment -str_cmd = ["a = [1 -... /* the start of a"; - "multiline comment */ 2 3]"]; // this currently generates an error -assert_checktrue(execstr(str_cmd, "errcatch") <> 0); diff --git a/scilab/modules/ast/tests/unit_tests/parser.dia.ref b/scilab/modules/ast/tests/unit_tests/parser.dia.ref deleted file mode 100644 index 483f4fa..0000000 --- a/scilab/modules/ast/tests/unit_tests/parser.dia.ref +++ /dev/null @@ -1,640 +0,0 @@ -// ============================================================================ -// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab -// Copyright (C) 2016 - DIGITEO - Cedric Delamarre -// -// This file is distributed under the same license as the Scilab package. -// ============================================================================ -// <-- CLI SHELL MODE --> -// line break -colvect(1,1) = 1; -colvect(2,1) = -2; -linevect = colvect'; -a=[1; ... --2]; -assert_checkequal(a, colvect); -a=[1;... --2]; -assert_checkequal(a, colvect); -a=[1; ... - -2]; -assert_checkequal(a, colvect); -a=[1;... - -2]; -assert_checkequal(a, colvect); -a=[1; ... -- 2]; -assert_checkequal(a, colvect); -a=[1;... -- 2]; -assert_checkequal(a, colvect); -a=[1 ... --2]; -assert_checkequal(a, linevect); -a=[1... --2]; -assert_checkequal(a, -1); -a=[1 ... - -2]; -assert_checkequal(a, linevect); -a=[1... - -2]; -assert_checkequal(a, linevect); -a=[1 ... -- 2]; -assert_checkequal(a, -1); -a=[1... -- 2]; -assert_checkequal(a, -1); -a=[1; ...//comment --2]; -assert_checkequal(a, colvect); -a=[1;...//comment --2]; -assert_checkequal(a, colvect); -a=[1; ...//comment - -2]; -assert_checkequal(a, colvect); -a=[1;...//comment - -2]; -assert_checkequal(a, colvect); -a=[1; ...//comment -- 2]; -assert_checkequal(a, colvect); -a=[1;...//comment -- 2]; -assert_checkequal(a, colvect); -a=[1 ...//comment --2]; -assert_checkequal(a, linevect); -a=[1...//comment --2]; -assert_checkequal(a, -1); -a=[1 ...//comment - -2]; -assert_checkequal(a, linevect); -a=[1...//comment - -2]; -assert_checkequal(a, linevect); -a=[1 ...//comment -- 2]; -assert_checkequal(a, -1); -a=[1...//comment -- 2]; -assert_checkequal(a, -1); -a=[1 ... --2 ]; -assert_checkequal(a, linevect); -a=[1... --2 ]; -assert_checkequal(a, -1); -a=[1 ... - -2 ]; -assert_checkequal(a, linevect); -a=[1... - -2 ]; -assert_checkequal(a, linevect); -a=[1 ... -- 2 ]; -assert_checkequal(a, -1); -a=[1... -- 2 ]; -assert_checkequal(a, -1); -// Operators within matrices -// DOTTIMES -a = [[2 3] .* -3]; -expected = [-6 -9]; -assert_checkequal(a, expected); -a = [[2 3] .* ... --3]; -assert_checkequal(a, expected); -a = [[2 3] .* ... // a comment --3]; -assert_checkequal(a, expected); -//DOTRDIVIDE -a = [[2 3] ./ -3]; -expected = [-2/3 -1]; -assert_checkequal(a, expected); -a = [[2 3] ./ ... --3]; -assert_checkequal(a, expected); -a = [[2 3] ./ ... // a comment --3]; -assert_checkequal(a, expected); -//DOTLDIVIDE -a = [[2 3] .\ -3]; -expected = [-3/2 -1]; -assert_checkequal(a, expected); -a = [[2 3] .\ ... --3]; -assert_checkequal(a, expected); -a = [[2 3] .\ ... // a comment --3]; -assert_checkequal(a, expected); -//DOTPOWER -a = [[2 3] .^ -3]; -expected = [(2^(-3)), (3^(-3))]; -assert_checkequal(a, expected); -a = [[2 3] .^ ... --3]; -assert_checkequal(a, expected); -a = [[2 3] .^ ... // a comment --3]; -assert_checkequal(a, expected); -//MINUS -a = [[2 3] - -3]; -expected = [(2-(-3)), (3-(-3))]; -assert_checkequal(a, expected); -a = [[2 3] - ... --3]; -assert_checkequal(a, expected); -a = [[2 3] - ... // a comment --3]; -assert_checkequal(a, expected); -//PLUS -a = [[2 3] + -3]; -expected = [(2+(-3)), (3+(-3))]; -assert_checkequal(a, expected); -a = [[2 3] + ... --3]; -assert_checkequal(a, expected); -a = [[2 3] + ... // a comment --3]; -assert_checkequal(a, expected); -//TIMES -a = [2 * -3]; -expected = [(2*(-3))]; -assert_checkequal(a, expected); -a = [2 * ... - -3]; -assert_checkequal(a, expected); -a = [2 * ... // a comment - -3]; -assert_checkequal(a, expected); -//RDIVIDE -a = [2 / -3]; -expected = [(2/(-3))]; -assert_checkequal(a, expected); -a = [2 / ... - -3]; -assert_checkequal(a, expected); -a = [2 / ... // a comment - -3]; -assert_checkequal(a, expected); -//LDIVIDE -a = [2 \ -3]; -expected = [(2\(-3))]; -assert_checkequal(a, expected); -a = [2 \ ... - -3]; -assert_checkequal(a, expected); -a = [2 \ ... // a comment - -3]; -assert_checkequal(a, expected); -//POWER -a = [2 ^ -3]; -expected = [(2^(-3))]; -assert_checkequal(a, expected); -a = [2 ^ ... - -3]; -assert_checkequal(a, expected); -a = [2 ^ ... // a comment - -3]; -assert_checkequal(a, expected); -//KRONTIMES -a = [[2 3] .*. -3]; -expected = [([2, 3].*.(-3))]; -assert_checkequal(a, expected); -a = [[2 3] .*. ... - -3]; -assert_checkequal(a, expected); -a = [[2 3] .*. ... // a comment - -3]; -assert_checkequal(a, expected); -//KRONRDIVIDE -a = [[2 3] ./. -3]; -expected = -[2 3] / 3; -assert_checkequal(a, expected); -a = [[2 3] ./. ... - -3]; -assert_checkequal(a, expected); -a = [[2 3] ./. ... // a comment - -3]; -assert_checkequal(a, expected); -//KRONLDIVIDE -a = [-3 .\. [2 3]]; -assert_checkequal(a, expected); -a = [-3 .\. ... - [2 3]]; -assert_checkequal(a, expected); -a = [-3 .\. ... // a comment - [2 3]]; -assert_checkequal(a, expected); -//EQ -a = [[2 3] == -3]; -expected = [([2, 3]==(-3))]; -assert_checkequal(a, expected); -a = [[2 3] == ... - -3]; -assert_checkequal(a, expected); -a = [[2 3] == ... // a comment - -3]; -assert_checkequal(a, expected); -//NE -a = [[2 3] ~= -3]; -expected = [([2, 3]~=(-3))]; -assert_checkequal(a, expected); -a = [[2 3] ~= ... - -3]; -assert_checkequal(a, expected); -a = [[2 3] ~= ... // a comment - -3]; -assert_checkequal(a, expected); -//LT -a = [[2 3] < -3]; -expected = [([2, 3]<(-3))]; -assert_checkequal(a, expected); -a = [[2 3] < ... - -3]; -assert_checkequal(a, expected); -a = [[2 3] < ... // a comment - -3]; -assert_checkequal(a, expected); -//GT -a = [[2 3] > -3]; -expected = [([2, 3]>(-3))]; -assert_checkequal(a, expected); -a = [[2 3] > ... - -3]; -assert_checkequal(a, expected); -a = [[2 3] > ... // a comment - -3]; -assert_checkequal(a, expected); -//LE -a = [[2 3] <= -3]; -expected = [([2, 3]<=(-3))]; -assert_checkequal(a, expected); -a = [[2 3] <= ... - -3]; -assert_checkequal(a, expected); -a = [[2 3] <= ... // a comment - -3]; -assert_checkequal(a, expected); -//GE -a = [[2 3] >= -3]; -expected = [([2, 3]>=(-3))]; -assert_checkequal(a, expected); -a = [[2 3] >= ... - -3]; -assert_checkequal(a, expected); -a = [[2 3] >= ... // a comment - -3]; -assert_checkequal(a, expected); -// bug_14361 -a=[1; .../* a comment */ --2]; -assert_checkequal(a, colvect); -a=[1;.../* a comment */ --2]; -assert_checkequal(a, colvect); -a=[1; .../* a comment */ - -2]; -assert_checkequal(a, colvect); -a=[1;.../* a comment */ - -2]; -assert_checkequal(a, colvect); -a=[1; .../* a comment */ -- 2]; -assert_checkequal(a, colvect); -a=[1;.../* a comment */ -- 2]; -assert_checkequal(a, colvect); -a=[1 .../* a comment */ --2]; -assert_checkequal(a, linevect); -a=[1.../* a comment */ --2]; -assert_checkequal(a, -1); -a=[1 .../* a comment */ - -2]; -assert_checkequal(a, linevect); -a=[1.../* a comment */ - -2]; -assert_checkequal(a, linevect); -a=[1 .../* a comment */ -- 2]; -assert_checkequal(a, -1); -a=[1.../* a comment */ -- 2]; -assert_checkequal(a, -1); -// Operators within matrices -// DOTTIMES -a = [[2 3] .* ... /* a comment */ --3]; -expected = [-6 -9]; -assert_checkequal(a, expected); -//DOTRDIVIDE -a = [[2 3] ./ ... /* a comment */ --3]; -expected = [-2/3 -1]; -assert_checkequal(a, expected); -//DOTLDIVIDE -a = [[2 3] .\ ... /* a comment */ --3]; -expected = [-3/2 -1]; -assert_checkequal(a, expected); -//DOTPOWER -a = [[2 3] .^ ... /* a comment */ --3]; -expected = [(2^(-3)), (3^(-3))]; -assert_checkequal(a, expected); -//MINUS -a = [[2 3] - ... /* a comment */ --3]; -expected = [(2-(-3)), (3-(-3))]; -assert_checkequal(a, expected); -//PLUS -a = [[2 3] + ... /* a comment */ --3]; -expected = [(2+(-3)), (3+(-3))]; -assert_checkequal(a, expected); -//TIMES -a = [2 * ... /* a comment */ - -3]; -expected = [(2*(-3))]; -assert_checkequal(a, expected); -//RDIVIDE -a = [2 / ... /* a comment */ - -3]; -expected = [(2/(-3))]; -assert_checkequal(a, expected); -//LDIVIDE -a = [2 \ ... /* a comment */ - -3]; -expected = [(2\(-3))]; -assert_checkequal(a, expected); -//POWER -a = [2 ^ ... /* a comment */ - -3]; -expected = [(2^(-3))]; -assert_checkequal(a, expected); -//KRONTIMES -a = [[2 3] .*. ... /* a comment */ - -3]; -expected = [([2, 3].*.(-3))]; -assert_checkequal(a, expected); -//kronrdivide -a = [[2 3] ./. ... /* a comment */ - -3]; -expected = [([2, 3] ./. (-3))]; -assert_checkequal(a, expected); -//KRONLDIVIDE -a = [-3 .\. ... /* a comment */ - [2 3]]; -assert_checkequal(a, expected); -//EQ -a = [[2 3] == ... /* a comment */ - -3]; -expected = [([2, 3]==(-3))]; -assert_checkequal(a, expected); -//NE -a = [[2 3] ~= ... /* a comment */ - -3]; -expected = [([2, 3]~=(-3))]; -assert_checkequal(a, expected); -//LT -a = [[2 3] < ... /* a comment */ - -3]; -expected = [([2, 3]<(-3))]; -assert_checkequal(a, expected); -//GT -a = [[2 3] > ... /* a comment */ - -3]; -expected = [([2, 3]>(-3))]; -assert_checkequal(a, expected); -//LE -a = [[2 3] <= ... /* a comment */ - -3]; -expected = [([2, 3]<=(-3))]; -assert_checkequal(a, expected); -//GE -a = [[2 3] >= ... /* a comment */ - -3]; -expected = [([2, 3]>=(-3))]; -assert_checkequal(a, expected); -// Comments on several lines -a=[1; .../* a comment - on several lines */ --2]; -assert_checkequal(a, colvect); -a=[1;.../* a comment - on several lines */ --2]; -assert_checkequal(a, colvect); -a=[1; .../* a comment - on several lines */ - -2]; -assert_checkequal(a, colvect); -a=[1;.../* a comment - on several lines */ - -2]; -assert_checkequal(a, colvect); -a=[1; .../* a comment - on several lines */ -- 2]; -assert_checkequal(a, colvect); -a=[1;.../* a comment - on several lines */ -- 2]; -assert_checkequal(a, colvect); -a=[1 .../* a comment - on several lines */ --2]; -assert_checkequal(a, linevect); -a=[1.../* a comment - on several lines */ --2]; -assert_checkequal(a, -1); -a=[1 .../* a comment - on several lines */ - -2]; -assert_checkequal(a, linevect); -a=[1.../* a comment - on several lines */ - -2]; -assert_checkequal(a, linevect); -a=[1 .../* a comment - on several lines */ -- 2]; -assert_checkequal(a, -1); -a=[1.../* a comment - on several lines */ -- 2]; -assert_checkequal(a, -1); -// Operators within matrices -// DOTTIMES -a = [[2 3] .* ... /* a comment - on several lines */ --3]; -expected = [-6 -9]; -assert_checkequal(a, expected); -//DOTRDIVIDE -a = [[2 3] ./ ... /* a comment - on several lines */ --3]; -expected = [-2/3 -1]; -assert_checkequal(a, expected); -//DOTLDIVIDE -a = [[2 3] .\ ... /* a comment - on several lines */ --3]; -expected = [-3/2 -1]; -assert_checkequal(a, expected); -//DOTPOWER -a = [[2 3] .^ ... /* a comment - on several lines */ --3]; -expected = [(2^(-3)), (3^(-3))]; -assert_checkequal(a, expected); -//MINUS -a = [[2 3] - ... /* a comment - on several lines */ --3]; -expected = [(2-(-3)), (3-(-3))]; -assert_checkequal(a, expected); -//PLUS -a = [[2 3] + ... /* a comment - on several lines */ --3]; -expected = [(2+(-3)), (3+(-3))]; -assert_checkequal(a, expected); -//TIMES -a = [2 * ... /* a comment - on several lines */ - -3]; -expected = [(2*(-3))]; -assert_checkequal(a, expected); -//RDIVIDE -a = [2 / ... /* a comment - on several lines */ - -3]; -expected = [(2/(-3))]; -assert_checkequal(a, expected); -//LDIVIDE -a = [2 \ ... /* a comment - on several lines */ - -3]; -expected = [(2\(-3))]; -assert_checkequal(a, expected); -//POWER -a = [2 ^ ... /* a comment - on several lines */ - -3]; -expected = [(2^(-3))]; -assert_checkequal(a, expected); -//KRONTIMES -a = [[2 3] .*. ... /* a comment - on several lines */ - -3]; -expected = [([2, 3].*.(-3))]; -assert_checkequal(a, expected); -//KRONRDIVIDE -a = [[2 3] ./. ... /* a comment - on several lines */ - -3]; -expected = [([2, 3]./.(-3))]; -assert_checkequal(a, expected); -//KRONLDIVIDE -a = [ -3 .\. ... /* a comment - on several lines */ - [2 3] ]; -assert_checkequal(a, expected); -//EQ -a = [[2 3] == ... /* a comment - on several lines */ - -3]; -expected = [([2, 3]==(-3))]; -assert_checkequal(a, expected); -//NE -a = [[2 3] ~= ... /* a comment - on several lines */ - -3]; -expected = [([2, 3]~=(-3))]; -assert_checkequal(a, expected); -//LT -a = [[2 3] < ... /* a comment - on several lines */ - -3]; -expected = [([2, 3]<(-3))]; -assert_checkequal(a, expected); -//GT -a = [[2 3] > ... /* a comment - on several lines */ - -3]; -expected = [([2, 3]>(-3))]; -assert_checkequal(a, expected); -//LE -a = [[2 3] <= ... /* a comment - on several lines */ - -3]; -expected = [([2, 3]<=(-3))]; -assert_checkequal(a, expected); -//GE -a = [[2 3] >= ... /* a comment - on several lines */ - -3]; -expected = [([2, 3]>=(-3))]; -assert_checkequal(a, expected); -// Special behaviour of ... with + and - -a = [1 +... -2] - a = - 3. -expected = 3; -assert_checkequal(a, expected); -a = [1 +... - 2] - a = - 3. -expected = 3; -assert_checkequal(a, expected); -a = [1 +... - +2] - a = - 3. -expected = 3; -assert_checkequal(a, expected); -a = [1 -... -2] - a = - -1. -expected = -1; -assert_checkequal(a, expected); -a = [1 -... - 2] - a = - -1. -expected = -1; -assert_checkequal(a, expected); -a = [1 -... - -2] - a = - 3. -expected = 3; -assert_checkequal(a, expected); -// Case with multiline comment -str_cmd = ["a = [1 -... /* the start of a"; - "multiline comment */ 2 3]"]; // this currently generates an error -assert_checktrue(execstr(str_cmd, "errcatch") <> 0); -// bug_14374 comments in SHELLMODE -// Testing if shellmode execution with command -// convstr a u // a comment -// convstr a /* a comment */ -// convstr a u /* some text -// ending comment here */ -exec(SCI + "/modules/ast/tests/nonreg_tests/bug_14374.tst"); -// Bug 7646: matrix transpose extraction -exec(SCI + "/modules/ast/tests/nonreg_tests/bug_7646.tst"); -// Bug 14662: matrix concatenation with simple quote and space led to a parser error -exec(SCI + "/modules/ast/tests/nonreg_tests/bug_14662.tst"); -// Bug 14667: multi line string in matrix generated a non terminal parser state -exec(SCI + "/modules/ast/tests/nonreg_tests/bug_14667.tst"); diff --git a/scilab/modules/ast/tests/unit_tests/parser.tst b/scilab/modules/ast/tests/unit_tests/parser.tst index 743fd58..195e0e3 100644 --- a/scilab/modules/ast/tests/unit_tests/parser.tst +++ b/scilab/modules/ast/tests/unit_tests/parser.tst @@ -1,11 +1,13 @@ // ============================================================================ // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab // Copyright (C) 2016 - DIGITEO - Cedric Delamarre +// Copyright (C) 2016 - Scilab Enterprises - Pierre-Aime Agnel // // This file is distributed under the same license as the Scilab package. // ============================================================================ // <-- CLI SHELL MODE --> +// <-- NO CHECK REF --> // line break @@ -356,8 +358,8 @@ a = [[2 3] >= ... // a comment -3]; assert_checkequal(a, expected); -// bug_14361 - +// http://bugzilla.scilab.org/14361 : +// -------------------------------- a=[1; .../* a comment */ -2]; assert_checkequal(a, colvect); @@ -731,6 +733,8 @@ str_cmd = ["a = [1 -... /* the start of a"; "multiline comment */ 2 3]"]; // this currently generates an error assert_checktrue(execstr(str_cmd, "errcatch") <> 0); +// -------------------------------------------- + // bug_14374 comments in SHELLMODE // Testing if shellmode execution with command // convstr a u // a comment