Merge pull request #301 from rentzsch/feature/modernization

Modernizing mogenerator internals.

MiscMerge/FoundationAdditions.m

@@ -30,7 +30,7 @@
  */
 
 #import "FoundationAdditions.h"
-#import <Foundation/Foundation.h>
+@import Foundation;
 #import "NSString+MiscAdditions.h"
 
 

MiscMerge/MiscMergeExpression.h

@@ -14,7 +14,7 @@
 //	for a list of all applicable permissions and restrictions.
 //
 
-#import <Foundation/Foundation.h>
+@import Foundation;
 
 @class MiscMergeEngine;
 

MiscMerge/MiscMergeTemplate.m

@@ -65,29 +65,29 @@ @implementation MiscMergeTemplate
 "*/
 
 /*"
- * Returns the default string used to start a merge command, "«".  A
+ * Returns the default string used to start a merge command, "«".  A
  * subclass of MiscMergeTemplate could override this method.
 "*/
 + (NSString *)defaultStartDelimiter
 {
     //	return @"(";
-    //	return @"«";
+    //	return @"«";
     /* This works better for whatever reason. Due to some unknown pecularities,
     a constant NSString doesn't work under Windows with Apple's
     implementation. */
-    return [NSString stringWithCString:"«" encoding:NSUTF8StringEncoding];
+    return [NSString stringWithCString:"«" encoding:NSUTF8StringEncoding];
 }
 
 /*"
- * Returns the default string used to end a merge command, "»".  A
+ * Returns the default string used to end a merge command, "»".  A
  * subclass of MiscMergeTemplate could override this method.
 "*/
 + (NSString *)defaultEndDelimiter
 {
     //	return @")";
-    //	return @"»";
+    //	return @"»";
     /* This works better than a constant NSString for whatever reason.  See above. */
-    return [NSString stringWithCString:"»" encoding:NSUTF8StringEncoding];
+    return [NSString stringWithCString:"»" encoding:NSUTF8StringEncoding];
 }
 
 /*" Creates a new, autoreleased MiscMergeTemplate. "*/
@@ -343,8 +343,8 @@ - (Class)_classForCommand:(NSString *)realCommand
  * classes with specific names.  The name that is looked up is build from
  * the first word found in %{aCommand}.  The first word is turned to all
  * lower case, with the first letter upper case, and then sandwiched
- * between "Merge" and "Command".  For example, the merge command "«if xxx
- * = y»" has the word "if" as the first word.  Thus, the class
+ * between "Merge" and "Command".  For example, the merge command "«if xxx
+ * = y»" has the word "if" as the first word.  Thus, the class
  * "MergeIfCommand" will be searched for. If the desired class cannot be
  * found, then it is assumed that the merge command is giving the name of a
  * field which should be inserted into the output document.

MiscMerge/NSNull.h

@@ -44,7 +44,7 @@
 - (id)copy;
 
 - (void)encodeWithCoder:(NSCoder *)aCoder;
-- (id)initWithCoder:(NSCoder *)aDecoder;
+- (instancetype)initWithCoder:(NSCoder *)aDecoder;
 
 - (id)replacementObjectForCoder:(NSCoder *)aCoder;
 

MiscMerge/_MiscMergeDebugCommand.m

@@ -15,7 +15,7 @@
 //
 
 #import "_MiscMergeDebugCommand.h"
-#import <Foundation/Foundation.h>
+@import Foundation;
 #import "NSString+MiscAdditions.h"
 #import "NSScanner+MiscMerge.h"
 

MiscMerge/_MiscMergeIfCommand.m

@@ -23,7 +23,7 @@
 
 @implementation _MiscMergeIfCommand
 
-- (id)init
+- (instancetype)init
 {
     [super init];
     trueBlock = [[MiscMergeCommandBlock alloc] initWithOwner:self];

MiscMerge/_MiscMergeProcedureCommand.m

@@ -15,7 +15,7 @@
 //	
 
 #import "_MiscMergeProcedureCommand.h"
-#import <Foundation/Foundation.h>
+@import Foundation;
 #import "MiscMergeEngine.h"
 #import "MiscMergeTemplate.h"
 #import "MiscMergeCommandBlock.h"