swift-tools 3.1.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7f9e144b048f84e06b725d3a6e60db0da26ad82
-  data.tar.gz: d4216fb46541e4915e26063362ad633ce9d99a50
+  metadata.gz: a996ed7884cc6e36f6488cdc8c872f6f8935add4
+  data.tar.gz: 812deb2223cf24ed41104d3a2df3b40f0b36c680
 SHA512:
-  metadata.gz: c3935cc68966effbe14953e10ac713a9ad40a987807eb065b6748de21477a9f7115310b9e541b1c3438c218daa777e5e5994295e45f6d89e754f9b521a0fa2b4
-  data.tar.gz: fa158c838246921bef06caf63f5e1129ef7ba64bc9ec9e5d10e4cbc58472a80f24936c5173c317d9d169c4e919a7651ca112d45e648a3e4b90e79bcfe8ea8cc9
+  metadata.gz: 6821410d2ff24e058c504592c06fccef962796796f2021844cd32b61284a56bbc9909bb74527ec0faffd1bcf6403d3d876c0ae6e73f65140ff4e54e7b60babb6
+  data.tar.gz: f61e270b413a36be7bc9accae6c6347f00a83654328a114341ea904151626320ad516ac55ad3ea7543d8273792a6ab1a210efa3f1d00200fd652112eafd1f0ee

data/lib/objc_2_swift.rb

@@ -62,6 +62,7 @@ module SwiftTools
                 :scope => v1[:scope] || v2[:scope],
                 :return_type => v1[:return_type],
                 :visibility => v1[:visibility],
+                :args => v2[:args],
                 :body => v2[:body]
             }
           } if have_interface
@@ -112,13 +113,13 @@ module SwiftTools
         }
         interface_data[:properties].merge!(new_properties)
 
