File tree 2 files changed +14
-5
lines changed
2 files changed +14
-5
lines changed Original file line number Diff line number Diff line change @@ -6,13 +6,12 @@ defmodule Json5.Decode.Helper do
6
6
alias Combine.ParserState
7
7
alias Json5.Decode
8
8
9
- @ multi_line_comment_regex ~R( \/\*[\s\S]*?\*\/)
10
-
11
9
@ elements [
12
10
:remove_white_space ,
13
11
:single_line_comment ,
14
12
:multi_line_comment
15
13
]
14
+
16
15
@ ignore_tags for (
17
16
x <- @ elements ,
18
17
y <- @ elements ,
@@ -76,7 +75,13 @@ defmodule Json5.Decode.Helper do
76
75
end
77
76
78
77
def multi_line_comment do
79
- skip ( word_of ( @ multi_line_comment_regex ) )
78
+ skip (
79
+ sequence ( [
80
+ string ( "/*" ) ,
81
+ many ( if_not ( string ( "*/" ) , char ( ) ) ) ,
82
+ string ( "*/" )
83
+ ] )
84
+ )
80
85
end
81
86
82
87
def ecma_line_terminator do
Original file line number Diff line number Diff line change @@ -14,15 +14,19 @@ defmodule Json5.Decode.String do
14
14
end
15
15
16
16
defp json5_single_string_characters ( prev \\ nil ) do
17
- prev |> many1 ( json5_single_string_character ( ) ) |> map ( & :erlang . iolist_to_binary / 1 )
17
+ prev
18
+ |> many1 ( json5_single_string_character ( ) )
19
+ |> map ( & :erlang . iolist_to_binary / 1 )
18
20
end
19
21
20
22
defp json5_single_string_character ( ) do
21
23
if_not ( char ( "'" ) , escape_new_line_char ( ) )
22
24
end
23
25
24
26
defp json5_double_string_characters ( prev \\ nil ) do
25
- prev |> many1 ( json5_double_string_character ( ) ) |> map ( & :erlang . iolist_to_binary / 1 )
27
+ prev
28
+ |> many1 ( json5_double_string_character ( ) )
29
+ |> map ( & :erlang . iolist_to_binary / 1 )
26
30
end
27
31
28
32
defp json5_double_string_character ( ) do
You can’t perform that action at this time.
0 commit comments