diff options
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/interp/compiler.boot | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 4ffb18ae..46c1ed57 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,9 @@ 2013-05-15 Gabriel Dos Reis <gdr@integrable-solutions.net> + * interp/compiler.boot (comp2): Leave categories alone. + +2013-05-15 Gabriel Dos Reis <gdr@integrable-solutions.net> + * interp/compiler.boot (comp2): Don't test for $bootStrapMode. 2013-05-15 Gabriel Dos Reis <gdr@integrable-solutions.net> diff --git a/src/interp/compiler.boot b/src/interp/compiler.boot index 3e951499..25f6f1b0 100644 --- a/src/interp/compiler.boot +++ b/src/interp/compiler.boot @@ -158,12 +158,13 @@ compNoStacking1(x,m,e,$compStack) == nil comp2(x,m,e) == - [y,m',e]:= comp3(x,m,e) or return nil + [y,m',e] := T := comp3(x,m,e) or return nil + T.mode = $Category => T --if cons? y and isDomainForm(y,e) then e := addDomain(x,e) --line commented out to prevent adding derived domain forms m~=m' and isDomainForm(m',e) => [y,m',addDomain(m',e)] --isDomainForm test needed to prevent error while compiling Ring - [y,m',e] + T comp3(x,m,$e) == --returns a Triple or %else nil to signalcan't do' |