From 52f54fa665fd41cd78ac05e73b750dd5ca0d38af Mon Sep 17 00:00:00 2001 From: Guillaume Allais Date: Tue, 24 Oct 2023 14:53:26 +0100 Subject: [PATCH 1/3] [ fix ] typo in error message --- src/Data/Aeson/Decoding/Text.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Data/Aeson/Decoding/Text.hs b/src/Data/Aeson/Decoding/Text.hs index ca00e6e9..08bfd742 100644 --- a/src/Data/Aeson/Decoding/Text.hs +++ b/src/Data/Aeson/Decoding/Text.hs @@ -171,7 +171,7 @@ scanStringLiteral ok err bs0 = go 0 bs0 where Just (_, bs') -> goEsc (n + 1) bs' errEnd = err "Unexpected end-of-input while parsing string literal" - errCC = err "Unespected control character while parsing string literal" + errCC = err "Unexpected control character while parsing string literal" ------------------------------------------------------------------------------- -- Number From 084fbca50db7dd5811a23ad94c207a4133f8f778 Mon Sep 17 00:00:00 2001 From: Guillaume Allais Date: Wed, 25 Oct 2023 11:18:40 +0100 Subject: [PATCH 2/3] [ fix ] additional occurences --- src/Data/Aeson/Decoding/ByteString.hs | 2 +- src/Data/Aeson/Decoding/ByteString/Lazy.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Data/Aeson/Decoding/ByteString.hs b/src/Data/Aeson/Decoding/ByteString.hs index 6ba082bb..1d4379a5 100644 --- a/src/Data/Aeson/Decoding/ByteString.hs +++ b/src/Data/Aeson/Decoding/ByteString.hs @@ -161,7 +161,7 @@ scanStringLiteral ok err bs0 = go 0 bs0 where Just (_, bs') -> goEsc (n + 1) bs' errEnd = err "Unexpected end-of-input while parsing string literal" - errCC = err "Unespected control character while parsing string literal" + errCC = err "Unexpected control character while parsing string literal" ------------------------------------------------------------------------------- -- Number diff --git a/src/Data/Aeson/Decoding/ByteString/Lazy.hs b/src/Data/Aeson/Decoding/ByteString/Lazy.hs index 9e699d03..0b9399b3 100644 --- a/src/Data/Aeson/Decoding/ByteString/Lazy.hs +++ b/src/Data/Aeson/Decoding/ByteString/Lazy.hs @@ -167,7 +167,7 @@ scanStringLiteral ok err bs0 = go 0 bs0 where Just (_, bs') -> goEsc (n + 1) bs' errEnd = err "Unexpected end-of-input while parsing string literal" - errCC = err "Unespected control character while parsing string literal" + errCC = err "Unexpected control character while parsing string literal" ------------------------------------------------------------------------------- -- Number From 876000136fd9b133d4575344c7e207cc3db0e61b Mon Sep 17 00:00:00 2001 From: Guillaume Allais Date: Wed, 25 Oct 2023 11:23:57 +0100 Subject: [PATCH 3/3] [ tests ] update golden files --- .../results/n_array_spaces_vertical_tab_formfeed.tok | 2 +- .../results/n_array_spaces_vertical_tab_formfeed.ttok | 2 +- tests/JSONTestSuite/results/n_string_unescaped_ctrl_char.tok | 2 +- tests/JSONTestSuite/results/n_string_unescaped_ctrl_char.ttok | 2 +- tests/JSONTestSuite/results/n_string_unescaped_newline.tok | 2 +- tests/JSONTestSuite/results/n_string_unescaped_newline.ttok | 2 +- tests/JSONTestSuite/results/n_string_unescaped_tab.tok | 2 +- tests/JSONTestSuite/results/n_string_unescaped_tab.ttok | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/JSONTestSuite/results/n_array_spaces_vertical_tab_formfeed.tok b/tests/JSONTestSuite/results/n_array_spaces_vertical_tab_formfeed.tok index 53fa1418..042c3590 100644 --- a/tests/JSONTestSuite/results/n_array_spaces_vertical_tab_formfeed.tok +++ b/tests/JSONTestSuite/results/n_array_spaces_vertical_tab_formfeed.tok @@ -1,3 +1,3 @@ TkArrayOpen TkItem -TkErr "Unespected control character while parsing string literal" +TkErr "Unexpected control character while parsing string literal" diff --git a/tests/JSONTestSuite/results/n_array_spaces_vertical_tab_formfeed.ttok b/tests/JSONTestSuite/results/n_array_spaces_vertical_tab_formfeed.ttok index 53fa1418..042c3590 100644 --- a/tests/JSONTestSuite/results/n_array_spaces_vertical_tab_formfeed.ttok +++ b/tests/JSONTestSuite/results/n_array_spaces_vertical_tab_formfeed.ttok @@ -1,3 +1,3 @@ TkArrayOpen TkItem -TkErr "Unespected control character while parsing string literal" +TkErr "Unexpected control character while parsing string literal" diff --git a/tests/JSONTestSuite/results/n_string_unescaped_ctrl_char.tok b/tests/JSONTestSuite/results/n_string_unescaped_ctrl_char.tok index 53fa1418..042c3590 100644 --- a/tests/JSONTestSuite/results/n_string_unescaped_ctrl_char.tok +++ b/tests/JSONTestSuite/results/n_string_unescaped_ctrl_char.tok @@ -1,3 +1,3 @@ TkArrayOpen TkItem -TkErr "Unespected control character while parsing string literal" +TkErr "Unexpected control character while parsing string literal" diff --git a/tests/JSONTestSuite/results/n_string_unescaped_ctrl_char.ttok b/tests/JSONTestSuite/results/n_string_unescaped_ctrl_char.ttok index 53fa1418..042c3590 100644 --- a/tests/JSONTestSuite/results/n_string_unescaped_ctrl_char.ttok +++ b/tests/JSONTestSuite/results/n_string_unescaped_ctrl_char.ttok @@ -1,3 +1,3 @@ TkArrayOpen TkItem -TkErr "Unespected control character while parsing string literal" +TkErr "Unexpected control character while parsing string literal" diff --git a/tests/JSONTestSuite/results/n_string_unescaped_newline.tok b/tests/JSONTestSuite/results/n_string_unescaped_newline.tok index 53fa1418..042c3590 100644 --- a/tests/JSONTestSuite/results/n_string_unescaped_newline.tok +++ b/tests/JSONTestSuite/results/n_string_unescaped_newline.tok @@ -1,3 +1,3 @@ TkArrayOpen TkItem -TkErr "Unespected control character while parsing string literal" +TkErr "Unexpected control character while parsing string literal" diff --git a/tests/JSONTestSuite/results/n_string_unescaped_newline.ttok b/tests/JSONTestSuite/results/n_string_unescaped_newline.ttok index 53fa1418..042c3590 100644 --- a/tests/JSONTestSuite/results/n_string_unescaped_newline.ttok +++ b/tests/JSONTestSuite/results/n_string_unescaped_newline.ttok @@ -1,3 +1,3 @@ TkArrayOpen TkItem -TkErr "Unespected control character while parsing string literal" +TkErr "Unexpected control character while parsing string literal" diff --git a/tests/JSONTestSuite/results/n_string_unescaped_tab.tok b/tests/JSONTestSuite/results/n_string_unescaped_tab.tok index 53fa1418..042c3590 100644 --- a/tests/JSONTestSuite/results/n_string_unescaped_tab.tok +++ b/tests/JSONTestSuite/results/n_string_unescaped_tab.tok @@ -1,3 +1,3 @@ TkArrayOpen TkItem -TkErr "Unespected control character while parsing string literal" +TkErr "Unexpected control character while parsing string literal" diff --git a/tests/JSONTestSuite/results/n_string_unescaped_tab.ttok b/tests/JSONTestSuite/results/n_string_unescaped_tab.ttok index 53fa1418..042c3590 100644 --- a/tests/JSONTestSuite/results/n_string_unescaped_tab.ttok +++ b/tests/JSONTestSuite/results/n_string_unescaped_tab.ttok @@ -1,3 +1,3 @@ TkArrayOpen TkItem -TkErr "Unespected control character while parsing string literal" +TkErr "Unexpected control character while parsing string literal"