summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--GNUmakefile8
-rw-r--r--MLKDoubleFloat.h50
-rw-r--r--MLKFloat.h7
-rw-r--r--MLKFloat.m55
-rw-r--r--MLKSingleFloat.h50
5 files changed, 160 insertions, 10 deletions
diff --git a/GNUmakefile b/GNUmakefile
index df47afe..41b42c1 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -20,10 +20,10 @@ include $(GNUSTEP_MAKEFILES)/common.make
TOOL_NAME = etoilisp
etoilisp_OBJC_FILES = MLKCharacter.m MLKCons.m MLKDynamicContext.m \
MLKEndOfFileError.m MLKEnvironment.m MLKError.m \
- MLKInteger.m MLKLinkedList.m MLKLispValue.m \
- MLKPackage.m MLKRatio.m MLKReader.m MLKReadtable.m \
- MLKReaderError.m MLKStream.m MLKSymbol.m \
- MLKThrowException.m \
+ MLKFloat.m MLKInteger.m MLKLinkedList.m \
+ MLKLispValue.m MLKPackage.m MLKRatio.m MLKReader.m \
+ MLKReadtable.m MLKReaderError.m MLKStream.m \
+ MLKSymbol.m MLKThrowException.m \
MLKUndefinedVariableException.m
BUNDLE_NAME = Test
diff --git a/MLKDoubleFloat.h b/MLKDoubleFloat.h
new file mode 100644
index 0000000..b915584
--- /dev/null
+++ b/MLKDoubleFloat.h
@@ -0,0 +1,50 @@
+/* -*- mode: objc; coding: utf-8 -*- */
+/* Étoilisp/Mulklisp, 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/>.
+ */
+
+#import "MLKFloat.h"
+
+@class NSString;
+
+
+@interface MLKDoubleFloat : MLKFloat
+{
+ double value;
+}
+
+-(MLKDoubleFloat *) initWithIntegerPart:(NSString *)intPart
+ negative:(BOOL)negative
+ fractionalPart:(NSString *)fractPart
+ exponent:(NSString *)exponent
+ exponentNegative:(BOOL)exponentNegative;
+
++(MLKDoubleFloat *) doubleFloatWithIntegerPart:(NSString *)intPart
+ negative:(BOOL)negative
+ fractionalPart:(NSString *)fractPart
+ exponent:(NSString *)exponent
+ exponentNegative:(BOOL)exponentNegative;
+
+-(float) floatValue;
+-(double) doubleValue;
+
+-(MLKFloat *) add:(MLKFloat *)arg;
+-(MLKFloat *) subtract:(MLKFloat *)arg;
+-(MLKFloat *) multiplyWith:(MLKFloat *)arg;
+-(MLKFloat *) divideBy:(MLKFloat *)arg;
+
+-(NSString *) description;
+@end
diff --git a/MLKFloat.h b/MLKFloat.h
index fdb1212..fe9ed48 100644
--- a/MLKFloat.h
+++ b/MLKFloat.h
@@ -18,19 +18,14 @@
#import "MLKLispValue.h"
-@class NSString;
+#import <Foundation/NSString.h>
@interface MLKFloat : MLKLispValue
-{
-}
-
+(MLKFloat *) floatWithExponentMarker:(unichar)exponentMarker
integerPart:(NSString *)intPart
negative:(BOOL)negative
fractionalPart:(NSString *)fractPart
exponent:(NSString *)exponent
exponentNegative:(BOOL)exponentNegative;
-
--(void) dealloc;
@end
diff --git a/MLKFloat.m b/MLKFloat.m
new file mode 100644
index 0000000..4083146
--- /dev/null
+++ b/MLKFloat.m
@@ -0,0 +1,55 @@
+/* -*- mode: objc; coding: utf-8 -*- */
+/* Étoilisp/Mulklisp, 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/>.
+ */
+
+#import "MLKFloat.h"
+#import "MLKSingleFloat.h"
+#import "MLKDoubleFloat.h"
+#import "MLKPackage.h"
+#import "MLKDynamicContext.h"
+
+
+@implementation MLKFloat : MLKLispValue
++(MLKFloat *) floatWithExponentMarker:(unichar)exponentMarker
+ integerPart:(NSString *)intPart
+ negative:(BOOL)negative
+ fractionalPart:(NSString *)fractPart
+ exponent:(NSString *)exponent
+ exponentNegative:(BOOL)exponentNegative
+{
+ MLKSymbol *defaultFormat;
+ MLKPackage *cl = [MLKPackage findPackage:@"COMMON-LISP"];
+ defaultFormat = [[MLKDynamicContext currentContext]
+ valueForBinding:[cl intern:@"*READ-DEFAULT-FLOAT-FORMAT*"]];
+ if (exponentMarker == 'd' || exponentMarker == 'D'
+ || exponentMarker == 'l' || exponentMarker == 'L'
+ || ((exponentMarker == 'e' || exponentMarker == 'E')
+ && ((defaultFormat == [cl intern:@"DOUBLE-FLOAT"])
+ || (defaultFormat == [cl intern:@"LONG-FLOAT"]))))
+ return [MLKDoubleFloat doubleFloatWithIntegerPart:intPart
+ negative:negative
+ fractionalPart:fractPart
+ exponent:exponent
+ exponentNegative:exponentNegative];
+ else
+ return [MLKSingleFloat singleFloatWithIntegerPart:intPart
+ negative:negative
+ fractionalPart:fractPart
+ exponent:exponent
+ exponentNegative:exponentNegative];
+}
+@end
diff --git a/MLKSingleFloat.h b/MLKSingleFloat.h
new file mode 100644
index 0000000..138c188
--- /dev/null
+++ b/MLKSingleFloat.h
@@ -0,0 +1,50 @@
+/* -*- mode: objc; coding: utf-8 -*- */
+/* Étoilisp/Mulklisp, 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/>.
+ */
+
+#import "MLKFloat.h"
+
+@class NSString;
+
+
+@interface MLKSingleFloat : MLKFloat
+{
+ float value;
+}
+
+-(MLKSingleFloat *) initWithIntegerPart:(NSString *)intPart
+ negative:(BOOL)negative
+ fractionalPart:(NSString *)fractPart
+ exponent:(NSString *)exponent
+ exponentNegative:(BOOL)exponentNegative;
+
++(MLKSingleFloat *) singleFloatWithIntegerPart:(NSString *)intPart
+ negative:(BOOL)negative
+ fractionalPart:(NSString *)fractPart
+ exponent:(NSString *)exponent
+ exponentNegative:(BOOL)exponentNegative;
+
+-(float) floatValue;
+-(double) doubleValue;
+
+-(MLKFloat *) add:(MLKFloat *)arg;
+-(MLKFloat *) subtract:(MLKFloat *)arg;
+-(MLKFloat *) multiplyWith:(MLKFloat *)arg;
+-(MLKFloat *) divideBy:(MLKFloat *)arg;
+
+-(NSString *) description;
+@end