Skip to content

Fix parsing of enums with E #109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rrosenzweig merged 1 commit into from
Aug 9, 2018
Merged

Fix parsing of enums with E #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions graphql_parser/src/graphql_parser.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,11 +188,14 @@ let string_value = lift (fun s -> `String s) (quote *> string_chars <* quote)
let boolean_value = string "true" *> return (`Bool true) <|>
string "false" *> return (`Bool false)

let number_value = lift (fun n ->
let number_value = number_chars >>= fun n ->
try
`Int (int_of_string n)
return (`Int (int_of_string n))
with Failure _ ->
`Float (float_of_string n)) number_chars
try
return (`Float (float_of_string n))
with Failure _ ->
fail (Format.sprintf "Invalid number value: %s" n)

let enum_value = name >>= function
| "true"
Expand Down
4 changes: 2 additions & 2 deletions graphql_parser/test/data/kitchen_sink.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,6 @@ fragment frag on Friend {
}

{
unnamed(truthy: true, falsey: false, nullish: null),
unnamed(truthy: true, falsey: false, nullish: null, enum: ECHO),
query
}
}
3 changes: 2 additions & 1 deletion graphql_parser/test/data/kitchen_sink.sexp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,8 @@
((Field
((alias ()) (name unnamed)
(arguments
((truthy (Bool true)) (falsey (Bool false)) (nullish Null)))
((truthy (Bool true)) (falsey (Bool false)) (nullish Null)
(enum (Enum ECHO))))
(directives ()) (selection_set ())))
(Field
((alias ()) (name query) (arguments ()) (directives ())
Expand Down