Merge pull request #77 from davidanthoff/fix-date-parsing

Fix date parsing

Author: davidanthoff

src/lib/date-tryparse-internal.jl

@@ -107,18 +107,21 @@ Returns a 3-element tuple `(values, pos, num_parsed)`:
             vi += 1
             quote
                 pos > len && @goto done
-                $nullable, next_pos = tryparsenext(directives[$i], str, pos, len, locale)
-                isnull($nullable) && @goto error
-                $name = unsafe_get($nullable)
+                nothingable_tuple = tryparsenext(directives[$i], str, pos, len, locale)
+                nothingable_tuple===nothing && @goto error
+                $name = nothingable_tuple[1]
+                next_pos = nothingable_tuple[2]
                 pos = next_pos
                 num_parsed += 1
                 directive_index += 1
             end
         else
             quote
                 pos > len && @goto done
-                nullable_delim, next_pos = tryparsenext(directives[$i], str, pos, len, locale)
-                isnull(nullable_delim) && @goto error
+                nothingable_tuple = tryparsenext(directives[$i], str, pos, len, locale)
+                nothingable_tuple===nothing && @goto error
+                nullable_delim = nothingable_tuple[1]
+                next_pos = nothingable_tuple[2]
                 pos = next_pos
                 directive_index += 1
             end

test/runtests.jl

@@ -373,8 +373,8 @@ end
     str = "1970-02-02 02:20:20"
     @test tryparsenext(tok, str, 1, length(str), opts) |> unwrap == (DateTime("1970-02-02T02:20:20"), length(str)+1)
     @test tryparsenext(tok, str*"x", 1, length(str)+1, opts) |> unwrap == (DateTime("1970-02-02T02:20:20"), length(str)+1)
-   #@test tryparsenext(tok, str[1:end-3]*"x", 1, length(str)-2, opts) |> failedat == length(str)-2
-   #@test tryparsenext(tok, str[1:end-3]*"y", 1, length(str)-2, opts) |> unwrap == (DateTime("1970-02-02T02:20"), length(str)-2)
+    @test tryparsenext(tok, str[1:end-3]*"x", 1, length(str)-2, opts) |> failedat == length(str)-2
+    @test tryparsenext(tok, str[1:end-3]*"y", 1, length(str)-2, opts) |> unwrap == (DateTime("1970-02-02T02:20"), length(str)-2)
 end