Shorten testcase variable names for Scilab 6 to work

This commit is contained in:
William S Fulton 2021-11-15 22:45:56 +00:00
commit 99954d6d4e
12 changed files with 86 additions and 86 deletions

View file

@ -39,15 +39,15 @@
;(check (=~ 15 (Overload-byval2cpr o #nil))) ;(check (=~ 15 (Overload-byval2cpr o #nil)))
;(check (=~ 16 (Overload-byval2cpr o x))) ;(check (=~ 16 (Overload-byval2cpr o x)))
; forward class declaration ; fwd class declaration
(check (=~ 17 (Overload-byval1forwardptr o x))) (check (=~ 17 (Overload-byval1fwdptr o x)))
(check (=~ 18 (Overload-byval1forwardptr o #nil))) (check (=~ 18 (Overload-byval1fwdptr o #nil)))
(check (=~ 19 (Overload-byval2forwardptr o #nil))) (check (=~ 19 (Overload-byval2fwdptr o #nil)))
(check (=~ 20 (Overload-byval2forwardptr o x))) (check (=~ 20 (Overload-byval2fwdptr o x)))
(check (=~ 21 (Overload-byval1forwardref o x))) (check (=~ 21 (Overload-byval1fwdref o x)))
(check (=~ 22 (Overload-byval2forwardref o x))) (check (=~ 22 (Overload-byval2fwdref o x)))
(exit 0) (exit 0)

View file

@ -37,13 +37,13 @@ check(13, o.byval1cpr(x));
// check(15, o.byval2cpr(null)); // check(15, o.byval2cpr(null));
check(16, o.byval2cpr(x)); check(16, o.byval2cpr(x));
// forward class declaration // fwd class declaration
check(17, o.byval1forwardptr(x)); check(17, o.byval1fwdptr(x));
// check(18, o.byval1forwardptr(null)); // check(18, o.byval1fwdptr(null));
// check(19, o.byval2forwardptr(null)); // check(19, o.byval2fwdptr(null));
check(20, o.byval2forwardptr(x)); check(20, o.byval2fwdptr(x));
check(21, o.byval1forwardref(x)); check(21, o.byval1fwdref(x));
check(22, o.byval2forwardref(x)); check(22, o.byval2fwdref(x));

View file

@ -29,13 +29,13 @@ assert(14 == o:byval1cpr(nil))
assert(15 == o:byval2cpr(nil)) assert(15 == o:byval2cpr(nil))
assert(16 == o:byval2cpr(x)) assert(16 == o:byval2cpr(x))
-- forward class declaration -- fwd class declaration
assert(17 == o:byval1forwardptr(x)) assert(17 == o:byval1fwdptr(x))
assert(18 == o:byval1forwardptr(nil)) assert(18 == o:byval1fwdptr(nil))
assert(19 == o:byval2forwardptr(nil)) assert(19 == o:byval2fwdptr(nil))
assert(20 == o:byval2forwardptr(x)) assert(20 == o:byval2fwdptr(x))
assert(21 == o:byval1forwardref(x)) assert(21 == o:byval1fwdref(x))
assert(22 == o:byval2forwardref(x)) assert(22 == o:byval2fwdref(x))

View file

@ -40,13 +40,13 @@ check(14, o.byval1cpr(null));
check(15, o.byval2cpr(null)); check(15, o.byval2cpr(null));
check(16, o.byval2cpr(x)); check(16, o.byval2cpr(x));
# forward class declaration # fwd class declaration
check(17, o.byval1forwardptr(x)); check(17, o.byval1fwdptr(x));
check(18, o.byval1forwardptr(null)); check(18, o.byval1fwdptr(null));
check(19, o.byval2forwardptr(null)); check(19, o.byval2fwdptr(null));
check(20, o.byval2forwardptr(x)); check(20, o.byval2fwdptr(x));
check(21, o.byval1forwardref(x)); check(21, o.byval1fwdref(x));
check(22, o.byval2forwardref(x)); check(22, o.byval2fwdref(x));

View file

@ -35,18 +35,18 @@ struct Overload {
int byval2cpr(Y*const& y) { return 15; } int byval2cpr(Y*const& y) { return 15; }
int byval2cpr(X x) { return 16; } int byval2cpr(X x) { return 16; }
// forward class declaration // fwd class declaration
int byval1forwardptr(X x) { return 17; } int byval1fwdptr(X x) { return 17; }
int byval1forwardptr(F* f) { return 18; } int byval1fwdptr(F* f) { return 18; }
int byval2forwardptr(F* f) { return 19; } int byval2fwdptr(F* f) { return 19; }
int byval2forwardptr(X x) { return 20; } int byval2fwdptr(X x) { return 20; }
int byval1forwardref(X x) { return 21; } int byval1fwdref(X x) { return 21; }
int byval1forwardref(F& f) { return -21; } int byval1fwdref(F& f) { return -21; }
int byval2forwardref(F& f) { return -22; } int byval2fwdref(F& f) { return -22; }
int byval2forwardref(X x) { return 22; } int byval2fwdref(X x) { return 22; }
}; };
%} %}

View file

@ -32,13 +32,13 @@ is(14, $o->byval1cpr(undef));
is(15, $o->byval2cpr(undef)); is(15, $o->byval2cpr(undef));
is(16, $o->byval2cpr($x)); is(16, $o->byval2cpr($x));
# forward class declaration # fwd class declaration
is(17, $o->byval1forwardptr($x)); is(17, $o->byval1fwdptr($x));
is(18, $o->byval1forwardptr(undef)); is(18, $o->byval1fwdptr(undef));
is(19, $o->byval2forwardptr(undef)); is(19, $o->byval2fwdptr(undef));
is(20, $o->byval2forwardptr($x)); is(20, $o->byval2fwdptr($x));
is(21, $o->byval1forwardref($x)); is(21, $o->byval1fwdref($x));
is(22, $o->byval2forwardref($x)); is(22, $o->byval2fwdref($x));

View file

@ -30,15 +30,15 @@ check::equal(14, $o->byval1cpr(null), "test 14");
check::equal(15, $o->byval2cpr(null), "test 15"); check::equal(15, $o->byval2cpr(null), "test 15");
check::equal(16, $o->byval2cpr($x), "test 16"); check::equal(16, $o->byval2cpr($x), "test 16");
# forward class declaration # fwd class declaration
check::equal(17, $o->byval1forwardptr($x), "test 17"); check::equal(17, $o->byval1fwdptr($x), "test 17");
check::equal(18, $o->byval1forwardptr(null), "test 18"); check::equal(18, $o->byval1fwdptr(null), "test 18");
check::equal(19, $o->byval2forwardptr(null), "test 19"); check::equal(19, $o->byval2fwdptr(null), "test 19");
check::equal(20, $o->byval2forwardptr($x), "test 20"); check::equal(20, $o->byval2fwdptr($x), "test 20");
check::equal(21, $o->byval1forwardref($x), "test 21"); check::equal(21, $o->byval1fwdref($x), "test 21");
check::equal(22, $o->byval2forwardref($x), "test 22"); check::equal(22, $o->byval2fwdref($x), "test 22");
check::done(); check::done();

View file

@ -32,13 +32,13 @@ check(14, o.byval1cpr(None))
check(15, o.byval2cpr(None)) check(15, o.byval2cpr(None))
check(16, o.byval2cpr(x)) check(16, o.byval2cpr(x))
# forward class declaration # fwd class declaration
check(17, o.byval1forwardptr(x)) check(17, o.byval1fwdptr(x))
check(18, o.byval1forwardptr(None)) check(18, o.byval1fwdptr(None))
check(19, o.byval2forwardptr(None)) check(19, o.byval2fwdptr(None))
check(20, o.byval2forwardptr(x)) check(20, o.byval2fwdptr(x))
check(21, o.byval1forwardref(x)) check(21, o.byval1fwdref(x))
check(22, o.byval2forwardref(x)) check(22, o.byval2fwdref(x))

View file

@ -34,16 +34,16 @@ unittest(12, o$byconstref2(x))
#unittest(15, o$byval2cpr(NULL)) #unittest(15, o$byval2cpr(NULL))
#unittest(16, o$byval2cpr(x)) #unittest(16, o$byval2cpr(x))
# forward class declaration # fwd class declaration
unittest(17, o$byval1forwardptr(x)) unittest(17, o$byval1fwdptr(x))
unittest(18, o$byval1forwardptr(NULL)) unittest(18, o$byval1fwdptr(NULL))
unittest(19, o$byval2forwardptr(NULL)) unittest(19, o$byval2fwdptr(NULL))
unittest(20, o$byval2forwardptr(x)) unittest(20, o$byval2fwdptr(x))
unittest(21, o$byval1forwardref(x)) unittest(21, o$byval1fwdref(x))
unittest(22, o$byval2forwardref(x)) unittest(22, o$byval2fwdref(x))
q(save="no") q(save="no")

View file

@ -40,13 +40,13 @@ swig_assert(14 == o.byval1cpr(nil))
swig_assert(15 == o.byval2cpr(nil)) swig_assert(15 == o.byval2cpr(nil))
swig_assert(16 == o.byval2cpr(x)) swig_assert(16 == o.byval2cpr(x))
# forward class declaration # fwd class declaration
swig_assert(17 == o.byval1forwardptr(x)) swig_assert(17 == o.byval1fwdptr(x))
swig_assert(18 == o.byval1forwardptr(nil)) swig_assert(18 == o.byval1fwdptr(nil))
swig_assert(19 == o.byval2forwardptr(nil)) swig_assert(19 == o.byval2fwdptr(nil))
swig_assert(20 == o.byval2forwardptr(x)) swig_assert(20 == o.byval2fwdptr(x))
swig_assert(21 == o.byval1forwardref(x)) swig_assert(21 == o.byval1fwdref(x))
swig_assert(22 == o.byval2forwardref(x)) swig_assert(22 == o.byval2fwdref(x))

View file

@ -30,16 +30,16 @@ checkequal(14, Overload_byval1cpr(o, NULL), "test 14");
checkequal(15, Overload_byval2cpr(o, NULL), "test 15"); checkequal(15, Overload_byval2cpr(o, NULL), "test 15");
checkequal(16, Overload_byval2cpr(o, x), "test 16"); checkequal(16, Overload_byval2cpr(o, x), "test 16");
// forward class declaration // fwd class declaration
checkequal(17, Overload_byval1forwardptr(o, x), "test 17"); checkequal(17, Overload_byval1fwdptr(o, x), "test 17");
checkequal(18, Overload_byval1forwardptr(o, NULL), "test 18"); checkequal(18, Overload_byval1fwdptr(o, NULL), "test 18");
checkequal(19, Overload_byval2forwardptr(o, NULL), "test 19"); checkequal(19, Overload_byval2fwdptr(o, NULL), "test 19");
checkequal(20, Overload_byval2forwardptr(o, x), "test 20"); checkequal(20, Overload_byval2fwdptr(o, x), "test 20");
checkequal(21, Overload_byval1forwardref(o, x), "test 21"); checkequal(21, Overload_byval1fwdref(o, x), "test 21");
checkequal(22, Overload_byval2forwardref(o, x), "test 22"); checkequal(22, Overload_byval2fwdref(o, x), "test 22");
exec("swigtest.quit", -1); exec("swigtest.quit", -1);

View file

@ -40,13 +40,13 @@ check "testX" 14 [$o byval1cpr "NULL"]
check "testX" 15 [$o byval2cpr "NULL"] check "testX" 15 [$o byval2cpr "NULL"]
check "testX" 16 [$o byval2cpr $x] check "testX" 16 [$o byval2cpr $x]
# forward class declaration # fwd class declaration
check "testX" 17 [$o byval1forwardptr $x] check "testX" 17 [$o byval1fwdptr $x]
check "testX" 18 [$o byval1forwardptr "NULL"] check "testX" 18 [$o byval1fwdptr "NULL"]
check "testX" 19 [$o byval2forwardptr "NULL"] check "testX" 19 [$o byval2fwdptr "NULL"]
check "testX" 20 [$o byval2forwardptr $x] check "testX" 20 [$o byval2fwdptr $x]
check "testX" 21 [$o byval1forwardref $x] check "testX" 21 [$o byval1fwdref $x]
check "testX" 22 [$o byval2forwardref $x] check "testX" 22 [$o byval2fwdref $x]