fix JuliaIO#21 : carriage return in string

aviks · Jul 12, 2013 · 23b7f15 · 23b7f15
1 parent c7ebaa3
commit 23b7f15
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/src/Parser.jl b/src/Parser.jl
@@ -91,7 +91,7 @@ module Parser
  return s
  end
  c = str[s]
- while (c == ' ' || c == '\t' || c == '\n') && s < e
+ while (c == ' ' || c == '\t' || c == '\n' || c=='\r') && s < e
  s += 1
  c = str[s]
  end

diff --git a/test/JSON.jl b/test/JSON.jl
@@ -164,3 +164,7 @@ fetch(finished_async_tests)
 obj = JSON.parse("{\"a\":2e10}")
 @assert(obj["a"] == 2e10)
 
+#test for issue 21
+a=JSON.parse(test21)
+@assert isa(a, Array{Any})
+@assert length(a) == 2
diff --git a/test/json_samples.jl b/test/json_samples.jl
@@ -610,4 +610,4 @@ unicode = "{\"অলিম্পিকস\": {
 
 
 
-
+test21 = "[\r\n{\r\n\"a\": 1,\r\n\"b\": 2\r\n},\r\n{\r\n\"a\": 3,\r\n\"b\": 4\r\n}\r\n]"