crystal-lang · Dec 30, 2016 · Dec 30, 2016 · Dec 30, 2016
Showing with 77 additions and 6 deletions.

+22 −0 spec/compiler/codegen/method_missing_spec.cr

+19 −0 spec/compiler/semantic/method_missing_spec.cr

+15 −0 spec/std/io/io_spec.cr

+6 −0 src/compiler/crystal/semantic/call.cr

+1 −3 src/http/content.cr

+14 −3 src/io.cr
diff --git a/spec/compiler/codegen/method_missing_spec.cr b/spec/compiler/codegen/method_missing_spec.cr
@@ -408,4 +408,26 @@ describe "Code gen: method_missing" do
       a.b(x: 1, y: 2)
       )).to_i.should eq(3)
   end
+
+  it "finds method_missing with 'with ... yield'" do
+    run(%(
+      class Foo
+        def initialize(@x : Int32)
+        end
+
+        macro method_missing(call)
+          @{{call.name.id}}
+        end
+      end
+
+      def bar
+        foo = Foo.new(10)
+        with foo yield
+      end
+
+      bar do
+        x
+      end
+      )).to_i.should eq(10)
+  end
 end
diff --git a/spec/compiler/semantic/method_missing_spec.cr b/spec/compiler/semantic/method_missing_spec.cr
@@ -73,4 +73,23 @@ describe "Semantic: method_missing" do
       ),
       "wrong method_missing expansion"
   end
+
+  it "finds method_missing with 'with ... yield'" do
+    assert_type(%(
+      class Foo
+        macro method_missing(call)
+          1
+        end
+      end
+
+      def bar
+        foo = Foo.new
+        with foo yield
+      end
+
+      bar do
+        baz
+      end
+      )) { int32 }
+  end
 end
diff --git a/spec/std/io/io_spec.cr b/spec/std/io/io_spec.cr
@@ -477,6 +477,21 @@ describe IO do
       io.skip(6)
       io.gets_to_end.should eq("world")
     end
+
+    it "skips but raises if not enough bytes" do
+      io = SimpleIOMemory.new
+      io << "hello"
+      expect_raises(IO::EOFError) do
+        io.skip(6)
+      end
+    end
+
+    it "skips to end" do
+      io = SimpleIOMemory.new
+      io << "hello"
+      io.skip_to_end
+      io.read_byte.should be_nil
+    end
   end
 
   describe "encoding" do

diff --git a/src/compiler/crystal/semantic/call.cr b/src/compiler/crystal/semantic/call.cr
@@ -237,6 +237,12 @@ class Crystal::Call
       defined_method_missing = owner.check_method_missing(signature, self)
       if defined_method_missing
         matches = owner.lookup_matches(signature)
+      elsif with_scope = @with_scope
+        defined_method_missing = with_scope.check_method_missing(signature, self)
+        if defined_method_missing
+          matches = with_scope.lookup_matches(signature)
+          @uses_with_scope = true
+        end
       end
     end
 

diff --git a/src/http/content.cr b/src/http/content.cr
@@ -2,9 +2,7 @@ module HTTP
   # :nodoc:
   module Content
     def close
-      buffer = uninitialized UInt8[1024]
-      while read(buffer.to_slice) > 0
-      end
+      skip_to_end
       super
     end
   end

diff --git a/src/io.cr b/src/io.cr
@@ -727,20 +727,31 @@ module IO
     gets(*args, **options) || raise EOFError.new
   end
 
-  # Reads and discards *bytes_count* bytes.
+  # Reads and discards exactly *bytes_count* bytes.
+  # Raises IO::EOFError if there aren't at least *bytes_count* bytes.
   #
   # ```
   # io = IO::Memory.new "hello world"
   # io.skip(6)
-  # io.gets # => "world"
+  # io.gets    # => "world"
+  # io.skip(1) # raises IO::EOFError
   # ```
   def skip(bytes_count : Int) : Nil
     buffer = uninitialized UInt8[1024]
     while bytes_count > 0
       read_count = read(buffer.to_slice[0, bytes_count])
+      raise IO::EOFError.new if read_count == 0
+
       bytes_count -= read_count
     end
-    nil
+  end
+
+  # Reads and discards bytes from `self` until there
+  # are no more bytes.
+  def skip_to_end : Nil
+    buffer = uninitialized UInt8[1024]
+    while read(buffer.to_slice) > 0
+    end
   end
 
   # Writes a single byte into this IO.