diff options
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/interp/c-util.boot | 2 | ||||
| -rw-r--r-- | src/interp/compiler.boot | 2 | ||||
| -rw-r--r-- | src/interp/wi1.boot | 5 |
4 files changed, 9 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c5ee7ffd..062afad7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,11 @@ 2010-03-04 Gabriel Dos Reis <gdr@cs.tamu.edu> + * interp/c-util.boot (isSymbol): Remove. + * interp/compiler.boot (compAtom): Don't use it. + * interp/wi1.boot (compAtom): Likewise. + +2010-03-04 Gabriel Dos Reis <gdr@cs.tamu.edu> + * interp/c-util.boot (quoteMinimally): New. (registerFunctionReplacement): Likewise. * interp/define.boot (spadCompileOrSetq): Use it. diff --git a/src/interp/c-util.boot b/src/interp/c-util.boot index 0b62a0f8..34fee8df 100644 --- a/src/interp/c-util.boot +++ b/src/interp/c-util.boot @@ -579,8 +579,6 @@ isDomainInScope(domain,e) == isFunctor name => false true --is not a functor -isSymbol x == IDENTP x or x=nil - isSimple x == atom x or $InteractiveMode => true x is [op,:argl] and diff --git a/src/interp/compiler.boot b/src/interp/compiler.boot index 44145fe9..93ae1330 100644 --- a/src/interp/compiler.boot +++ b/src/interp/compiler.boot @@ -396,7 +396,7 @@ compAtom(x,m,e) == x = "iterate" => compIterate(x,m,e) T:= IDENTP x and compAtomWithModemap(x,m,e,get(x,"modemap",e)) => T t:= - isSymbol x => compSymbol(x,m,e) or return nil + IDENTP x => compSymbol(x,m,e) or return nil member(m,$IOFormDomains) and primitiveType x => [x,m,e] STRINGP x => [x,x,e] [x,primitiveType x or return nil,e] diff --git a/src/interp/wi1.boot b/src/interp/wi1.boot index f97716eb..09e160f8 100644 --- a/src/interp/wi1.boot +++ b/src/interp/wi1.boot @@ -1,6 +1,6 @@ -- Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd. -- All rights reserved. --- Copyright (C) 2007-2009, Gabriel Dos Reis. +-- Copyright (C) 2007-2010, Gabriel Dos Reis. -- All rights reserved. -- -- Redistribution and use in source and binary forms, with or without @@ -347,8 +347,7 @@ compAtom(x,m,e) == FIXP x and opOf m in '(Integer NonNegativeInteger PositiveInteger SmallInteger) => markAt [x,m,e] -- FIXP x and (T := [x, $Integer,e]) and (T' := convert(T,m)) => markAt(T, T') t:= - isSymbol x => - compSymbol(x,m,e) or return nil + IDENTP x => compSymbol(x,m,e) or return nil m = $Expression and primitiveType x => [x,m,e] STRINGP x => x ~= '"failed" and (member($Symbol, $localImportStack) or |