swift-tools 3.0.1 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b52354a80d7ac7852a905b6541417c85f8b1a246
-  data.tar.gz: 46a3befc26c77cc13a2b3b8ea49cb4e328abe737
+  metadata.gz: e7f9e144b048f84e06b725d3a6e60db0da26ad82
+  data.tar.gz: d4216fb46541e4915e26063362ad633ce9d99a50
 SHA512:
-  metadata.gz: 74674780c301661ba1d7c2ec59db1b50207295ae26ca1d777b799c4a1e6c871ed61577180af00350a85dfb0e0c9b7d402e80f3915114b5804d163cf40db32cb1
-  data.tar.gz: f5ceddfb1267f8debd7632846422386e8be41530ce73d7d092a2b1db3122cb6a86252640b3ae41fcf3b15b3ceee91854b3e32d796eefe1cd1b8eec0b437f768a
+  metadata.gz: c3935cc68966effbe14953e10ac713a9ad40a987807eb065b6748de21477a9f7115310b9e541b1c3438c218daa777e5e5994295e45f6d89e754f9b521a0fa2b4
+  data.tar.gz: fa158c838246921bef06caf63f5e1129ef7ba64bc9ec9e5d10e4cbc58472a80f24936c5173c317d9d169c4e919a7651ca112d45e648a3e4b90e79bcfe8ea8cc9

data/lib/objc_2_swift.rb

@@ -120,7 +120,7 @@ module SwiftTools
         interface_data[:properties].each {|prop_name, prop_data|
           line = INDENT
           if prop_data[:readonly]
-            line += "private(set) public "
+            line += "private(set) "
           elsif prop_data[:visibility] == :private
             line += 'private '
           end
@@ -166,6 +166,10 @@ module SwiftTools
             line += 'private '
           end
 
+          if interface_data[:base]
+            line += 'override '
+          end
+
           line += "init() {"
 
           if init_data[:body].length > 0
@@ -206,6 +210,7 @@ module SwiftTools
             fix_null(body)
             fix_at_string(body)
             fix_broken_else(body)
+            fix_alloc_init(body)
             line += body + INDENT + "}\n"
           end
 
@@ -227,19 +232,37 @@ module SwiftTools
     def capture_imports(h_filename, content)
       r1 = ''
       r2 = ''
-      content.scan(/[@#]import\s*"?[\.a-zA-Z0-9_]+"?\s*;?\s*\n?/m).each {|m|
-        s = m.strip
+      content.to_enum(:scan, /[@#]import *"?([\.a-zA-Z0-9_]+)"? *;? *\n?/m).map { Regexp.last_match }.each {|m|
+        s = m[0].strip
         if s.start_with?("#")
           if s.index(h_filename).nil?
             r2 += "// TODO: Add '#{s}' to bridging header\n"
           end
         else
-          r1 += remove_eol_semicolons(s) + "\n"
+          r1 += "import #{m[1]}\n"
         end
       }
       {:at_imports => r1, :hash_imports => r2}
     end
 
+    def capture_statics(content)
+      statics = ''
+      content.scan(/static *(.*?);/m) {|m|
+        decl = m[0]
+        decl.gsub!('const', '')
+        decl.gsub!('*', '')
+        decl.gsub!('@"', '"')
+        decl.scan(/([a-zA-Z0-9_\*]+) +([a-zA-Z0-9_\*]+)(?: *= *(.*))?/m) {|mm|
+          statics += "// TODO: Add 'static let #{mm[1]}: #{map_type(mm[0])}"
+          if mm[2]
+            statics += " = #{mm[2]}"
+          end
+          statics += "' to one of your classes'\n"
+        }
+      }
+      statics
+    end
+
     def capture_interfaces(content, in_hdr)
       interfaces = {}
       content.scan(/^\s*@interface\s*([a-zA-Z0-9_]+)(?:\s*:\s*([a-zA-Z0-9_]+)\s*)?(?:\s*\(([a-zA-Z0-9_, ]*)\))?(?:\s*<(.+)>)?((?:.|\n)*?)@end *\n$/m).each {|m|
@@ -315,24 +338,6 @@ module SwiftTools
       implementations
     end
 
-    def capture_statics(content)
-      statics = ''
-      content.scan(/static *(.*?);/m) {|m|
-        decl = m[0]
-        decl.gsub!('const', '')
-        decl.gsub!('*', '')
-        decl.gsub!('@"', '"')
-        decl.scan(/([a-zA-Z0-9_\*]+) +([a-zA-Z0-9_\*]+)(?: *= *(.*))?/m) {|mm|
-          statics += "@objc let #{mm[1]}: #{map_type(mm[0])}"
-          if mm[2]
-            statics += " = #{mm[2]}"
-          end
-          statics += "\n"
-        }
-      }
-      statics
-    end
-
     def convert_to_dot_syntax(content)
       # Repeatedly find a [] syntax method call that does not have a nested [] call
       # and convert it until done.
@@ -360,7 +365,7 @@ module SwiftTools
             arg = { :name => label_match[1]}
 
             if block_match = body.match(/ *(?:\(.*?\))?(?: |\n)\{/, label_match.offset(0)[1])
-              end_of_param = find_close_char_offset(body, block_match.offset(0)[1], '{', '}')
+              end_of_param = find_close_char_offset(body, block_match.offset(0)[1], '{', '}') + 1
             else
               # Find the next arg label or the end of the string
               next_label_match = body.match(param_label_re, label_match.offset(0)[1])
@@ -430,6 +435,15 @@ module SwiftTools
       '(' + params + ')'
     end
 
+    def fix_alloc_init(content)
+      content.gsub!(/([a-zA-Z0-9_]+)\.alloc\(\)\.init(?:With([a-zA-Z0-9_]+))?\(/) { |m|
+        r = "#{$1}("
+        if $2
+          r += $2[0].downcase + $2[1..-1] + ': '
+        end
+      }
+    end
+
     def fix_if_statements(content)
       content.gsub!(/if *\((.+?)\)(?: |\n)*{/m) {|m|
         "if #{$1} {"
@@ -509,6 +523,8 @@ module SwiftTools
         'Long'
       when 'void'
         'Void'
+      when 'NSString'
+        'String'
       when /(.*)\*/
         $1
       else

data/lib/swift_tools.rb

@@ -2,5 +2,5 @@ require 'csharp_2_swift'
 require 'objc_2_swift'
 
 module SwiftTools
-  VERSION = "3.0.1"
+  VERSION = "3.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: swift-tools
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.0
 platform: ruby
 authors:
 - John Lyon-smith