Browse code

Lots of adaptation for mulle-objc.

Nat! authored on 21-04-2017 17:35:10
Showing 52 changed files
1 1
new file mode 100644
... ...
@@ -0,0 +1 @@
1
+https://github.com/mulle-nat
... ...
@@ -1,2 +1 @@
1 1
 https://github.com/madler/zlib.git
2
-ssh://git@mulle-kybernetik.com:23/MulleFoundation
3 2
new file mode 100644
... ...
@@ -0,0 +1 @@
1
+${MULLE_CONFIGURATION_CLONE:-https://github.com/mulle-nat/mulle-configuration;;${MULLE_CONFIGURATION_BRANCH:-release}
0 2
new file mode 100644
... ...
@@ -0,0 +1 @@
1
+${MULLE_FOUNDATION_REPOSITORIES}/MulleFoundation;;${MULLE_FOUNDATION_BRANCH:-release}
... ...
@@ -23,3 +23,7 @@ dependencies/
23 23
 mulle-configuration/
24 24
 .repos/mulle-thread/mintomic/
25 25
 .repos/mulle-thread/mulle-configuration/
26
+/addictions
27
+/.bootstrap.repos
28
+/stashes
29
+mulle-configuration
26 30
\ No newline at end of file
... ...
@@ -6,145 +6,20 @@ project (MulleScion)
6 6
 set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/mulle-configuration)
7 7
 message(STATUS "CMAKE_MODULE_PATH is ${CMAKE_MODULE_PATH}")
8 8
 message(STATUS "CMAKE_BUILD_TYPE is ${CMAKE_BUILD_TYPE}")
