xdry 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/xdry/boxing.rb

@@ -55,6 +55,19 @@ module XDry
       end
     end
 
+    module UNKNOWN
+      def self.retain expr
+        "[#{expr} retain]"
+      end
+
+      def self.release out, expr
+        out << "[#{expr} release]";
+      end
+
+      def self.release_and_clear out, var_name
+      end
+    end
+
   end
 
   module Boxing
@@ -203,6 +216,8 @@ module XDry
           when PointerVarType then RetainPolicy::RETAIN
           when IdVarType      then RetainPolicy::ASSIGN_REF
           when SimpleVarType  then RetainPolicy::ASSIGN_VALUE
+          when UnknownVarType then RetainPolicy::UNKNOWN
+          when PointerPointerVarType then RetainPolicy::RETAIN
         end
       end
     end

data/lib/xdry/generators/dealloc.rb

@@ -14,6 +14,9 @@ module Generators
     id "dealloc"
 
     def process_class oclass
+      # avoid generation of empty deallocs
+      lines = generate_release_calls_if(oclass) { true }
+      return if lines.empty?
 
       MethodPatcher.new(patcher, oclass, 'dealloc', ImplementationStartIP.new(oclass), DEALLOC_CODE) do |dealloc_method|
         impl = dealloc_method.impl

data/lib/xdry/parsing/driver.rb

@@ -1,4 +1,9 @@
-require 'generator'
+begin
+  require 'generator'
+rescue LoadError
+  Generator = Enumerator
+end
+
 require 'stringio'
 
 module XDry
@@ -47,8 +52,8 @@ module XDry
     def parse_data_in_scopes gen, scopes
       scope_stack = ScopeStack.new(scopes)
       scope_stack.verbose = @verbose
-      while gen.next?
-        orig_line, line, pos, eol_comments, indent = gen.next
+      while data = gen.next
+        orig_line, line, pos, eol_comments, indent = data
         puts "        #{pos} #{orig_line}" if @verbose
         pos.scope_before = scope_stack.current_scope
         scope_stack.parse_line line, eol_comments, indent do |scope, child|
@@ -66,6 +71,8 @@ module XDry
         end
         pos.scope_after = scope_stack.current_scope
       end
+    rescue EOFError, StopIteration
+      #
     end
 
     def new_lines_generator g, file_ref, io

data/lib/xdry/parsing/parsers.rb

@@ -71,15 +71,9 @@ module XDry
         @tags << 'persistent'
       when ''
         @tags.clear
-      when /^(\w+)\s+(\w+)\s*;/
-        type_name, field_name = $1, $2
-        yield process_type_hint(NFieldDef.new(field_name, SimpleVarType.new(type_name)), eol_comments)
-      when /^(\w+)\s*\*\s*(\w+)\s*;/
-        type_name, field_name = $1, $2
-        yield process_type_hint(NFieldDef.new(field_name, PointerVarType.new(type_name)), eol_comments)
-      when /^id<(\w+)>\s+(\w+)\s*;/
-        type_name, field_name = $1, $2
-        yield process_type_hint(NFieldDef.new(field_name, IdVarType.new()), eol_comments)
+      when /^(.*[\s\W])(\w+)\s*;/
+        type_name, field_name = $1.strip, $2
+        yield process_type_hint(NFieldDef.new(field_name, VarType.parse(type_name)), eol_comments)
       end
     end
 

data/lib/xdry/parsing/parts/selectors.rb

@@ -1,3 +1,4 @@
+require 'strscan'
 
 module XDry
 
@@ -8,15 +9,32 @@ module XDry
       if string =~ /^\w+$/
         SimpleSelectorDef.new(string)
       else
-        comps = string.split(/\s+(?!\*)/).collect do |component_string|
-          if component_string =~ /^(\w+:)\s*(?:\(([^)]+)\)\s*)?(\w*)$/
-            keyword, type_decl, arg_name = $1, $2, $3
-            type = if type_decl then VarType.parse(type_decl) else nil end
-            SelectorComponent.new(keyword, arg_name, type)
+        ss = StringScanner.new(string)
+        comps = []
+        while not ss.eos?
+          keyword = ss.scan(/\w+\s*:/) or raise(StandardError, "Cannot parse selector '#{string}': keyword expected at '#{ss.rest}'")
+          keyword = keyword.gsub(/\s/, '')
+
+          ss.skip(/\s+/)
+          if ss.skip(/\(/)
+            res = ss.scan_until(/\)/) or raise(StandardError, "Cannot parse selector '#{string}': missing closing paren at '#{ss.rest}'")
+            type_decl = res[0..-2].strip
           else
