aboutsummaryrefslogtreecommitdiff
path: root/src/interp
diff options
context:
space:
mode:
Diffstat (limited to 'src/interp')
-rw-r--r--src/interp/compiler.boot2
-rw-r--r--src/interp/daase.lisp2
-rw-r--r--src/interp/define.boot9
-rw-r--r--src/interp/sys-driver.boot3
-rw-r--r--src/interp/sys-globals.boot2
5 files changed, 9 insertions, 9 deletions
diff --git a/src/interp/compiler.boot b/src/interp/compiler.boot
index b3f6a7f7..7279e5e3 100644
--- a/src/interp/compiler.boot
+++ b/src/interp/compiler.boot
@@ -831,7 +831,7 @@ compSetq1(form,val,m,E) ==
compMakeDeclaration: (%Form,%Mode,%Env) -> %Maybe %Triple
compMakeDeclaration(x,m,e) ==
- $insideExpressionIfTrue: local
+ $insideExpressionIfTrue: local := false
compColon(x,m,e)
setqSetelt([v,:s],val,m,E) ==
diff --git a/src/interp/daase.lisp b/src/interp/daase.lisp
index d0ce7826..380965e6 100644
--- a/src/interp/daase.lisp
+++ b/src/interp/daase.lisp
@@ -356,7 +356,7 @@
(browseopen)
(setq *category-stream-stamp* '(0 . 0))
(categoryopen) ;note: this depends on constructorform in browse.daase
- (unless (|getOptionValue| (|Option| "system-algebra") (|%systemOptions|))
+ (unless |$buildingSystemAlgebra|
(initial-getdatabase))
#+:AKCL (gbc t)
)
diff --git a/src/interp/define.boot b/src/interp/define.boot
index f7ee6d58..75944abb 100644
--- a/src/interp/define.boot
+++ b/src/interp/define.boot
@@ -60,8 +60,7 @@ compDefine(form,m,e) ==
$tripleHits: local:= 0
$macroIfTrue: local := false
$packagesUsed: local := false
- result:= compDefine1(form,m,e)
- result
+ compDefine1(form,m,e)
++ We are about to process the body of a capsule. If the capsule defines
++ `Rep' as a constant, then implicitly insert the view morphisms
@@ -279,15 +278,15 @@ compDefineCategory2(form,signature,specialCases,body,m,e,
$prefix,$formalArgList) ==
--1. bind global variables
$insideCategoryIfTrue: local:= true
- $TOP__LEVEL: local
- $definition: local
+ $TOP__LEVEL: local := nil
+ $definition: local := form
--used by DomainSubstitutionFunction
$form: local := nil
$op: local := nil
$extraParms: local := nil
--Set in DomainSubstitutionFunction, used further down
-- 1.1 augment e to add declaration $: <form>
- [$op,:argl]:= $definition:= form
+ [$op,:argl] := $definition
e:= addBinding("$",[['mode,:$definition]],e)
-- 2. obtain signature
diff --git a/src/interp/sys-driver.boot b/src/interp/sys-driver.boot
index cc82e8b5..05c39858 100644
--- a/src/interp/sys-driver.boot
+++ b/src/interp/sys-driver.boot
@@ -71,7 +71,7 @@ AxiomCore::%sysInit() ==
-- a goat for CLisp FFI, please.
sys_-osInitCLispFFI()
)endif
-)if %hasFeature KEYWORD::GCL
+)if %hasFeature KEYWORD::GCL or %hasFeature KEYWORD::ECL
SETQ(COMPILER::_*COMPILE_-VERBOSE_*,false)
SETQ(COMPILER::_*SUPPRESS_-COMPILER_-WARNINGS_*,true)
SETQ(COMPILER::_*SUPPRESS_-COMPILER_-NOTES_*,true)
@@ -190,6 +190,7 @@ initializeGlobalState() ==
GCMSG(NIL)
if have_to then
$superHash := MAKE_-HASHTABLE('UEQUAL)
+ initNewWorld()
-- 1. Macros.
if have_to then buildHtMacroTable()
diff --git a/src/interp/sys-globals.boot b/src/interp/sys-globals.boot
index c66f0d82..e42e9a91 100644
--- a/src/interp/sys-globals.boot
+++ b/src/interp/sys-globals.boot
@@ -240,7 +240,7 @@ $traceletFunctions := []
$useDCQnotLET := false
++
-$updateCatTableIfTrue := true
+$updateCatTableIfTrue := false
++
$TranslateOnly := false