Merge pull request #303 from wravery/bug-fixes

wravery · web-flow · commit a45352b31b27 · 2024-07-17T22:27:39.000-07:00
Couple of bug fixes
diff --git a/cmake/version.txt b/cmake/version.txt
@@ -1 +1 @@
-4.5.6
+4.5.7
diff --git a/include/graphqlservice/internal/Grammar.h b/include/graphqlservice/internal/Grammar.h
@@ -453,9 +453,7 @@ struct field_selection_set : seq<star<ignored>, selection_set>
 {
 };
 
-struct field_content
-	: sor<seq<field_arguments, opt<field_directives>, field_selection_set>,
-		  seq<field_arguments, field_directives>, field_arguments>
+struct field_content : seq<field_arguments, opt<field_directives>, opt<field_selection_set>>
 {
 };
 
diff --git a/include/graphqlservice/internal/Version.h b/include/graphqlservice/internal/Version.h
@@ -10,11 +10,11 @@
 
 namespace graphql::internal {
 
-constexpr std::string_view FullVersion { "4.5.6" };
+constexpr std::string_view FullVersion { "4.5.7" };
 
 constexpr size_t MajorVersion = 4;
 constexpr size_t MinorVersion = 5;
-constexpr size_t PatchVersion = 6;
+constexpr size_t PatchVersion = 7;
 
 } // namespace graphql::internal
 
diff --git a/res/ClientGen.rc b/res/ClientGen.rc
@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define GRAPHQL_RC_VERSION     4,5,6,0
-#define GRAPHQL_RC_VERSION_STR "4.5.6"
+#define GRAPHQL_RC_VERSION     4,5,7,0
+#define GRAPHQL_RC_VERSION_STR "4.5.7"
 
 #ifndef DEBUG
 #define VER_DEBUG   0
diff --git a/res/SchemaGen.rc b/res/SchemaGen.rc
@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define GRAPHQL_RC_VERSION     4,5,6,0
-#define GRAPHQL_RC_VERSION_STR "4.5.6"
+#define GRAPHQL_RC_VERSION     4,5,7,0
+#define GRAPHQL_RC_VERSION_STR "4.5.7"
 
 #ifndef DEBUG
 #define VER_DEBUG   0
diff --git a/res/graphqlclient_version.rc b/res/graphqlclient_version.rc
@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define GRAPHQL_RC_VERSION     4,5,6,0
-#define GRAPHQL_RC_VERSION_STR "4.5.6"
+#define GRAPHQL_RC_VERSION     4,5,7,0
+#define GRAPHQL_RC_VERSION_STR "4.5.7"
 
 #ifndef DEBUG
 #define VER_DEBUG   0
diff --git a/res/graphqljson_version.rc b/res/graphqljson_version.rc
@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define GRAPHQL_RC_VERSION     4,5,6,0
-#define GRAPHQL_RC_VERSION_STR "4.5.6"
+#define GRAPHQL_RC_VERSION     4,5,7,0
+#define GRAPHQL_RC_VERSION_STR "4.5.7"
 
 #ifndef DEBUG
 #define VER_DEBUG   0
diff --git a/res/graphqlpeg_version.rc b/res/graphqlpeg_version.rc
@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define GRAPHQL_RC_VERSION     4,5,6,0
-#define GRAPHQL_RC_VERSION_STR "4.5.6"
+#define GRAPHQL_RC_VERSION     4,5,7,0
+#define GRAPHQL_RC_VERSION_STR "4.5.7"
 
 #ifndef DEBUG
 #define VER_DEBUG   0
diff --git a/res/graphqlresponse_version.rc b/res/graphqlresponse_version.rc
@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define GRAPHQL_RC_VERSION     4,5,6,0
-#define GRAPHQL_RC_VERSION_STR "4.5.6"
+#define GRAPHQL_RC_VERSION     4,5,7,0
+#define GRAPHQL_RC_VERSION_STR "4.5.7"
 
 #ifndef DEBUG
 #define VER_DEBUG   0
diff --git a/res/graphqlservice_version.rc b/res/graphqlservice_version.rc
@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define GRAPHQL_RC_VERSION     4,5,6,0
-#define GRAPHQL_RC_VERSION_STR "4.5.6"
+#define GRAPHQL_RC_VERSION     4,5,7,0
+#define GRAPHQL_RC_VERSION_STR "4.5.7"
 
 #ifndef DEBUG
 #define VER_DEBUG   0
diff --git a/vcpkg.json b/vcpkg.json
@@ -49,5 +49,5 @@
   "dependencies": [
     "pegtl"
   ],
-  "builtin-baseline": "a618637937298060bdbe5fbcfb628eabd1082c8a"
+  "builtin-baseline": "7aeffc91033ad35cc4e2c152f213a866ec6c11ac"
 }

Original file line number	Diff line number	Diff line change
`@@ -453,9 +453,7 @@ struct field_selection_set : seq<star<ignored>, selection_set>`
`453`	`453`	`{`
`454`	`454`	`};`
`455`	`455`
`456`		`-struct field_content`
`457`		`- : sor<seq<field_arguments, opt<field_directives>, field_selection_set>,`
`458`		`- seq<field_arguments, field_directives>, field_arguments>`
	`456`	`+struct field_content : seq<field_arguments, opt<field_directives>, opt<field_selection_set>>`
`459`	`457`	`{`
`460`	`458`	`};`
`461`	`459`