-            raise StandardError, "Cannot parse selector component '#{component_string}' for selector '#{string}'"
+            type_decl = nil
           end
+
+          ss.skip(/\s+/)
+          unless ss.match?(/\w+\s*:/)
+            arg_name = ss.scan(/\w+/)
+          else
+            arg_name = nil
+          end
+          ss.skip(/\s+/)
+
+          type = if type_decl then VarType.parse(type_decl) else nil end
+          comps << SelectorComponent.new(keyword, arg_name, type)
         end
+
         CompoundSelectorDef.new(comps)
       end
     end

data/lib/xdry/parsing/parts/var_types.rb

@@ -7,13 +7,19 @@ module XDry
       case type_decl
       when /^id$/
         IdVarType.new
+      when /^id\s*<\s*(\w+)\s*>$/
+        IdVarType.new($1)
       when /^(?:unsigned\s+|signed\s+|long\s+)?\w+$/
         SimpleVarType.new(type_decl.gsub(/\s+/, ' '))
       when /^(\w+)\s*\*$/
         class_name = $1
         PointerVarType.new(class_name)
+      when /^(\w+)\s*\*\s*\*$/
+        class_name = $1
+        PointerPointerVarType.new(class_name)
       else
-        raise StandardError, "Cannot parse Obj-C type: '#{type_decl}'"
+        puts "!! Cannot parse Obj-C type: '#{type_decl}'"
+        return UnknownVarType.new(type_decl)
       end
     end
 
@@ -25,8 +31,18 @@ module XDry
   end
 
   class IdVarType < VarType
+    attr_reader :protocol
+
+    def initialize protocol=nil
+      @protocol = protocol
+    end
+
     def to_s
-      "id"
+      if @protocol.nil?
+        "id"
+      else
+        "id<#{@protocol}>"
+      end
     end
 
     def default_property_retainment_policy; 'assign'; end
@@ -63,4 +79,38 @@ module XDry
     def default_property_retainment_policy; 'retain'; end
   end
 
+  class PointerPointerVarType < VarType
+    attr_reader :name
+    attr_accessor :type_hint
+
+    def initialize name
+      @name = name
+    end
+
+    def to_s
+      "#{@name} **"
+    end
+
+    def needs_space?; false; end
+
+    def default_property_retainment_policy; 'retain'; end
+  end
+
+  class UnknownVarType < VarType
+    attr_reader :name
+    attr_accessor :type_hint
+
+    def initialize name
+      @name = name
+    end
+
+    def to_s
+      @name
+    end
+
+    def needs_space?; true; end
+
+    def default_property_retainment_policy; 'retain'; end
+  end
+
 end

data/lib/xdry/patching/patcher.rb

@@ -131,7 +131,7 @@ module XDry
     end
 
     def load_lines_of file_ref
-      file_ref.read.lines.collect
+      file_ref.read.lines.collect.to_a
     end
 
   end

data/spec/dealloc_spec.rb

@@ -2,6 +2,18 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "dealloc support" do
 
