Merge branch 'more-octave-fixes'

* more-octave-fixes:
  Octave: error() must be called with an argument
This commit is contained in:
William S Fulton 2020-08-27 19:45:32 +01:00
commit bebb655975
77 changed files with 308 additions and 308 deletions

View file

@ -2,6 +2,6 @@ abstract_access
d = abstract_access.D();
if (d.do_x() != 1)
error
error("failed");
endif

View file

@ -10,7 +10,7 @@ a = A();
if (a.write(e) != 1)
error
error("failed");
endif

View file

@ -2,39 +2,39 @@ _callback
callback
if (foo(2) != 2)
error
error("failed");
endif
if (A_bar(2) != 4)
error
error("failed");
endif
if (foobar(3, _callback.foo) != foo(3))
error
error("failed");
endif
if (foobar(3, foo) != foo(3))
error
error("failed");
endif
if (foobar(3, A_bar) != A_bar(3))
error
error("failed");
endif
if (foobar(3, foof) != foof(3))
error
error("failed");
endif
if (foobar_i(3, foo_i) != foo_i(3))
error
error("failed");
endif
if (foobar_d(3.5, foo_d) != foo_d(3.5))
error
error("failed");
endif
a = A();
if (foobarm(3, a, A.foom_cb_ptr) != a.foom(3))
error
error("failed");
endif

View file

@ -8,5 +8,5 @@ class_ignore
a = class_ignore.Bar();
if (!strcmp(class_ignore.do_blah(a),"Bar::blah"))
error
error("failed");
endif

View file

@ -3,5 +3,5 @@ class_scope_weird
f = class_scope_weird.Foo();
g = class_scope_weird.Foo(3);
if (f.bar(3) != 3)
error
error("failed");
endif

View file

@ -4,21 +4,21 @@ defaults1 = Defaults1(1000);
defaults1 = Defaults1();
if (defaults1.ret(10.0) != 10.0)
error
error("failed");
endif
if (defaults1.ret() != -1.0)
error
error("failed");
endif
defaults2 = Defaults2(1000);
defaults2 = Defaults2();
if (defaults2.ret(10.0) != 10.0)
error
error("failed");
endif
if (defaults2.ret() != -1.0)
error
error("failed");
endif

View file

@ -10,7 +10,7 @@ f11 = Foo1(f1);
if (f1.x != f11.x)
error
error("failed");
endif
@ -23,7 +23,7 @@ catch
end_try_catch
if (!good)
error
error("failed");
endif
@ -31,7 +31,7 @@ bi = Bari(5);
bc = Bari(bi);
if (bi.x != bc.x)
error
error("failed");
endif
@ -44,6 +44,6 @@ catch
end_try_catch
if (!good)
error
error("failed");
endif

View file

@ -7,19 +7,19 @@ default_args
if (default_args.Statics.staticmethod() != 60)
error
error("failed");
endif
if (default_args.cfunc1(1) != 2)
error
error("failed");
endif
if (default_args.cfunc2(1) != 3)
error
error("failed");
endif
if (default_args.cfunc3(1) != 4)
error
error("failed");
endif

View file

@ -28,17 +28,17 @@ MyExample3=@() subclass(director_abstract.Example3_i(),'Color',@(self,r,g,b) b);
me1 = MyExample1();
if (director_abstract.Example1.get_color(me1, 1,2,3) != 1)
error
error("failed");
endif
me2 = MyExample2(1,2);
if (me2.get_color(me2, 1,2,3) != 2)
error
error("failed");
endif
me3 = MyExample3();
if (me3.get_color(me3, 1,2,3) != 3)
error
error("failed");
endif

View file

@ -33,7 +33,7 @@ endif
a = director_basic.A1(1);
if (a.rg(2) != 2)
error
error("failed");
endif
function self=OctClass()
@ -62,16 +62,16 @@ bd = dd.cmethod(b);
cc.method(b);
if (c.cmethod != 7)
error
error("failed");
endif
if (bc.x != 34)
error
error("failed");
endif
if (bd.x != 16)
error
error("failed");
endif

View file

@ -6,5 +6,5 @@ b = director_enum.Foo();
a = MyFoo();
if (a.say_hi(director_enum.hello) != b.say_hello(director_enum.hi))
error
error("failed");
endif

View file

@ -31,9 +31,9 @@ c = FooBar_int_get_self(cc);
c.advance();
if (!strcmp(c.get_name(),"FooBar::get_name hello"))
error
error("failed");
endif
if (!strcmp(c.name(),"FooBar::get_name hello"))
error
error("failed");
endif

View file

@ -11,6 +11,6 @@ c = b.get();
if (swig_this(a) != swig_this(c))
a,c
error
error("failed");
endif

View file

@ -6,13 +6,13 @@ endif
enum_template
if (enum_template.MakeETest() != 1)
error
error("failed");
endif
enum_template.TakeETest(0);
try
a=enum_template.TakeETest(0);
error
error("failed");
catch
end_try_catch

View file

@ -6,18 +6,18 @@ enums.bar3(1)
enums.bar1(1)
if (enums.cvar.enumInstance != 2)
error
error("failed");
endif
if (enums.cvar.Slap != 10)
error
error("failed");
endif
if (enums.cvar.Mine != 11)
error
error("failed");
endif
if (enums.cvar.Thigh != 12)
error
error("failed");
endif

View file

@ -7,9 +7,9 @@ extend_template_ns
f = Foo_One();
if (f.test1(37) != 37)
error
error("failed");
endif
if (f.test2(42) != 42)
error
error("failed");
endif

View file

@ -2,9 +2,9 @@ extend_template
f = extend_template.Foo_0();
if (f.test1(37) != 37)
error
error("failed");
endif
if (f.test2(42) != 42)
error
error("failed");
endif

View file

@ -1,6 +1,6 @@
extend_variable
if (Foo.Bar != 42)
error
error("failed");
endif

View file

@ -8,25 +8,25 @@ friends
a = friends.A(2);
if (friends.get_val1(a) != 2)
error
error("failed");
endif
if (friends.get_val2(a) != 4)
error
error("failed");
endif
if (friends.get_val3(a) != 6)
error
error("failed");
endif
# nice overload working fine
if (friends.get_val1(1,2,3) != 1)
error
error("failed");
endif
b = friends.B(3);
# David's case
if (friends.mix(a,b) != 5)
error
error("failed");
endif
di = friends.D_d(2);
@ -34,18 +34,18 @@ dd = friends.D_d(3.3);
# incredible template overloading working just fine
if (friends.get_val1(di) != 2)
error
error("failed");
endif
if (friends.get_val1(dd) != 3.3)
error
error("failed");
endif
friends.set(di, 4);
friends.set(dd, 1.3);
if (friends.get_val1(di) != 4)
error
error("failed");
endif
if (friends.get_val1(dd) != 1.3)
error
error("failed");
endif

View file

@ -7,14 +7,14 @@ grouping
x = grouping.test1(42);
if (x != 42)
error
error("failed");
endif
grouping.test2(42);
x = (grouping.do_unary(37, grouping.NEGATE));
if (x != -37)
error
error("failed");
endif
grouping.cvar.test3 = 42;

Some files were not shown because too many files have changed in this diff Show more