From b70fac011273cd8dcd23ac9993fc3f4bf3ab6b91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Kochma=C5=84ski?= Date: Mon, 30 Oct 2023 17:40:19 +0100 Subject: [PATCH] cosmetic: minor fixes to the compiler --- src/cmp/cmpenv-declare.lsp | 4 ++-- src/cmp/cmpenv-var.lsp | 4 ++-- src/cmp/cmpfun.lsp | 2 +- src/cmp/cmppass1-fun.lsp | 7 +++---- src/cmp/cmpprop.lsp | 2 -- src/cmp/cmptype.lsp | 6 +++--- src/cmp/cmputil.lsp | 2 +- 7 files changed, 12 insertions(+), 15 deletions(-) diff --git a/src/cmp/cmpenv-declare.lsp b/src/cmp/cmpenv-declare.lsp index 9e709970f..c32c8ab6b 100644 --- a/src/cmp/cmpenv-declare.lsp +++ b/src/cmp/cmpenv-declare.lsp @@ -40,7 +40,7 @@ (defun alien-declaration-p (name &optional (env *cmp-env*)) (and (symbolp name) - (member name (cmp-env-search-declaration 'alien env si::*alien-declarations*) + (member name (cmp-env-search-declaration 'alien env si:*alien-declarations*) :test 'eq))) (defun policy-declaration-p (name) @@ -156,7 +156,7 @@ special variable declarations, as these have been extracted before." env) (cl:DECLARATION (validate-alien-declaration (rest decl) #'cmperr) - (cmp-env-extend-declaration 'alien (rest decl) env si::*alien-declarations*)) + (cmp-env-extend-declaration 'alien (rest decl) env si:*alien-declarations*)) ((SI::C-LOCAL SI::C-GLOBAL SI::NO-CHECK-TYPE :READ-ONLY) env) ((cl:DYNAMIC-EXTENT cl:IGNORABLE SI:FUNCTION-BLOCK-NAME) diff --git a/src/cmp/cmpenv-var.lsp b/src/cmp/cmpenv-var.lsp index 295a97fc5..b8ece1cee 100644 --- a/src/cmp/cmpenv-var.lsp +++ b/src/cmp/cmpenv-var.lsp @@ -32,7 +32,7 @@ (defun special-variable-p (name) "Return true if NAME is associated to a special variable in the lexical environment." - (or (si::specialp name) + (or (si:specialp name) (check-global name) (let ((v (cmp-env-search-var name *cmp-env-root*))) ;; Fixme! Revise the declamation code to ensure whether @@ -40,7 +40,7 @@ (and v (eq (var-kind v) 'SPECIAL))))) (defun constant-variable-p (name) - (si::constp name)) + (si:constp name)) (defun local-variable-p (name &optional (env *cmp-env*)) (let ((record (cmp-env-search-var name env))) diff --git a/src/cmp/cmpfun.lsp b/src/cmp/cmpfun.lsp index dc3100892..0f13def22 100644 --- a/src/cmp/cmpfun.lsp +++ b/src/cmp/cmpfun.lsp @@ -134,7 +134,7 @@ The function thus belongs to the type of functions that ecl_make_cfun accepts." (let (narg) (and (not (eq (fun-closure fun) 'CLOSURE)) (= (fun-minarg fun) (setf narg (fun-maxarg fun))) - (<= narg si::c-arguments-limit) + (<= narg si:c-arguments-limit) narg))) (defun add-to-fun-referenced-vars (fun var-list) diff --git a/src/cmp/cmppass1-fun.lsp b/src/cmp/cmppass1-fun.lsp index 9bad5f480..768665b25 100644 --- a/src/cmp/cmppass1-fun.lsp +++ b/src/cmp/cmppass1-fun.lsp @@ -141,7 +141,7 @@ (let* ((*current-function* fun) (*cmp-env* (setf (fun-cmp-env fun) (cmp-env-mark 'SI:FUNCTION-BOUNDARY))) (setjmps *setjmps*) - (decl (si::process-declarations (rest lambda-list-and-body))) + (decl (si:process-declarations (rest lambda-list-and-body))) (global (and *use-c-global* (assoc 'SI::C-GLOBAL decl) (setf (fun-global fun) T))) @@ -149,7 +149,7 @@ cfun exported minarg maxarg proclamation-found-p) (multiple-value-bind (lambda-expr optional-type-checks keyword-type-checks) (c1lambda-expr lambda-list-and-body name - (si::function-block-name name)) + (si:function-block-name name)) (when (and no-entry (policy-debug-ihs-frame)) (setf no-entry nil) (cmpnote "Ignoring SI::C-LOCAL declaration for~%~4I~A~%because the debug level is large" name)) @@ -223,7 +223,6 @@ (defun c1lambda-expr (lambda-expr function-name block-name &aux doc body ss is ts other-decls - new-variables (type-checks '()) (*permanent-data* t) (old-env *cmp-env*) @@ -355,7 +354,7 @@ keyword-type-check-forms)))))) (defun cmp-process-lambda-list (list) - (handler-case (si::process-lambda-list list 'function) + (handler-case (si:process-lambda-list list 'function) (error (c) (cmperr "Illegal lambda list ~S:~%~A" list c)))) (defun lambda-form-allowed-nargs (lambda) diff --git a/src/cmp/cmpprop.lsp b/src/cmp/cmpprop.lsp index db360cfce..fb9a117b1 100644 --- a/src/cmp/cmpprop.lsp +++ b/src/cmp/cmpprop.lsp @@ -92,7 +92,6 @@ values-type)) (defun p1fcall (c1form fun args fun-val call-type) - (declare (ignore fun)) (p1propagate fun) (p1propagate-list args) (ecase call-type @@ -117,7 +116,6 @@ (p1trivial c1form)))) (defun p1mcall (c1form fun args fun-val call-type) - (declare (ignore fun)) (p1propagate fun) (p1propagate-list args) (ecase call-type diff --git a/src/cmp/cmptype.lsp b/src/cmp/cmptype.lsp index cece8a742..68c52b196 100644 --- a/src/cmp/cmptype.lsp +++ b/src/cmp/cmptype.lsp @@ -50,7 +50,7 @@ ,@(when (member :complex-float *features*) '((si:complex-single-float . #c(0.0f0 0.0f0)) (si:complex-double-float . #c(0.0d0 0.0d0)) - (si:complex-single-float . #c(0.0l0 0.0l0))))) + (si:complex-long-float . #c(0.0l0 0.0l0))))) :test #'subtypep)))) (if new-value (c1constant-value new-value) @@ -67,7 +67,7 @@ (if found (multiple-value-bind (req-types opt-types rest-flag key-flag key-types allow-other-keys) - (si::process-lambda-list arg-types 'ftype) + (si:process-lambda-list arg-types 'ftype) (declare (ignore rest-flag key-flag allow-other-keys)) (list (loop for var in requireds @@ -167,7 +167,7 @@ (cond ((and trivial valid) value) ((multiple-value-setq (valid value) (constant-value-p value env)) - (si::maybe-quote value)) + (si:maybe-quote value)) (t (ext:with-clean-symbols (%value) `(let* ((%value ,value)) diff --git a/src/cmp/cmputil.lsp b/src/cmp/cmputil.lsp index 77c127f42..6040d189a 100644 --- a/src/cmp/cmputil.lsp +++ b/src/cmp/cmputil.lsp @@ -126,7 +126,7 @@ (apply #'format t args))) (defun cmp-eval (form &optional (env *cmp-env*)) - (handler-case (si::eval-with-env form env nil t :execute) + (handler-case (si:eval-with-env form env nil t :execute) (serious-condition (c) (when *compiler-break-enable* (invoke-debugger c))