aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/interp/compiler.boot8
-rw-r--r--src/lisp/core.lisp.in7
2 files changed, 3 insertions, 12 deletions
diff --git a/src/interp/compiler.boot b/src/interp/compiler.boot
index ae68d089..7c07df36 100644
--- a/src/interp/compiler.boot
+++ b/src/interp/compiler.boot
@@ -1208,14 +1208,6 @@ compPredicate(p,E) ==
[p',m,getSuccessEnvironment(p,E),getInverseEnvironment(p,E)]
getSuccessEnvironment(a,e) ==
- a is ["is",id,m] =>
- IDENTP id and isDomainForm(m,$EmptyEnvironment) =>
- e:=put(id,"specialCase",m,e)
- currentProplist:= getProplist(id,e)
- [.,.,e] := T := comp(m,$EmptyMode,e) or return nil -- duplicates compIs
- newProplist:= consProplistOf(id,currentProplist,"value",[m,:rest removeEnv T])
- addBinding(id,newProplist,e)
- e
a is ["case",x,m] and IDENTP x =>
put(x,"condition",[a,:get(x,"condition",e)],e)
e
diff --git a/src/lisp/core.lisp.in b/src/lisp/core.lisp.in
index 9d65d262..f4f9fa15 100644
--- a/src/lisp/core.lisp.in
+++ b/src/lisp/core.lisp.in
@@ -231,10 +231,9 @@
;; versions as poor man safeguard to portability chaos.
(defconstant |$ECLVersionNumber|
#-:ecl -1
- #+:ecl (cond ((find-symbol "+ECL-VERSION-NUMBER+" "EXT")
- ext:+ecl-version-number+)
- (t -1)))
-
+ #+:ecl (let ((ver (find-symbol "+ECL-VERSION-NUMBER+" "EXT")))
+ (cond (ver (symbol-value ver))
+ (t -1))))
;;
;; -*- OpenAxiom filesystem -*-