X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/sod/blobdiff_plain/3001131b3f69ac4aaaae4500a18a0c721b13c88f..1e99dff054f6f323d9cb743d6a77578ee819404a:/test/test.sod diff --git a/test/test.sod b/test/test.sod index f794c76..5779376 100644 --- a/test/test.sod +++ b/test/test.sod @@ -135,7 +135,7 @@ static int check_vec(struct vec *v, ...) } -[link = SodObject, nick = t1base] +[link = SodObject, nick = base] class T1Base: SodObject { [combination = progn] void aprogn(); [combination = sum] int asum(); @@ -158,24 +158,24 @@ class T1Base: SodObject { struct vec avec(); } -[link = T1Base, nick = t1mid] +[link = T1Base, nick = mid] class T1Mid: T1Base { - void t1base.aprogn() { STEP(1); } - int t1base.asum() { return 1; } - int t1base.aand() { return 8; } - int t1base.amax() { return 12; } - struct item *t1base.alist() { return make_item("mid"); } - int t1base.avec() { return 19; } + void base.aprogn() { STEP(1); } + int base.asum() { return 1; } + int base.aand() { return 8; } + int base.amax() { return 12; } + struct item *base.alist() { return make_item("mid"); } + int base.avec() { return 19; } } -[link = T1Mid, nick = t1sub] +[link = T1Mid, nick = sub] class T1Sub: T1Mid { - void t1base.aprogn() { STEP(0); } - int t1base.asum() { return 2; } - int t1base.aand() { return 6; } - int t1base.amax() { return 17; } - struct item *t1base.alist() { return make_item("sub"); } - int t1base.avec() { return 4; } + void base.aprogn() { STEP(0); } + int base.asum() { return 2; } + int base.aand() { return 6; } + int base.amax() { return 17; } + struct item *base.alist() { return make_item("sub"); } + int base.avec() { return 4; } } code c: tests { @@ -186,7 +186,7 @@ code c: tests { STEP(0); T1Base_aprogn(t1); STEP(1); if (T1Base_asum(t1) == 0) STEP(2); if (T1Base_aand(t1) == 1) STEP(3); - if (!t1->_vt->t1base.amax) STEP(4); + if (!t1->_vt->base.amax) STEP(4); l = T1Base_alist(t1); if (!l) STEP(5); v = T1Base_avec(t1);