+  it "shouldn't add dealloc when it is not needed" do
+    xdry :dealloc, <<-END
+      @interface Foo {
+        int something;
+      }
+      @end
+
+      @implementation Foo
+      @end
+    END
+  end
+
   it "should add missing release calls to dealloc" do
     xdry :dealloc, <<-END
       @interface Foo {

data/spec/prop_from_field_spec.rb

@@ -36,4 +36,21 @@ describe "property from field generator" do
     END
   end
 
+  it "should add a property for a field with unknown type" do
+    xdry :prop_from_field, <<-END
+      @interface Foo {
+    -   Blah Blah __const __attribute((WOWWW!!!! 111 22) _something; !p
+    +   Blah Blah __const __attribute((WOWWW!!!! 111 22) _something;
+      }
+
+    + @property(nonatomic, retain) Blah Blah __const __attribute((WOWWW!!!! 111 22) something;
+    +
+      @end
+
+      @implementation Foo
+
+      @end
+    END
+  end
+
 end

data/spec/selector_parsing_spec.rb

@@ -0,0 +1,88 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "SelectorDef" do
+
+  it "should parse a simple selector" do
+    sel = XDry::SelectorDef.parse('count')
+    sel.class.should == XDry::SimpleSelectorDef
+    sel.selector.should == 'count'
+  end
+
+  it "should parse foo:(Foo)oof" do
+    sel = XDry::SelectorDef.parse('foo:(Foo)oof')
+    sel.components.count.should == 1
+    sel.components[0].keyword.should == 'foo:'
+    sel.components[0].arg_name.should == 'oof'
+    sel.components[0].type.class.should == XDry::SimpleVarType
+    sel.components[0].type.name.should == 'Foo'
+  end
+
+  it "should parse foo:" do
+    sel = XDry::SelectorDef.parse('foo:')
+    sel.components.count.should == 1
+    sel.components[0].keyword.should == 'foo:'
+    sel.components[0].arg_name.should == nil
+    sel.components[0].type.should == nil
+  end
+
+  it "should parse foo:oof" do
+    sel = XDry::SelectorDef.parse('foo:oof')
+    sel.components.count.should == 1
+    sel.components[0].keyword.should == 'foo:'
+    sel.components[0].arg_name.should == 'oof'
+    sel.components[0].type.should == nil
+  end
+
+  it "should parse foo:(Foo)oof bar:(Bar)rab" do
+    sel = XDry::SelectorDef.parse('foo:(Foo)oof bar:(Bar)rab')
+    sel.components.count.should == 2
+
+    sel.components[0].keyword.should == 'foo:'
+    sel.components[0].arg_name.should == 'oof'
+    sel.components[0].type.class.should == XDry::SimpleVarType
+    sel.components[0].type.name.should == 'Foo'
+
+    sel.components[1].keyword.should == 'bar:'
+    sel.components[1].arg_name.should == 'rab'
+    sel.components[1].type.class.should == XDry::SimpleVarType
+    sel.components[1].type.name.should == 'Bar'
+  end
+
+  it "should parse foo:bar:" do
+    sel = XDry::SelectorDef.parse('foo:bar:')
+    sel.components.count.should == 2
+
+    sel.components[0].keyword.should == 'foo:'
+    sel.components[0].arg_name.should == nil
+    sel.components[0].type.should == nil
+
+    sel.components[1].keyword.should == 'bar:'
+    sel.components[1].arg_name.should == nil
+    sel.components[1].type.should == nil
+  end
+
+  it "should parse foo:(unsigned char)oof" do
+    sel = XDry::SelectorDef.parse('foo:(unsigned char)oof')
+    sel.components.count.should == 1
+    sel.components[0].keyword.should == 'foo:'
+    sel.components[0].arg_name.should == 'oof'
+    sel.components[0].type.class.should == XDry::SimpleVarType
+    sel.components[0].type.name.should == 'unsigned char'
+  end
+
+  it "should parse foo : (  unsigned char  )   oof   bar    : (long long) zzzz  " do
+    sel = XDry::SelectorDef.parse('foo : (  unsigned char  )   oof   bar    : (long long) zzzz  ')
+    sel.components.count.should == 2
+
+    sel.components[0].keyword.should == 'foo:'
+    sel.components[0].arg_name.should == 'oof'
+    sel.components[0].type.class.should == XDry::SimpleVarType
+    sel.components[0].type.name.should == 'unsigned char'
+
+    sel.components[1].keyword.should == 'bar:'
+    sel.components[1].arg_name.should == 'zzzz'
+    sel.components[1].type.class.should == XDry::SimpleVarType
+    sel.components[1].type.name.should == 'long long'
+  end
+
+end

data/spec/unknown_stuff_handling_spec.rb

@@ -0,0 +1,18 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "XDry" do
+
+  it "should not choke on unknown types" do
+    xdry <<-END
+      @interface Foo {
+        Foo Bar Buuuzzzzza _something;
+      }
+
+      @end
+
+      @implementation Foo
+      @end
+    END
+  end
+
+end

data/spec/vartype_parsing_spec.rb

@@ -0,0 +1,37 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "VarType" do
+
+  for simple in ['int', 'signed int', 'unsigned int', 'unsigned char', 'long long']
+    it "should parse #{simple}" do
+      sel = XDry::VarType.parse(simple)
+      sel.class.should == XDry::SimpleVarType
+      sel.to_s == simple
+    end
+  end
+
+  it "should parse NSString *" do
+    sel = XDry::VarType.parse('NSString *')
+    sel.class.should == XDry::PointerVarType
+    sel.name == 'NSString'
+  end
+
+  it "should parse NSError **" do
+    sel = XDry::VarType.parse('NSError **')
+    sel.class.should == XDry::PointerPointerVarType
+    sel.name == 'NSError'
+  end
+
+  it "should parse id" do
+    sel = XDry::VarType.parse('id')
+    sel.class.should == XDry::IdVarType
+    sel.protocol == nil
+  end
+
+  it "should parse id<Foo>" do
+    sel = XDry::VarType.parse('id<Foo>')
+    sel.class.should == XDry::IdVarType
+    sel.protocol == 'Foo'
+  end
+
+end

data/xdry.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{xdry}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrey Tarantsov"]
-  s.date = %q{2011-03-20}
+  s.date = %q{2011-03-22}
   s.default_executable = %q{xdry}
   s.description = %q{Autogenerates all kinds of funky stuff (like accessors) in Xcode projects}
   s.email = %q{andreyvit@gmail.com}
@@ -66,14 +66,17 @@ Gem::Specification.new do |s|
     "spec/field_from_prop_spec.rb",
     "spec/prop_from_field_spec.rb",
     "spec/readme_samples_spec.rb",
+    "spec/selector_parsing_spec.rb",
     "spec/spec.opts",
     "spec/spec_helper.rb",
     "spec/synthesize_spec.rb",
+    "spec/unknown_stuff_handling_spec.rb",
+    "spec/vartype_parsing_spec.rb",
     "xdry.gemspec"
   ]
   s.homepage = %q{http://andreyvit.github.com/xdry/}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{eXtra D.R.Y. for Xcode}
   s.test_files = [
     "spec/boxing_spec.rb",
@@ -83,12 +86,14 @@ Gem::Specification.new do |s|
     "spec/field_from_prop_spec.rb",
     "spec/prop_from_field_spec.rb",
     "spec/readme_samples_spec.rb",
+    "spec/selector_parsing_spec.rb",
     "spec/spec_helper.rb",
-    "spec/synthesize_spec.rb"
+    "spec/synthesize_spec.rb",
+    "spec/unknown_stuff_handling_spec.rb",
+    "spec/vartype_parsing_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: xdry
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 1
-  version: 0.1.1
+  prerelease: 
+  version: 0.1.2
 platform: ruby
 authors: 
 - Andrey Tarantsov
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-20 00:00:00 +06:00
+date: 2011-03-22 00:00:00 +06:00
 default_executable: xdry
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,11 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 2
-        - 9
         version: 1.2.9
   type: :development
   version_requirements: *id001
@@ -91,9 +81,12 @@ files:
 - spec/field_from_prop_spec.rb
 - spec/prop_from_field_spec.rb
 - spec/readme_samples_spec.rb
+- spec/selector_parsing_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/synthesize_spec.rb
+- spec/unknown_stuff_handling_spec.rb
+- spec/vartype_parsing_spec.rb
 - xdry.gemspec
 has_rdoc: true
 homepage: http://andreyvit.github.com/xdry/
@@ -109,23 +102,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: eXtra D.R.Y. for Xcode
@@ -137,5 +124,8 @@ test_files:
 - spec/field_from_prop_spec.rb
 - spec/prop_from_field_spec.rb
 - spec/readme_samples_spec.rb
+- spec/selector_parsing_spec.rb
 - spec/spec_helper.rb
 - spec/synthesize_spec.rb
+- spec/unknown_stuff_handling_spec.rb
+- spec/vartype_parsing_spec.rb