summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--GNUmakefile19
-rw-r--r--MLKListenerController.m2
-rw-r--r--MLKPackage.m1
-rw-r--r--MLKRoot.m12
-rw-r--r--Toilet Lisp.xcodeproj/project.pbxproj288
-rw-r--r--init.lisp56
6 files changed, 66 insertions, 312 deletions
diff --git a/GNUmakefile b/GNUmakefile
index 86b2711..b6f9a00 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -83,8 +83,23 @@ ToiletKit_OBJC_FILES = functions.m globals.m MLKArray.m \
NSString-MLKPrinting.m
ToiletKit_OBJCFLAGS = -Wall
ToiletKit_LDFLAGS = -lgmp -lffi -ldl
-#LIBRARIES_DEPEND_UPON
-
+#FIXME:
+ToiletKit_RESOURCE_FILES = array.lisp control-flow.lisp defun-0.lisp \
+ defun-1.lisp destructuring-bind.lisp evaluation.lisp \
+ ffi.lisp init.lisp list-functions-2.lisp \
+ list-functions.lisp llvm-ffi.lisp numbers.lisp \
+ package.lisp reader.lisp sharpsign.lisp string.lisp \
+ types.lisp util.lisp \
+ \
+ Sacla/array.lisp Sacla/character.lisp Sacla/clos.lisp \
+ Sacla/condition.lisp Sacla/cons.lisp Sacla/core.lisp \
+ Sacla/data-and-control.lisp Sacla/do.lisp \
+ Sacla/eval.lisp Sacla/hash-table.lisp Sacla/init.lisp \
+ Sacla/loop.lisp Sacla/package.lisp Sacla/printer.lisp \
+ Sacla/reader.lisp Sacla/sequence.lisp \
+ Sacla/share-2.lisp Sacla/share.lisp Sacla/stand-in.lisp \
+ Sacla/stream.lisp Sacla/string.lisp Sacla/symbol.lisp \
+ Sacla/testbed.lisp
ifeq ($(USE_LLVM),YES)
LLVM_CONFIG = llvm-config
diff --git a/MLKListenerController.m b/MLKListenerController.m
index 680365f..2998ab2 100644
--- a/MLKListenerController.m
+++ b/MLKListenerController.m
@@ -35,7 +35,7 @@
- (void) initialiseInterpreter
{
- [inputField setStringValue:@"(load \"init.lisp\")"];
+ [inputField setStringValue:@"(require \"init.lisp\")"];
[self submit:self];
}
diff --git a/MLKPackage.m b/MLKPackage.m
index d432465..193c83a 100644
--- a/MLKPackage.m
+++ b/MLKPackage.m
@@ -155,6 +155,7 @@ static NSMutableDictionary *packages = nil;
[sys export:[sys intern:@"SET"]];
[sys export:[sys intern:@"APPLY"]];
[sys export:[sys intern:@"EVAL"]];
+ [sys export:[sys intern:@"REQUIRE"]];
[sys export:[sys intern:@"OBJC-CLASS-OF"]];
[sys export:[sys intern:@"OBJC-SUBCLASSP"]];
diff --git a/MLKRoot.m b/MLKRoot.m
index eaff94c..6789ffb 100644
--- a/MLKRoot.m
+++ b/MLKRoot.m
@@ -39,6 +39,7 @@
#import "util.h"
#import <Foundation/NSArray.h>
+#import <Foundation/NSBundle.h>
#import <Foundation/NSException.h>
#import <Foundation/NSInvocation.h>
#import <Foundation/NSMethodSignature.h>
@@ -95,7 +96,6 @@ cons (id _data, id car, id cdr, id _marker)
static id
load (id _data, NSString *fileName, id _marker)
{
- // FIXME
BOOL success;
int l, i;
NSInputStream *input = [NSInputStream inputStreamWithFileAtPath:fileName];
@@ -166,6 +166,15 @@ load (id _data, NSString *fileName, id _marker)
}
static id
+require (id _data, id moduleName, id _marker)
+{
+ NSBundle *toiletKit = [NSBundle bundleForClass:[MLKRoot class]];
+ NSString *path = [[toiletKit resourcePath]
+ stringByAppendingPathComponent:stringify(moduleName)];
+ return load (nil, path, MLKEndOfArgumentsMarker);
+}
+
+static id
eq (id _data, id x, id y, id _marker)
{
return truify (x == y);
@@ -808,6 +817,7 @@ register_sys (NSString *name, id (*function)())
register_sys (@"RPLACD", rplacd);
register_sys (@"CONS", cons);
register_sys (@"LOAD", load);
+ register_sys (@"REQUIRE", require);
register_sys (@"EQ", eq);
register_sys (@"FIXNUM-EQ", fixnum_eq);
register_sys (@"SYMBOLP", symbolp);
diff --git a/Toilet Lisp.xcodeproj/project.pbxproj b/Toilet Lisp.xcodeproj/project.pbxproj
index c71a51a..2ec504f 100644
--- a/Toilet Lisp.xcodeproj/project.pbxproj
+++ b/Toilet Lisp.xcodeproj/project.pbxproj
@@ -15,42 +15,6 @@
A745C35A0E607D6F00C43A04 /* MLKLLVMCompiler.mm in Sources */ = {isa = PBXBuildFile; fileRef = A78713810E4EFF4000A7191F /* MLKLLVMCompiler.mm */; };
A745C4080E6189EB00C43A04 /* MLKReadEvalPrintLoop.m in Sources */ = {isa = PBXBuildFile; fileRef = A7E5C4850E21698100A01D81 /* MLKReadEvalPrintLoop.m */; };
A745C40A0E6189EB00C43A04 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A7E5C55B0E21740C00A01D81 /* Foundation.framework */; };
- A745C40C0E6189EB00C43A04 /* control-flow.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A834010E477B76005D64E0 /* control-flow.lisp */; };
- A745C40D0E6189EB00C43A04 /* defun-0.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A834020E477B76005D64E0 /* defun-0.lisp */; };
- A745C40E0E6189EB00C43A04 /* defun-1.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A834030E477B76005D64E0 /* defun-1.lisp */; };
- A745C40F0E6189EB00C43A04 /* destructuring-bind.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A834040E477B76005D64E0 /* destructuring-bind.lisp */; };
- A745C4100E6189EB00C43A04 /* evaluation.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A834050E477B76005D64E0 /* evaluation.lisp */; };
- A745C4110E6189EB00C43A04 /* init.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A834060E477B76005D64E0 /* init.lisp */; };
- A745C4120E6189EB00C43A04 /* list-functions-2.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A834070E477B76005D64E0 /* list-functions-2.lisp */; };
- A745C4130E6189EB00C43A04 /* list-functions.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A834080E477B76005D64E0 /* list-functions.lisp */; };
- A745C4140E6189EB00C43A04 /* numbers.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A834090E477B76005D64E0 /* numbers.lisp */; };
- A745C4150E6189EB00C43A04 /* reader.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8340A0E477B76005D64E0 /* reader.lisp */; };
- A745C4160E6189EB00C43A04 /* sharpsign.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8340B0E477B76005D64E0 /* sharpsign.lisp */; };
- A745C4170E6189EB00C43A04 /* types.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8340C0E477B76005D64E0 /* types.lisp */; };
- A745C4180E6189EB00C43A04 /* util.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8340D0E477B76005D64E0 /* util.lisp */; };
- A745C41A0E6189EB00C43A04 /* array.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A835670E477C26005D64E0 /* array.lisp */; };
- A745C41B0E6189EB00C43A04 /* character.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A835680E477C26005D64E0 /* character.lisp */; };
- A745C41C0E6189EB00C43A04 /* clos.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A835690E477C26005D64E0 /* clos.lisp */; };
- A745C41D0E6189EB00C43A04 /* condition.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8356A0E477C26005D64E0 /* condition.lisp */; };
- A745C41E0E6189EB00C43A04 /* cons.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8356B0E477C26005D64E0 /* cons.lisp */; };
- A745C41F0E6189EB00C43A04 /* core.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8356C0E477C26005D64E0 /* core.lisp */; };
- A745C4200E6189EB00C43A04 /* data-and-control.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8356D0E477C26005D64E0 /* data-and-control.lisp */; };
- A745C4210E6189EB00C43A04 /* do.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8356E0E477C26005D64E0 /* do.lisp */; };
- A745C4220E6189EB00C43A04 /* eval.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8356F0E477C26005D64E0 /* eval.lisp */; };
- A745C4230E6189EB00C43A04 /* hash-table.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A835700E477C26005D64E0 /* hash-table.lisp */; };
- A745C4240E6189EB00C43A04 /* init.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A835710E477C26005D64E0 /* init.lisp */; };
- A745C4250E6189EB00C43A04 /* loop.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A835720E477C26005D64E0 /* loop.lisp */; };
- A745C4260E6189EB00C43A04 /* package.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A835730E477C26005D64E0 /* package.lisp */; };
- A745C4270E6189EB00C43A04 /* printer.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A835740E477C26005D64E0 /* printer.lisp */; };
- A745C4280E6189EB00C43A04 /* reader.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A835750E477C26005D64E0 /* reader.lisp */; };
- A745C4290E6189EB00C43A04 /* sequence.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A835760E477C26005D64E0 /* sequence.lisp */; };
- A745C42A0E6189EB00C43A04 /* share-2.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A835770E477C26005D64E0 /* share-2.lisp */; };
- A745C42B0E6189EB00C43A04 /* share.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A835780E477C26005D64E0 /* share.lisp */; };
- A745C42C0E6189EB00C43A04 /* stand-in.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A835790E477C26005D64E0 /* stand-in.lisp */; };
- A745C42D0E6189EB00C43A04 /* stream.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8357A0E477C26005D64E0 /* stream.lisp */; };
- A745C42E0E6189EB00C43A04 /* string.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8357B0E477C26005D64E0 /* string.lisp */; };
- A745C42F0E6189EB00C43A04 /* symbol.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8357C0E477C26005D64E0 /* symbol.lisp */; };
- A745C4300E6189EB00C43A04 /* testbed.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8357D0E477C26005D64E0 /* testbed.lisp */; };
A745C44E0E618B2C00C43A04 /* MLKLLVMCompiler.h in Headers */ = {isa = PBXBuildFile; fileRef = A78713850E4EFF5D00A7191F /* MLKLLVMCompiler.h */; };
A745C44F0E618B2C00C43A04 /* MLKLexicalContext-MLKLLVMCompilation.h in Headers */ = {isa = PBXBuildFile; fileRef = A72E9E6D0E5220B700BDE40F /* MLKLexicalContext-MLKLLVMCompilation.h */; };
A78711320E4C459200A7191F /* globals.m in Sources */ = {isa = PBXBuildFile; fileRef = A787112E0E4C459200A7191F /* globals.m */; };
@@ -114,42 +78,6 @@
A7A833950E476D0D005D64E0 /* MLKDispatchingMacroCharacterReader.h in Headers */ = {isa = PBXBuildFile; fileRef = A7A8338F0E476D0D005D64E0 /* MLKDispatchingMacroCharacterReader.h */; };
A7A833960E476D0D005D64E0 /* MLKSharpsignColonReader.h in Headers */ = {isa = PBXBuildFile; fileRef = A7A833900E476D0D005D64E0 /* MLKSharpsignColonReader.h */; };
A7A833970E476D0D005D64E0 /* MLKValuesFunction.h in Headers */ = {isa = PBXBuildFile; fileRef = A7A833910E476D0D005D64E0 /* MLKValuesFunction.h */; };
- A7A8341B0E477B80005D64E0 /* control-flow.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A834010E477B76005D64E0 /* control-flow.lisp */; };
- A7A8341C0E477B80005D64E0 /* defun-0.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A834020E477B76005D64E0 /* defun-0.lisp */; };
- A7A8341D0E477B80005D64E0 /* defun-1.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A834030E477B76005D64E0 /* defun-1.lisp */; };
- A7A8341E0E477B80005D64E0 /* destructuring-bind.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A834040E477B76005D64E0 /* destructuring-bind.lisp */; };
- A7A8341F0E477B80005D64E0 /* evaluation.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A834050E477B76005D64E0 /* evaluation.lisp */; };
- A7A834200E477B80005D64E0 /* init.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A834060E477B76005D64E0 /* init.lisp */; };
- A7A834210E477B80005D64E0 /* list-functions-2.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A834070E477B76005D64E0 /* list-functions-2.lisp */; };
- A7A834220E477B80005D64E0 /* list-functions.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A834080E477B76005D64E0 /* list-functions.lisp */; };
- A7A834230E477B80005D64E0 /* numbers.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A834090E477B76005D64E0 /* numbers.lisp */; };
- A7A834240E477B80005D64E0 /* reader.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8340A0E477B76005D64E0 /* reader.lisp */; };
- A7A834250E477B80005D64E0 /* sharpsign.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8340B0E477B76005D64E0 /* sharpsign.lisp */; };
- A7A834260E477B80005D64E0 /* types.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8340C0E477B76005D64E0 /* types.lisp */; };
- A7A834270E477B80005D64E0 /* util.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8340D0E477B76005D64E0 /* util.lisp */; };
- A7A835E00E477C7F005D64E0 /* array.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A835670E477C26005D64E0 /* array.lisp */; };
- A7A835E10E477C7F005D64E0 /* character.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A835680E477C26005D64E0 /* character.lisp */; };
- A7A835E20E477C7F005D64E0 /* clos.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A835690E477C26005D64E0 /* clos.lisp */; };
- A7A835E30E477C7F005D64E0 /* condition.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8356A0E477C26005D64E0 /* condition.lisp */; };
- A7A835E40E477C7F005D64E0 /* cons.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8356B0E477C26005D64E0 /* cons.lisp */; };
- A7A835E50E477C7F005D64E0 /* core.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8356C0E477C26005D64E0 /* core.lisp */; };
- A7A835E60E477C7F005D64E0 /* data-and-control.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8356D0E477C26005D64E0 /* data-and-control.lisp */; };
- A7A835E70E477C7F005D64E0 /* do.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8356E0E477C26005D64E0 /* do.lisp */; };
- A7A835E80E477C7F005D64E0 /* eval.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8356F0E477C26005D64E0 /* eval.lisp */; };
- A7A835E90E477C7F005D64E0 /* hash-table.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A835700E477C26005D64E0 /* hash-table.lisp */; };
- A7A835EA0E477C7F005D64E0 /* init.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A835710E477C26005D64E0 /* init.lisp */; };
- A7A835EB0E477C7F005D64E0 /* loop.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A835720E477C26005D64E0 /* loop.lisp */; };
- A7A835EC0E477C7F005D64E0 /* package.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A835730E477C26005D64E0 /* package.lisp */; };
- A7A835ED0E477C7F005D64E0 /* printer.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A835740E477C26005D64E0 /* printer.lisp */; };
- A7A835EE0E477C7F005D64E0 /* reader.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A835750E477C26005D64E0 /* reader.lisp */; };
- A7A835EF0E477C7F005D64E0 /* sequence.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A835760E477C26005D64E0 /* sequence.lisp */; };
- A7A835F00E477C7F005D64E0 /* share-2.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A835770E477C26005D64E0 /* share-2.lisp */; };
- A7A835F10E477C7F005D64E0 /* share.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A835780E477C26005D64E0 /* share.lisp */; };
- A7A835F20E477C7F005D64E0 /* stand-in.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A835790E477C26005D64E0 /* stand-in.lisp */; };
- A7A835F30E477C7F005D64E0 /* stream.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8357A0E477C26005D64E0 /* stream.lisp */; };
- A7A835F40E477C7F005D64E0 /* string.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8357B0E477C26005D64E0 /* string.lisp */; };
- A7A835F50E477C7F005D64E0 /* symbol.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8357C0E477C26005D64E0 /* symbol.lisp */; };
- A7A835F60E477C7F005D64E0 /* testbed.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8357D0E477C26005D64E0 /* testbed.lisp */; };
A7A85D5B0E668CA700021916 /* ToiletLisp_main.m in Sources */ = {isa = PBXBuildFile; fileRef = A7A85D5A0E668CA700021916 /* ToiletLisp_main.m */; };
A7A85DDE0E668DEF00021916 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A7E5C55B0E21740C00A01D81 /* Foundation.framework */; };
A7A85DE00E668E1500021916 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A7A85DDF0E668E1500021916 /* AppKit.framework */; };
@@ -170,46 +98,7 @@
A7A8602D0E66FEFB00021916 /* MLKStreamStream.h in Headers */ = {isa = PBXBuildFile; fileRef = A7A860230E66FEFB00021916 /* MLKStreamStream.h */; };
A7A8602E0E66FEFB00021916 /* MLKStreamStream.m in Sources */ = {isa = PBXBuildFile; fileRef = A7A860240E66FEFB00021916 /* MLKStreamStream.m */; };
A7A8603E0E6700D000021916 /* MLKToiletApplicationController.m in Sources */ = {isa = PBXBuildFile; fileRef = A7A8603D0E6700D000021916 /* MLKToiletApplicationController.m */; };
- A7A860800E67058900021916 /* array.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A787112C0E4C456C00A7191F /* array.lisp */; };
- A7A860810E67058900021916 /* control-flow.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A834010E477B76005D64E0 /* control-flow.lisp */; };
- A7A860820E67058900021916 /* defun-0.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A834020E477B76005D64E0 /* defun-0.lisp */; };
- A7A860830E67058900021916 /* defun-1.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A834030E477B76005D64E0 /* defun-1.lisp */; };
- A7A860840E67058900021916 /* destructuring-bind.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A834040E477B76005D64E0 /* destructuring-bind.lisp */; };
- A7A860850E67058900021916 /* evaluation.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A834050E477B76005D64E0 /* evaluation.lisp */; };
- A7A860860E67058900021916 /* ffi.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A787138B0E4EFF8A00A7191F /* ffi.lisp */; };
- A7A860870E67058900021916 /* init.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A834060E477B76005D64E0 /* init.lisp */; };
- A7A860880E67058900021916 /* list-functions-2.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A834070E477B76005D64E0 /* list-functions-2.lisp */; };
- A7A860890E67058900021916 /* list-functions.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A834080E477B76005D64E0 /* list-functions.lisp */; };
- A7A8608A0E67058900021916 /* numbers.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A834090E477B76005D64E0 /* numbers.lisp */; };
- A7A8608B0E67058900021916 /* package.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A787138C0E4EFF8A00A7191F /* package.lisp */; };
- A7A8608C0E67058900021916 /* reader.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8340A0E477B76005D64E0 /* reader.lisp */; };
- A7A8608D0E67058900021916 /* sharpsign.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8340B0E477B76005D64E0 /* sharpsign.lisp */; };
- A7A8608E0E67058900021916 /* string.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A787138D0E4EFF8A00A7191F /* string.lisp */; };
- A7A8608F0E67058900021916 /* types.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8340C0E477B76005D64E0 /* types.lisp */; };
- A7A860900E67058900021916 /* util.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8340D0E477B76005D64E0 /* util.lisp */; };
- A7A860940E6705B300021916 /* array.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A835670E477C26005D64E0 /* array.lisp */; };
- A7A860950E6705B300021916 /* character.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A835680E477C26005D64E0 /* character.lisp */; };
- A7A860960E6705B300021916 /* clos.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A835690E477C26005D64E0 /* clos.lisp */; };
- A7A860970E6705B300021916 /* condition.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8356A0E477C26005D64E0 /* condition.lisp */; };
- A7A860980E6705B300021916 /* cons.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8356B0E477C26005D64E0 /* cons.lisp */; };
- A7A860990E6705B300021916 /* core.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8356C0E477C26005D64E0 /* core.lisp */; };
- A7A8609A0E6705B300021916 /* data-and-control.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8356D0E477C26005D64E0 /* data-and-control.lisp */; };
- A7A8609B0E6705B300021916 /* do.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8356E0E477C26005D64E0 /* do.lisp */; };
- A7A8609C0E6705B300021916 /* eval.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8356F0E477C26005D64E0 /* eval.lisp */; };
- A7A8609D0E6705B300021916 /* hash-table.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A835700E477C26005D64E0 /* hash-table.lisp */; };
- A7A8609E0E6705B300021916 /* init.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A835710E477C26005D64E0 /* init.lisp */; };
- A7A8609F0E6705B300021916 /* loop.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A835720E477C26005D64E0 /* loop.lisp */; };
- A7A860A00E6705B300021916 /* package.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A835730E477C26005D64E0 /* package.lisp */; };
- A7A860A10E6705B300021916 /* printer.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A835740E477C26005D64E0 /* printer.lisp */; };
- A7A860A20E6705B300021916 /* reader.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A835750E477C26005D64E0 /* reader.lisp */; };
- A7A860A30E6705B300021916 /* sequence.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A835760E477C26005D64E0 /* sequence.lisp */; };
- A7A860A40E6705B300021916 /* share-2.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A835770E477C26005D64E0 /* share-2.lisp */; };
- A7A860A50E6705B300021916 /* share.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A835780E477C26005D64E0 /* share.lisp */; };
- A7A860A60E6705B300021916 /* stand-in.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A835790E477C26005D64E0 /* stand-in.lisp */; };
- A7A860A70E6705B300021916 /* stream.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8357A0E477C26005D64E0 /* stream.lisp */; };
- A7A860A80E6705B300021916 /* string.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8357B0E477C26005D64E0 /* string.lisp */; };
- A7A860A90E6705B300021916 /* symbol.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8357C0E477C26005D64E0 /* symbol.lisp */; };
- A7A860AA0E6705B300021916 /* testbed.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8357D0E477C26005D64E0 /* testbed.lisp */; };
+ A7A861490E67500500021916 /* ToiletKit.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7E5C3EB0E21689F00A01D81 /* ToiletKit.framework */; };
A7B6D0C20E22094F006F6A21 /* MLKStringOutputStream.h in Headers */ = {isa = PBXBuildFile; fileRef = A7B6D0C00E22094F006F6A21 /* MLKStringOutputStream.h */; };
A7B6D0C30E22094F006F6A21 /* MLKStringOutputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = A7B6D0C10E22094F006F6A21 /* MLKStringOutputStream.m */; };
A7E5C43E0E21695800A01D81 /* MLKBinding.h in Headers */ = {isa = PBXBuildFile; fileRef = A7E5C3F80E21695700A01D81 /* MLKBinding.h */; };
@@ -319,65 +208,11 @@
/* End PBXContainerItemProxy section */
/* Begin PBXCopyFilesBuildPhase section */
- A745C40B0E6189EB00C43A04 /* CopyFiles */ = {
- isa = PBXCopyFilesBuildPhase;
- buildActionMask = 2147483647;
- dstPath = "";
- dstSubfolderSpec = 16;
- files = (
- A745C40C0E6189EB00C43A04 /* control-flow.lisp in CopyFiles */,
- A745C40D0E6189EB00C43A04 /* defun-0.lisp in CopyFiles */,
- A745C40E0E6189EB00C43A04 /* defun-1.lisp in CopyFiles */,
- A745C40F0E6189EB00C43A04 /* destructuring-bind.lisp in CopyFiles */,
- A745C4100E6189EB00C43A04 /* evaluation.lisp in CopyFiles */,
- A745C4110E6189EB00C43A04 /* init.lisp in CopyFiles */,
- A745C4120E6189EB00C43A04 /* list-functions-2.lisp in CopyFiles */,
- A745C4130E6189EB00C43A04 /* list-functions.lisp in CopyFiles */,
- A745C4140E6189EB00C43A04 /* numbers.lisp in CopyFiles */,
- A745C4150E6189EB00C43A04 /* reader.lisp in CopyFiles */,
- A745C4160E6189EB00C43A04 /* sharpsign.lisp in CopyFiles */,
- A745C4170E6189EB00C43A04 /* types.lisp in CopyFiles */,
- A745C4180E6189EB00C43A04 /* util.lisp in CopyFiles */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
- A745C4190E6189EB00C43A04 /* CopyFiles */ = {
- isa = PBXCopyFilesBuildPhase;
- buildActionMask = 2147483647;
- dstPath = Sacla;
- dstSubfolderSpec = 16;
- files = (
- A745C41A0E6189EB00C43A04 /* array.lisp in CopyFiles */,
- A745C41B0E6189EB00C43A04 /* character.lisp in CopyFiles */,
- A745C41C0E6189EB00C43A04 /* clos.lisp in CopyFiles */,
- A745C41D0E6189EB00C43A04 /* condition.lisp in CopyFiles */,
- A745C41E0E6189EB00C43A04 /* cons.lisp in CopyFiles */,
- A745C41F0E6189EB00C43A04 /* core.lisp in CopyFiles */,
- A745C4200E6189EB00C43A04 /* data-and-control.lisp in CopyFiles */,
- A745C4210E6189EB00C43A04 /* do.lisp in CopyFiles */,
- A745C4220E6189EB00C43A04 /* eval.lisp in CopyFiles */,
- A745C4230E6189EB00C43A04 /* hash-table.lisp in CopyFiles */,
- A745C4240E6189EB00C43A04 /* init.lisp in CopyFiles */,
- A745C4250E6189EB00C43A04 /* loop.lisp in CopyFiles */,
- A745C4260E6189EB00C43A04 /* package.lisp in CopyFiles */,
- A745C4270E6189EB00C43A04 /* printer.lisp in CopyFiles */,
- A745C4280E6189EB00C43A04 /* reader.lisp in CopyFiles */,
- A745C4290E6189EB00C43A04 /* sequence.lisp in CopyFiles */,
- A745C42A0E6189EB00C43A04 /* share-2.lisp in CopyFiles */,
- A745C42B0E6189EB00C43A04 /* share.lisp in CopyFiles */,
- A745C42C0E6189EB00C43A04 /* stand-in.lisp in CopyFiles */,
- A745C42D0E6189EB00C43A04 /* stream.lisp in CopyFiles */,
- A745C42E0E6189EB00C43A04 /* string.lisp in CopyFiles */,
- A745C42F0E6189EB00C43A04 /* symbol.lisp in CopyFiles */,
- A745C4300E6189EB00C43A04 /* testbed.lisp in CopyFiles */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
A787116F0E4C4A0200A7191F /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
- dstSubfolderSpec = 16;
+ dstSubfolderSpec = 7;
files = (
A78712010E4C4AC500A7191F /* array.lisp in CopyFiles */,
A78712020E4C4AC500A7191F /* control-flow.lisp in CopyFiles */,
@@ -403,7 +238,7 @@
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = Sacla;
- dstSubfolderSpec = 16;
+ dstSubfolderSpec = 7;
files = (
A787120F0E4C4ADE00A7191F /* array.lisp in CopyFiles */,
A78712100E4C4ADE00A7191F /* character.lisp in CopyFiles */,
@@ -431,115 +266,13 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
- A7A833FD0E477B33005D64E0 /* CopyFiles */ = {
- isa = PBXCopyFilesBuildPhase;
- buildActionMask = 2147483647;
- dstPath = "";
- dstSubfolderSpec = 16;
- files = (
- A7A8341B0E477B80005D64E0 /* control-flow.lisp in CopyFiles */,
- A7A8341C0E477B80005D64E0 /* defun-0.lisp in CopyFiles */,
- A7A8341D0E477B80005D64E0 /* defun-1.lisp in CopyFiles */,
- A7A8341E0E477B80005D64E0 /* destructuring-bind.lisp in CopyFiles */,
- A7A8341F0E477B80005D64E0 /* evaluation.lisp in CopyFiles */,
- A7A834200E477B80005D64E0 /* init.lisp in CopyFiles */,
- A7A834210E477B80005D64E0 /* list-functions-2.lisp in CopyFiles */,
- A7A834220E477B80005D64E0 /* list-functions.lisp in CopyFiles */,
- A7A834230E477B80005D64E0 /* numbers.lisp in CopyFiles */,
- A7A834240E477B80005D64E0 /* reader.lisp in CopyFiles */,
- A7A834250E477B80005D64E0 /* sharpsign.lisp in CopyFiles */,
- A7A834260E477B80005D64E0 /* types.lisp in CopyFiles */,
- A7A834270E477B80005D64E0 /* util.lisp in CopyFiles */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
- A7A835DE0E477C67005D64E0 /* CopyFiles */ = {
- isa = PBXCopyFilesBuildPhase;
- buildActionMask = 2147483647;
- dstPath = Sacla;
- dstSubfolderSpec = 16;
- files = (
- A7A835E00E477C7F005D64E0 /* array.lisp in CopyFiles */,
- A7A835E10E477C7F005D64E0 /* character.lisp in CopyFiles */,
- A7A835E20E477C7F005D64E0 /* clos.lisp in CopyFiles */,
- A7A835E30E477C7F005D64E0 /* condition.lisp in CopyFiles */,
- A7A835E40E477C7F005D64E0 /* cons.lisp in CopyFiles */,
- A7A835E50E477C7F005D64E0 /* core.lisp in CopyFiles */,
- A7A835E60E477C7F005D64E0 /* data-and-control.lisp in CopyFiles */,
- A7A835E70E477C7F005D64E0 /* do.lisp in CopyFiles */,
- A7A835E80E477C7F005D64E0 /* eval.lisp in CopyFiles */,
- A7A835E90E477C7F005D64E0 /* hash-table.lisp in CopyFiles */,
- A7A835EA0E477C7F005D64E0 /* init.lisp in CopyFiles */,
- A7A835EB0E477C7F005D64E0 /* loop.lisp in CopyFiles */,
- A7A835EC0E477C7F005D64E0 /* package.lisp in CopyFiles */,
- A7A835ED0E477C7F005D64E0 /* printer.lisp in CopyFiles */,
- A7A835EE0E477C7F005D64E0 /* reader.lisp in CopyFiles */,
- A7A835EF0E477C7F005D64E0 /* sequence.lisp in CopyFiles */,
- A7A835F00E477C7F005D64E0 /* share-2.lisp in CopyFiles */,
- A7A835F10E477C7F005D64E0 /* share.lisp in CopyFiles */,
- A7A835F20E477C7F005D64E0 /* stand-in.lisp in CopyFiles */,
- A7A835F30E477C7F005D64E0 /* stream.lisp in CopyFiles */,
- A7A835F40E477C7F005D64E0 /* string.lisp in CopyFiles */,
- A7A835F50E477C7F005D64E0 /* symbol.lisp in CopyFiles */,
- A7A835F60E477C7F005D64E0 /* testbed.lisp in CopyFiles */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
- A7A8607E0E67051B00021916 /* CopyFiles */ = {
+ A7A861410E674FE100021916 /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
- dstSubfolderSpec = 6;
+ dstSubfolderSpec = 10;
files = (
- A7A860800E67058900021916 /* array.lisp in CopyFiles */,
- A7A860810E67058900021916 /* control-flow.lisp in CopyFiles */,
- A7A860820E67058900021916 /* defun-0.lisp in CopyFiles */,
- A7A860830E67058900021916 /* defun-1.lisp in CopyFiles */,
- A7A860840E67058900021916 /* destructuring-bind.lisp in CopyFiles */,
- A7A860850E67058900021916 /* evaluation.lisp in CopyFiles */,
- A7A860860E67058900021916 /* ffi.lisp in CopyFiles */,
- A7A860870E67058900021916 /* init.lisp in CopyFiles */,
- A7A860880E67058900021916 /* list-functions-2.lisp in CopyFiles */,
- A7A860890E67058900021916 /* list-functions.lisp in CopyFiles */,
- A7A8608A0E67058900021916 /* numbers.lisp in CopyFiles */,
- A7A8608B0E67058900021916 /* package.lisp in CopyFiles */,
- A7A8608C0E67058900021916 /* reader.lisp in CopyFiles */,
- A7A8608D0E67058900021916 /* sharpsign.lisp in CopyFiles */,
- A7A8608E0E67058900021916 /* string.lisp in CopyFiles */,
- A7A8608F0E67058900021916 /* types.lisp in CopyFiles */,
- A7A860900E67058900021916 /* util.lisp in CopyFiles */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
- A7A860920E67059900021916 /* CopyFiles */ = {
- isa = PBXCopyFilesBuildPhase;
- buildActionMask = 2147483647;
- dstPath = Sacla;
- dstSubfolderSpec = 6;
- files = (
- A7A860940E6705B300021916 /* array.lisp in CopyFiles */,
- A7A860950E6705B300021916 /* character.lisp in CopyFiles */,
- A7A860960E6705B300021916 /* clos.lisp in CopyFiles */,
- A7A860970E6705B300021916 /* condition.lisp in CopyFiles */,
- A7A860980E6705B300021916 /* cons.lisp in CopyFiles */,
- A7A860990E6705B300021916 /* core.lisp in CopyFiles */,
- A7A8609A0E6705B300021916 /* data-and-control.lisp in CopyFiles */,
- A7A8609B0E6705B300021916 /* do.lisp in CopyFiles */,
- A7A8609C0E6705B300021916 /* eval.lisp in CopyFiles */,
- A7A8609D0E6705B300021916 /* hash-table.lisp in CopyFiles */,
- A7A8609E0E6705B300021916 /* init.lisp in CopyFiles */,
- A7A8609F0E6705B300021916 /* loop.lisp in CopyFiles */,
- A7A860A00E6705B300021916 /* package.lisp in CopyFiles */,
- A7A860A10E6705B300021916 /* printer.lisp in CopyFiles */,
- A7A860A20E6705B300021916 /* reader.lisp in CopyFiles */,
- A7A860A30E6705B300021916 /* sequence.lisp in CopyFiles */,
- A7A860A40E6705B300021916 /* share-2.lisp in CopyFiles */,
- A7A860A50E6705B300021916 /* share.lisp in CopyFiles */,
- A7A860A60E6705B300021916 /* stand-in.lisp in CopyFiles */,
- A7A860A70E6705B300021916 /* stream.lisp in CopyFiles */,
- A7A860A80E6705B300021916 /* string.lisp in CopyFiles */,
- A7A860A90E6705B300021916 /* symbol.lisp in CopyFiles */,
- A7A860AA0E6705B300021916 /* testbed.lisp in CopyFiles */,
+ A7A861490E67500500021916 /* ToiletKit.framework in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1064,8 +797,7 @@
A72BC6EA0E65DE4600486804 /* Resources */,
A72BC6EB0E65DE4600486804 /* Sources */,
A72BC6EC0E65DE4600486804 /* Frameworks */,
- A7A8607E0E67051B00021916 /* CopyFiles */,
- A7A860920E67059900021916 /* CopyFiles */,
+ A7A861410E674FE100021916 /* CopyFiles */,
);
buildRules = (
);
@@ -1101,8 +833,6 @@
buildPhases = (
A745C4070E6189EB00C43A04 /* Sources */,
A745C4090E6189EB00C43A04 /* Frameworks */,
- A745C40B0E6189EB00C43A04 /* CopyFiles */,
- A745C4190E6189EB00C43A04 /* CopyFiles */,
);
buildRules = (
);
@@ -1139,8 +869,6 @@
buildPhases = (
A7E5C3F00E21690200A01D81 /* Sources */,
A7E5C3F10E21690200A01D81 /* Frameworks */,
- A7A833FD0E477B33005D64E0 /* CopyFiles */,
- A7A835DE0E477C67005D64E0 /* CopyFiles */,
);
buildRules = (
);
@@ -2504,7 +2232,7 @@
GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
HEADER_SEARCH_PATHS = /opt/local/include;
INFOPLIST_FILE = "ToiletKit-Info.plist";
- INSTALL_PATH = "$(HOME)/Library/Frameworks";
+ INSTALL_PATH = /Library/Frameworks;
LIBRARY_SEARCH_PATHS = /opt/local/lib;
MACOSX_DEPLOYMENT_TARGET = "";
OTHER_CFLAGS = "-DHAVE_FFI_H";
diff --git a/init.lisp b/init.lisp
index 71a4211..87ac802 100644
--- a/init.lisp
+++ b/init.lisp
@@ -18,34 +18,34 @@
(in-package #:common-lisp)
-(load "util.lisp")
-(load "defun-0.lisp")
-(load "list-functions.lisp")
-(load "destructuring-bind.lisp")
-(load "defun-1.lisp")
-(load "list-functions.lisp")
-(load "reader.lisp")
-(load "sharpsign.lisp")
-(load "control-flow.lisp")
-(load "types.lisp")
-(load "numbers.lisp")
-(load "list-functions-2.lisp")
-(load "ffi.lisp")
-
-(load "Sacla/share.lisp")
-(load "Sacla/do.lisp")
-
-(load "evaluation.lisp")
-
-(load "Sacla/share-2.lisp")
-
-(load "Sacla/data-and-control.lisp")
-
-(load "array.lisp")
-(load "Sacla/array.lisp")
-
-(load "string.lisp")
-(load "package.lisp")
+(require "util.lisp")
+(require "defun-0.lisp")
+(require "list-functions.lisp")
+(require "destructuring-bind.lisp")
+(require "defun-1.lisp")
+(require "list-functions.lisp")
+(require "reader.lisp")
+(require "sharpsign.lisp")
+(require "control-flow.lisp")
+(require "types.lisp")
+(require "numbers.lisp")
+(require "list-functions-2.lisp")
+(require "ffi.lisp")
+
+(require "Sacla/share.lisp")
+(require "Sacla/do.lisp")
+
+(require "evaluation.lisp")
+
+(require "Sacla/share-2.lisp")
+
+(require "Sacla/data-and-control.lisp")
+
+(require "array.lisp")
+(require "Sacla/array.lisp")
+
+(require "string.lisp")
+(require "package.lisp")
(setq *system-initialised-p* t)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-21 20:32:59 +0000