aboutsummaryrefslogtreecommitdiff
path: root/src/interp
diff options
context:
space:
mode:
Diffstat (limited to 'src/interp')
-rw-r--r--src/interp/compiler.boot5
-rw-r--r--src/interp/lisp-backend.boot3
2 files changed, 6 insertions, 2 deletions
diff --git a/src/interp/compiler.boot b/src/interp/compiler.boot
index 959d3b84..434f3c93 100644
--- a/src/interp/compiler.boot
+++ b/src/interp/compiler.boot
@@ -1715,7 +1715,10 @@ compColon([":",f,t],m,e) ==
if not $bootStrapMode and $insideFunctorIfTrue and
makeCategoryForm(t,e) is [catform,e] then
e := giveVariableSomeValue(f,t,e)
- ["/throwAway",getmode(f,e),e]
+ val :=
+ $insideCapsuleFunctionIfTrue => ['%LET,f,'%undefined]
+ "/throwAway"
+ [val,getmode(f,e),e]
unknownTypeError name ==
name:=
diff --git a/src/interp/lisp-backend.boot b/src/interp/lisp-backend.boot
index 8e382180..3ab11a8a 100644
--- a/src/interp/lisp-backend.boot
+++ b/src/interp/lisp-backend.boot
@@ -749,7 +749,8 @@ getOpcodeExpander op ==
++ Expand all opcodes contained in the form `x' into a form
++ suitable for evaluation by the VM.
expandToVMForm x ==
- x = '%false or x = '%nil => 'NIL
+ x is '%false or x is '%nil => 'NIL
+ x is '%undefined => 'NIL -- for the time being. FIXME.
ident? x and (x' := x has %Rename) => x'
atomic? x => x
[op,:args] := x