remove plural S from enum type names

diff --git a/swift/cocoaconv.rb b/swift/cocoaconv.rb
index cd29daf853cebf666125bc1dc107403b18018987..064c4c3ea2e439e6f37c7446acd59b8cc5065046 100755 (executable)
--- a/swift/cocoaconv.rb
+++ b/swift/cocoaconv.rb
@@ -93,12 +93,17 @@ class String
 end
 
 module NSEnum
-  def type_name
-    type.camelize
-  end
-  
   def self.type_names(type)
-    return "MMD6#{type.camelize}", type.camelize
+    type_name = type.camelize
+    # Remove plural "S"
+    type_name = if type_name == "TokenTypes"
+                  "TokenType"
+                elsif type_name == "ParserExtensions"
+                  "ParserExtension"
+                else
+                  type_name
+                end
+    return "MMD6#{type_name}", type_name
   end
 
   def ns_enum
@@ -107,7 +112,8 @@ module NSEnum
       .map { |line| NSEnum.case(type_name, line) }
       .join("\n")
       
-    %Q{typedef NS_ENUM(NSUInteger, #{type_name}) {
+    return %Q{
+typedef NS_ENUM(NSUInteger, #{type_name}) {
 #{ns_enum_cases}
 } NS_SWIFT_NAME(#{swift_type_name});}
   end
@@ -211,7 +217,7 @@ input.close
 
 
 result = if options[:mode] == :nsenum
-           enums.ns_enums.join("\n\n")
+           enums.ns_enums.join("\n")
          elsif options[:mode] == :swift
            enums.swift_descriptions.join("\n")
          else