From 3329eeafa1f08c5b9d410e57f761011d2e1ac1d6 Mon Sep 17 00:00:00 2001
From: Matthias Andreas Benkard <matthias@benkard.de>
Date: Thu, 7 Aug 2008 14:21:27 +0200
Subject: Centralise declaration and documentation string handling.

---
 MLKInterpreter.m | 48 +++++++++---------------------------------------
 1 file changed, 9 insertions(+), 39 deletions(-)

(limited to 'MLKInterpreter.m')

diff --git a/MLKInterpreter.m b/MLKInterpreter.m
index 1dd5e6b..159de2a 100644
--- a/MLKInterpreter.m
+++ b/MLKInterpreter.m
@@ -633,25 +633,14 @@ static MLKSymbol *MULTIPLE_VALUE_CALL;
             }
           else if (car == _MACROLET)
             {
-              id declarations;
+              id declarations, doc;
               id clauses;
               id body;
               NSArray *result;
               MLKLexicalContext *ctx;
 
-              body = [[program cdr] cdr];
-
-              if ([[body car] isKindOfClass:[MLKCons class]]
-                  && [[body car] car] == DECLARE)
-                {
-                  declarations = [[body car] cdr];
-                  body = [body cdr];
-                }
-              else
-                {
-                  declarations = nil;
-                }
-
+              MLKSplitDeclarationsDocAndForms (&declarations, &doc, &body,
+                                               [[program cdr] cdr]);
               ctx = LAUTORELEASE ([[MLKLexicalContext alloc]
                                    initWithParent:context
                                    variables:nil
@@ -704,7 +693,7 @@ static MLKSymbol *MULTIPLE_VALUE_CALL;
             }
           else if (car == _FLET)
             {
-              id declarations;
+              id declarations, doc;
               id clauses;
               NSMutableArray *new_clauses;
               id body;
@@ -712,18 +701,8 @@ static MLKSymbol *MULTIPLE_VALUE_CALL;
               MLKLexicalContext *ctx;
               MLKLexicalEnvironment *env;
 
-              body = [[program cdr] cdr];
-
-              if ([[body car] isKindOfClass:[MLKCons class]]
-                  && [[body car] car] == DECLARE)
-                {
-                  declarations = [[body car] cdr];
-                  body = [body cdr];
-                }
-              else
-                {
-                  declarations = nil;
-                }
+              MLKSplitDeclarationsDocAndForms (&declarations, &doc, &body,
+                                               [[program cdr] cdr]);
 
               ctx = LAUTORELEASE ([[MLKLexicalContext alloc]
                                    initWithParent:context
@@ -790,7 +769,7 @@ static MLKSymbol *MULTIPLE_VALUE_CALL;
             }
           else if (car == LET)
             {
-              id declarations;
+              id declarations, doc;
               id clauses;
               id body;
               NSArray *result;
@@ -799,17 +778,8 @@ static MLKSymbol *MULTIPLE_VALUE_CALL;
               MLKLexicalEnvironment *env;
               MLKDynamicContext *dynctx;
 
-              body = [[program cdr] cdr];
-              if ([[body car] isKindOfClass:[MLKCons class]]
-                  && [[body car] car] == DECLARE)
-                {
-                  declarations = [[body car] cdr];
-                  body = [body cdr];
-                }
-              else
-                {
-                  declarations = nil;
-                }
+              MLKSplitDeclarationsDocAndForms (&declarations, &doc, &body,
+                                               [[program cdr] cdr]);
 
               ctx = LAUTORELEASE ([[MLKLexicalContext alloc]
                                    initWithParent:context
-- 
cgit v1.2.3