Skip to content

Misc. updates to synch with latest PEGTL #60

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
merged 3 commits into from
Aug 10, 2019
Merged

Misc. updates to synch with latest PEGTL #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
71d7284
Use std::nullopt instead of default std::optional constructor
wravery Aug 10, 2019
f776bd5
Update PEGTL submodule
wravery Aug 10, 2019
065baeb
Replace removed parse_tree::basic_node::is with is_type
wravery Aug 10, 2019
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
2 changes: 1 addition & 1 deletion PEGTL
Open in desktop
Submodule PEGTL updated 102 files
4 changes: 2 additions & 2 deletions include/graphqlservice/GraphQLGrammar.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ void for_each_child(const ast_node& n, std::function<void(const ast_node&)>&& fu
{
for (const auto& child : n.children)
{
if (child->is<Rule>())
if (child->is_type<Rule>())
{
func(*child);
}
Expand All @@ -36,7 +36,7 @@ void on_first_child(const ast_node& n, std::function<void(const ast_node&)>&& fu
{
for (const auto& child : n.children)
{
if (child->is<Rule>())
if (child->is_type<Rule>())
{
func(*child);
return;
Expand Down
2 changes: 1 addition & 1 deletion include/graphqlservice/GraphQLService.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ struct ModifiedArgument
if (valueItr == arguments.get<const response::MapType&>().cend()
|| valueItr->second.type() == response::Type::Null)
{
return {};
return std::nullopt;
}

auto result = require<Other...>(name, arguments);
Expand Down
34 changes: 17 additions & 17 deletions src/GraphQLService.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,40 +90,40 @@ response::Value ValueVisitor::getValue()

void ValueVisitor::visit(const peg::ast_node & value)
{
if (value.is<peg::variable_value>())
if (value.is_type<peg::variable_value>())
{
visitVariable(value);
}
else if (value.is<peg::integer_value>())
else if (value.is_type<peg::integer_value>())
{
visitIntValue(value);
}
else if (value.is<peg::float_value>())
else if (value.is_type<peg::float_value>())
{
visitFloatValue(value);
}
else if (value.is<peg::string_value>())
else if (value.is_type<peg::string_value>())
{
visitStringValue(value);
}
else if (value.is<peg::true_keyword>()
|| value.is<peg::false_keyword>())
else if (value.is_type<peg::true_keyword>()
|| value.is_type<peg::false_keyword>())
{
visitBooleanValue(value);
}
else if (value.is<peg::null_keyword>())
else if (value.is_type<peg::null_keyword>())
{
visitNullValue(value);
}
else if (value.is<peg::enum_value>())
else if (value.is_type<peg::enum_value>())
{
visitEnumValue(value);
}
else if (value.is<peg::list_value>())
else if (value.is_type<peg::list_value>())
{
visitListValue(value);
}
else if (value.is<peg::object_value>())
else if (value.is_type<peg::object_value>())
{
visitObjectValue(value);
}
Expand Down Expand Up @@ -166,7 +166,7 @@ void ValueVisitor::visitStringValue(const peg::ast_node & stringValue)

void ValueVisitor::visitBooleanValue(const peg::ast_node & booleanValue)
{
_value = response::Value(booleanValue.is<peg::true_keyword>());
_value = response::Value(booleanValue.is_type<peg::true_keyword>());
}

void ValueVisitor::visitNullValue(const peg::ast_node& /*nullValue*/)
Expand Down Expand Up @@ -758,15 +758,15 @@ std::queue<std::pair<std::string, std::future<response::Value>>> SelectionVisito

void SelectionVisitor::visit(const peg::ast_node & selection)
{
if (selection.is<peg::field>())
if (selection.is_type<peg::field>())
{
visitField(selection);
}
else if (selection.is<peg::fragment_spread>())
else if (selection.is_type<peg::fragment_spread>())
{
visitFragmentSpread(selection);
}
else if (selection.is<peg::inline_fragment>())
else if (selection.is_type<peg::inline_fragment>())
{
visitInlineFragment(selection);
}
Expand Down Expand Up @@ -1338,15 +1338,15 @@ void SubscriptionDefinitionVisitor::visit(const peg::ast_node & operationDefinit

for (const auto& child : selection.children)
{
if (child->is<peg::field>())
if (child->is_type<peg::field>())
{
visitField(*child);
}
else if (child->is<peg::fragment_spread>())
else if (child->is_type<peg::fragment_spread>())
{
visitFragmentSpread(*child);
}
else if (child->is<peg::inline_fragment>())
else if (child->is_type<peg::inline_fragment>())
{
visitInlineFragment(*child);
}
Expand Down
80 changes: 40 additions & 40 deletions src/SchemaGenerator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,59 +523,59 @@ void Generator::fixupInputFieldList(InputFieldList& fields)

void Generator::visitDefinition(const peg::ast_node& definition)
{
if (definition.is<peg::schema_definition>())
if (definition.is_type<peg::schema_definition>())
{
visitSchemaDefinition(definition);
}
else if (definition.is<peg::schema_extension>())
else if (definition.is_type<peg::schema_extension>())
{
visitSchemaExtension(definition);
}
else if (definition.is<peg::scalar_type_definition>())
else if (definition.is_type<peg::scalar_type_definition>())
{
visitScalarTypeDefinition(definition);
}
else if (definition.is<peg::enum_type_definition>())
else if (definition.is_type<peg::enum_type_definition>())
{
visitEnumTypeDefinition(definition);
}
else if (definition.is<peg::enum_type_extension>())
else if (definition.is_type<peg::enum_type_extension>())
{
visitEnumTypeExtension(definition);
}
else if (definition.is<peg::input_object_type_definition>())
else if (definition.is_type<peg::input_object_type_definition>())
{
visitInputObjectTypeDefinition(definition);
}
else if (definition.is<peg::input_object_type_extension>())
else if (definition.is_type<peg::input_object_type_extension>())
{
visitInputObjectTypeExtension(definition);
}
else if (definition.is<peg::union_type_definition>())
else if (definition.is_type<peg::union_type_definition>())
{
visitUnionTypeDefinition(definition);
}
else if (definition.is<peg::union_type_extension>())
else if (definition.is_type<peg::union_type_extension>())
{
visitUnionTypeExtension(definition);
}
else if (definition.is<peg::interface_type_definition>())
else if (definition.is_type<peg::interface_type_definition>())
{
visitInterfaceTypeDefinition(definition);
}
else if (definition.is<peg::interface_type_extension>())
else if (definition.is_type<peg::interface_type_extension>())
{
visitInterfaceTypeExtension(definition);
}
else if (definition.is<peg::object_type_definition>())
else if (definition.is_type<peg::object_type_definition>())
{
visitObjectTypeDefinition(definition);
}
else if (definition.is<peg::object_type_extension>())
else if (definition.is_type<peg::object_type_extension>())
{
visitObjectTypeExtension(definition);
}
else if (definition.is<peg::directive_definition>())
else if (definition.is_type<peg::directive_definition>())
{
visitDirectiveDefinition(definition);
}
Expand Down Expand Up @@ -1048,26 +1048,26 @@ OutputFieldList Generator::getOutputFields(const std::vector<std::unique_ptr<peg

for (const auto& child : fieldDefinition->children)
{
if (child->is<peg::field_name>())
if (child->is_type<peg::field_name>())
{
field.name = child->string_view();
field.cppName = getSafeCppName(field.name);
}
else if (child->is<peg::arguments_definition>())
else if (child->is_type<peg::arguments_definition>())
{
field.arguments = getInputFields(child->children);
}
else if (child->is<peg::named_type>()
|| child->is<peg::list_type>()
|| child->is<peg::nonnull_type>())
else if (child->is_type<peg::named_type>()
|| child->is_type<peg::list_type>()
|| child->is_type<peg::nonnull_type>())
{
fieldType.visit(*child);
}
else if (child->is<peg::description>())
else if (child->is_type<peg::description>())
{
field.description = child->children.front()->unescaped;
}
else if (child->is<peg::directives>())
else if (child->is_type<peg::directives>())
{
peg::for_each_child<peg::directive>(*child,
[&field](const peg::ast_node & directive)
Expand Down Expand Up @@ -1134,26 +1134,26 @@ InputFieldList Generator::getInputFields(const std::vector<std::unique_ptr<peg::

for (const auto& child : fieldDefinition->children)
{
if (child->is<peg::argument_name>())
if (child->is_type<peg::argument_name>())
{
field.name = child->string_view();
field.cppName = getSafeCppName(field.name);
}
else if (child->is<peg::named_type>()
|| child->is<peg::list_type>()
|| child->is<peg::nonnull_type>())
else if (child->is_type<peg::named_type>()
|| child->is_type<peg::list_type>()
|| child->is_type<peg::nonnull_type>())
{
fieldType.visit(*child);
}
else if (child->is<peg::default_value>())
else if (child->is_type<peg::default_value>())
{
DefaultValueVisitor defaultValue;

defaultValue.visit(*child->children.back());
field.defaultValue = defaultValue.getValue();
field.defaultValueString = child->children.back()->string_view();
}
else if (child->is<peg::description>())
else if (child->is_type<peg::description>())
{
field.description = child->children.front()->unescaped;
}
Expand All @@ -1169,15 +1169,15 @@ InputFieldList Generator::getInputFields(const std::vector<std::unique_ptr<peg::

void Generator::TypeVisitor::visit(const peg::ast_node& typeName)
{
if (typeName.is<peg::nonnull_type>())
if (typeName.is_type<peg::nonnull_type>())
{
visitNonNullType(typeName);
}
else if (typeName.is<peg::list_type>())
else if (typeName.is_type<peg::list_type>())
{
visitListType(typeName);
}
else if (typeName.is<peg::named_type>())
else if (typeName.is_type<peg::named_type>())
{
visitNamedType(typeName);
}
Expand Down Expand Up @@ -1220,36 +1220,36 @@ std::pair<std::string, TypeModifierStack> Generator::TypeVisitor::getType()

void Generator::DefaultValueVisitor::visit(const peg::ast_node& value)
{
if (value.is<peg::integer_value>())
if (value.is_type<peg::integer_value>())
{
visitIntValue(value);
}
else if (value.is<peg::float_value>())
else if (value.is_type<peg::float_value>())
{
visitFloatValue(value);
}
else if (value.is<peg::string_value>())
else if (value.is_type<peg::string_value>())
{
visitStringValue(value);
}
else if (value.is<peg::true_keyword>()
|| value.is<peg::false_keyword>())
else if (value.is_type<peg::true_keyword>()
|| value.is_type<peg::false_keyword>())
{
visitBooleanValue(value);
}
else if (value.is<peg::null_keyword>())
else if (value.is_type<peg::null_keyword>())
{
visitNullValue(value);
}
else if (value.is<peg::enum_value>())
else if (value.is_type<peg::enum_value>())
{
visitEnumValue(value);
}
else if (value.is<peg::list_value>())
else if (value.is_type<peg::list_value>())
{
visitListValue(value);
}
else if (value.is<peg::object_value>())
else if (value.is_type<peg::object_value>())
{
visitObjectValue(value);
}
Expand All @@ -1272,7 +1272,7 @@ void Generator::DefaultValueVisitor::visitStringValue(const peg::ast_node& strin

void Generator::DefaultValueVisitor::visitBooleanValue(const peg::ast_node& booleanValue)
{
_value = response::Value(booleanValue.is<peg::true_keyword>());
_value = response::Value(booleanValue.is_type<peg::true_keyword>());
}

void Generator::DefaultValueVisitor::visitNullValue(const peg::ast_node& /*nullValue*/)
Expand Down