Skip to content

Commit 647e973

Browse files
committed
Use string literals for parser rule error messages
1 parent 0e61a3c commit 647e973

File tree

1 file changed

+59
-59
lines changed

1 file changed

+59
-59
lines changed

src/SyntaxTree.cpp

Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -662,7 +662,7 @@ struct executable_selector<type_condition> : std::true_type
662662
template <typename Rule>
663663
struct ast_control : normal<Rule>
664664
{
665-
static const std::string error_message;
665+
static const char* error_message;
666666

667667
template <typename Input, typename... State>
668668
[[noreturn]] static void raise(const Input& in, State&&...)
@@ -672,175 +672,175 @@ struct ast_control : normal<Rule>
672672
};
673673

674674
template <>
675-
const std::string ast_control<one<'}'>>::error_message = "Expected }";
675+
const char* ast_control<one<'}'>>::error_message = "Expected }";
676676
template <>
677-
const std::string ast_control<one<']'>>::error_message = "Expected ]";
677+
const char* ast_control<one<']'>>::error_message = "Expected ]";
678678
template <>
679-
const std::string ast_control<one<')'>>::error_message = "Expected )";
679+
const char* ast_control<one<')'>>::error_message = "Expected )";
680680
template <>
681-
const std::string ast_control<quote_token>::error_message = "Expected \"";
681+
const char* ast_control<quote_token>::error_message = "Expected \"";
682682
template <>
683-
const std::string ast_control<block_quote_token>::error_message = "Expected \"\"\"";
683+
const char* ast_control<block_quote_token>::error_message = "Expected \"\"\"";
684684

