aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog3
-rw-r--r--src/interp/compiler.boot6
-rw-r--r--src/interp/wi1.boot2
3 files changed, 5 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index aa9569ab..e7d8f158 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,6 @@
-2008-12-09 Gabriel Dos Reis <gdr@cs.tamu.edu>
+2008-12-10 Gabriel Dos Reis <gdr@cs.tamu.edu>
+ * interp/compiler.boot (quotify): Remove.
* interp/parse.boot (parseCases): Remove.
(parseUpArrow): Likewise.
* interp/compiler.boot (preprocessParseTree): New.
diff --git a/src/interp/compiler.boot b/src/interp/compiler.boot
index 78a8145c..543c1edf 100644
--- a/src/interp/compiler.boot
+++ b/src/interp/compiler.boot
@@ -1167,7 +1167,7 @@ compIf(["IF",a,b,c],m,E) ==
[xb,mb,Eb]:= Tb:= compFromIf(b,m,Ea) or return nil
[xc,mc,Ec]:= Tc:= compFromIf(c,resolve(mb,m),Einv) or return nil
xb':= coerce(Tb,mc) or return nil
- x:= ["IF",xa,quotify xb'.expr,quotify xc]
+ x:= ["IF",xa,xb'.expr,xc]
(returnEnv:= Env(xb'.env,Ec,xb'.expr,xc,E)) where
Env(bEnv,cEnv,b,c,E) ==
canReturn(b,0,0,true) =>
@@ -1273,9 +1273,7 @@ isUnionMode(m,e) ==
compFromIf(a,m,E) ==
a="%noBranch" => ["%noBranch",m,E]
- true => comp(a,m,E)
-
-quotify x == x
+ comp(a,m,E)
compImport: (%Form,%Mode,%Env) -> %Maybe %Triple
compImport(["import",:doms],m,e) ==
diff --git a/src/interp/wi1.boot b/src/interp/wi1.boot
index 9b83ebc0..eab2d59d 100644
--- a/src/interp/wi1.boot
+++ b/src/interp/wi1.boot
@@ -1022,7 +1022,7 @@ compIf(["IF",aOrig,b,c],m,E) ==
[xb,mb,Eb]:= Tb:= compFromIf(b,m,Ea) or return nil
[xc,mc,Ec]:= Tc:= compFromIf(c,resolve(mb,m),Einv) or return nil
xb':= coerce(Tb,mc) or return nil
- x:= ["IF",xa,quotify xb'.expr,quotify xc]
+ x:= ["IF",xa,xb'.expr,xc]
(returnEnv:= Env(xb'.env,Ec,xb'.expr,xc,E)) where
Env(bEnv,cEnv,b,c,E) ==
canReturn(b,0,0,true) =>