From 3dc479ae544db8bc9224f183f33cb3e16fe2daac Mon Sep 17 00:00:00 2001
From: Gabriel Dos Reis <GabrielDosReis@users.noreply.github.com>
Date: Sat, 20 Aug 2022 23:10:21 -0700
Subject: fix sbcl 1.5.9 build (#16)

* Fix build with SBCL-1.5.9

* Fix dynamic loading of open-axiom-core.so
---
 src/interp/i-output.boot   | 20 +++++++++-----------
 src/interp/sys-driver.boot |  6 ------
 2 files changed, 9 insertions(+), 17 deletions(-)

(limited to 'src/interp')

diff --git a/src/interp/i-output.boot b/src/interp/i-output.boot
index d035bd0b..a4c44912 100644
--- a/src/interp/i-output.boot
+++ b/src/interp/i-output.boot
@@ -1,6 +1,6 @@
 -- Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
 -- All rights reserved.
--- Copyright (C) 2007-2016, Gabriel Dos Reis.
+-- Copyright (C) 2007-2022, Gabriel Dos Reis.
 -- All rights reserved.
 --
 -- Redistribution and use in source and binary forms, with or without
@@ -1111,21 +1111,19 @@ aggregateApp(u,x,y,d,s) ==
 
 --% Function to compute Width
 
+widthOfString u ==
+  u = $EmptyString => 0
+  stringChar(u,0) = char "%" and
+    (stringChar(u,1) = char "b" or stringChar(u,1) = char "d") => 1
+  #u
+
 outformWidth u ==  --WIDTH as called from OUTFORM to do a COPY
-  string? u =>
-    u = $EmptyString => 0
-    stringChar(u,0) = char "%" and
-      (stringChar(u,1) = char "b" or stringChar(u,1) = char "d") => 1
-    #u
+  string? u => widthOfString u
   u isnt [.,:.] => # atom2String u
   WIDTH copyTree u
 
 WIDTH u ==
-  string? u =>
-    u = $EmptyString => 0
-    stringChar(u,0) = char "%" and
-      (stringChar(u,1) = char "b" or stringChar(u,1) = char "d") => 1
-    #u
+  string? u => widthOfString u
   integer? u => 
     if (u < 1) then 
       negative := 1
diff --git a/src/interp/sys-driver.boot b/src/interp/sys-driver.boot
index 4ab20b23..7fd65924 100644
--- a/src/interp/sys-driver.boot
+++ b/src/interp/sys-driver.boot
@@ -75,12 +75,6 @@ symbolFunction('%sysInit) := () +->
 
 --%
 
-++ Returns the directory name as specified through option name `opt'.
-directoryFromCommandLine opt ==
-  dir := ASSOC(Option opt, %systemOptions()) =>
-    ensureTrailingSlash rest dir
-  nil
-
 ++ Returns the system algebra directory, as specified on command
 ++ line.  nil, otherwise.
 systemAlgebraDirectory() ==
-- 
cgit v1.2.3