685685
template <>
686-
const std::string ast_control<variable_name_content>::error_message =
686+
const char* ast_control<variable_name_content>::error_message =
687687
"Expected https://spec.graphql.org/October2021/#Variable";
688688
template <>
689-
const std::string ast_control<escaped_unicode_content>::error_message =
689+
const char* ast_control<escaped_unicode_content>::error_message =
690690
"Expected https://spec.graphql.org/October2021/#EscapedUnicode";
691691
template <>
692-
const std::string ast_control<string_escape_sequence_content>::error_message =
692+
const char* ast_control<string_escape_sequence_content>::error_message =
693693
"Expected https://spec.graphql.org/October2021/#EscapedCharacter";
694694
template <>
695-
const std::string ast_control<string_quote_content>::error_message =
695+
const char* ast_control<string_quote_content>::error_message =
696696
"Expected https://spec.graphql.org/October2021/#StringCharacter";
697697
template <>
698-
const std::string ast_control<block_quote_content>::error_message =
698+
const char* ast_control<block_quote_content>::error_message =
699699
"Expected https://spec.graphql.org/October2021/#BlockStringCharacter";
700700
template <>
701-
const std::string ast_control<fractional_part_content>::error_message =
701+
const char* ast_control<fractional_part_content>::error_message =
702702
"Expected https://spec.graphql.org/October2021/#FractionalPart";
703703
template <>
704-
const std::string ast_control<exponent_part_content>::error_message =
704+
const char* ast_control<exponent_part_content>::error_message =
705705
"Expected https://spec.graphql.org/October2021/#ExponentPart";
706706
template <>
707-
const std::string ast_control<argument_content>::error_message =
707+
const char* ast_control<argument_content>::error_message =
708708
"Expected https://spec.graphql.org/October2021/#Argument";
709709
template <>
710-
const std::string ast_control<arguments_content>::error_message =
710+
const char* ast_control<arguments_content>::error_message =
711711
"Expected https://spec.graphql.org/October2021/#Arguments";
712712
template <>
713-
const std::string ast_control<list_value_content>::error_message =
713+
const char* ast_control<list_value_content>::error_message =
714714
"Expected https://spec.graphql.org/October2021/#ListValue";
715715
template <>
716-
const std::string ast_control<object_field_content>::error_message =
716+
const char* ast_control<object_field_content>::error_message =
717717
"Expected https://spec.graphql.org/October2021/#ObjectField";
718718
template <>
719-
const std::string ast_control<object_value_content>::error_message =
719+
const char* ast_control<object_value_content>::error_message =
720720
"Expected https://spec.graphql.org/October2021/#ObjectValue";
721721
template <>
722-
const std::string ast_control<input_value_content>::error_message =
722+
const char* ast_control<input_value_content>::error_message =
723723
"Expected https://spec.graphql.org/October2021/#Value";
724724
template <>
725-
const std::string ast_control<default_value_content>::error_message =
725+
const char* ast_control<default_value_content>::error_message =
726726
"Expected https://spec.graphql.org/October2021/#DefaultValue";
727727
template <>
728-
const std::string ast_control<list_type_content>::error_message =
728+
const char* ast_control<list_type_content>::error_message =
729729
"Expected https://spec.graphql.org/October2021/#ListType";
730730
template <>
731-
const std::string ast_control<type_name_content>::error_message =
731+
const char* ast_control<type_name_content>::error_message =
732732
"Expected https://spec.graphql.org/October2021/#Type";
733733
template <>
734-
const std::string ast_control<variable_content>::error_message =
734+
const char* ast_control<variable_content>::error_message =
735735
"Expected https://spec.graphql.org/October2021/#VariableDefinition";
736736
template <>
737-
const std::string ast_control<variable_definitions_content>::error_message =
737+
const char* ast_control<variable_definitions_content>::error_message =
738738
"Expected https://spec.graphql.org/October2021/#VariableDefinitions";
739739
template <>
740-
const std::string ast_control<directive_content>::error_message =
740+
const char* ast_control<directive_content>::error_message =
741741
"Expected https://spec.graphql.org/October2021/#Directive";
742742
template <>
743-
const std::string ast_control<field_content>::error_message =
743+
const char* ast_control<field_content>::error_message =
744744
"Expected https://spec.graphql.org/October2021/#Field";
745745
template <>
746-
const std::string ast_control<type_condition_content>::error_message =
746+
const char* ast_control<type_condition_content>::error_message =
747747
"Expected https://spec.graphql.org/October2021/#TypeCondition";
748748
template <>
749-
const std::string ast_control<fragement_spread_or_inline_fragment_content>::error_message =
749+
const char* ast_control<fragement_spread_or_inline_fragment_content>::error_message =
750750
"Expected https://spec.graphql.org/October2021/#FragmentSpread or "
751751
"https://spec.graphql.org/October2021/#InlineFragment";
752752
template <>
753-
const std::string ast_control<selection_set_content>::error_message =
753+
const char* ast_control<selection_set_content>::error_message =
754754
"Expected https://spec.graphql.org/October2021/#SelectionSet";
755755
template <>
756-
const std::string ast_control<operation_definition_operation_type_content>::error_message =
756+
const char* ast_control<operation_definition_operation_type_content>::error_message =
757757
"Expected https://spec.graphql.org/October2021/#OperationDefinition";
758758
template <>
759-
const std::string ast_control<fragment_definition_content>::error_message =
759+
const char* ast_control<fragment_definition_content>::error_message =
760760
"Expected https://spec.graphql.org/October2021/#FragmentDefinition";
761761
template <>
762-
const std::string ast_control<root_operation_definition_content>::error_message =
762+
const char* ast_control<root_operation_definition_content>::error_message =
763763
"Expected https://spec.graphql.org/October2021/#RootOperationTypeDefinition";
764764
template <>
765-
const std::string ast_control<schema_definition_content>::error_message =
765+
const char* ast_control<schema_definition_content>::error_message =
766766
"Expected https://spec.graphql.org/October2021/#SchemaDefinition";
767767
template <>
768-
const std::string ast_control<scalar_type_definition_content>::error_message =
768+
const char* ast_control<scalar_type_definition_content>::error_message =
769769
"Expected https://spec.graphql.org/October2021/#ScalarTypeDefinition";
770770
template <>
771-
const std::string ast_control<arguments_definition_content>::error_message =
771+
const char* ast_control<arguments_definition_content>::error_message =
772772
"Expected https://spec.graphql.org/October2021/#ArgumentsDefinition";
773773
template <>
774-
const std::string ast_control<field_definition_content>::error_message =
774+
const char* ast_control<field_definition_content>::error_message =
775775
"Expected https://spec.graphql.org/October2021/#FieldDefinition";
776776
template <>
777-
const std::string ast_control<fields_definition_content>::error_message =
777+
const char* ast_control<fields_definition_content>::error_message =
778778
"Expected https://spec.graphql.org/October2021/#FieldsDefinition";
779779
template <>
780-
const std::string ast_control<implements_interfaces_content>::error_message =
780+
const char* ast_control<implements_interfaces_content>::error_message =
781781
"Expected https://spec.graphql.org/October2021/#ImplementsInterfaces";
782782
template <>
783-
const std::string ast_control<object_type_definition_content>::error_message =
783+
const char* ast_control<object_type_definition_content>::error_message =
784784
"Expected https://spec.graphql.org/October2021/#ObjectTypeDefinition";
785785
template <>
786-
const std::string ast_control<interface_type_definition_content>::error_message =
786+
const char* ast_control<interface_type_definition_content>::error_message =
787787
"Expected https://spec.graphql.org/October2021/#InterfaceTypeDefinition";
788788
template <>
789-
const std::string ast_control<union_member_types_content>::error_message =
789+
const char* ast_control<union_member_types_content>::error_message =
790790
"Expected https://spec.graphql.org/October2021/#UnionMemberTypes";
791791
template <>
792-
const std::string ast_control<union_type_definition_content>::error_message =
792+
const char* ast_control<union_type_definition_content>::error_message =
793793
"Expected https://spec.graphql.org/October2021/#UnionTypeDefinition";
794794
template <>
795-
const std::string ast_control<enum_value_definition_content>::error_message =
795+
const char* ast_control<enum_value_definition_content>::error_message =
796796
"Expected https://spec.graphql.org/October2021/#EnumValueDefinition";
797797
template <>
798-
const std::string ast_control<enum_values_definition_content>::error_message =
798+
const char* ast_control<enum_values_definition_content>::error_message =
799799
"Expected https://spec.graphql.org/October2021/#EnumValuesDefinition";
800800
template <>
801-
const std::string ast_control<enum_type_definition_content>::error_message =
801+
const char* ast_control<enum_type_definition_content>::error_message =
802802
"Expected https://spec.graphql.org/October2021/#EnumTypeDefinition";
803803
template <>
804-
const std::string ast_control<input_field_definition_content>::error_message =
804+
const char* ast_control<input_field_definition_content>::error_message =
805805
"Expected https://spec.graphql.org/October2021/#InputValueDefinition";
806806
template <>
807-
const std::string ast_control<input_fields_definition_content>::error_message =
807+
const char* ast_control<input_fields_definition_content>::error_message =
808808
"Expected https://spec.graphql.org/October2021/#InputFieldsDefinition";
809809
template <>
810-
const std::string ast_control<input_object_type_definition_content>::error_message =
810+
const char* ast_control<input_object_type_definition_content>::error_message =
811811
"Expected https://spec.graphql.org/October2021/#InputObjectTypeDefinition";
812812
template <>
813-
const std::string ast_control<directive_definition_content>::error_message =
813+
const char* ast_control<directive_definition_content>::error_message =
814814
"Expected https://spec.graphql.org/October2021/#DirectiveDefinition";
815815
template <>
816-
const std::string ast_control<schema_extension_content>::error_message =
816+
const char* ast_control<schema_extension_content>::error_message =
817817
"Expected https://spec.graphql.org/October2021/#SchemaExtension";
818818
template <>
819-
const std::string ast_control<scalar_type_extension_content>::error_message =
819+
const char* ast_control<scalar_type_extension_content>::error_message =
820820
"Expected https://spec.graphql.org/October2021/#ScalarTypeExtension";
821821
template <>
822-
const std::string ast_control<object_type_extension_content>::error_message =
822+
const char* ast_control<object_type_extension_content>::error_message =
823823
"Expected https://spec.graphql.org/October2021/#ObjectTypeExtension";
824824
template <>
825-
const std::string ast_control<interface_type_extension_content>::error_message =
825+
const char* ast_control<interface_type_extension_content>::error_message =
826826
"Expected https://spec.graphql.org/October2021/#InterfaceTypeExtension";
827827
template <>
828-
const std::string ast_control<union_type_extension_content>::error_message =
828+
const char* ast_control<union_type_extension_content>::error_message =
829829
"Expected https://spec.graphql.org/October2021/#UnionTypeExtension";
830830
template <>
831-
const std::string ast_control<enum_type_extension_content>::error_message =
831+
const char* ast_control<enum_type_extension_content>::error_message =
832832
"Expected https://spec.graphql.org/October2021/#EnumTypeExtension";
833833
template <>
834-
const std::string ast_control<input_object_type_extension_content>::error_message =
834+
const char* ast_control<input_object_type_extension_content>::error_message =
835835
"Expected https://spec.graphql.org/October2021/#InputObjectTypeExtension";
836836
template <>
837-
const std::string ast_control<mixed_document_content>::error_message =
837+
const char* ast_control<mixed_document_content>::error_message =
838838
"Expected https://spec.graphql.org/October2021/#Document";
839839
template <>
840-
const std::string ast_control<executable_document_content>::error_message =
840+
const char* ast_control<executable_document_content>::error_message =
841841
"Expected executable https://spec.graphql.org/October2021/#Document";
842842
template <>
843-
const std::string ast_control<schema_document_content>::error_message =
843+
const char* ast_control<schema_document_content>::error_message =
844844
"Expected schema type https://spec.graphql.org/October2021/#Document";
845845

846846
ast parseSchemaString(std::string_view input)

0 commit comments

Comments
 (0)