swift-pyrite 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36f9b0fd8023d203e9d57df4a7cd0d847853d76b
-  data.tar.gz: ebf4387326c7564ac2621a8fbfd431aa44b6927d
+  metadata.gz: 774c7aeda0acea26d2d5520472ae5e42fe297c4c
+  data.tar.gz: 99201a8a43fca9e649a5fee48634c7f91fa340e9
 SHA512:
-  metadata.gz: e41bf40867fff24be1886a7bd01a0fb6b80fb5dd209b78ec90dbf18bf60118e3e181803e74175fc400d4fc82f73dff735ed7a856f3979cc9a59026ddeb8f45da
-  data.tar.gz: c87d24d7530e09b110f9818e848739f3dedac1da2ad2bf0b1372f92a72ed6859160f5916d9632985669257a3ac999a76c36f1350c12d59aa98dba9aa1c2934d2
+  metadata.gz: 12ff99b918c63369bed43da53b7084237178bfd937c32e4cda48d8789123c216603dc19c8312992fb7e57a8c48e05af7270b54cae247ff1449380668cfaab283
+  data.tar.gz: d787efee670ccfa8316d7dc1b9eb4fb0f388641dbf64150c19628e520866c10bd10b524f9c1b03bbaafd0298b02a2100f997da67377f0841f044fc88875de79e

data/.gitignore

@@ -9,3 +9,4 @@
 /tmp/
 out
 *.gem
+spec/actual_fakes/*

data/lib/swift/pyrite/parser.rb

@@ -13,7 +13,7 @@ module Swift
       rule(:ignore_before) { block_comment | comment | (str('protocol').absent? >> any) }
 
       rule(:generic) { str('<') >> type >> str('>') }
-      rule(:type) { (str('[').maybe >> type_name >> generic.maybe >> str(']').maybe).as(:type) }
+      rule(:type) { (str('[').maybe.as(:bracketed) >> type_name.as(:type_name) >> generic.as(:generic).maybe >> str(']').maybe) }
 
       rule(:type_name) { identifier >> match('[?!]').maybe }
 

data/lib/swift/pyrite/transformer.rb

@@ -15,6 +15,19 @@ module Swift
         "Fake#{protocol_name}"
       end
 
+      def unwind_type exp
+        output = []
+        output << exp[:type_name]
+        if exp[:generic]
+          output << "<#{unwind_type(exp[:generic])}>"
+        end
+        if exp[:bracketed]
+          output.unshift('[')
+          output << ']'
+        end
+        output.join
+      end
+
       def generate
         output = []
         output << "class #{struct_name}: #{protocol_name} {"
@@ -33,11 +46,11 @@ module Swift
         (@ast[:expressions] || []).map do |exp|
           next if exp[:type] != 'var'
           e = exp[:var_decl]
-          name, type = e[:name], e[:type]
+          name, type = e[:name], unwind_type(e)
           output << "    self.#{name} = #{name}"
           vars << "#{name}: #{type}"
         end
-        if output.size > 0 
+        if output.size > 0
           output.unshift("  init(#{vars.join(', ')}) {")
           output << "  }"
         end
@@ -56,7 +69,7 @@ module Swift
 
       def copy_variable(exp)
         name = exp[:name]
-        type = exp[:type]
+        type = unwind_type(exp)
         "  var #{name}: #{type}"
       end
 
@@ -81,7 +94,9 @@ module Swift
         output = []
         output << "  var #{exp[:name]}CallCount: Int = 0"
         unless exp[:arguments].nil?
-          types = exp[:arguments].map {|a| a[:type] }
+          types = exp[:arguments].map do |a|
+            unwind_type(a)
+          end
           tupleType = "(" + types.join(", ") + ")"
           output << "  var #{exp[:name]}CalledWith: [#{tupleType}] = [#{tupleType}]()"
         end
@@ -94,12 +109,12 @@ module Swift
       def tuple(exp)
         results = exp.map do |item|
           if item[:name]
-            "#{item[:name]}: #{item[:type]}"
+            "#{item[:name]}: #{unwind_type(item)}"
           else
-            item[:type]
+            unwind_type(item)
           end
         end
-        if results.count > 1 
+        if results.count > 1
           "(#{results.join(', ')})"
         else
           results.join
@@ -110,7 +125,7 @@ module Swift
         return if exp.nil?
         output = []
         exp.each do |arg|
-          output << "#{arg[:name]}: #{arg[:type]}"
+          output << "#{arg[:name]}: #{unwind_type(arg)}"
         end
         output.join(", ")
       end

data/lib/swift/pyrite/version.rb

@@ -1,5 +1,5 @@
 module Swift
   module Pyrite
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: swift-pyrite
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Genevieve L'Esperance