From aaad91784fdd7264b141965b7121b49ea6dc5ad3 Mon Sep 17 00:00:00 2001 From: Matthias Benkard Date: Fri, 8 Aug 2008 11:58:54 +0200 Subject: MLKArray: Improve portability. --- MLKArray.m | 7 +++++-- functions.h | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/MLKArray.m b/MLKArray.m index db13c69..5890953 100644 --- a/MLKArray.m +++ b/MLKArray.m @@ -26,6 +26,7 @@ #include #include +#include @implementation MLKArray @@ -115,7 +116,8 @@ static int eq (const void *x, const void *y) -(NSUInteger) indexOfObjectIdenticalTo:(id)anObject inRange:(NSRange)range { // FIXME: How to treat [NSNull null]? - return ((id*)lfind (anObject, _buffer + range.location, &range.length, sizeof(id), eq) + size_t length = range.length; + return ((id*)lfind (anObject, _buffer + range.location, &length, sizeof(id), eq) - _buffer) / sizeof(id); } @@ -133,7 +135,8 @@ static int equalp (const void *x, const void *y) -(NSUInteger) indexOfObject:(id)anObject inRange:(NSRange)range { // FIXME: How to treat [NSNull null]? - return ((id*)lfind (anObject, _buffer + range.location, &range.length, sizeof(id), equalp) + size_t length = range.length; + return ((id*)lfind (anObject, _buffer + range.location, &length, sizeof(id), equalp) - _buffer) / sizeof(id); } diff --git a/functions.h b/functions.h index e635220..f322d7a 100644 --- a/functions.h +++ b/functions.h @@ -25,6 +25,8 @@ #include #elif HAVE_FFI_FFI_H #include +#else +#error "Couldn't include ffi.h." #endif -- cgit v1.2.3 From c6591746d39dd039bafe5b628fde8f4de1930b6b Mon Sep 17 00:00:00 2001 From: Matthias Benkard Date: Fri, 8 Aug 2008 12:00:30 +0200 Subject: Update Xcode project. --- Toilet Lisp.xcodeproj/project.pbxproj | 393 ++++++++++++++++++++++++++-------- 1 file changed, 298 insertions(+), 95 deletions(-) diff --git a/Toilet Lisp.xcodeproj/project.pbxproj b/Toilet Lisp.xcodeproj/project.pbxproj index 8c44e8f..3538ced 100644 --- a/Toilet Lisp.xcodeproj/project.pbxproj +++ b/Toilet Lisp.xcodeproj/project.pbxproj @@ -7,6 +7,51 @@ objects = { /* Begin PBXBuildFile section */ + A78711320E4C459200A7191F /* globals.m in Sources */ = {isa = PBXBuildFile; fileRef = A787112E0E4C459200A7191F /* globals.m */; }; + A78711330E4C459200A7191F /* MLKArray.m in Sources */ = {isa = PBXBuildFile; fileRef = A787112F0E4C459200A7191F /* MLKArray.m */; }; + A78711340E4C459200A7191F /* MLKCompiledProcedure.m in Sources */ = {isa = PBXBuildFile; fileRef = A78711300E4C459200A7191F /* MLKCompiledProcedure.m */; }; + A78711350E4C459200A7191F /* MLKForeignProcedure.m in Sources */ = {isa = PBXBuildFile; fileRef = A78711310E4C459200A7191F /* MLKForeignProcedure.m */; }; + A787113A0E4C45A300A7191F /* globals.h in Headers */ = {isa = PBXBuildFile; fileRef = A78711360E4C45A300A7191F /* globals.h */; }; + A787113B0E4C45A300A7191F /* MLKArray.h in Headers */ = {isa = PBXBuildFile; fileRef = A78711370E4C45A300A7191F /* MLKArray.h */; }; + A787113C0E4C45A300A7191F /* MLKCompiledProcedure.h in Headers */ = {isa = PBXBuildFile; fileRef = A78711380E4C45A300A7191F /* MLKCompiledProcedure.h */; }; + A787113D0E4C45A300A7191F /* MLKForeignProcedure.h in Headers */ = {isa = PBXBuildFile; fileRef = A78711390E4C45A300A7191F /* MLKForeignProcedure.h */; }; + A78712010E4C4AC500A7191F /* array.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A787112C0E4C456C00A7191F /* array.lisp */; }; + A78712020E4C4AC500A7191F /* control-flow.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A834010E477B76005D64E0 /* control-flow.lisp */; }; + A78712030E4C4AC500A7191F /* defun-0.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A834020E477B76005D64E0 /* defun-0.lisp */; }; + A78712040E4C4AC500A7191F /* defun-1.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A834030E477B76005D64E0 /* defun-1.lisp */; }; + A78712050E4C4AC500A7191F /* destructuring-bind.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A834040E477B76005D64E0 /* destructuring-bind.lisp */; }; + A78712060E4C4AC500A7191F /* evaluation.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A834050E477B76005D64E0 /* evaluation.lisp */; }; + A78712070E4C4AC500A7191F /* init.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A834060E477B76005D64E0 /* init.lisp */; }; + A78712080E4C4AC500A7191F /* list-functions-2.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A834070E477B76005D64E0 /* list-functions-2.lisp */; }; + A78712090E4C4AC500A7191F /* list-functions.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A834080E477B76005D64E0 /* list-functions.lisp */; }; + A787120A0E4C4AC500A7191F /* numbers.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A834090E477B76005D64E0 /* numbers.lisp */; }; + A787120B0E4C4AC500A7191F /* reader.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8340A0E477B76005D64E0 /* reader.lisp */; }; + A787120C0E4C4AC500A7191F /* sharpsign.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8340B0E477B76005D64E0 /* sharpsign.lisp */; }; + A787120D0E4C4AC500A7191F /* types.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8340C0E477B76005D64E0 /* types.lisp */; }; + A787120E0E4C4AC500A7191F /* util.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8340D0E477B76005D64E0 /* util.lisp */; }; + A787120F0E4C4ADE00A7191F /* array.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A835670E477C26005D64E0 /* array.lisp */; }; + A78712100E4C4ADE00A7191F /* character.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A835680E477C26005D64E0 /* character.lisp */; }; + A78712110E4C4ADE00A7191F /* clos.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A835690E477C26005D64E0 /* clos.lisp */; }; + A78712120E4C4ADE00A7191F /* condition.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8356A0E477C26005D64E0 /* condition.lisp */; }; + A78712130E4C4ADE00A7191F /* cons.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8356B0E477C26005D64E0 /* cons.lisp */; }; + A78712140E4C4ADE00A7191F /* core.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8356C0E477C26005D64E0 /* core.lisp */; }; + A78712150E4C4ADE00A7191F /* data-and-control.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8356D0E477C26005D64E0 /* data-and-control.lisp */; }; + A78712160E4C4ADE00A7191F /* do.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8356E0E477C26005D64E0 /* do.lisp */; }; + A78712170E4C4ADE00A7191F /* eval.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8356F0E477C26005D64E0 /* eval.lisp */; }; + A78712180E4C4ADE00A7191F /* hash-table.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A835700E477C26005D64E0 /* hash-table.lisp */; }; + A78712190E4C4ADE00A7191F /* init.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A835710E477C26005D64E0 /* init.lisp */; }; + A787121A0E4C4ADE00A7191F /* loop.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A835720E477C26005D64E0 /* loop.lisp */; }; + A787121B0E4C4ADE00A7191F /* package.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A835730E477C26005D64E0 /* package.lisp */; }; + A787121C0E4C4ADE00A7191F /* printer.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A835740E477C26005D64E0 /* printer.lisp */; }; + A787121D0E4C4ADE00A7191F /* reader.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A835750E477C26005D64E0 /* reader.lisp */; }; + A787121E0E4C4ADE00A7191F /* sequence.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A835760E477C26005D64E0 /* sequence.lisp */; }; + A787121F0E4C4ADE00A7191F /* share-2.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A835770E477C26005D64E0 /* share-2.lisp */; }; + A78712200E4C4ADE00A7191F /* share.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A835780E477C26005D64E0 /* share.lisp */; }; + A78712210E4C4ADE00A7191F /* stand-in.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A835790E477C26005D64E0 /* stand-in.lisp */; }; + A78712220E4C4ADE00A7191F /* stream.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8357A0E477C26005D64E0 /* stream.lisp */; }; + A78712230E4C4ADE00A7191F /* string.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8357B0E477C26005D64E0 /* string.lisp */; }; + A78712240E4C4ADE00A7191F /* symbol.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8357C0E477C26005D64E0 /* symbol.lisp */; }; + A78712250E4C4ADE00A7191F /* testbed.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A8357D0E477C26005D64E0 /* testbed.lisp */; }; A7A833860E476CF3005D64E0 /* functions.m in Sources */ = {isa = PBXBuildFile; fileRef = A7A833800E476CF3005D64E0 /* functions.m */; }; A7A833870E476CF3005D64E0 /* MLKBackquoteReader.m in Sources */ = {isa = PBXBuildFile; fileRef = A7A833810E476CF3005D64E0 /* MLKBackquoteReader.m */; }; A7A833880E476CF3005D64E0 /* MLKCommaReader.m in Sources */ = {isa = PBXBuildFile; fileRef = A7A833820E476CF3005D64E0 /* MLKCommaReader.m */; }; @@ -19,19 +64,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 */; }; - A7A8340E0E477B76005D64E0 /* control-flow.lisp in Resources */ = {isa = PBXBuildFile; fileRef = A7A834010E477B76005D64E0 /* control-flow.lisp */; }; - A7A8340F0E477B76005D64E0 /* defun-0.lisp in Resources */ = {isa = PBXBuildFile; fileRef = A7A834020E477B76005D64E0 /* defun-0.lisp */; }; - A7A834100E477B76005D64E0 /* defun-1.lisp in Resources */ = {isa = PBXBuildFile; fileRef = A7A834030E477B76005D64E0 /* defun-1.lisp */; }; - A7A834110E477B76005D64E0 /* destructuring-bind.lisp in Resources */ = {isa = PBXBuildFile; fileRef = A7A834040E477B76005D64E0 /* destructuring-bind.lisp */; }; - A7A834120E477B76005D64E0 /* evaluation.lisp in Resources */ = {isa = PBXBuildFile; fileRef = A7A834050E477B76005D64E0 /* evaluation.lisp */; }; - A7A834130E477B76005D64E0 /* init.lisp in Resources */ = {isa = PBXBuildFile; fileRef = A7A834060E477B76005D64E0 /* init.lisp */; }; - A7A834140E477B76005D64E0 /* list-functions-2.lisp in Resources */ = {isa = PBXBuildFile; fileRef = A7A834070E477B76005D64E0 /* list-functions-2.lisp */; }; - A7A834150E477B76005D64E0 /* list-functions.lisp in Resources */ = {isa = PBXBuildFile; fileRef = A7A834080E477B76005D64E0 /* list-functions.lisp */; }; - A7A834160E477B76005D64E0 /* numbers.lisp in Resources */ = {isa = PBXBuildFile; fileRef = A7A834090E477B76005D64E0 /* numbers.lisp */; }; - A7A834170E477B76005D64E0 /* reader.lisp in Resources */ = {isa = PBXBuildFile; fileRef = A7A8340A0E477B76005D64E0 /* reader.lisp */; }; - A7A834180E477B76005D64E0 /* sharpsign.lisp in Resources */ = {isa = PBXBuildFile; fileRef = A7A8340B0E477B76005D64E0 /* sharpsign.lisp */; }; - A7A834190E477B76005D64E0 /* types.lisp in Resources */ = {isa = PBXBuildFile; fileRef = A7A8340C0E477B76005D64E0 /* types.lisp */; }; - A7A8341A0E477B76005D64E0 /* util.lisp in Resources */ = {isa = PBXBuildFile; fileRef = A7A8340D0E477B76005D64E0 /* util.lisp */; }; 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 */; }; @@ -45,32 +77,6 @@ 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 */; }; - A7A835A30E477C27005D64E0 /* array.lisp in Resources */ = {isa = PBXBuildFile; fileRef = A7A835670E477C26005D64E0 /* array.lisp */; }; - A7A835A40E477C27005D64E0 /* character.lisp in Resources */ = {isa = PBXBuildFile; fileRef = A7A835680E477C26005D64E0 /* character.lisp */; }; - A7A835A50E477C27005D64E0 /* clos.lisp in Resources */ = {isa = PBXBuildFile; fileRef = A7A835690E477C26005D64E0 /* clos.lisp */; }; - A7A835A60E477C27005D64E0 /* condition.lisp in Resources */ = {isa = PBXBuildFile; fileRef = A7A8356A0E477C26005D64E0 /* condition.lisp */; }; - A7A835A70E477C27005D64E0 /* cons.lisp in Resources */ = {isa = PBXBuildFile; fileRef = A7A8356B0E477C26005D64E0 /* cons.lisp */; }; - A7A835A80E477C27005D64E0 /* core.lisp in Resources */ = {isa = PBXBuildFile; fileRef = A7A8356C0E477C26005D64E0 /* core.lisp */; }; - A7A835A90E477C27005D64E0 /* data-and-control.lisp in Resources */ = {isa = PBXBuildFile; fileRef = A7A8356D0E477C26005D64E0 /* data-and-control.lisp */; }; - A7A835AA0E477C27005D64E0 /* do.lisp in Resources */ = {isa = PBXBuildFile; fileRef = A7A8356E0E477C26005D64E0 /* do.lisp */; }; - A7A835AB0E477C27005D64E0 /* eval.lisp in Resources */ = {isa = PBXBuildFile; fileRef = A7A8356F0E477C26005D64E0 /* eval.lisp */; }; - A7A835AC0E477C27005D64E0 /* hash-table.lisp in Resources */ = {isa = PBXBuildFile; fileRef = A7A835700E477C26005D64E0 /* hash-table.lisp */; }; - A7A835AD0E477C27005D64E0 /* init.lisp in Resources */ = {isa = PBXBuildFile; fileRef = A7A835710E477C26005D64E0 /* init.lisp */; }; - A7A835AE0E477C27005D64E0 /* loop.lisp in Resources */ = {isa = PBXBuildFile; fileRef = A7A835720E477C26005D64E0 /* loop.lisp */; }; - A7A835AF0E477C27005D64E0 /* package.lisp in Resources */ = {isa = PBXBuildFile; fileRef = A7A835730E477C26005D64E0 /* package.lisp */; }; - A7A835B00E477C27005D64E0 /* printer.lisp in Resources */ = {isa = PBXBuildFile; fileRef = A7A835740E477C26005D64E0 /* printer.lisp */; }; - A7A835B10E477C27005D64E0 /* reader.lisp in Resources */ = {isa = PBXBuildFile; fileRef = A7A835750E477C26005D64E0 /* reader.lisp */; }; - A7A835B20E477C27005D64E0 /* sequence.lisp in Resources */ = {isa = PBXBuildFile; fileRef = A7A835760E477C26005D64E0 /* sequence.lisp */; }; - A7A835B30E477C27005D64E0 /* share-2.lisp in Resources */ = {isa = PBXBuildFile; fileRef = A7A835770E477C26005D64E0 /* share-2.lisp */; }; - A7A835B40E477C27005D64E0 /* share.lisp in Resources */ = {isa = PBXBuildFile; fileRef = A7A835780E477C26005D64E0 /* share.lisp */; }; - A7A835B50E477C27005D64E0 /* stand-in.lisp in Resources */ = {isa = PBXBuildFile; fileRef = A7A835790E477C26005D64E0 /* stand-in.lisp */; }; - A7A835B60E477C27005D64E0 /* stream.lisp in Resources */ = {isa = PBXBuildFile; fileRef = A7A8357A0E477C26005D64E0 /* stream.lisp */; }; - A7A835B70E477C27005D64E0 /* string.lisp in Resources */ = {isa = PBXBuildFile; fileRef = A7A8357B0E477C26005D64E0 /* string.lisp */; }; - A7A835B80E477C27005D64E0 /* symbol.lisp in Resources */ = {isa = PBXBuildFile; fileRef = A7A8357C0E477C26005D64E0 /* symbol.lisp */; }; - A7A835B90E477C27005D64E0 /* testbed.lisp in Resources */ = {isa = PBXBuildFile; fileRef = A7A8357D0E477C26005D64E0 /* testbed.lisp */; }; - A7A835BA0E477C27005D64E0 /* ansi-tests.lisp in Resources */ = {isa = PBXBuildFile; fileRef = A7A8357F0E477C26005D64E0 /* ansi-tests.lisp */; }; - A7A835BB0E477C27005D64E0 /* desirable-printer.lisp in Resources */ = {isa = PBXBuildFile; fileRef = A7A835800E477C26005D64E0 /* desirable-printer.lisp */; }; - A7A835DD0E477C27005D64E0 /* x-sequence.lisp in Resources */ = {isa = PBXBuildFile; fileRef = A7A835A20E477C27005D64E0 /* x-sequence.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 */; }; @@ -179,6 +185,61 @@ /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ + A787116F0E4C4A0200A7191F /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 16; + files = ( + A78712010E4C4AC500A7191F /* array.lisp in CopyFiles */, + A78712020E4C4AC500A7191F /* control-flow.lisp in CopyFiles */, + A78712030E4C4AC500A7191F /* defun-0.lisp in CopyFiles */, + A78712040E4C4AC500A7191F /* defun-1.lisp in CopyFiles */, + A78712050E4C4AC500A7191F /* destructuring-bind.lisp in CopyFiles */, + A78712060E4C4AC500A7191F /* evaluation.lisp in CopyFiles */, + A78712070E4C4AC500A7191F /* init.lisp in CopyFiles */, + A78712080E4C4AC500A7191F /* list-functions-2.lisp in CopyFiles */, + A78712090E4C4AC500A7191F /* list-functions.lisp in CopyFiles */, + A787120A0E4C4AC500A7191F /* numbers.lisp in CopyFiles */, + A787120B0E4C4AC500A7191F /* reader.lisp in CopyFiles */, + A787120C0E4C4AC500A7191F /* sharpsign.lisp in CopyFiles */, + A787120D0E4C4AC500A7191F /* types.lisp in CopyFiles */, + A787120E0E4C4AC500A7191F /* util.lisp in CopyFiles */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + A78711740E4C4A4700A7191F /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = Sacla; + dstSubfolderSpec = 16; + files = ( + A787120F0E4C4ADE00A7191F /* array.lisp in CopyFiles */, + A78712100E4C4ADE00A7191F /* character.lisp in CopyFiles */, + A78712110E4C4ADE00A7191F /* clos.lisp in CopyFiles */, + A78712120E4C4ADE00A7191F /* condition.lisp in CopyFiles */, + A78712130E4C4ADE00A7191F /* cons.lisp in CopyFiles */, + A78712140E4C4ADE00A7191F /* core.lisp in CopyFiles */, + A78712150E4C4ADE00A7191F /* data-and-control.lisp in CopyFiles */, + A78712160E4C4ADE00A7191F /* do.lisp in CopyFiles */, + A78712170E4C4ADE00A7191F /* eval.lisp in CopyFiles */, + A78712180E4C4ADE00A7191F /* hash-table.lisp in CopyFiles */, + A78712190E4C4ADE00A7191F /* init.lisp in CopyFiles */, + A787121A0E4C4ADE00A7191F /* loop.lisp in CopyFiles */, + A787121B0E4C4ADE00A7191F /* package.lisp in CopyFiles */, + A787121C0E4C4ADE00A7191F /* printer.lisp in CopyFiles */, + A787121D0E4C4ADE00A7191F /* reader.lisp in CopyFiles */, + A787121E0E4C4ADE00A7191F /* sequence.lisp in CopyFiles */, + A787121F0E4C4ADE00A7191F /* share-2.lisp in CopyFiles */, + A78712200E4C4ADE00A7191F /* share.lisp in CopyFiles */, + A78712210E4C4ADE00A7191F /* stand-in.lisp in CopyFiles */, + A78712220E4C4ADE00A7191F /* stream.lisp in CopyFiles */, + A78712230E4C4ADE00A7191F /* string.lisp in CopyFiles */, + A78712240E4C4ADE00A7191F /* symbol.lisp in CopyFiles */, + A78712250E4C4ADE00A7191F /* testbed.lisp in CopyFiles */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; A7A833FD0E477B33005D64E0 /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; @@ -236,6 +297,15 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + A787112C0E4C456C00A7191F /* array.lisp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = array.lisp; sourceTree = ""; }; + A787112E0E4C459200A7191F /* globals.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = globals.m; sourceTree = ""; }; + A787112F0E4C459200A7191F /* MLKArray.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MLKArray.m; sourceTree = ""; }; + A78711300E4C459200A7191F /* MLKCompiledProcedure.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MLKCompiledProcedure.m; sourceTree = ""; }; + A78711310E4C459200A7191F /* MLKForeignProcedure.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MLKForeignProcedure.m; sourceTree = ""; }; + A78711360E4C45A300A7191F /* globals.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = globals.h; sourceTree = ""; }; + A78711370E4C45A300A7191F /* MLKArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MLKArray.h; sourceTree = ""; }; + A78711380E4C45A300A7191F /* MLKCompiledProcedure.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MLKCompiledProcedure.h; sourceTree = ""; }; + A78711390E4C45A300A7191F /* MLKForeignProcedure.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MLKForeignProcedure.h; sourceTree = ""; }; A7A833800E476CF3005D64E0 /* functions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = functions.m; sourceTree = ""; }; A7A833810E476CF3005D64E0 /* MLKBackquoteReader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MLKBackquoteReader.m; sourceTree = ""; }; A7A833820E476CF3005D64E0 /* MLKCommaReader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MLKCommaReader.m; sourceTree = ""; }; @@ -389,6 +459,7 @@ isa = PBXGroup; children = ( A7A835660E477C26005D64E0 /* Sacla */, + A787112C0E4C456C00A7191F /* array.lisp */, A7A834010E477B76005D64E0 /* control-flow.lisp */, A7A834020E477B76005D64E0 /* defun-0.lisp */, A7A834030E477B76005D64E0 /* defun-1.lisp */, @@ -471,6 +542,10 @@ A7E5C48C0E2169CE00A01D81 /* Headers */ = { isa = PBXGroup; children = ( + A78711360E4C45A300A7191F /* globals.h */, + A78711370E4C45A300A7191F /* MLKArray.h */, + A78711380E4C45A300A7191F /* MLKCompiledProcedure.h */, + A78711390E4C45A300A7191F /* MLKForeignProcedure.h */, A7A8338C0E476D0D005D64E0 /* functions.h */, A7A8338D0E476D0D005D64E0 /* MLKBackquoteReader.h */, A7A8338E0E476D0D005D64E0 /* MLKCommaReader.h */, @@ -522,6 +597,10 @@ A7E5C48D0E216A0E00A01D81 /* Source Files */ = { isa = PBXGroup; children = ( + A787112E0E4C459200A7191F /* globals.m */, + A787112F0E4C459200A7191F /* MLKArray.m */, + A78711300E4C459200A7191F /* MLKCompiledProcedure.m */, + A78711310E4C459200A7191F /* MLKForeignProcedure.m */, A7A833800E476CF3005D64E0 /* functions.m */, A7A833810E476CF3005D64E0 /* MLKBackquoteReader.m */, A7A833820E476CF3005D64E0 /* MLKCommaReader.m */, @@ -616,6 +695,10 @@ A7A833950E476D0D005D64E0 /* MLKDispatchingMacroCharacterReader.h in Headers */, A7A833960E476D0D005D64E0 /* MLKSharpsignColonReader.h in Headers */, A7A833970E476D0D005D64E0 /* MLKValuesFunction.h in Headers */, + A787113A0E4C45A300A7191F /* globals.h in Headers */, + A787113B0E4C45A300A7191F /* MLKArray.h in Headers */, + A787113C0E4C45A300A7191F /* MLKCompiledProcedure.h in Headers */, + A787113D0E4C45A300A7191F /* MLKForeignProcedure.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -627,9 +710,10 @@ buildConfigurationList = A7E5C3ED0E2168A000A01D81 /* Build configuration list for PBXNativeTarget "ToiletKit" */; buildPhases = ( A7E5C3E60E21689F00A01D81 /* Headers */, - A7E5C3E70E21689F00A01D81 /* Resources */, + A787116F0E4C4A0200A7191F /* CopyFiles */, A7E5C3E80E21689F00A01D81 /* Sources */, A7E5C3E90E21689F00A01D81 /* Frameworks */, + A78711740E4C4A4700A7191F /* CopyFiles */, ); buildRules = ( ); @@ -676,55 +760,6 @@ }; /* End PBXProject section */ -/* Begin PBXResourcesBuildPhase section */ - A7E5C3E70E21689F00A01D81 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - A7A8340E0E477B76005D64E0 /* control-flow.lisp in Resources */, - A7A8340F0E477B76005D64E0 /* defun-0.lisp in Resources */, - A7A834100E477B76005D64E0 /* defun-1.lisp in Resources */, - A7A834110E477B76005D64E0 /* destructuring-bind.lisp in Resources */, - A7A834120E477B76005D64E0 /* evaluation.lisp in Resources */, - A7A834130E477B76005D64E0 /* init.lisp in Resources */, - A7A834140E477B76005D64E0 /* list-functions-2.lisp in Resources */, - A7A834150E477B76005D64E0 /* list-functions.lisp in Resources */, - A7A834160E477B76005D64E0 /* numbers.lisp in Resources */, - A7A834170E477B76005D64E0 /* reader.lisp in Resources */, - A7A834180E477B76005D64E0 /* sharpsign.lisp in Resources */, - A7A834190E477B76005D64E0 /* types.lisp in Resources */, - A7A8341A0E477B76005D64E0 /* util.lisp in Resources */, - A7A835A30E477C27005D64E0 /* array.lisp in Resources */, - A7A835A40E477C27005D64E0 /* character.lisp in Resources */, - A7A835A50E477C27005D64E0 /* clos.lisp in Resources */, - A7A835A60E477C27005D64E0 /* condition.lisp in Resources */, - A7A835A70E477C27005D64E0 /* cons.lisp in Resources */, - A7A835A80E477C27005D64E0 /* core.lisp in Resources */, - A7A835A90E477C27005D64E0 /* data-and-control.lisp in Resources */, - A7A835AA0E477C27005D64E0 /* do.lisp in Resources */, - A7A835AB0E477C27005D64E0 /* eval.lisp in Resources */, - A7A835AC0E477C27005D64E0 /* hash-table.lisp in Resources */, - A7A835AD0E477C27005D64E0 /* init.lisp in Resources */, - A7A835AE0E477C27005D64E0 /* loop.lisp in Resources */, - A7A835AF0E477C27005D64E0 /* package.lisp in Resources */, - A7A835B00E477C27005D64E0 /* printer.lisp in Resources */, - A7A835B10E477C27005D64E0 /* reader.lisp in Resources */, - A7A835B20E477C27005D64E0 /* sequence.lisp in Resources */, - A7A835B30E477C27005D64E0 /* share-2.lisp in Resources */, - A7A835B40E477C27005D64E0 /* share.lisp in Resources */, - A7A835B50E477C27005D64E0 /* stand-in.lisp in Resources */, - A7A835B60E477C27005D64E0 /* stream.lisp in Resources */, - A7A835B70E477C27005D64E0 /* string.lisp in Resources */, - A7A835B80E477C27005D64E0 /* symbol.lisp in Resources */, - A7A835B90E477C27005D64E0 /* testbed.lisp in Resources */, - A7A835BA0E477C27005D64E0 /* ansi-tests.lisp in Resources */, - A7A835BB0E477C27005D64E0 /* desirable-printer.lisp in Resources */, - A7A835DD0E477C27005D64E0 /* x-sequence.lisp in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - /* Begin PBXSourcesBuildPhase section */ A7E5C3E80E21689F00A01D81 /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -768,6 +803,10 @@ A7A833890E476CF3005D64E0 /* MLKDispatchingMacroCharacterReader.m in Sources */, A7A8338A0E476CF3005D64E0 /* MLKSharpsignColonReader.m in Sources */, A7A8338B0E476CF3005D64E0 /* MLKValuesFunction.m in Sources */, + A78711320E4C459200A7191F /* globals.m in Sources */, + A78711330E4C459200A7191F /* MLKArray.m in Sources */, + A78711340E4C459200A7191F /* MLKCompiledProcedure.m in Sources */, + A78711350E4C459200A7191F /* MLKForeignProcedure.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -790,6 +829,152 @@ /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ + A78711410E4C46FA00A7191F /* Debug 10.4+ (fast) */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = NO; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + FRAMEWORK_VERSION = A; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_FIX_AND_CONTINUE = YES; + GCC_FAST_OBJC_DISPATCH = YES; + GCC_GENERATE_DEBUGGING_SYMBOLS = YES; + GCC_MODEL_TUNING = G4; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = ""; + GCC_WARN_ABOUT_MISSING_NEWLINE = YES; + HEADER_SEARCH_PATHS = /opt/local/include; + INFOPLIST_FILE = "ToiletKit-Info.plist"; + INSTALL_PATH = "$(HOME)/Library/Frameworks"; + LIBRARY_SEARCH_PATHS = /opt/local/lib; + MACOSX_DEPLOYMENT_TARGET = ""; + OTHER_CFLAGS = "-DHAVE_FFI_H"; + OTHER_LDFLAGS = ( + "-framework", + Foundation, + "-lgmp", + "-lffi", + ); + PREBINDING = NO; + PRODUCT_NAME = ToiletKit; + ZERO_LINK = YES; + }; + name = "Debug 10.4+ (fast)"; + }; + A78711420E4C46FA00A7191F /* Debug 10.4+ (fast) */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_FIX_AND_CONTINUE = YES; + GCC_FAST_OBJC_DISPATCH = YES; + GCC_GENERATE_DEBUGGING_SYMBOLS = YES; + GCC_MODEL_TUNING = G4; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; + GCC_WARN_ABOUT_MISSING_NEWLINE = YES; + HEADER_SEARCH_PATHS = /opt/local/include; + INSTALL_PATH = "$(HOME)/bin"; + LIBRARY_SEARCH_PATHS = /opt/local/lib; + OTHER_CFLAGS = "-DHAVE_FFI_H"; + OTHER_LDFLAGS = ( + "-framework", + Foundation, + "-lgmp", + "-ledit", + "-framework", + ToiletKit, + ); + PREBINDING = NO; + PRODUCT_NAME = toilet; + ZERO_LINK = NO; + }; + name = "Debug 10.4+ (fast)"; + }; + A78711430E4C46FA00A7191F /* Debug 10.4+ (fast) */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = NO; + }; + name = "Debug 10.4+ (fast)"; + }; + A78711440E4C473D00A7191F /* Debug 10.4+ (fast + GC) */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = NO; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + FRAMEWORK_VERSION = A; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_FIX_AND_CONTINUE = YES; + GCC_ENABLE_OBJC_GC = YES; + GCC_FAST_OBJC_DISPATCH = YES; + GCC_GENERATE_DEBUGGING_SYMBOLS = YES; + GCC_MODEL_TUNING = G4; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = ""; + GCC_WARN_ABOUT_MISSING_NEWLINE = YES; + HEADER_SEARCH_PATHS = /opt/local/include; + INFOPLIST_FILE = "ToiletKit-Info.plist"; + INSTALL_PATH = "$(HOME)/Library/Frameworks"; + LIBRARY_SEARCH_PATHS = /opt/local/lib; + MACOSX_DEPLOYMENT_TARGET = ""; + OTHER_CFLAGS = "-DHAVE_FFI_H"; + OTHER_LDFLAGS = ( + "-framework", + Foundation, + "-lgmp", + "-lffi", + ); + PREBINDING = NO; + PRODUCT_NAME = ToiletKit; + ZERO_LINK = YES; + }; + name = "Debug 10.4+ (fast + GC)"; + }; + A78711450E4C473D00A7191F /* Debug 10.4+ (fast + GC) */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_FIX_AND_CONTINUE = YES; + GCC_ENABLE_OBJC_GC = YES; + GCC_FAST_OBJC_DISPATCH = YES; + GCC_GENERATE_DEBUGGING_SYMBOLS = YES; + GCC_MODEL_TUNING = G4; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Foundation.framework/Headers/Foundation.h"; + GCC_WARN_ABOUT_MISSING_NEWLINE = YES; + HEADER_SEARCH_PATHS = /opt/local/include; + INSTALL_PATH = "$(HOME)/bin"; + LIBRARY_SEARCH_PATHS = /opt/local/lib; + OTHER_CFLAGS = "-DHAVE_FFI_H"; + OTHER_LDFLAGS = ( + "-framework", + Foundation, + "-lgmp", + "-ledit", + "-framework", + ToiletKit, + ); + PREBINDING = NO; + PRODUCT_NAME = toilet; + ZERO_LINK = NO; + }; + name = "Debug 10.4+ (fast + GC)"; + }; + A78711460E4C473D00A7191F /* Debug 10.4+ (fast + GC) */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = NO; + }; + name = "Debug 10.4+ (fast + GC)"; + }; A7E5C3D00E21682800A01D81 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -814,18 +999,22 @@ GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_MODEL_TUNING = G5; + GCC_MODEL_TUNING = G4; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; + GCC_PREFIX_HEADER = ""; + GCC_WARN_ABOUT_MISSING_NEWLINE = YES; HEADER_SEARCH_PATHS = /opt/local/include; INFOPLIST_FILE = "ToiletKit-Info.plist"; INSTALL_PATH = "$(HOME)/Library/Frameworks"; LIBRARY_SEARCH_PATHS = /opt/local/lib; + MACOSX_DEPLOYMENT_TARGET = ""; + OTHER_CFLAGS = "-DHAVE_FFI_H"; OTHER_LDFLAGS = ( "-framework", Foundation, "-lgmp", + "-lffi", ); PREBINDING = NO; PRODUCT_NAME = ToiletKit; @@ -842,17 +1031,21 @@ FRAMEWORK_VERSION = A; GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_MODEL_TUNING = G5; + GCC_MODEL_TUNING = G4; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; + GCC_PREFIX_HEADER = ""; + GCC_WARN_ABOUT_MISSING_NEWLINE = YES; HEADER_SEARCH_PATHS = /opt/local/include; INFOPLIST_FILE = "ToiletKit-Info.plist"; INSTALL_PATH = "$(HOME)/Library/Frameworks"; LIBRARY_SEARCH_PATHS = /opt/local/lib; + MACOSX_DEPLOYMENT_TARGET = ""; + OTHER_CFLAGS = "-DHAVE_FFI_H"; OTHER_LDFLAGS = ( "-framework", Foundation, "-lgmp", + "-lffi", ); PREBINDING = NO; PRODUCT_NAME = ToiletKit; @@ -867,13 +1060,15 @@ GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_MODEL_TUNING = G5; + GCC_MODEL_TUNING = G4; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; + GCC_WARN_ABOUT_MISSING_NEWLINE = YES; HEADER_SEARCH_PATHS = /opt/local/include; INSTALL_PATH = "$(HOME)/bin"; LIBRARY_SEARCH_PATHS = /opt/local/lib; + OTHER_CFLAGS = "-DHAVE_FFI_H"; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -894,12 +1089,14 @@ COPY_PHASE_STRIP = YES; GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_MODEL_TUNING = G5; + GCC_MODEL_TUNING = G4; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; + GCC_WARN_ABOUT_MISSING_NEWLINE = YES; HEADER_SEARCH_PATHS = /opt/local/include; INSTALL_PATH = "$(HOME)/bin"; LIBRARY_SEARCH_PATHS = /opt/local/lib; + OTHER_CFLAGS = "-DHAVE_FFI_H"; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -921,6 +1118,8 @@ isa = XCConfigurationList; buildConfigurations = ( A7E5C3D00E21682800A01D81 /* Debug */, + A78711430E4C46FA00A7191F /* Debug 10.4+ (fast) */, + A78711460E4C473D00A7191F /* Debug 10.4+ (fast + GC) */, A7E5C3D10E21682800A01D81 /* Release */, ); defaultConfigurationIsVisible = 0; @@ -930,6 +1129,8 @@ isa = XCConfigurationList; buildConfigurations = ( A7E5C3EE0E2168A000A01D81 /* Debug */, + A78711410E4C46FA00A7191F /* Debug 10.4+ (fast) */, + A78711440E4C473D00A7191F /* Debug 10.4+ (fast + GC) */, A7E5C3EF0E2168A000A01D81 /* Release */, ); defaultConfigurationIsVisible = 0; @@ -939,6 +1140,8 @@ isa = XCConfigurationList; buildConfigurations = ( A7E5C3F60E21692100A01D81 /* Debug */, + A78711420E4C46FA00A7191F /* Debug 10.4+ (fast) */, + A78711450E4C473D00A7191F /* Debug 10.4+ (fast + GC) */, A7E5C3F70E21692100A01D81 /* Release */, ); defaultConfigurationIsVisible = 0; -- cgit v1.2.3 From 717ac56d3b5dcd87874819c39c51a871296d979c Mon Sep 17 00:00:00 2001 From: Matthias Benkard Date: Fri, 8 Aug 2008 12:03:40 +0200 Subject: Update .gitignore. --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 8f6e655..3f2f33a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,9 @@ +build/ obj/ derived_src/ Test.bundle/ ToiletKit.framework/ +.DS_Store *~ a123 Notizen.txt -- cgit v1.2.3 From 8478027006b9694404450960ca39078842f0555d Mon Sep 17 00:00:00 2001 From: Matthias Benkard Date: Fri, 8 Aug 2008 14:16:28 +0200 Subject: Minor cleanups. --- MLKInterpreter.m | 1 + MLKStream.h | 4 ++-- MLKStream.m | 7 +++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/MLKInterpreter.m b/MLKInterpreter.m index a2aa81e..b0c38ef 100644 --- a/MLKInterpreter.m +++ b/MLKInterpreter.m @@ -38,6 +38,7 @@ #import "util.h" #import +#import #import #import #import diff --git a/MLKStream.h b/MLKStream.h index 7d579ae..3e4f597 100644 --- a/MLKStream.h +++ b/MLKStream.h @@ -17,9 +17,9 @@ */ #import "MLKLispValue.h" -#import -@class NSInputStream, NSOutputStream; +#import +#import @interface MLKStream : MLKLispValue diff --git a/MLKStream.m b/MLKStream.m index e0090d0..6448bdc 100644 --- a/MLKStream.m +++ b/MLKStream.m @@ -22,6 +22,9 @@ #import +#include +#include + @implementation MLKStream -(MLKStream *) init; @@ -66,7 +69,7 @@ -(unichar) readChar { uint8_t *buffer; - int i; + size_t i; unichar retval; if (_charCached) @@ -92,7 +95,7 @@ //NSLog (@"%@", _input); - buffer = realloc (buffer, i+1); + buffer = (uint8_t *) realloc (buffer, i+1); bytes_read = [_input read:(buffer+i) maxLength:1]; //NSLog (@"%d bytes read", bytes_read); -- cgit v1.2.3 From 1ec0f143110288a504bd0c267614ea7d1447e804 Mon Sep 17 00:00:00 2001 From: Matthias Benkard Date: Fri, 8 Aug 2008 14:23:12 +0200 Subject: Xcode: For the release target, build universal binaries. --- Toilet Lisp.xcodeproj/project.pbxproj | 180 ++++++++++++++++++++++++++++++++++ 1 file changed, 180 insertions(+) diff --git a/Toilet Lisp.xcodeproj/project.pbxproj b/Toilet Lisp.xcodeproj/project.pbxproj index 3538ced..b4fd92a 100644 --- a/Toilet Lisp.xcodeproj/project.pbxproj +++ b/Toilet Lisp.xcodeproj/project.pbxproj @@ -975,6 +975,168 @@ }; name = "Debug 10.4+ (fast + GC)"; }; + A78712520E4C6BA300A7191F /* Release 10.4+ (fast) */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = ( + ppc, + ppc64, + i386, + x86_64, + ); + COPY_PHASE_STRIP = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + FRAMEWORK_VERSION = A; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + GCC_FAST_OBJC_DISPATCH = YES; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_MODEL_TUNING = G4; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = ""; + GCC_WARN_ABOUT_MISSING_NEWLINE = YES; + HEADER_SEARCH_PATHS = /opt/local/include; + INFOPLIST_FILE = "ToiletKit-Info.plist"; + INSTALL_PATH = "$(HOME)/Library/Frameworks"; + LIBRARY_SEARCH_PATHS = /opt/local/lib; + MACOSX_DEPLOYMENT_TARGET = ""; + OTHER_CFLAGS = "-DHAVE_FFI_H"; + OTHER_LDFLAGS = ( + "-framework", + Foundation, + "-lgmp", + "-lffi", + ); + PREBINDING = NO; + PRODUCT_NAME = ToiletKit; + ZERO_LINK = NO; + }; + name = "Release 10.4+ (fast)"; + }; + A78712530E4C6BA300A7191F /* Release 10.4+ (fast + GC) */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = ( + ppc, + ppc64, + i386, + x86_64, + ); + COPY_PHASE_STRIP = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + FRAMEWORK_VERSION = A; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + GCC_ENABLE_OBJC_GC = YES; + GCC_FAST_OBJC_DISPATCH = YES; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_MODEL_TUNING = G4; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = ""; + GCC_WARN_ABOUT_MISSING_NEWLINE = YES; + HEADER_SEARCH_PATHS = /opt/local/include; + INFOPLIST_FILE = "ToiletKit-Info.plist"; + INSTALL_PATH = "$(HOME)/Library/Frameworks"; + LIBRARY_SEARCH_PATHS = /opt/local/lib; + MACOSX_DEPLOYMENT_TARGET = ""; + OTHER_CFLAGS = "-DHAVE_FFI_H"; + OTHER_LDFLAGS = ( + "-framework", + Foundation, + "-lgmp", + "-lffi", + ); + PREBINDING = NO; + PRODUCT_NAME = ToiletKit; + ZERO_LINK = NO; + }; + name = "Release 10.4+ (fast + GC)"; + }; + A78712540E4C6BA300A7191F /* Release 10.4+ (fast) */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = ( + ppc, + ppc64, + i386, + x86_64, + ); + COPY_PHASE_STRIP = YES; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + GCC_FAST_OBJC_DISPATCH = YES; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_MODEL_TUNING = G4; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; + GCC_WARN_ABOUT_MISSING_NEWLINE = YES; + HEADER_SEARCH_PATHS = /opt/local/include; + INSTALL_PATH = "$(HOME)/bin"; + LIBRARY_SEARCH_PATHS = /opt/local/lib; + OTHER_CFLAGS = "-DHAVE_FFI_H"; + OTHER_LDFLAGS = ( + "-framework", + Foundation, + "-lgmp", + "-ledit", + "-framework", + ToiletKit, + ); + PREBINDING = NO; + PRODUCT_NAME = toilet; + ZERO_LINK = NO; + }; + name = "Release 10.4+ (fast)"; + }; + A78712550E4C6BA300A7191F /* Release 10.4+ (fast + GC) */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = ( + ppc, + ppc64, + i386, + x86_64, + ); + COPY_PHASE_STRIP = YES; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + GCC_ENABLE_OBJC_GC = YES; + GCC_FAST_OBJC_DISPATCH = YES; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_MODEL_TUNING = G4; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; + GCC_WARN_ABOUT_MISSING_NEWLINE = YES; + HEADER_SEARCH_PATHS = /opt/local/include; + INSTALL_PATH = "$(HOME)/bin"; + LIBRARY_SEARCH_PATHS = /opt/local/lib; + OTHER_CFLAGS = "-DHAVE_FFI_H"; + OTHER_LDFLAGS = ( + "-framework", + Foundation, + "-lgmp", + "-ledit", + "-framework", + ToiletKit, + ); + PREBINDING = NO; + PRODUCT_NAME = toilet; + ZERO_LINK = NO; + }; + name = "Release 10.4+ (fast + GC)"; + }; + A78712560E4C6BA300A7191F /* Release 10.4+ (fast) */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = YES; + }; + name = "Release 10.4+ (fast)"; + }; + A78712570E4C6BA300A7191F /* Release 10.4+ (fast + GC) */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = YES; + }; + name = "Release 10.4+ (fast + GC)"; + }; A7E5C3D00E21682800A01D81 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -1025,6 +1187,12 @@ A7E5C3EF0E2168A000A01D81 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + ppc64, + i386, + x86_64, + ); COPY_PHASE_STRIP = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -1086,6 +1254,12 @@ A7E5C3F70E21692100A01D81 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + ppc64, + i386, + x86_64, + ); COPY_PHASE_STRIP = YES; GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; @@ -1121,6 +1295,8 @@ A78711430E4C46FA00A7191F /* Debug 10.4+ (fast) */, A78711460E4C473D00A7191F /* Debug 10.4+ (fast + GC) */, A7E5C3D10E21682800A01D81 /* Release */, + A78712560E4C6BA300A7191F /* Release 10.4+ (fast) */, + A78712570E4C6BA300A7191F /* Release 10.4+ (fast + GC) */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1132,6 +1308,8 @@ A78711410E4C46FA00A7191F /* Debug 10.4+ (fast) */, A78711440E4C473D00A7191F /* Debug 10.4+ (fast + GC) */, A7E5C3EF0E2168A000A01D81 /* Release */, + A78712520E4C6BA300A7191F /* Release 10.4+ (fast) */, + A78712530E4C6BA300A7191F /* Release 10.4+ (fast + GC) */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1143,6 +1321,8 @@ A78711420E4C46FA00A7191F /* Debug 10.4+ (fast) */, A78711450E4C473D00A7191F /* Debug 10.4+ (fast + GC) */, A7E5C3F70E21692100A01D81 /* Release */, + A78712540E4C6BA300A7191F /* Release 10.4+ (fast) */, + A78712550E4C6BA300A7191F /* Release 10.4+ (fast + GC) */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; -- cgit v1.2.3 From af415e7e63dc62416cd73a4f146e26e8f3e55c6f Mon Sep 17 00:00:00 2001 From: Matthias Benkard Date: Fri, 8 Aug 2008 19:06:58 +0200 Subject: MLKForeignProcedure: Do not free(3) the foreign function in -dealloc. --- MLKForeignProcedure.m | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/MLKForeignProcedure.m b/MLKForeignProcedure.m index 248a184..459ce97 100644 --- a/MLKForeignProcedure.m +++ b/MLKForeignProcedure.m @@ -105,21 +105,17 @@ -(NSString *) descriptionForLisp { - return [NSString stringWithFormat:@"", self]; + return [NSString stringWithFormat:@"", _code, self]; } -(void) dealloc { - // FIXME: Can we really just use free() here? - free (_code); free (_argumentTypes); [super dealloc]; } -(void) finalize { - // FIXME: Can we really just use free() here? - free (_code); free (_argumentTypes); } @end -- cgit v1.2.3 From 09b354980b8cfc50d01741b5ec433a5bab14ef6e Mon Sep 17 00:00:00 2001 From: Matthias Benkard Date: Fri, 8 Aug 2008 19:08:03 +0200 Subject: Fix %FOREIGN-LAMBDA. --- MLKInterpreter.m | 8 ++++---- MLKPackage.m | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/MLKInterpreter.m b/MLKInterpreter.m index b0c38ef..2a85502 100644 --- a/MLKInterpreter.m +++ b/MLKInterpreter.m @@ -510,10 +510,10 @@ static MLKSymbol *MULTIPLE_VALUE_CALL; #endif #endif - return LAUTORELEASE ([[MLKForeignProcedure alloc] - initWithCode:function - argumentTypes:[argtypes array] - returnType:returnType]); + RETURN_VALUE (LAUTORELEASE ([[MLKForeignProcedure alloc] + initWithCode:function + argumentTypes:[argtypes array] + returnType:returnType])); } else if (car == FUNCTION) { diff --git a/MLKPackage.m b/MLKPackage.m index 2d14ef5..256b6a9 100644 --- a/MLKPackage.m +++ b/MLKPackage.m @@ -97,6 +97,7 @@ static NSMutableDictionary *packages = nil; [sys export:[sys intern:@"%LOOP"]]; [sys export:[sys intern:@"%FLET"]]; [sys export:[sys intern:@"%MACROLET"]]; + [sys export:[sys intern:@"%FOREIGN-LAMBDA"]]; [sys export:[sys intern:@"*SYSTEM-INITIALISED-P*"]]; -- cgit v1.2.3 From 249175b68c3cb9d9b146c3930ae62cb2712f8d1a Mon Sep 17 00:00:00 2001 From: Matthias Benkard Date: Fri, 8 Aug 2008 19:09:24 +0200 Subject: Make MLKPackage Fix-and-Continue-friendly. --- MLKPackage.m | 53 +++++++++++++++++++++++++++++++++-------------------- 1 file changed, 33 insertions(+), 20 deletions(-) diff --git a/MLKPackage.m b/MLKPackage.m index 256b6a9..f867694 100644 --- a/MLKPackage.m +++ b/MLKPackage.m @@ -33,26 +33,39 @@ static NSMutableDictionary *packages = nil; @implementation MLKPackage +(void) initialize { - packages = [[NSMutableDictionary alloc] init]; - - MLKPackage *cl = [MLKPackage packageWithName:@"COMMON-LISP" - nicknames:[NSSet setWithObject:@"CL"]]; - MLKPackage *clUser = [MLKPackage packageWithName:@"COMMON-LISP-USER" - nicknames:[NSSet setWithObject:@"CL-USER"]];; - MLKPackage *sys = [MLKPackage packageWithName:@"TOILET-SYSTEM" - nicknames:[NSSet setWithObjects: - @"TL-SYS", @"SYSTEM", - @"SYS", nil]]; - MLKPackage *toilet = [MLKPackage packageWithName:@"TOILET-LISP" - nicknames:[NSSet setWithObjects: - @"TL", @"TOILET", nil]]; - MLKPackage *tlUser = [MLKPackage packageWithName:@"TOILET-LISP-USER" - nicknames:[NSSet setWithObjects: - @"TL-USER", - @"TOILET-USER", - nil]]; - - [MLKPackage packageWithName:@"KEYWORD" nicknames:[NSSet set]]; + MLKPackage *cl, *clUser, *sys, *toilet, *tlUser; + + if (!packages) + { + packages = [[NSMutableDictionary alloc] init]; + + cl = [MLKPackage packageWithName:@"COMMON-LISP" + nicknames:[NSSet setWithObject:@"CL"]]; + clUser = [MLKPackage packageWithName:@"COMMON-LISP-USER" + nicknames:[NSSet setWithObject:@"CL-USER"]];; + sys = [MLKPackage packageWithName:@"TOILET-SYSTEM" + nicknames:[NSSet setWithObjects: + @"TL-SYS", @"SYSTEM", + @"SYS", nil]]; + toilet = [MLKPackage packageWithName:@"TOILET-LISP" + nicknames:[NSSet setWithObjects: + @"TL", @"TOILET", nil]]; + tlUser = [MLKPackage packageWithName:@"TOILET-LISP-USER" + nicknames:[NSSet setWithObjects: + @"TL-USER", + @"TOILET-USER", + nil]]; + + [MLKPackage packageWithName:@"KEYWORD" nicknames:[NSSet set]]; + } + else + { + cl = [self findPackage:@"COMMON-LISP"]; + clUser = [self findPackage:@"COMMON-LISP-USER"]; + sys = [self findPackage:@"TOILET-SYSTEM"]; + toilet = [self findPackage:@"TOILET-LISP"]; + tlUser = [self findPackage:@"TOILET-LISP-USER"]; + } [cl usePackage:sys]; -- cgit v1.2.3 From f24fe15610e9d5bd3457bcb7567dc723672ffb04 Mon Sep 17 00:00:00 2001 From: Matthias Benkard Date: Fri, 8 Aug 2008 19:10:07 +0200 Subject: Fix the BSD/Darwin implementation of %FOREIGN-LAMBDA. --- MLKInterpreter.m | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/MLKInterpreter.m b/MLKInterpreter.m index 2a85502..a98fb41 100644 --- a/MLKInterpreter.m +++ b/MLKInterpreter.m @@ -43,14 +43,16 @@ #import #import -#ifndef _WIN32 -#include +#include + +#ifdef _WIN32 + #include #else -#include + #define _BSD_SOURCE + #undef _POSIX_C_SOURCE // needed at least on Mac OS X for RTLD_DEFAULT to be defined + #include #endif -#include - static MLKPackage *cl; static MLKPackage *sys; @@ -502,12 +504,7 @@ static MLKSymbol *MULTIPLE_VALUE_CALL; //EnumProcessModules (...); //GetProcAddress (..., [name UTF8String]); #else -#ifdef linux function = dlsym (RTLD_DEFAULT, [name UTF8String]); -#else - // FIXME - function = dlsym (NULL, [name UTF8String]); -#endif #endif RETURN_VALUE (LAUTORELEASE ([[MLKForeignProcedure alloc] -- cgit v1.2.3