Merge pull request #4421 from rmosolgo/load-schema-directives

Properly load schema directives from SDL
rmosolgo · Apr 5, 2023 · ea45d0e · ea45d0e
2 parents 62e3a7a + d611f55
commit ea45d0e
Show file tree

Hide file tree

Showing 6 changed files with 1,064 additions and 1,015 deletions.
diff --git a/graphql-c_parser/ext/graphql_c_parser_ext/parser.c b/graphql-c_parser/ext/graphql_c_parser_ext/parser.c
diff --git a/graphql-c_parser/ext/graphql_c_parser_ext/parser.y b/graphql-c_parser/ext/graphql_c_parser_ext/parser.y
@@ -479,18 +479,22 @@ type_system_definition:
    | directive_definition
 
   schema_definition:
-      SCHEMA directives_list_opt LCURLY operation_type_definition_list RCURLY {
+      SCHEMA directives_list_opt operation_type_definition_list_opt {
         $$ = MAKE_AST_NODE(SchemaDefinition, 6,
           rb_ary_entry($1, 1),
           rb_ary_entry($1, 2),
           // TODO use static strings:
-          rb_hash_aref($4, rb_str_new_cstr("query")),
-          rb_hash_aref($4, rb_str_new_cstr("mutation")),
-          rb_hash_aref($4, rb_str_new_cstr("subscription")),
+          rb_hash_aref($3, rb_str_new_cstr("query")),
+          rb_hash_aref($3, rb_str_new_cstr("mutation")),
+          rb_hash_aref($3, rb_str_new_cstr("subscription")),
           $2
         );
       }
 
+  operation_type_definition_list_opt:
+      /* none */ { $$ = rb_hash_new(); }
+    | LCURLY operation_type_definition_list RCURLY { $$ = $2; }
+
   operation_type_definition_list:
       operation_type_definition {
         $$ = rb_hash_new();