summaryrefslogtreecommitdiffstats
path: root/struct.c
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2015-10-01 06:58:23 -0700
committerKaz Kylheku <kaz@kylheku.com>2015-10-01 06:58:23 -0700
commitca0ca229837e344df05bfa79333b1ed4993f9719 (patch)
treeaf070c8742122f7be39972d7c660813c92985b8d /struct.c
parent6e3ee573178e8860bb79f68153bfa7ed7ac949c7 (diff)
downloadtxr-ca0ca229837e344df05bfa79333b1ed4993f9719.tar.gz
txr-ca0ca229837e344df05bfa79333b1ed4993f9719.tar.bz2
txr-ca0ca229837e344df05bfa79333b1ed4993f9719.zip
Allow super to take an instance as an argument.
* struct.c (super): Detect structure instance and resolve it to its type. Recursion eliminated in favor of imperative approach that eliminates redundant checks. * txr.1: Description of super updated.
Diffstat (limited to 'struct.c')
-rw-r--r--struct.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/struct.c b/struct.c
index 9de7d0c5..054b5f09 100644
--- a/struct.c
+++ b/struct.c
@@ -263,8 +263,12 @@ val super(val type)
val stype = find_struct_type(type);
if (!stype)
no_such_struct(lit("super"), type);
- return super(stype);
- } else {
+ type = stype;
+ } else if (structp(type)) {
+ type = struct_type(type);
+ }
+
+ {
struct struct_type *st = coerce(struct struct_type *,
cobj_handle(type, struct_type_s));
return st->super;