-        # line2 = INDENT + "public var #{prop_data[:getter]}: #{prop_data[:type]} { return #{prop_name} }\n"
-        # if prop_data[:getter]
-        #   line1 = INDENT + "private "
-
         # Write properties
         interface_data[:properties].each {|prop_name, prop_data|
           line = INDENT
+          if prop_data[:ib_outlet]
+            line += "@IBOutlet "
+          end
+
           if prop_data[:readonly]
             line += "private(set) "
           elsif prop_data[:visibility] == :private
@@ -145,6 +146,10 @@ module SwiftTools
             line += ": #{prop_data[:type]}"
           end
 
+          unless prop_data[:notnull]
+            line += '!'
+          end
+
           if prop_data[:initializer]
             line += " = #{prop_data[:initializer]}"
           end
@@ -188,7 +193,15 @@ module SwiftTools
             line += 'private '
           end
 
-          line += "func #{method_name}()"
+          line += "func #{method_name}("
+          args = method_data[:args]
+          args.each_index {|i|
+            if i > 0
+              line += ", "
+            end
+            line += args[i][1] + ": " + args[i][0]
+          }
+          line += ")"
           if method_data[:return_type] and method_data[:return_type] != 'Void'
             line += " -> #{method_data[:return_type]}"
           end
@@ -265,10 +278,10 @@ module SwiftTools
 
     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|
+      content.scan(/^\s*@interface *([a-zA-Z0-9_]+)(?: *: *([a-zA-Z0-9_]+) *)?(?: *\(([a-zA-Z0-9_, ]*)\))?(?: *<(.+)>)?((?:.|\n)*?)@end *\n$/m).each {|m|
         body = m[4]
-        properties = extract_properties(body, in_hdr)
-        methods = extract_methods(body, in_hdr)
+        properties = capture_properties(body, in_hdr)
+        methods = capture_methods(body, in_hdr)
 
         interfaces[m[0]] = {
           :base => m[1],
@@ -282,12 +295,12 @@ module SwiftTools
       interfaces
     end
 
-    def extract_properties(content, in_hdr)
+    def capture_properties(content, in_hdr)
       properties = {}
-      content.scan(/^\s*@property\s*\(([a-zA-Z0-9_=, ]*)\)\s*([a-zA-Z0-9_\*]+)\s*([a-zA-Z0-9_\*]+)\s*/m) {|m|
-        name = $3
-        type = map_type(remove_ptr($2))
-        options = Hash[$1.split(',').map(&:strip).collect {|s|
+      content.to_enum(:scan, /^ *@property *\(([a-zA-Z0-9_=, ]*)\) *(IBOutlet)? *([a-zA-Z0-9_\*]+) *([a-zA-Z0-9_\*]+) */m).map { Regexp.last_match }.each {|m|
+        name = m[4]
+        type = map_type(remove_ptr(m[3]))
+        options = Hash[m[1].split(',').map(&:strip).collect {|s|
           a = s.split('=')
           if a.length > 1
             [a[0].to_sym, a[1]]
@@ -295,6 +308,9 @@ module SwiftTools
             [a[0].to_sym, true]
           end
         }]
+        if m[2]
+          options[:ib_outlet] = true
+        end
         properties[remove_ptr(name)] = {
             :type => type,
             :visibility => in_hdr ? :public : :private,
@@ -304,9 +320,9 @@ module SwiftTools
       properties
     end
 
-    def extract_methods(content, in_hdr)
+    def capture_methods(content, in_hdr)
       methods = {}
-      content.to_enum(:scan, /^ *(\+|-)? *\(([a-zA-Z0-9_]+)\) *([a-zA-Z0-9_]+)(?:[ \n]*\{)?/m).map { Regexp.last_match }.each {|m|
+      content.to_enum(:scan, /^ *(\+|-)? *\(([a-zA-Z0-9_]+)\) *([a-zA-Z0-9_]+)(?: *: *)?([^}]*?){/m).map { Regexp.last_match }.each {|m|
         if in_hdr
           body = ''
         else
@@ -314,9 +330,11 @@ module SwiftTools
           body_end_offset = find_close_char_offset(content, body_start_offset, '{', '}') - 1
           body = indent_lines(content[body_start_offset..body_end_offset])
         end
+
         methods[m[3]] = {
           :scope => (m[1] == '+' ? :static : :instance),
           :return_type => map_type(remove_ptr(m[2])),
+          :args => capture_method_args(m[4]),
           :visibility => in_hdr ? :public : :private,
           :body => body
         }
@@ -328,7 +346,7 @@ module SwiftTools
       implementations = {}
       content.scan(/^\s*@implementation *([a-zA-Z0-9_]+)((?:.|\n)*?)@end *\n$/m).each {|m|
         body = m[1]
-        methods = extract_methods(body, in_hdr = false)
+        methods = capture_methods(body, in_hdr = false)
 
         implementations[m[0]] = {
             :methods => methods,
@@ -338,6 +356,19 @@ module SwiftTools
       implementations
     end
 
+    def capture_method_args(content)
+      args = []
+      raw_args = content.gsub(/ *\*/, '*')
+      raw_args = raw_args.split(' ') # The only space left should be between the args
+      raw_args.each {|raw_arg|
+        m = raw_arg.match(/\((.*)\)(.*)/)
+        unless m.nil?
+          args.push([map_type(remove_ptr(m[1])), m[2]])
+        end
+      }
+      args
+    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.
@@ -399,7 +430,7 @@ module SwiftTools
     def convert_var_decls(content)
       # Note, this must be done _before_ removing EOL semicolons
       content.gsub!(/^( *)([a-zA-Z0-9_\*]+) +([a-zA-Z0-9_\*]+)(?: *= *(.*?))? *;/m) {|m|
-        decl = "#{$1}var #{$3}: #{map_type(remove_ptr($2))}"
+        decl = "#{$1}var #{remove_ptr($3)}: #{map_type(remove_ptr($2))}"
         if $4
           decl += " = #{$4}"
         end
@@ -508,7 +539,7 @@ module SwiftTools
     end
 
     def remove_ptr(content)
-      content.gsub('*', '')
+      content.gsub('*', '').strip
     end
 
     def map_type(content)
@@ -525,8 +556,8 @@ module SwiftTools
         'Void'
       when 'NSString'
         'String'
-      when /(.*)\*/
-        $1
+      when 'CGRect'
+        'CGRect'
       else
         content
       end

data/lib/swift_tools.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swift-tools
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.3.0
 platform: ruby
 authors:
 - John Lyon-smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-07 00:00:00.000000000 Z
+date: 2016-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: methadone