about summary refs log tree commit diff stats
path: root/mu.arc
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2014-11-07 00:56:42 -0800
committerKartik K. Agaram <vc@akkartik.com>2014-11-07 00:56:42 -0800
commit0c62881a6f7adc4dfbeca243e44b585dc4cb40fe (patch)
treeec23369bc85215ddebf5b1acfd6dce5bf96510e3 /mu.arc
parente4821af3f8da05be6d631e2116d03abcc1a6e6cf (diff)
downloadmu-0c62881a6f7adc4dfbeca243e44b585dc4cb40fe.tar.gz
246
Diffstat (limited to 'mu.arc')
-rw-r--r--mu.arc13
1 files changed, 7 insertions, 6 deletions
diff --git a/mu.arc b/mu.arc
index dca953e9..12202995 100644
--- a/mu.arc
+++ b/mu.arc
@@ -709,12 +709,13 @@
                 (assert basetype!address "@args.0 requests deref, but it's not an address of a record")
                 (= basetype (types* basetype!elem)))
               (when (isa field 'sym)
-                (assert (~offset field) "field @args.1 is also a variable")
-                (assert basetype!fields "no field names available for @instr")
-                (iflet idx (pos field basetype!fields)
-                  (do (set isa-field.field)
-                      (= offset.field idx))
-                  (assert nil "couldn't find field in @instr"))))
+                (assert (or (~offset field) isa-field.field) "field @args.1 is also a variable")
+                (when (~offset field)
+                  (assert basetype!fields "no field names available for @instr")
+                  (iflet idx (pos field basetype!fields)
+                    (do (set isa-field.field)
+                        (= offset.field idx))
+                    (assert nil "couldn't find field in @instr")))))
             (each arg args
               (assert (~isa-field v.arg) "arg @arg is also a field name")
               (when (maybe-add arg offset idx)