diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-02-24 03:14:35 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-02-24 03:14:35 +0000 |
| commit | 7eca3ee736c49024a85ad00ff9b0a912d640380c (patch) | |
| tree | 3ac6fb675cb2efbf8c4a62dfa9ca069de6aeb234 /src/interp/wi1.boot | |
| parent | 155d5c8bf8562bc3797535df1cbb89f7dcb5c03d (diff) | |
| download | open-axiom-7eca3ee736c49024a85ad00ff9b0a912d640380c.tar.gz | |
some cleanups
Diffstat (limited to 'src/interp/wi1.boot')
| -rw-r--r-- | src/interp/wi1.boot | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/interp/wi1.boot b/src/interp/wi1.boot index 509485b9..08de7a26 100644 --- a/src/interp/wi1.boot +++ b/src/interp/wi1.boot @@ -347,7 +347,7 @@ compAtom(x,m,e) == -- integer? x and (T := [x, $Integer,e]) and (T' := convert(T,m)) => markAt(T, T') t:= IDENTP x => compSymbol(x,m,e) or return nil - m = $Expression and primitiveType x => [x,m,e] + m = $OutputForm and primitiveType x => [x,m,e] string? x => x ~= '"failed" and (member($Symbol, $localImportStack) or member($Symbol, $globalImportStack)) => markAt [x, '(String), e] @@ -381,7 +381,7 @@ compSymbol(s,m,e) == [s,m',e] --s is a declared argument MEMQ(s,$FormalMapVariableList) => stackMessage ["no mode found for",s] ---> - m = $Symbol or m = $Expression => [['QUOTE,s],m,e] + m = $Symbol or m = $OutputForm => [['QUOTE,s],m,e] ---> was ['QUOTE, s] not isFunction(s,e) => errorRef s @@ -409,7 +409,7 @@ compForm1(form,m,e) == -- foobar domain -- markImport(domain,true) -------> new <------------- - domain=$Expression and op'="construct" => compExpressionList(argl,m,e) + domain=$OutputForm and op'="construct" => compExpressionList(argl,m,e) (op'="COLLECT") and coerceable(domain,m,e) => (T:= comp([op',:argl],domain,e) or return nil; coerce(T,m)) -------> new <------------- @@ -885,7 +885,7 @@ coerceExtraHard(T is [x,m',e],m) == unionLike?(m',e) is ['UnionCategory,:l] and (t:= hasType(x,e)) and member(t,l) and (T':= autoCoerceByModemap(T,t)) and (T'':= coerce(T',m)) => T'' - m' is ['Record,:.] and m = $Expression => + m' is ['Record,:.] and m = $OutputForm => [['coerceRe2E,x,['ELT,COPY m',0]],m,e] nil |