crystal-lang · Jun 6, 2016 · Jun 6, 2016 · Jun 6, 2016 · Jun 6, 2016
Showing with 39 additions and 12 deletions.

+3 −0 spec/compiler/parser/parser_spec.cr

+20 −0 spec/compiler/type_inference/splat_spec.cr

+3 −2 src/compiler/crystal/syntax/ast.cr

+3 −0 src/compiler/crystal/syntax/parser.cr

+6 −6 src/io.cr

+4 −4 src/kernel.cr
diff --git a/spec/compiler/parser/parser_spec.cr b/spec/compiler/parser/parser_spec.cr
@@ -1324,6 +1324,9 @@ describe "Parser" do
 
   assert_syntax_error "'''", "invalid empty char literal"
 
+  assert_syntax_error "def foo(*args = 1); end", "splat argument can't have default value"
+  assert_syntax_error "def foo(**args = 1); end", "double splat argument can't have default value"
+
   describe "end locations" do
     assert_end_location "nil"
     assert_end_location "false"

diff --git a/spec/compiler/type_inference/splat_spec.cr b/spec/compiler/type_inference/splat_spec.cr
@@ -417,6 +417,26 @@ describe "Type inference: splat" do
       "no overload matches"
   end
 
+  it "method with splat and optional named argument matches zero args call (#2746)" do
+    assert_type(%(
+      def foo(*args, k1 = nil)
+        args
+      end
+
+      foo
+      )) { tuple_of([] of Type) }
+  end
+
+  it "method with default arguments and splat matches call with one arg (#2766)" do
+    assert_type(%(
+      def foo(a = nil, b = nil, *, c = nil)
+        a
+      end
+
+      foo(10)
+      )) { int32 }
+  end
+
   describe Splat do
     it "without splat" do
       a_def = Def.new("foo", args: [Arg.new("x"), Arg.new("y")])

diff --git a/src/compiler/crystal/syntax/ast.cr b/src/compiler/crystal/syntax/ast.cr
@@ -952,9 +952,10 @@ module Crystal
       splat_index = self.splat_index
       if splat_index
         if args[splat_index].name.empty?
-          min_size = max_size = splat_index
+          min_size = {default_value_index || splat_index, splat_index}.min
+          max_size = splat_index
         else
-          min_size -= 1 unless default_value_index
+          min_size -= 1 unless default_value_index && default_value_index < splat_index
           max_size = Int32::MAX
         end
       end

diff --git a/src/compiler/crystal/syntax/parser.cr b/src/compiler/crystal/syntax/parser.cr
@@ -3190,6 +3190,9 @@ module Crystal
       end
 
       if @token.type == :"="
+        raise "splat argument can't have default value", @token if splat
+        raise "double splat argument can't have default value", @token if double_splat
+
         next_token_skip_space_or_newline
 
         case @token.type

diff --git a/src/io.cr b/src/io.cr
@@ -657,8 +657,8 @@ module IO
   end
 
   # Same as `gets`, but raises `EOFError` if called at the end of this IO.
-  def read_line(*args) : String?
-    gets(*args) || raise EOFError.new
+  def read_line(*args, **options) : String?
+    gets(*args, **options) || raise EOFError.new
   end
 
   # Reads and discards *bytes_count* bytes.
@@ -754,8 +754,8 @@ module IO
   # olleh
   # dlrow
   # ```
-  def each_line(*args)
-    while line = gets(*args)
+  def each_line(*args, **options)
+    while line = gets(*args, **options)
       yield line
     end
   end
@@ -770,8 +770,8 @@ module IO
   # iter.next # => "hello\n"
   # iter.next # => "world"
   # ```
-  def each_line(*args)
-    LineIterator.new(self, args)
+  def each_line(*args, **options)
+    LineIterator.new(self, args, **options)
   end
 
   # Inovkes the given block with each `Char` in this IO.

diff --git a/src/kernel.cr b/src/kernel.cr
@@ -28,13 +28,13 @@ def loop
 end
 
 # Reads a line from STDIN. See `IO#gets`.
-def gets(*args)
-  STDIN.gets(*args)
+def gets(*args, **options)
+  STDIN.gets(*args, **options)
 end
 
 # Reads a line from STDIN. See `IO#read_line`.
-def read_line(*args)
-  STDIN.read_line(*args)
+def read_line(*args, **options)
+  STDIN.read_line(*args, **options)
 end
 
 # Prints objects to STDOUT and then invokes `STDOUT.flush`. See `IO#print`.