Merge pull request #187 from mvidner/not-enough-argument-definitions

Fix 'Not enough argument definitions' exception when parsing less usual constructs

lib/ruby-lint/variable_predicates.rb

@@ -20,6 +20,7 @@ module VariablePredicates
     #
     RUBY_CLASSES = {
       :str    => 'String',
+      :dstr   => 'String',
       :sym    => 'Symbol',
       :int    => 'Fixnum',
       :float  => 'Float',

lib/ruby-lint/virtual_machine.rb

@@ -103,7 +103,9 @@ class VirtualMachine < Iterator
       :int,
       :float,
       :str,
+      :dstr,
       :sym,
+      :regexp,
       :true,
       :false,
       :nil,
@@ -448,6 +450,13 @@ def on_self
       push_value(method.return_value)
     end
 
+    ##
+    # Pushes the return value of the block yielded to, that is, an unknown one.
+    #
+    def on_yield
+      push_unknown_value
+    end
+
     ##
     # Creates the definition for a module.
     #

spec/ruby-lint/virtual_machine/assignments/return_values_spec.rb

@@ -38,19 +38,53 @@ def example
     value.instance?.should == true
   end
 
+  it 'assigns a return value for a bare yield' do
+    code = <<-CODE
+number = yield
+    CODE
+
+    defs = build_definitions(code)
+
+    defs.lookup(:lvar, 'number').value.should_not == nil
+  end
+
+
   describe 'setting instance types for core Ruby types' do
     it 'creates a new String instance' do
       defs = build_definitions('number = "10"')
 
       defs.lookup(:lvar, 'number').value.instance?.should == true
     end
 
+    it 'creates a new interpolated String instance' do
+      defs = build_definitions('number = "#{1}#{0}"')
+
+      defs.lookup(:lvar, 'number').value.instance?.should == true
+    end
+
+    it 'creates a new heredoc String instance' do
+      code = <<-CODE
+number = <<EOS
+EOS
+      CODE
+
+      defs = build_definitions(code)
+
+      defs.lookup(:lvar, 'number').value.instance?.should == true
+    end
+
     it 'creates a new Symbol instance' do
       defs = build_definitions('number = :"10"')
 
       defs.lookup(:lvar, 'number').value.instance?.should == true
     end
 
+    it 'creates a new Regexp instance' do
+      defs = build_definitions('number = //')
+
+      defs.lookup(:lvar, 'number').value.instance?.should == true
+    end
+
     it 'creates a new Fixnum instance' do
       defs = build_definitions('number = 10')