9
+
10
+set( MULLE_LANGUAGE "ObjC")
11
+
9 12
 if( "${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
10 13
   include( Debug)
11 14
 else()
12 15
   include( Release)
13 16
 endif()
14 17
 
15
-# move to mulle-configuration
16
-IF(APPLE)
17
-   find_library( FOUNDATION
18
-                 NAMES Foundation
19
-                 PATHS ${CMAKE_OSX_SYSROOT}/System/Library
20
-                 PATH_SUFFIXES Frameworks
21
-                 NO_DEFAULT_PATH)
22
-else()
23
-   find_library( FOUNDATION
24
-                 NAMES Foundation
25
-                 HINTS lib dependencies/lib
26
-                )
27
-endif()
28
-
29 18
 
30 19
 add_definitions( -DPROJECT_VERSION=1854)
31 20
 
32
-include_directories(
33
-src
34
-src/hoedown
35
-src/mongoose
36
-google-toolbox-for-mac
37
-google-toolbox-for-mac/Foundation
38
-)
39
-
40
-
41
-set( MONGOOSE_SOURCES
42
-src/mongoose/mongoose.c
43
-)
44 21
 
45
-
46
-set( HOEDOWN_SOURCES
47
-src/hoedown/Hoedown.m
48
-src/hoedown/Hoedown+MulleScionPrinting.m
49
-src/hoedown/NSString+TrimTextFromExamples.m
50
-src/hoedown/NSData+Hoedown.m
51
-src/hoedown/autolink.c
52
-src/hoedown/buffer.c
53
-src/hoedown/document.c
54
-src/hoedown/escape.c
55
-src/hoedown/html_blocks.c
56
-src/hoedown/html_smartypants.c
57
-src/hoedown/html.c
58
-src/hoedown/stack.c
59
-src/hoedown/version.c
60
-)
61
-
62
-
63
-set( GOOGLE_TOOLBOX_SOURCES
64
-google-toolbox-for-mac/Foundation/GTMNSString+HTML.m
65
-)
66
-
67
-
68
-
69
-# public headers
70
-set( MULLE_SCION_HEADERS
71
-src/MulleScion.h
72
-)
73
-
74
-
75
-set( MULLE_SCION_SOURCES
76
-src/MulleScion.m
77
-)
78
-
79
-
80
-# public headers
81
-set( MULLE_SCION_FOUNDATION_HEADERS
82
-src/MulleObjCCompilerSettings.h
83
-src/MulleScionObjectModel.h
84
-src/MulleScionObjectModel+NSCoding.h
85
-src/MulleScionTemplate+CompressedArchive.h
86
-src/NSFileHandle+MulleOutputFileHandle.h
87
-src/MulleScionObjectModel+TraceDescription.h
88
-)
89
-
90
-
91
-set( MULLE_SCION_FOUNDATION_SOURCES
92
-src/MulleScionObjectModel.m
93
-src/MulleScionObjectModel+NSCoding.m
94
-src/MulleScionTemplate+CompressedArchive.m
95
-src/NSFileHandle+MulleOutputFileHandle.m
96
-src/MulleScionObjectModel+TraceDescription.m
97
-src/NSData+ZLib.m
98
-src/NSObject+KVC_Compatibility.m
99
-src/NSString+HTMLEscape.m
100
-${GOOGLE_TOOLBOX_SOURCES}
101
-${HOEDOWN_SOURCES}
102
-)
103
-
104
-
105
-# public headers
106
-set( MULLE_SCION_PARSER_HEADERS
107
-src/MulleScionParser.h
108
-src/MulleScionParser+Parsing.h
109
-)
110
-
111
-
112
-set( MULLE_SCION_PARSER_SOURCES
113
-src/MulleScionParser.m
114
-src/MulleScionParser+Parsing.m
115
-src/MulleScionObjectModel+Parsing.m
116
-src/MulleScionObjectModel+BlockExpansion.m
117
-src/MulleScionObjectModel+MacroExpansion.m
118
-)
119
-
120
-
121
-# public headers
122
-set( MULLE_SCION_PRINTER_HEADERS
123
-src/MulleScionOutputProtocol.h
124
-src/MulleScionDataSourceProtocol.h
125
-src/MulleScionPrinter.h
126
-src/MulleScionPrintingException.h
127
-src/NSObject+MulleScionDescription.h
128
-)
129
-
130
-
131
-set( MULLE_SCION_PRINTER_SOURCES
132
-src/MulleScionDataSourceProtocol.m
133
-src/MulleScionPrinter.m
134
-src/MulleScionPrintingException.m
135
-src/MulleScionObjectModel+Printing.m
136
-src/NSObject+MulleScionDescription.m
137
-src/NSValue+CheatAndHack.m
138
-src/MulleMutableLineNumber.m
139
-src/MulleScionNull.m
140
-)
141
-
142
-
143
-set( TOOL_SOURCES
144
-src/MulleMongoose.m
145
-src/MulleScionObjectModel+MulleMongoose.m
146
-src/main.m
147
-)
22
+include( CMakeSourcesAndHeaders.txt )
148 23
 
149 24
 
150 25
 set( HEADERS
... ...
@@ -155,6 +30,13 @@ ${MULLE_SCION_PRINTER_HEADERS}
155 30
 )
156 31
 
157 32
 
33
+
34
+# move to mulle-configuration
35
+set( CMAKE_FIND_FRAMEWORK "LAST")
36
+
37
+find_library( FOUNDATION_LIBRARY NAMES Foundation)
38
+message( STATUS "FOUNDATION_LIBRARY is ${FOUNDATION_LIBRARY}")
39
+
158 40
 add_library( MulleScion STATIC
159 41
 ${MULLE_SCION_SOURCES}
160 42
 ${MULLE_SCION_FOUNDATION_SOURCES}
... ...
@@ -162,25 +44,29 @@ ${MULLE_SCION_PARSER_SOURCES}
162 44
 ${MULLE_SCION_PRINTER_SOURCES}
163 45
 )
164 46
 
47
+target_link_libraries( MulleScion
48
+${FOUNDATION_LIBRARY}
49
+${OS_SPECIFIC_LIBS}
50
+-lz
51
+)
52
+
165 53
 
166 54
 add_executable( mulle-scion
167 55
 ${MONGOOSE_SOURCES}
168 56
 ${TOOL_SOURCES}
169 57
 )
170
- 
171
-set( OS_SPECIFIC_LIBS ${OS_SPECIFIC_LIBS} -lz)
58
+
172 59
 
173 60
 target_link_libraries( mulle-scion
174 61
 ${BEGIN_ALL_LOAD}
175 62
 MulleScion
176
-${FOUNDATION}
177 63
 ${END_ALL_LOAD}
64
+${FOUNDATION_LIBRARY}
178 65
 ${OS_SPECIFIC_LIBS}
179 66
 -lz
180 67
 )
181 68
 
182 69
 
183
-
184 70
 INSTALL( TARGETS MulleScion DESTINATION "lib")
185 71
 INSTALL( FILES ${HEADERS} DESTINATION "include/MulleScion")
186 72
 
187 73
new file mode 100644
... ...
@@ -0,0 +1,117 @@
1
+include_directories(
2
+src
3
+src/hoedown
4
+src/mongoose
5
+google-toolbox-for-mac
6
+google-toolbox-for-mac/Foundation
7
+)
8
+
9
+
10
+set( MONGOOSE_SOURCES
11
+src/mongoose/mongoose.c
12
+)
13
+
14
+
15
+set( HOEDOWN_SOURCES
16
+src/hoedown/Hoedown.m
17
+src/hoedown/Hoedown+MulleScionPrinting.m
18
+src/hoedown/NSString+TrimTextFromExamples.m
19
+src/hoedown/NSData+Hoedown.m
20
+src/hoedown/autolink.c
21
+src/hoedown/buffer.c
22
+src/hoedown/document.c
23
+src/hoedown/escape.c
24
+src/hoedown/html_blocks.c
25
+src/hoedown/html_smartypants.c
26
+src/hoedown/html.c
27
+src/hoedown/stack.c
28
+src/hoedown/version.c
29
+)
30
+
31
+
32
+set( GOOGLE_TOOLBOX_SOURCES
33
+google-toolbox-for-mac/Foundation/GTMNSString+HTML.m
34
+)
35
+
36
+
37
+
38
+# public headers
39
+set( MULLE_SCION_HEADERS
40
+src/MulleScion.h
41
+)
42
+
43
+
44
+set( MULLE_SCION_SOURCES
45
+src/MulleScion.m
46
+)
47
+
48
+
49
+# public headers
50
+set( MULLE_SCION_FOUNDATION_HEADERS
51
+src/MulleObjCCompilerSettings.h
52
+src/MulleScionObjectModel.h
53
+src/MulleScionObjectModel+NSCoding.h
54
+src/MulleScionTemplate+CompressedArchive.h
55
+src/NSFileHandle+MulleOutputFileHandle.h
56
+src/MulleScionObjectModel+TraceDescription.h
57
+)
58
+
59
+
60
+set( MULLE_SCION_FOUNDATION_SOURCES
61
+src/MulleScionObjectModel.m
62
+src/MulleScionObjectModel+NSCoding.m
63
+src/MulleScionTemplate+CompressedArchive.m
64
+src/NSFileHandle+MulleOutputFileHandle.m
65
+src/MulleScionObjectModel+TraceDescription.m
66
+src/NSData+ZLib.m
67
+src/NSObject+KVC_Compatibility.m
68
+src/NSString+HTMLEscape.m
69
+${GOOGLE_TOOLBOX_SOURCES}
70
+${HOEDOWN_SOURCES}
71
+)
72
+
73
+
74
+# public headers
75
+set( MULLE_SCION_PARSER_HEADERS
76
+src/MulleScionParser.h
77
+src/MulleScionParser+Parsing.h
78
+)
79
+
80
+
81
+set( MULLE_SCION_PARSER_SOURCES
82
+src/MulleScionParser.m
83
+src/MulleScionParser+Parsing.m
84
+src/MulleScionObjectModel+Parsing.m
85
+src/MulleScionObjectModel+BlockExpansion.m
86
+src/MulleScionObjectModel+MacroExpansion.m
87
+)
88
+
89
+
90
+# public headers
91
+set( MULLE_SCION_PRINTER_HEADERS
92
+src/MulleScionOutputProtocol.h
93
+src/MulleScionDataSourceProtocol.h
94
+src/MulleScionPrinter.h
95
+src/MulleScionPrintingException.h
96
+src/NSObject+MulleScionDescription.h
97
+)
98
+
99
+
100
+set( MULLE_SCION_PRINTER_SOURCES
101
+src/MulleScionDataSourceProtocol.m
102
+src/MulleScionPrinter.m
103
+src/MulleScionPrintingException.m
104
+src/MulleScionObjectModel+Printing.m
105
+src/NSObject+MulleScionDescription.m
106
+src/NSValue+CheatAndHack.m
107
+src/MulleMutableLineNumber.m
108
+src/MulleScionNull.m
109
+)
110
+
111
+
112
+set( TOOL_SOURCES
113
+src/MulleMongoose.m
114
+src/MulleScionObjectModel+MulleMongoose.m
115
+src/main.m
116
+)
117
+
... ...
@@ -1019,18 +1019,18 @@
1019 1019
 		41D6DE9F16DE28B8004833D6 /* MulleScionPrinter */ = {
1020 1020
 			isa = PBXGroup;
1021 1021
 			children = (
1022
-				41D6DEA916DE3900004833D6 /* MulleScionOutputProtocol.h */,
1023 1022
 				4121DB1516DD8A0900BFD60C /* MulleScionDataSourceProtocol.h */,
1024 1023
 				41D6DEA716DE3374004833D6 /* MulleScionDataSourceProtocol.m */,
1024
+				41D6DEA916DE3900004833D6 /* MulleScionOutputProtocol.h */,
1025 1025
 				41764BA016DA51B700560FCF /* MulleScionPrinter.h */,
1026 1026
 				41764BA116DA51B700560FCF /* MulleScionPrinter.m */,
1027
+				41D6DEA316DE32A9004833D6 /* MulleScionPrintingException.h */,
1027 1028
 				41D6DEA416DE32A9004833D6 /* MulleScionPrintingException.m */,
1028 1029
 				41764BA816DA5B2B00560FCF /* MulleScionObjectModel+Printing.m */,
1029 1030
 				41764BAB16DA5E1600560FCF /* NSObject+MulleScionDescription.m */,
1030 1031
 				4121DB1016DD685C00BFD60C /* NSValue+CheatAndHack.m */,
1031 1032
 				410B32E916DB8A7D005D0EAD /* MulleMutableLineNumber.m */,
1032 1033
 				41F12D4516E274D200120E63 /* MulleScionNull.m */,
1033
-				41D6DEA316DE32A9004833D6 /* MulleScionPrintingException.h */,
1034 1034
 				41764BA716DA5B2B00560FCF /* MulleScionObjectModel+Printing.h */,
1035 1035
 				41764BAA16DA5E1600560FCF /* NSObject+MulleScionDescription.h */,
1036 1036
 				410B32E816DB8A7D005D0EAD /* MulleMutableLineNumber.h */,
... ...
@@ -61,7 +61,7 @@ class ${PROJECT} < Formula
61 61
   version "${VERSION}"
62 62
   sha256 "${HASH}"
63 63
 
64
-  depends_on "mulle-bootstrap"
64
+  depends_on "mulle-kybernetik/software/mulle-bootstrap"
65 65
   depends_on :xcode => :build
66 66
   depends_on :macos => :snow_leopard
67 67
 
... ...
@@ -37,7 +37,7 @@
37 37
 
38 38
 static inline Class   MulleGetClass( id self)
39 39
 {
40
-   return( mulle_objc_object_get_isa( self));
40
+   return( self ? (Class) _mulle_objc_object_get_isa( self) : Nil);
41 41
 }
42 42
 
43 43
 #else
... ...
@@ -56,7 +56,7 @@ static inline Class   MulleGetClass( id self)
56 56
 
57 57
 static inline Class   MulleGetClass( id self)
58 58
 {
59
-   return( ((struct objc_object *) self)->isa);
59
+   return( self ? ((struct objc_object *) self)->isa : Nil);
60 60
 }
61 61
 # endif
62 62
 #endif
... ...
@@ -1,5 +1,5 @@
1 1
 //
2
-//  NSLineCountNumber.h
2
+//  MulleMutableLineNumber.h
3 3
 //  MulleScion
4 4
 //
5 5
 //  Created by Nat! on 25.02.13.
... ...
@@ -1,5 +1,5 @@
1 1
 //
2
-//  NSLineCountNumber.m
2
+//  MulleMutableLineNumber.m
3 3
 //  MulleScion
4 4
 //
5 5
 //  Created by Nat! on 25.02.13.
... ...
@@ -1,12 +1,37 @@
1
-/*
2
- *  MulleCore - Optimized Foundation Replacements and Extensions Functionality
3
- *              also a part of MulleEOFoundation of MulleEOF (Project Titmouse)
4
- *              which is part of the Mulle EOControl Framework Collection
5
- *  Copyright (C) 2013 Nat!, Codeon GmbH, Mulle kybernetiK. All rights reserved.
6
- *
7
- *  Coded by Nat!
8
- *
9
- */
1
+//
2
+//  MulleCore - Optimized Foundation Replacements and Extensions Functionality
3
+//              also a part of MulleEOFoundation of MulleEOF (Project Titmouse)
4
+//              which is part of the Mulle EOControl Framework Collection
5
+//  Copyright (C) 2013 Nat!, Codeon GmbH, Mulle kybernetiK. All rights reserved.
6
+//
7
+//
8
+//  Redistribution and use in source and binary forms, with or without
9
+//  modification, are permitted provided that the following conditions are met:
10
+//
11
+//  Redistributions of source code must retain the above copyright notice, this
12
+//  list of conditions and the following disclaimer.
13
+//
14
+//  Redistributions in binary form must reproduce the above copyright notice,
15
+//  this list of conditions and the following disclaimer in the documentation
16
+//  and/or other materials provided with the distribution.
17
+//
18
+//  Neither the name of Mulle kybernetiK nor the names of its contributors
19
+//  may be used to endorse or promote products derived from this software
20
+//  without specific prior written permission.
21
+//
22
+//  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
23
+//  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
24
+//  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
25
+//  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
26
+//  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
27
+//  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
28
+//  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
29
+//  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
30
+//  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
31
+//  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
32
+//  POSSIBILITY OF SUCH DAMAGE.
33
+//
34
+
10 35
 #ifndef __has_feature      // Optional.
11 36
 # define __has_feature(x) 0 // Compatibility with non-clang compilers.
12 37
 #endif
... ...
@@ -63,7 +63,7 @@
63 63
  printf( "%s", [output UTF8String]);
64 64
  * --------------snip------------------------
65 65
  */
66
-@interface MulleScionTemplate ( Convenience)
66
+@interface MulleScionTemplate( Convenience)
67 67
 
68 68
 - (id) initWithUTF8String:(unsigned char *) s;
69 69
 
... ...
@@ -117,7 +117,7 @@
117 117
 
118 118
 #ifndef DONT_HAVE_MULLE_SCION_CACHING
119 119
 
120
-@interface MulleScionTemplate ( Caching)
120
+@interface MulleScionTemplate( Caching)
121 121
 
122 122
 // Easier to use environment variable: MulleScionCacheDirectory
123 123
 + (void) setCacheDirectory:(NSString *) directory;
... ...
@@ -52,7 +52,7 @@
52 52
 char  MulleScionFrameworkVersion[] = STRINGIFY( PROJECT_VERSION);
53 53
 
54 54
 
55
-@implementation MulleScionTemplate ( Convenience)
55
+@implementation MulleScionTemplate( Convenience)
56 56
 
57 57
 + (BOOL) writeToOutput:(id <MulleScionOutput>) output
58 58
           templateFile:(NSObject <MulleScionStringOrURL> *) fileName
... ...
@@ -338,7 +338,7 @@ static MulleScionPrinter  *createPrinterWithDatasource( id dataSource)
338 338
 
339 339
 #define MulleScionCacheDirectoryKey   @"MulleScionCacheDirectory"
340 340
 
341
-@implementation MulleScionTemplate ( Caching)
341
+@implementation MulleScionTemplate( Caching)
342 342
 
343 343
 static BOOL       cacheEnabled_;
344 344
 static NSString   *cacheDirectory_;
... ...
@@ -1,5 +1,5 @@
1 1
 //
2
-//  MulleScionOutputProtocol.h
2
+//  MulleScionDataSourceProtocol.h
3 3
 //  MulleScion
4 4
 //
5 5
 //  Created by Nat! on 27.02.13.
... ...
@@ -100,7 +100,7 @@
100 100
 // 
101 101
 // NSObject has default implementations for all methods (also KVC)
102 102
 //
103
-@interface NSObject ( MulleScionDataSource) 
103
+@interface NSObject( MulleScionDataSource) 
104 104
 
105 105
 - (id) mulleScionDataSource;
106 106
 
... ...
@@ -1,5 +1,5 @@
1 1
 //
2
-//  NSObject+MulleScionDataSource.m
2
+//  MulleScionDataSourceProtocol.m
3 3
 //  MulleScion
4 4
 //
5 5
 //  Created by Nat! on 27.02.13.
... ...
@@ -41,7 +41,7 @@
41 41
 #import "MulleScionPrintingException.h"
42 42
 
43 43
 
44
-@interface NSObject ( OldMethods)
44
+@interface NSObject( OldMethods)
45 45
 
46 46
 + (void) poseAs:(Class) cls;
47 47
 
... ...
@@ -54,7 +54,7 @@
54 54
 // Your dataSource can override this method and check if the keyPath is OK.
55 55
 // If not, raise an exception otherwise call super.
56 56
 //
57
-@implementation NSObject ( MulleScionDataSourceSupport)
57
+@implementation NSObject( MulleScionDataSourceSupport)
58 58
 
59 59
 - (id) mulleScionValueForKeyPath:(NSString *) keyPath
60 60
                   localVariables:(NSMutableDictionary *) locals
... ...
@@ -38,7 +38,7 @@
38 38
 #import "MulleScionObjectModel+Parsing.h"
39 39
 
40 40
 
41
-@interface MulleScionObject ( BlockExpansion)
41
+@interface MulleScionObject( BlockExpansion)
42 42
 
43 43
 - (MulleScionObject *) ownerOfBlockWithIdentifier:(NSString *) identifier;
44 44
 - (MulleScionObject *) nextOwnerOfBlockCommand;
... ...
@@ -39,7 +39,7 @@
39 39
 #import "MulleScionObjectModel+NSCoding.h"
40 40
 
41 41
 
42
-@implementation MulleScionObject ( BlockExpansion)
42
+@implementation MulleScionObject( BlockExpansion)
43 43
 
44 44
 - (MulleScionObject *) nextOwnerOfBlockCommand
45 45
 {
... ...
@@ -8,7 +8,7 @@
8 8
 #import "MulleScionObjectModel.h"
9 9
 
10 10
 
11
-@interface NSObject ( MulleGraphvizSubclassing)
11
+@interface NSObject( MulleGraphvizSubclassing)
12 12
 
13 13
 - (NSMutableDictionary *) mulleGraphvizAttributes;
14 14
 - (NSMutableDictionary *) mulleGraphvizChildrenByName;
... ...
@@ -22,7 +22,7 @@
22 22
 
23 23
 
24 24
 // a beginning, not the end
25
-@implementation MulleScionObject ( MulleGraphviz)
25
+@implementation MulleScionObject( MulleGraphviz)
26 26
 
27 27
 - (NSMutableDictionary *) mulleGraphvizChildrenByName
28 28
 {
... ...
@@ -56,7 +56,7 @@
56 56
 
57 57
 
58 58
 
59
-@implementation MulleScionValueObject ( MulleGraphviz)
59
+@implementation MulleScionValueObject( MulleGraphviz)
60 60
 
61 61
 - (NSMutableDictionary *) mulleGraphvizAttributes
62 62
 {
... ...
@@ -71,7 +71,7 @@
71 71
 @end
72 72
 
73 73
 
74
-@implementation MulleScionBinaryOperatorExpression ( Graphviz)
74
+@implementation MulleScionBinaryOperatorExpression( Graphviz)
75 75
 
76 76
 - (NSMutableDictionary *) mulleGraphvizAttributes
77 77
 {
... ...
@@ -95,7 +95,7 @@
95 95
 @end
96 96
 
97 97
 
98
-@implementation MulleScionComparison ( MulleGraphviz)
98
+@implementation MulleScionComparison( MulleGraphviz)
99 99
 
100 100
 - (NSMutableDictionary *) mulleGraphvizAttributes
101 101
 {
... ...
@@ -37,7 +37,7 @@
37 37
 #import "MulleScionObjectModel+Parsing.h"
38 38
 
39 39
 
40
-@interface MulleScionMacro ( MacroExpansion)
40
+@interface MulleScionMacro( MacroExpansion)
41 41
 
42 42
 - (NSDictionary *) parametersWithArguments:(NSArray *) arguments
43 43
                                   fileName:(NSString *) fileName
... ...
@@ -49,7 +49,7 @@
49 49
 @end
50 50
 
51 51
 
52
-@interface MulleScionObject ( VariableSubstitution)
52
+@interface MulleScionObject( VariableSubstitution)
53 53
 
54 54
 //
55 55
 // will return nil, if the object itself needs not to be exchanged
... ...
@@ -42,7 +42,7 @@
42 42
 // this is totally hackish
43 43
 
44 44
 
45
-@implementation MulleScionObject ( VariableSubstitution)
45
+@implementation MulleScionObject( VariableSubstitution)
46 46
 
47 47
 - (id) replaceVariableWithIdentifier:(NSString *)identifier
48 48
                       withExpression:(MulleScionExpression *) expr NS_RETURNS_RETAINED
... ...
@@ -53,7 +53,7 @@
53 53
 @end
54 54
 
55 55
 
56
-@implementation MulleScionIdentifierExpression ( VariableSubstitution)
56
+@implementation MulleScionIdentifierExpression( VariableSubstitution)
57 57
 
58 58
 - (id) replaceVariableWithIdentifier:(NSString *) identifier
59 59
                       withExpression:(MulleScionExpression *) expr NS_RETURNS_RETAINED
... ...
@@ -153,7 +153,7 @@ static NSMutableArray  *replaceVariablesWithIdentifierInArray( NSArray *array,
153 153
 }
154 154
 
155 155
 
156
-@implementation MulleScionArray ( VariableSubstitution)
156
+@implementation MulleScionArray( VariableSubstitution)
157 157
 
158 158
 - (id) replaceVariableWithIdentifier:(NSString *) identifier
159 159
                       withExpression:(MulleScionExpression *) expr NS_RETURNS_RETAINED
... ...
@@ -174,7 +174,7 @@ static NSMutableArray  *replaceVariablesWithIdentifierInArray( NSArray *array,
174 174
 
175 175
 
176 176
 
177
-@implementation MulleScionDictionary ( VariableSubstitution)
177
+@implementation MulleScionDictionary( VariableSubstitution)
178 178
    
179 179
 - (id) replaceVariableWithIdentifier:(NSString *) identifier
180 180
                       withExpression:(MulleScionExpression *) expr NS_RETURNS_RETAINED
... ...
@@ -194,7 +194,7 @@ static NSMutableArray  *replaceVariablesWithIdentifierInArray( NSArray *array,
194 194
 @end
195 195
 
196 196
 
197
-@implementation MulleScionFunction ( VariableSubstitution)
197
+@implementation MulleScionFunction( VariableSubstitution)
198 198
 
199 199
 - (id) replaceVariableWithIdentifier:(NSString *) identifier
200 200
                       withExpression:(MulleScionExpression *) expr NS_RETURNS_RETAINED
... ...
@@ -215,7 +215,7 @@ static NSMutableArray  *replaceVariablesWithIdentifierInArray( NSArray *array,
215 215
 @end
216 216
 
217 217
 
218
-@implementation MulleScionMethod ( VariableSubstitution)
218
+@implementation MulleScionMethod( VariableSubstitution)
219 219
 
220 220
 - (id) replaceVariableWithIdentifier:(NSString *) identifier
221 221
                       withExpression:(MulleScionExpression *) expr NS_RETURNS_RETAINED
... ...
@@ -250,7 +250,7 @@ static NSMutableArray  *replaceVariablesWithIdentifierInArray( NSArray *array,
250 250
 
251 251
 
252 252
 
253
-@implementation MulleScionUnaryOperatorExpression ( VariableSubstitution)
253
+@implementation MulleScionUnaryOperatorExpression( VariableSubstitution)
254 254
 
255 255
 - (id) replaceVariableWithIdentifier:(NSString *) identifier
256 256
                       withExpression:(MulleScionExpression *) expr NS_RETURNS_RETAINED
... ...
@@ -272,7 +272,7 @@ static NSMutableArray  *replaceVariablesWithIdentifierInArray( NSArray *array,
272 272
 @end
273 273
 
274 274
 
275
-@implementation MulleScionBinaryOperatorExpression ( VariableSubstitution)
275
+@implementation MulleScionBinaryOperatorExpression( VariableSubstitution)
276 276
 
277 277
 - (id) replaceVariableWithIdentifier:(NSString *) identifier
278 278
                       withExpression:(MulleScionExpression *) expr NS_RETURNS_RETAINED
... ...
@@ -307,7 +307,7 @@ static NSMutableArray  *replaceVariablesWithIdentifierInArray( NSArray *array,
307 307
 //
308 308
 // can't fully macro expand right side of a pipe
309 309
 //
310
-@implementation MulleScionPipe ( Printing)
310
+@implementation MulleScionPipe( VariableSubstitution)
311 311
 
312 312
 - (id) replaceVariableWithIdentifier:(NSString *) identifier
313 313
                       withExpression:(MulleScionExpression *) expr NS_RETURNS_RETAINED
... ...
@@ -340,7 +340,7 @@ static NSMutableArray  *replaceVariablesWithIdentifierInArray( NSArray *array,
340 340
 @end
341 341
 
342 342
 
343
-@implementation MulleScionDot ( Printing)
343
+@implementation MulleScionDot( VariableSubstitution)
344 344
 
345 345
 - (id) replaceVariableWithIdentifier:(NSString *) identifier
346 346
                       withExpression:(MulleScionExpression *) expr NS_RETURNS_RETAINED
... ...
@@ -372,7 +372,7 @@ static NSMutableArray  *replaceVariablesWithIdentifierInArray( NSArray *array,
372 372
 @end
373 373
 
374 374
 
375
-@implementation MulleScionConditional ( VariableSubstitution)
375
+@implementation MulleScionConditional( VariableSubstitution)
376 376
 
377 377
 - (id) replaceVariableWithIdentifier:(NSString *) identifier
378 378
                       withExpression:(MulleScionExpression *) expr NS_RETURNS_RETAINED
... ...
@@ -409,7 +409,7 @@ static NSMutableArray  *replaceVariablesWithIdentifierInArray( NSArray *array,
409 409
 @end
410 410
 
411 411
 
412
-@implementation MulleScionAssignmentExpression ( VariableSubstitution)
412
+@implementation MulleScionAssignmentExpression( VariableSubstitution)
413 413
 
414 414
 - (id) replaceVariableWithIdentifier:(NSString *) identifier
415 415
                       withExpression:(MulleScionExpression *) expr NS_RETURNS_RETAINED
... ...
@@ -439,7 +439,7 @@ static NSMutableArray  *replaceVariablesWithIdentifierInArray( NSArray *array,
439 439
 @end
440 440
 
441 441
 
442
-@implementation MulleScionSet ( VariableSubstitution)
442
+@implementation MulleScionSet( VariableSubstitution)
443 443
 
444 444
 - (id) replaceVariableWithIdentifier:(NSString *) identifier
445 445
                      withExpression:(MulleScionExpression *) expr NS_RETURNS_RETAINED
... ...
@@ -469,7 +469,7 @@ static NSMutableArray  *replaceVariablesWithIdentifierInArray( NSArray *array,
469 469
 @end
470 470
 
471 471
 
472
-@implementation MulleScionExpressionCommand ( VariableSubstitution)
472
+@implementation MulleScionExpressionCommand( VariableSubstitution)
473 473
 
474 474
 - (id) replaceVariableWithIdentifier:(NSString *) identifier
475 475
                       withExpression:(MulleScionExpression *) expr NS_RETURNS_RETAINED
... ...
@@ -494,7 +494,7 @@ static NSMutableArray  *replaceVariablesWithIdentifierInArray( NSArray *array,
494 494
 # pragma mark -
495 495
 # pragma Expansion Works
496 496
 
497
-@implementation MulleScionMacro ( MacroExpansion)
497
+@implementation MulleScionMacro( MacroExpansion)
498 498
 
499 499
 - (id) replaceVariableWithIdentifier:(NSString *) identifier
500 500
                       withExpression:(MulleScionExpression *) expr NS_RETURNS_RETAINED
... ...
@@ -605,12 +605,14 @@ typedef struct
605 605
    id                              value;
606 606
    NSString                        *identifier;
607 607
    NSMutableArray                  *identifiers;
608
+   NSArray                         *arguments;
608 609
    
609 610
    parameters  = [NSMutableDictionary dictionary];
610 611
    identifiers = [NSMutableArray array];
611 612
    
612 613
    // first setup default values for macro and remember where what is
613
-   rover = [[[self function] arguments] objectEnumerator];
614
+   arguments = [[self function] arguments];
615
+   rover     = [arguments objectEnumerator];
614 616
    
615 617
    while( expr = [rover nextObject])
616 618
    {
... ...
@@ -37,7 +37,7 @@
37 37
 #import "MulleScionObjectModel+MulleMongoose.h"
38 38
 
39 39
 
40
-@implementation MulleScionTemplate ( MulleMongoose)
40
+@implementation MulleScionTemplate( MulleMongoose)
41 41
 
42 42
 static BOOL fileExists( NSString *fileName)
43 43
 {
... ...
@@ -37,7 +37,7 @@
37 37
 #import "MulleScionObjectModel.h"
38 38
 
39 39
 
40
-@interface MulleScionObject ( NSCoding) < NSCoding, NSCopying >
40
+@interface MulleScionObject( NSCoding) < NSCoding, NSCopying >
41 41
 
42 42
 - (id) initWithCoder:(NSCoder *) decoder;
43 43
 - (void) encodeWithCoder:(NSCoder *) encoder;
... ...
@@ -38,7 +38,7 @@
38 38
 #import "MulleScionObjectModel+NSCoding.h"
39 39
 
40 40
 
41
-@implementation MulleScionObject ( NSCoding)
41
+@implementation MulleScionObject( NSCoding)
42 42
 
43 43
 + (void) load
44 44
 {
... ...
@@ -50,12 +50,12 @@
50 50
 // use NSCoding to make a copy, so I don't have to write all those
51 51
 // copy routines
52 52
 //
53
-- (id) copyWithZone:(NSZone *) zone
53
+static id  _copy(id self)
54 54
 {
55 55
    NSData             *data;
56 56
    NSAutoreleasePool  *pool;
57 57
    id                 copy;
58
-   
58
+
59 59
    pool = [NSAutoreleasePool new];
60 60
 #if TARGET_OS_IPHONE  // much slower...
61 61
    data = [NSKeyedArchiver archivedDataWithRootObject:self];
... ...
@@ -65,23 +65,35 @@
65 65
    copy = [[NSUnarchiver unarchiveObjectWithData:data] retain];
66 66
 #endif
67 67
    [pool release];
68
-   
68
+
69 69
    return( copy);
70 70
 }
71
-    
72
-    
71
+
72
+
73
+- (id) copyWithZone:(NSZone *) zone
74
+{
75
+   return( _copy( self));
76
+}
77
+
78
+
79
+- (id) copy
80
+{
81
+   return( _copy( self));
82
+}
83
+
84
+
73 85
 - (id) initWithCoder:(NSCoder *) decoder
74 86
 {
75 87
    uint32_t  lineNumber;
76 88
    id        next;
77
-   
89
+
78 90
    [decoder decodeValueOfObjCType:@encode( uint32_t)
79 91
                                at:&lineNumber];
80 92
 
81 93
     // needed to be coded like this otherwise keyed unarchiver trashes the
82 94
     // stack
83 95
    next = [decoder decodeObject];
84
-   
96
+
85 97
    self = [self initWithLineNumber:lineNumber];
86 98
    assert( self);
87 99
 
... ...
@@ -93,7 +105,7 @@
93 105
 - (void) encodeWithCoder:(NSCoder *) encoder
94 106
 {
95 107
    uint32_t  lineNumber;
96
-   
108
+
97 109
    lineNumber = (uint32_t) lineNumber_;
98 110
    [encoder encodeValueOfObjCType:@encode( uint32_t)
99 111
                                at:&lineNumber];
... ...
@@ -103,13 +115,13 @@
103 115
 @end
104 116
 
105 117
 
106
-@implementation MulleScionValueObject ( NSCoding)
118
+@implementation MulleScionValueObject( NSCoding)
107 119
 
108 120
 - (id) initWithCoder:(NSCoder *) decoder
109 121
 {
110 122
    self = [super initWithCoder:decoder];
111 123
    assert( self);
112
-   
124
+
113 125
    [decoder decodeValuesOfObjCTypes:"@", &value_];
114 126
    return( self);
115 127
 }
... ...
@@ -124,13 +136,13 @@
124 136
 @end
125 137
 
126 138
 
127
-@implementation MulleScionAssignmentExpression ( NSCoding )
139
+@implementation MulleScionAssignmentExpression( NSCoding )
128 140
 
129 141
 - (id) initWithCoder:(NSCoder *) decoder
130 142
 {
131 143
    self = [super initWithCoder:decoder];
132 144
    assert( self);
133
-   
145
+
134 146
    [decoder decodeValuesOfObjCTypes:"@", &right_];
135 147
    return( self);
136 148
 }
... ...
@@ -145,13 +157,13 @@
145 157
 @end
146 158
 
147 159
 
148
-@implementation MulleScionParameterAssignment ( NSCoding )
160
+@implementation MulleScionParameterAssignment( NSCoding )
149 161
 
150 162
 - (id) initWithCoder:(NSCoder *) decoder
151 163
 {
152 164
    self = [super initWithCoder:decoder];
153 165
    assert( self);
154
-   
166
+
155 167
    [decoder decodeValuesOfObjCTypes:"@", &expression_];
156 168
    return( self);
157 169
 }
... ...
@@ -166,13 +178,13 @@
166 178
 @end
167 179
 
168 180
 
169
-@implementation MulleScionFunction ( NSCoding )
181
+@implementation MulleScionFunction( NSCoding )
170 182
 
171 183
 - (id) initWithCoder:(NSCoder *) decoder
172 184
 {
173 185
    self = [super initWithCoder:decoder];
174 186
    assert( self);
175
-   
187
+
176 188
    [decoder decodeValuesOfObjCTypes:"@", &arguments_];
177 189
    return( self);
178 190
 }
... ...
@@ -187,15 +199,15 @@
187 199
 @end
188 200
 
189 201
 
190
-@implementation MulleScionMethod ( NSCoding )
202
+@implementation MulleScionMethod( NSCoding )
191 203
 
192 204
 - (id) initWithCoder:(NSCoder *) decoder
193 205
 {
194 206
    NSString  *methodName;
195
-   
207
+
196 208
    self = [super initWithCoder:decoder];
197 209
    assert( self);
198
-   
210
+
199 211
    [decoder decodeValuesOfObjCTypes:"@@", &arguments_, &methodName];
200 212
    action_ = NSSelectorFromString( methodName);
201 213
    [methodName release];
... ...
@@ -215,13 +227,13 @@
215 227
 @end
216 228
 
217 229
 
218
-@implementation MulleScionBinaryOperatorExpression  ( NSCoding )
230
+@implementation MulleScionBinaryOperatorExpression ( NSCoding )
219 231
 
220 232
 - (id) initWithCoder:(NSCoder *) decoder
221 233
 {
222 234
    self = [super initWithCoder:decoder];
223 235
    assert( self);
224
-   
236
+
225 237
    [decoder decodeValuesOfObjCTypes:"@", &right_];
226 238
    return( self);
227 239
 }
... ...
@@ -236,7 +248,7 @@
236 248
 @end
237 249
 
238 250
 
239
-@implementation MulleScionComparison  ( NSCoding )
251
+@implementation MulleScionComparison ( NSCoding )
240 252
 
241 253
 - (id) initWithCoder:(NSCoder *) decoder
242 254
 {
... ...
@@ -244,7 +256,7 @@
244 256
 
245 257
    self = [super initWithCoder:decoder];
246 258
    assert( self);
247
-   
259
+
248 260
    [decoder decodeValuesOfObjCTypes:"C", &code];
249 261
    comparison_ = code;
250 262
    return( self);
... ...
@@ -254,7 +266,7 @@
254 266
 - (void) encodeWithCoder:(NSCoder *) encoder
255 267
 {
256 268
    unsigned char   code;
257
-   
269
+
258 270
    [super encodeWithCoder:encoder];
259 271
    code = comparison_;
260 272
    [encoder encodeValuesOfObjCTypes:"C", &code];
... ...
@@ -263,13 +275,13 @@
263 275
 @end
264 276
 
265 277
 
266
-@implementation MulleScionConditional ( NSCoding )
278
+@implementation MulleScionConditional( NSCoding )
267 279
 
268 280
 - (id) initWithCoder:(NSCoder *) decoder
269 281
 {
270 282
    self = [super initWithCoder:decoder];
271 283
    assert( self);
272
-   
284
+
273 285
    [decoder decodeValuesOfObjCTypes:"@@", &middle_, &right_];
274 286
    return( self);
275 287
 }
... ...
@@ -284,13 +296,13 @@
284 296
 @end
285 297
 
286 298
 
287
-@implementation MulleScionExpressionCommand ( NSCoding)
299
+@implementation MulleScionExpressionCommand( NSCoding)
288 300
 
289 301
 - (id) initWithCoder:(NSCoder *) decoder
290 302
 {
291 303
    self = [super initWithCoder:decoder];
292 304
    assert( self);
293
-   
305
+
294 306
    [decoder decodeValuesOfObjCTypes:"@", &expression_];
295 307
    return( self);
296 308
 }
... ...
@@ -305,7 +317,7 @@
305 317
 @end
306 318
 
307 319
 
308
-@implementation MulleScionFilter ( NSCoding)
320
+@implementation MulleScionFilter( NSCoding)
309 321
 
310 322
 - (id) initWithCoder:(NSCoder *) decoder
311 323
 {
... ...
@@ -326,13 +338,13 @@
326 338
 
327 339
 
328 340
 
329
-@implementation MulleScionSet ( NSCoding)
341
+@implementation MulleScionSet( NSCoding)
330 342
 
331 343
 - (id) initWithCoder:(NSCoder *) decoder
332 344
 {
333 345
    self = [super initWithCoder:decoder];
334 346
    assert( self);
335
-   
347
+
336 348
    [decoder decodeValuesOfObjCTypes:"@@", &left_, &right_];
337 349
    return( self);
338 350
 }
... ...
@@ -348,13 +360,13 @@
348 360
 
349 361
 
350 362
 
351
-@implementation MulleScionBlock ( NSCoding)
363
+@implementation MulleScionBlock( NSCoding)
352 364
 
353 365
 - (id) initWithCoder:(NSCoder *) decoder
354 366
 {
355 367
    self = [super initWithCoder:decoder];
356 368
    assert( self);
357
-   
369
+
358 370
    [decoder decodeValuesOfObjCTypes:"@@", &identifier_, &fileName_];
359 371
    return( self);
360 372
 }
... ...
@@ -370,7 +382,7 @@
370 382
 
371 383
 
372 384
 #ifdef DEBUG
373
-@implementation MulleScionMacro ( NSCoding )
385
+@implementation MulleScionMacro( NSCoding )
374 386
 
375 387
 - (id) initWithCoder:(NSCoder *) decoder
376 388
 {
... ...
@@ -386,13 +398,13 @@
386 398
 #endif
387 399
 
388 400
 
389
-@implementation MulleScionRequires ( NSCoding)
401
+@implementation MulleScionRequires( NSCoding)
390 402
 
391 403
 - (id) initWithCoder:(NSCoder *) decoder
392 404
 {
393 405
    self = [super initWithCoder:decoder];
394 406
    assert( self);
395
-   
407
+
396 408
    [decoder decodeValuesOfObjCTypes:"@", &identifier_];
397 409
    return( self);
398 410
 }
... ...
@@ -40,7 +40,7 @@
40 40
 #import "MulleScionOutputProtocol.h"
41 41
 
42 42
 
43
-@interface MulleScionObject ( Printing)
43
+@interface MulleScionObject( Printing)
44 44
 
45 45
 - (MulleScionObject *) renderInto:(id <MulleScionOutput>) output
46 46
                    localVariables:(NSMutableDictionary *) locals
... ...
@@ -66,7 +66,7 @@ extern NSString   *MulleScionEvenKey;
66 66
 extern NSString   *MulleScionOddKey;
67 67
 
68 68
 
69
-@interface MulleScionTemplate ( Printing)
69
+@interface MulleScionTemplate( Printing)
70 70
 
71 71
 - (NSMutableDictionary *) localVariablesWithDefaultValues:(NSDictionary *) defaults;
72 72
 + (NSMutableDictionary *) mulleScionDefaultBuiltinFunctionTable;
... ...
@@ -199,7 +199,7 @@ static inline void   TRACE_EVAL_BEGIN_END( MulleScionObject *self, id value, id
199 199
 # define TRACE_EVAL_BEGIN_END( self, value, result)
200 200
 #endif
201 201
 
202
-@interface MulleScionExpression ( Printing)
202
+@interface MulleScionExpression( Printing)
203 203
 
204 204
 // this should never return nil, but MulleScionNull instead
205 205
 // should also never receive nil as value
... ...
@@ -216,7 +216,7 @@ static inline void   TRACE_EVAL_BEGIN_END( MulleScionObject *self, id value, id
216 216
 
217 217
 #pragma mark -
218 218
 
219
-@implementation MulleScionObject ( Printing)
219
+@implementation MulleScionObject( Printing)
220 220
 
221 221
 - (MulleScionObject *) renderInto:(id <MulleScionOutput>) output
222 222
                    localVariables:(NSMutableDictionary *) locals
... ...
@@ -363,7 +363,7 @@ void   MulleScionRenderPlaintextString( NSString *value,
363 363
 
364 364
 #pragma mark -
365 365
 
366
-@implementation MulleScionTemplate ( Printing)
366
+@implementation MulleScionTemplate( Printing)
367 367
 
368 368
 static void   initLineNumber( NSMutableDictionary *locals)
369 369
 {
... ...
@@ -576,7 +576,7 @@ static id  f_NSLocalizedString( id self, NSArray *arguments, NSMutableDictionary
576 576
 
577 577
 #pragma mark -
578 578
 
579
-@implementation MulleScionPlainText ( Printing)
579
+@implementation MulleScionPlainText( Printing)
580 580
 
581 581
 - (MulleScionObject *) renderInto:(id <MulleScionOutput>) output
582 582
                    localVariables:(NSMutableDictionary *) locals
... ...
@@ -622,7 +622,7 @@ static id   MulleScionValueForKeyPath( NSString *keyPath,
622 622
 
623 623
 #pragma mark -
624 624
 
625
-@implementation MulleScionVariable ( Printing)
625
+@implementation MulleScionVariable( Printing)
626 626
 
627 627
 - (id) valueWithLocalVariables:(NSMutableDictionary *) locals
628 628
                     dataSource:(id <MulleScionDataSource>) dataSource
... ...
@@ -667,7 +667,7 @@ static id   MulleScionValueForKeyPath( NSString *keyPath,
667 667
 
668 668
 #pragma mark -
669 669
 
670
-@implementation MulleScionFunction ( Printing)
670
+@implementation MulleScionFunction( Printing)
671 671
 
672 672
 - (id) valueWithLocalVariables:(NSMutableDictionary *) locals
673 673
                     dataSource:(id <MulleScionDataSource>) dataSource
... ...
@@ -700,7 +700,7 @@ static id   MulleScionValueForKeyPath( NSString *keyPath,
700 700
 
701 701
 #pragma mark -
702 702
 
703
-@implementation MulleScionMethod ( Printing)
703
+@implementation MulleScionMethod( Printing)
704 704
 
705 705
 static char   *_NSObjCSkipRuntimeTypeQualifier( char *type)
706 706
 {
... ...
@@ -957,7 +957,7 @@ static void   *numberBuffer( char *type, NSNumber *value)
957 957
 
958 958
 #pragma mark -
959 959
 
960
-@implementation MulleScionExpression ( Printing)
960
+@implementation MulleScionExpression( Printing)
961 961
 
962 962
 - (id) evaluateValue:(id) value
963 963
       localVariables:(NSMutableDictionary *) locals
... ...
@@ -1030,7 +1030,7 @@ static void   *numberBuffer( char *type, NSNumber *value)
1030 1030
 
1031 1031
 #pragma mark -
1032 1032
 
1033
-@implementation MulleScionNumber ( Printing)
1033
+@implementation MulleScionNumber( Printing)
1034 1034
 
1035 1035
 - (id) valueWithLocalVariables:(NSMutableDictionary *) locals
1036 1036
                     dataSource:(id <MulleScionDataSource>) dataSource
... ...
@@ -1044,7 +1044,7 @@ static void   *numberBuffer( char *type, NSNumber *value)
1044 1044
 
1045 1045
 #pragma mark -
1046 1046
 
1047
-@implementation MulleScionString ( Printing)
1047
+@implementation MulleScionString( Printing)
1048 1048
 
1049 1049
 - (id) valueWithLocalVariables:(NSMutableDictionary *) locals
1050 1050
                     dataSource:(id <MulleScionDataSource>) dataSource
... ...
@@ -1058,7 +1058,7 @@ static void   *numberBuffer( char *type, NSNumber *value)
1058 1058
 
1059 1059
 #pragma mark -
1060 1060
 
1061
-@implementation MulleScionSelector ( Printing)
1061
+@implementation MulleScionSelector( Printing)
1062 1062
 
1063 1063
 - (id) valueWithLocalVariables:(NSMutableDictionary *) locals
1064 1064
                     dataSource:(id <MulleScionDataSource>) dataSource
... ...
@@ -1072,7 +1072,7 @@ static void   *numberBuffer( char *type, NSNumber *value)
1072 1072
 
1073 1073
 #pragma mark -
1074 1074
 
1075
-@implementation MulleScionArray ( Printing)
1075
+@implementation MulleScionArray( Printing)
1076 1076
 
1077 1077
 - (id) valueWithLocalVariables:(NSMutableDictionary *) locals
1078 1078
                     dataSource:(id <MulleScionDataSource>) dataSource
... ...
@@ -1102,7 +1102,7 @@ static void   *numberBuffer( char *type, NSNumber *value)
1102 1102
 
1103 1103
 #pragma mark -
1104 1104
 
1105
-@implementation MulleScionDictionary ( Printing)
1105
+@implementation MulleScionDictionary( Printing)
1106 1106
    
1107 1107
 - (id) valueWithLocalVariables:(NSMutableDictionary *) locals
1108 1108
                     dataSource:(id <MulleScionDataSource>) dataSource
... ...
@@ -1134,7 +1134,7 @@ static void   *numberBuffer( char *type, NSNumber *value)
1134 1134
 
1135 1135
 #pragma mark -
1136 1136
 
1137
-@implementation MulleScionParameterAssignment ( Printing)
1137
+@implementation MulleScionParameterAssignment( Printing)
1138 1138
 
1139 1139
 - (id) valueWithLocalVariables:(NSMutableDictionary *) locals
1140 1140
                     dataSource:(id <MulleScionDataSource>) dataSource
... ...
@@ -1189,7 +1189,7 @@ static void   *numberBuffer( char *type, NSNumber *value)
1189 1189
 
1190 1190
 #pragma mark -
1191 1191
 
1192
-@implementation MulleScionCommand ( Printing)
1192
+@implementation MulleScionCommand( Printing)
1193 1193
 
1194 1194
 - (MulleScionObject *) renderBlock:(MulleScionObject *) curr
1195 1195
                               into:(id <MulleScionOutput>) output
... ...
@@ -1220,7 +1220,7 @@ static void   *numberBuffer( char *type, NSNumber *value)
1220 1220
 
1221 1221
 #pragma mark -
1222 1222
 
1223
-@implementation MulleScionAssignmentExpression ( Printing)
1223
+@implementation MulleScionAssignmentExpression( Printing)
1224 1224
 
1225 1225
 - (id) valueWithLocalVariables:(NSMutableDictionary *) locals
1226 1226
                     dataSource:(id <MulleScionDataSource>) dataSource
... ...
@@ -1242,7 +1242,7 @@ static void   *numberBuffer( char *type, NSNumber *value)
1242 1242
 @end
1243 1243
 
1244 1244
 
1245
-@implementation MulleScionSet ( Printing)
1245
+@implementation MulleScionSet( Printing)
1246 1246
 
1247 1247
 - (id) valueWithLocalVariables:(NSMutableDictionary *) locals
1248 1248
                     dataSource:(id <MulleScionDataSource>) dataSource
... ...
@@ -1284,7 +1284,7 @@ static void   *numberBuffer( char *type, NSNumber *value)
1284 1284
 #pragma mark -
1285 1285
 
1286 1286
 
1287
-@implementation MulleScionLog ( Printing)
1287
+@implementation MulleScionLog( Printing)
1288 1288
 
1289 1289
 - (id) valueWithLocalVariables:(NSMutableDictionary *) locals
1290 1290
                     dataSource:(id <MulleScionDataSource>) dataSource
... ...
@@ -1325,7 +1325,7 @@ static void   *numberBuffer( char *type, NSNumber *value)
1325 1325
 
1326 1326
 #pragma mark -
1327 1327
 
1328
-@implementation MulleScionTerminator ( Printing)
1328
+@implementation MulleScionTerminator( Printing)
1329 1329
 
1330 1330
 - (MulleScionObject *) renderInto:(id <MulleScionOutput>) output
1331 1331
                    localVariables:(NSMutableDictionary *) locals
... ...
@@ -1342,7 +1342,7 @@ static void   *numberBuffer( char *type, NSNumber *value)
1342 1342
 
1343 1343
 #pragma mark -
1344 1344
 
1345
-@implementation MulleScionExpressionCommand ( Printing)
1345
+@implementation MulleScionExpressionCommand( Printing)
1346 1346
 
1347 1347
 // just executes the expression, but discards the value
1348 1348
 - (MulleScionObject *) renderInto:(id <MulleScionOutput>) output
... ...
@@ -1371,7 +1371,7 @@ static void   *numberBuffer( char *type, NSNumber *value)
1371 1371
 
1372 1372
 #pragma mark -
1373 1373
 
1374
-@implementation MulleScionIf ( Printing)
1374
+@implementation MulleScionIf( Printing)
1375 1375
 
1376 1376
 static Class  _nsStringClass;
1377 1377
 
... ...
@@ -1465,7 +1465,7 @@ static BOOL  isTrue( id value)
1465 1465
 
1466 1466
 #pragma mark -
1467 1467
 
1468
-@implementation MulleScionFor ( Printing)
1468
+@implementation MulleScionFor( Printing)
1469 1469
 
1470 1470
 - (MulleScionObject *) renderInto:(id <MulleScionOutput>) output
1471 1471
                    localVariables:(NSMutableDictionary *) locals
... ...
@@ -1650,7 +1650,7 @@ done:
1650 1650
 
1651 1651
 #pragma mark -
1652 1652
 
1653
-@implementation MulleScionWhile ( Printing)
1653
+@implementation MulleScionWhile( Printing)
1654 1654
 
1655 1655
 - (MulleScionObject *) renderInto:(id <MulleScionOutput>) output
1656 1656
                    localVariables:(NSMutableDictionary *) locals
... ...
@@ -1699,7 +1699,7 @@ done:
1699 1699
 
1700 1700
 #pragma mark -
1701 1701
 
1702
-@implementation MulleScionBlock ( Printing)
1702
+@implementation MulleScionBlock( Printing)
1703 1703
 
1704 1704
 - (MulleScionObject *) renderInto:(id <MulleScionOutput>) output
1705 1705
                    localVariables:(NSMutableDictionary *) locals
... ...
@@ -1732,7 +1732,7 @@ done:
1732 1732
 
1733 1733
 #pragma mark -
1734 1734
 
1735
-@implementation MulleScionEndBlock ( Printing)
1735
+@implementation MulleScionEndBlock( Printing)
1736 1736
 
1737 1737
 - (MulleScionObject *) renderInto:(id <MulleScionOutput>) output
1738 1738
                    localVariables:(NSMutableDictionary *) locals
... ...
@@ -1771,7 +1771,7 @@ done:
1771 1771
 @end
1772 1772
 
1773 1773
 
1774
-@implementation MulleScionComparison ( Printing)
1774
+@implementation MulleScionComparison( Printing)
1775 1775
 
1776 1776
 - (id) evaluateValue:(id) value
1777 1777
       localVariables:(NSMutableDictionary *) locals
... ...
@@ -1825,7 +1825,7 @@ done:
1825 1825
 
1826 1826
 #pragma mark -
1827 1827
 
1828
-@implementation MulleScionNot ( Printing)
1828
+@implementation MulleScionNot( Printing)
1829 1829
 
1830 1830
 - (id) evaluateValue:(id) value
1831 1831
       localVariables:(NSMutableDictionary *) locals
... ...
@@ -1846,7 +1846,7 @@ done:
1846 1846
 
1847 1847
 #pragma mark -
1848 1848
 
1849
-@implementation MulleScionAnd ( Printing)
1849
+@implementation MulleScionAnd( Printing)
1850 1850
 
1851 1851
 - (id) evaluateValue:(id) value
1852 1852
       localVariables:(NSMutableDictionary *) locals
... ...
@@ -1881,7 +1881,7 @@ done:
1881 1881
 
1882 1882
 #pragma mark -
1883 1883
 
1884
-@implementation MulleScionOr ( Printing)
1884
+@implementation MulleScionOr( Printing)
1885 1885
 
1886 1886
 - (id) evaluateValue:(id) value
1887 1887
       localVariables:(NSMutableDictionary *) locals
... ...
@@ -1917,7 +1917,7 @@ done:
1917 1917
 
1918 1918
 #pragma mark -
1919 1919
 
1920
-@implementation MulleScionIndexing ( Printing)
1920
+@implementation MulleScionIndexing( Printing)
1921 1921
 
1922 1922
 - (id) evaluateValue:(id) value
1923 1923
       localVariables:(NSMutableDictionary *) locals
... ...
@@ -2009,7 +2009,7 @@ done:
2009 2009
 
2010 2010
 #pragma mark -
2011 2011
 
2012
-@implementation MulleScionPipe ( Printing)
2012
+@implementation MulleScionPipe( Printing)
2013 2013
 
2014 2014
 - (id) evaluateValue:(id) value
2015 2015
       localVariables:(NSMutableDictionary *) locals
... ...
@@ -2075,7 +2075,7 @@ done:
2075 2075
 
2076 2076
 #pragma mark -
2077 2077
 
2078
-@implementation MulleScionDot ( Printing)
2078
+@implementation MulleScionDot( Printing)
2079 2079
 
2080 2080
 - (id) evaluateValue:(id) value
2081 2081
       localVariables:(NSMutableDictionary *) locals
... ...
@@ -2140,7 +2140,7 @@ done:
2140 2140
 
2141 2141
 #pragma mark -
2142 2142
 
2143
-@implementation MulleScionConditional ( Printing)
2143
+@implementation MulleScionConditional( Printing)
2144 2144
 
2145 2145
 - (id) evaluateValue:(id) value
2146 2146
       localVariables:(NSMutableDictionary *) locals
... ...
@@ -2168,7 +2168,7 @@ done:
2168 2168
 
2169 2169
 #pragma mark -
2170 2170
 
2171
-@implementation MulleScionFilter ( Printing)
2171
+@implementation MulleScionFilter( Printing)
2172 2172
 
2173 2173
 - (MulleScionObject *) renderInto:(id <MulleScionOutput>) output
2174 2174
                    localVariables:(NSMutableDictionary *) locals
... ...
@@ -2245,7 +2245,7 @@ done:
2245 2245
 
2246 2246
 #pragma mark -
2247 2247
 
2248
-@implementation MulleScionEndFilter ( Printing)
2248
+@implementation MulleScionEndFilter( Printing)
2249 2249
 
2250 2250
 - (MulleScionObject *) renderInto:(id <MulleScionOutput>) output
2251 2251
                    localVariables:(NSMutableDictionary *) locals
... ...
@@ -2357,7 +2357,7 @@ static NSBundle  *searchForBundleInDirectory( NSFileManager *manager, NSString *
2357 2357
 
2358 2358
 #pragma mark -
2359 2359
 
2360
-@implementation MulleScionRequires ( Printing)
2360
+@implementation MulleScionRequires( Printing)
2361 2361
 
2362 2362
 - (MulleScionObject *) renderInto:(id <MulleScionOutput>) output
2363 2363
                    localVariables:(NSMutableDictionary *) locals
... ...
@@ -38,14 +38,14 @@
38 38
 #import "MulleScionObjectModel.h"
39 39
 
40 40
 
41
-@interface NSObject ( TraceValueDescription)
41
+@interface NSObject( TraceValueDescription)
42 42
 
43 43
 - (NSString *) traceValueDescription;
44 44
 
45 45
 @end
46 46
 
47 47
 
48
-@interface MulleScionObject ( TraceDescription)
48
+@interface MulleScionObject( TraceDescription)
49 49
 
50 50
 - (NSString *) traceDescription;
51 51
 - (NSString *) dumpDescription;
... ...
@@ -81,7 +81,7 @@ NSString   *mulleLinefeedEscapedShortenedString( NSString *s, size_t max)
81 81
 }
82 82
 
83 83