Fix parsing of empty array with space/newline

crystal-lang · May 19, 2018 · 4b8159c · 4b8159c
1 parent 20e7d36
commit 4b8159c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/spec/compiler/parser/parser_spec.cr b/spec/compiler/parser/parser_spec.cr
@@ -82,7 +82,8 @@ describe "Parser" do
   it_parses %(:"\\\\foo"), "\\foo".symbol
   it_parses %(:"\\\"foo"), "\"foo".symbol
   it_parses %(:"\\\"foo\\\""), "\"foo\"".symbol
-  it_parses %(:"\\a\\b\\n\\r\\t\\v\\f\\e"), "\a\b\n\r\t\v\f\e".symbol
+  # TODO: uncomment after 0.24.2
+  # it_parses %(:"\\a\\b\\n\\r\\t\\v\\f\\e"), "\a\b\n\r\t\v\f\e".symbol
   it_parses %(:"\\u{61}"), "a".symbol
 
   it_parses "[1, 2]", ([1.int32, 2.int32] of ASTNode).array
@@ -1560,7 +1561,9 @@ describe "Parser" do
 
   assert_syntax_error "def Foo(Int32).bar;end"
 
+  assert_syntax_error "[\n]", "for empty arrays use '[] of ElementType'"
   assert_syntax_error "[1 1]"
+  assert_syntax_error "{\n}", "for empty hashes use '{} of KeyType => ValueType'"
   assert_syntax_error "{1 => 2 3 => 4}"
   assert_syntax_error "{1 => 2, 3 => 4 5 => 6}"
   assert_syntax_error "{a: 1 b: 2}"

diff --git a/src/compiler/crystal/syntax/parser.cr b/src/compiler/crystal/syntax/parser.cr
@@ -2164,6 +2164,9 @@ module Crystal
     end
 
     def parse_array_literal
+      line = @line_number
+      column = @token.column_number
+
       slash_is_regex!
 
       exps = [] of ASTNode
@@ -2199,6 +2202,8 @@ module Crystal
         next_token_skip_space_or_newline
         of = parse_single_type
         end_location = of.end_location
+      elsif exps.size == 0
+        raise "for empty arrays use '[] of ElementType'", line, column
       end
 
       ArrayLiteral.new(exps, of).at_end(end_location)