suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(if (not X) Y Z) compiles as (if X Z Y)

Browse Source 
svn: r1769
This commit is contained in:
Matthew Flatt 2006-01-05 17:35:31 +00:00
parent da799daa20
commit f4cae8e9ca
2 changed files with 2707 additions and 2701 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5367
src/mzscheme/src/cstartup.inc
View File

File diff suppressed because it is too large Load Diff

41
src/mzscheme/src/eval.c
View File

@ -1012,21 +1012,6 @@ scheme_make_branch(Scheme_Object *test, Scheme_Object *thenp,
b = MALLOC_ONE_TAGGED(Scheme_Branch_Rec);
b->so.type = scheme_branch_type;
#if 0
/* Try optimize: (if (not x) y z) => (if x z y) */
if (SAME_TYPE(SCHEME_TYPE(test), scheme_application_type)) {
Scheme_App_Rec *app;
app = (Scheme_App_Rec *)test;
if ((app->num_args == 1) && SAME_PTR(scheme_not_prim, app->args[0])) {
test = thenp;
thenp = elsep;
elsep = test;
test = app->args[1];
}
}
#endif
b->test = test;
b->tbranch = thenp;
b->fbranch = elsep;
@ -1041,9 +1026,29 @@ static Scheme_Object *resolve_branch(Scheme_Object *o, Resolve_Info *info)
b = (Scheme_Branch_Rec *)o;
t = scheme_resolve_expr(b->test, info);
tb = scheme_resolve_expr(b->tbranch, info);
fb = scheme_resolve_expr(b->fbranch, info);
t = b->test;
tb = b->tbranch;
fb = b->fbranch;
/* Try optimize: (if (not x) y z) => (if x z y) */
/* Done here because `not' is easily recognized at this
point, and we haven't yet resolved Scheme-stack locations
so it's ok to remove an application. */
if (SAME_TYPE(SCHEME_TYPE(t), scheme_application2_type)) {
Scheme_App2_Rec *app;
app = (Scheme_App2_Rec *)t;
if (SAME_PTR(scheme_not_prim, app->rator)) {
t = tb;
tb = fb;
fb = t;
t = app->rand;
}
}
t = scheme_resolve_expr(t, info);
tb = scheme_resolve_expr(tb, info);
fb = scheme_resolve_expr(fb, info);
b->test = t;
b->tbranch = tb;
b->fbranch = fb;