From 8972fb38d34f808c111ea1251fbb6964ccdb1869 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Kochma=C5=84ski?= Date: Thu, 30 Jul 2015 08:32:02 +0200 Subject: [PATCH] cmp: remove redundant compute-main-name function MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Same functionality is provided by compute-init-name Signed-off-by: Daniel Kochmański --- src/cmp/cmpmain.lsp | 4 +++- src/cmp/cmpname.lsp | 3 --- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/cmp/cmpmain.lsp b/src/cmp/cmpmain.lsp index 50edbe8f7..ebbc920eb 100755 --- a/src/cmp/cmpmain.lsp +++ b/src/cmp/cmpmain.lsp @@ -478,7 +478,9 @@ output = si_safe_eval(2, ecl_read_from_cstring(lisp_code), ECL_NIL); (unless init-name (setf init-name (compute-init-name output-name :kind target))) (unless main-name - (setf main-name (compute-main-name output-name :kind target))) + (setf main-name (compute-init-name output-name + :kind target + :prefix "main_"))) (ecase target (:program (format c-file +lisp-program-init+ init-name "" submodules "") diff --git a/src/cmp/cmpname.lsp b/src/cmp/cmpname.lsp index f70c00edf..4382bbcd3 100644 --- a/src/cmp/cmpname.lsp +++ b/src/cmp/cmpname.lsp @@ -123,9 +123,6 @@ the function name it precedes." (otherwise (error "C::BUILDER cannot accept files of kind ~s" kind))))) -(defun compute-main-name (pathname &rest args) - (apply #'compute-init-name pathname :prefix "main_" args)) - (defun init-function-name (s &key (kind :object) (prefix nil)) (flet ((translate-char (c) (cond ((and (char>= c #\a) (char<= c #\z))