aboutsummaryrefslogtreecommitdiff
path: root/src/interp
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2010-03-04 08:51:34 +0000
committerdos-reis <gdr@axiomatics.org>2010-03-04 08:51:34 +0000
commitc633999fd009d1d69611fd968c040f4a3e8c08fc (patch)
tree37784ad512d0ca46544d55a5bf1a04063d310691 /src/interp
parent5c643bf0dce03bf61ead5b95c27de845ac242680 (diff)
downloadopen-axiom-c633999fd009d1d69611fd968c040f4a3e8c08fc.tar.gz
* interp/c-util.boot (isSymbol): Remove.
* interp/compiler.boot (compAtom): Don't use it. * interp/wi1.boot (compAtom): Likewise.
Diffstat (limited to 'src/interp')
-rw-r--r--src/interp/c-util.boot2
-rw-r--r--src/interp/compiler.boot2
-rw-r--r--src/interp/wi1.boot5
3 files changed, 3 insertions, 6 deletions
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