summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Andreas Benkard <matthias@benkard.de>2008-10-04 17:07:25 +0200
committerMatthias Andreas Benkard <matthias@benkard.de>2008-10-04 17:07:25 +0200
commit1644a54365a21931e53a0a917984c67bc0c460d3 (patch)
tree94da02c766f024ce5f72db9fe2dbbd7fb946c114
parent38e6ddffecf15880ad9bcdfbff097565fca70792 (diff)
Revert "Link ToiletKit with the SCM continuation support code."
This reverts commit 5dc8e497315ba791c8a8de021f3d2d292566fb56. Conflicts: Toilet Lisp.xcodeproj/project.pbxproj
-rw-r--r--GNUmakefile10
-rw-r--r--SCM/toilet-scm.c33
-rw-r--r--Toilet Lisp.xcodeproj/project.pbxproj28
3 files changed, 2 insertions, 69 deletions
diff --git a/GNUmakefile b/GNUmakefile
index 8ed21d7..a9984d9 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -19,7 +19,7 @@
export USE_LLVM ADDITIONAL_OBJCFLAGS ADDITIONAL_LDFLAGS LLVM_CONFIG
-KIT_TARGETS = SCM/continue.o SCM/toilet-scm.o ToiletKit
+KIT_TARGETS = ToiletKit
USE_LLVM := YES
ifeq ($(USE_LLVM),YES)
@@ -84,10 +84,7 @@ ToiletKit_OBJC_FILES = functions.m globals.m MLKArray.m \
MLKUnboundVariableError.m MLKValuesFunction.m \
NSObject-MLKPrinting.m NSString-MLKPrinting.m
ToiletKit_OBJCFLAGS = -Wall
-ToiletKit_LDFLAGS = -lgmp -lffi -ldl SCM/continue.o SCM/toilet-scm.o
-
-SCM/%.o: SCM/%.c
- $(CC) -o $@ -c $< $(CFLAGS) $(ToiletKit_OBJCFLAGS) $(ADDITIONAL_OBJCFLAGS) -fPIC
+ToiletKit_LDFLAGS = -lgmp -lffi -ldl
# We copy the whole Sacla directory, because copying individual files causes them to
# lose their relative path. Does anyone else think this is retarded?
@@ -210,9 +207,6 @@ before-Test:: ToiletKit
#after-clean::
# -rmdir $(GNUSTEP_OBJ_DIR)/StepTalkShell
-after-clean::
- rm -f SCM/continue.o SCM/toilet-scm.o
-
ifneq ($(BUILD_TOILET_LLVM),YES)
after-clean::
$(MAKE) clean shared=no BUILD_TOILET_LLVM=YES
diff --git a/SCM/toilet-scm.c b/SCM/toilet-scm.c
deleted file mode 100644
index b3f2f12..0000000
--- a/SCM/toilet-scm.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* -*- mode: objc; coding: utf-8 -*- */
-/* Toilet Lisp, a Common Lisp subset for the Étoilé runtime.
- * Copyright (C) 2008 Matthias Andreas Benkard.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <stdlib.h>
-#include <stdint.h>
-
-char s_call_cc[] = "call-with-current-continuation";
-
-char *must_malloc (size_t len, const char *what)
-{
- return (char *)malloc(len);
-}
-
-void must_free (char *obj, size_t len)
-{
- if (obj)
- free(obj);
-}
diff --git a/Toilet Lisp.xcodeproj/project.pbxproj b/Toilet Lisp.xcodeproj/project.pbxproj
index 4e04fb8..a8a7b8f 100644
--- a/Toilet Lisp.xcodeproj/project.pbxproj
+++ b/Toilet Lisp.xcodeproj/project.pbxproj
@@ -175,13 +175,6 @@
A7E5C55D0E21740C00A01D81 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A7E5C55B0E21740C00A01D81 /* Foundation.framework */; };
A7EE013F0E850E010024E903 /* MLKContinuation.h in Headers */ = {isa = PBXBuildFile; fileRef = A7EE013D0E850E010024E903 /* MLKContinuation.h */; };
A7EE01400E850E010024E903 /* MLKContinuation.m in Sources */ = {isa = PBXBuildFile; fileRef = A7EE013E0E850E010024E903 /* MLKContinuation.m */; };
- A7EEFFD30E84FF650024E903 /* continue.c in Sources */ = {isa = PBXBuildFile; fileRef = A7EEFFD20E84FF650024E903 /* continue.c */; };
- A7EEFFD90E84FF7C0024E903 /* continue.h in Headers */ = {isa = PBXBuildFile; fileRef = A7EEFFD40E84FF7C0024E903 /* continue.h */; };
- A7EEFFDA0E84FF7C0024E903 /* scm.h in Headers */ = {isa = PBXBuildFile; fileRef = A7EEFFD50E84FF7C0024E903 /* scm.h */; };
- A7EEFFDB0E84FF7C0024E903 /* scmfig.h in Headers */ = {isa = PBXBuildFile; fileRef = A7EEFFD60E84FF7C0024E903 /* scmfig.h */; };
- A7EEFFDC0E84FF7C0024E903 /* scmflags.h in Headers */ = {isa = PBXBuildFile; fileRef = A7EEFFD70E84FF7C0024E903 /* scmflags.h */; };
- A7EEFFDD0E84FF7C0024E903 /* setjump.h in Headers */ = {isa = PBXBuildFile; fileRef = A7EEFFD80E84FF7C0024E903 /* setjump.h */; };
- A7EEFFED0E85025A0024E903 /* toilet-scm.c in Sources */ = {isa = PBXBuildFile; fileRef = A7EEFFEC0E85025A0024E903 /* toilet-scm.c */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -468,13 +461,6 @@
A7E5C55B0E21740C00A01D81 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
A7EE013D0E850E010024E903 /* MLKContinuation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MLKContinuation.h; sourceTree = "<group>"; };
A7EE013E0E850E010024E903 /* MLKContinuation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MLKContinuation.m; sourceTree = "<group>"; };
- A7EEFFD20E84FF650024E903 /* continue.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = continue.c; path = SCM/continue.c; sourceTree = "<group>"; };
- A7EEFFD40E84FF7C0024E903 /* continue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = continue.h; path = SCM/continue.h; sourceTree = "<group>"; };
- A7EEFFD50E84FF7C0024E903 /* scm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = scm.h; path = SCM/scm.h; sourceTree = "<group>"; };
- A7EEFFD60E84FF7C0024E903 /* scmfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = scmfig.h; path = SCM/scmfig.h; sourceTree = "<group>"; };
- A7EEFFD70E84FF7C0024E903 /* scmflags.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = scmflags.h; path = SCM/scmflags.h; sourceTree = "<group>"; };
- A7EEFFD80E84FF7C0024E903 /* setjump.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = setjump.h; path = SCM/setjump.h; sourceTree = "<group>"; };
- A7EEFFEC0E85025A0024E903 /* toilet-scm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "toilet-scm.c"; path = "SCM/toilet-scm.c"; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -625,11 +611,6 @@
A7E5C48C0E2169CE00A01D81 /* Headers */ = {
isa = PBXGroup;
children = (
- A7EEFFD40E84FF7C0024E903 /* continue.h */,
- A7EEFFD50E84FF7C0024E903 /* scm.h */,
- A7EEFFD60E84FF7C0024E903 /* scmfig.h */,
- A7EEFFD70E84FF7C0024E903 /* scmflags.h */,
- A7EEFFD80E84FF7C0024E903 /* setjump.h */,
A7A8628C0E6E775F00021916 /* MLKNoSuchSymbolError.h */,
A7A8628E0E6E776000021916 /* MLKStreamError.h */,
A7A862900E6E776000021916 /* MLKUnboundVariableError.h */,
@@ -698,8 +679,6 @@
A7E5C48D0E216A0E00A01D81 /* Source Files */ = {
isa = PBXGroup;
children = (
- A7EEFFEC0E85025A0024E903 /* toilet-scm.c */,
- A7EEFFD20E84FF650024E903 /* continue.c */,
A7A8628D0E6E776000021916 /* MLKNoSuchSymbolError.m */,
A7A8628F0E6E776000021916 /* MLKStreamError.m */,
A7A862910E6E776000021916 /* MLKUnboundVariableError.m */,
@@ -832,11 +811,6 @@
A7A862920E6E776000021916 /* MLKNoSuchSymbolError.h in Headers */,
A7A862940E6E776000021916 /* MLKStreamError.h in Headers */,
A7A862960E6E776000021916 /* MLKUnboundVariableError.h in Headers */,
- A7EEFFD90E84FF7C0024E903 /* continue.h in Headers */,
- A7EEFFDA0E84FF7C0024E903 /* scm.h in Headers */,
- A7EEFFDB0E84FF7C0024E903 /* scmfig.h in Headers */,
- A7EEFFDC0E84FF7C0024E903 /* scmflags.h in Headers */,
- A7EEFFDD0E84FF7C0024E903 /* setjump.h in Headers */,
A7EE013F0E850E010024E903 /* MLKContinuation.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -1050,8 +1024,6 @@
A7A862930E6E776000021916 /* MLKNoSuchSymbolError.m in Sources */,
A7A862950E6E776000021916 /* MLKStreamError.m in Sources */,
A7A862970E6E776000021916 /* MLKUnboundVariableError.m in Sources */,
- A7EEFFD30E84FF650024E903 /* continue.c in Sources */,
- A7EEFFED0E85025A0024E903 /* toilet-scm.c in Sources */,
A7EE01400E850E010024E903 /* MLKContinuation.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;