Hide id_table struct (#27)

ruby · soutaro · Feb 13, 2025 · Feb 13, 2025 · Nov 28, 2024 · Oct 30, 2024
commit bb5e560ad3f48f838df24a215ae58ee7966d088f
diff --git a/include/rbs/parser.h b/include/rbs/parser.h
@@ -10,17 +10,6 @@
 #include <stdbool.h>
 #include <stddef.h>
 
-/**
- * id_table represents a set of RBS constant IDs.
- * This is used to manage the set of bound variables.
- * */
-typedef struct id_table {
-  size_t size;
-  size_t count;
-  rbs_constant_id_t *ids;
-  struct id_table *next;
-} id_table;
-
 /**
  * comment represents a sequence of comment lines.
  *
@@ -62,7 +51,7 @@ typedef struct {
   token next_token2;      /* The second lookahead token */
   token next_token3;      /* The third lookahead token */
 
-  id_table *vars;         /* Known type variables */
+  struct id_table *vars;  /* Known type variables */
   comment *last_comment;  /* Last read comment */
 
   rbs_constant_pool_t constant_pool;
@@ -86,7 +75,7 @@ typedef struct {
  * end
  * ```
  * */
-id_table *parser_push_typevar_table(parserstate *state, bool reset);
+void parser_push_typevar_table(parserstate *state, bool reset);
 
 /**
  * Insert new type variable into the latest table.

diff --git a/src/parser.c b/src/parser.c
@@ -91,6 +91,17 @@ typedef struct {
   rbs_node_t *rest_keywords;
 } method_params;
 
+/**
+ * id_table represents a set of RBS constant IDs.
+ * This is used to manage the set of bound variables.
+ * */
+typedef struct id_table {
+  size_t size;
+  size_t count;
+  rbs_constant_id_t *ids;
+  struct id_table *next;
+} id_table;
+
 static bool rbs_is_untyped_params(method_params *params) {
   return params->required_positionals == NULL;
 }
@@ -3250,7 +3261,7 @@ id_table *alloc_reset_table(rbs_allocator_t *allocator) {
   return table;
 }
 
-id_table *parser_push_typevar_table(parserstate *state, bool reset) {
+void parser_push_typevar_table(parserstate *state, bool reset) {
   if (reset) {
     id_table *table = alloc_reset_table(&state->allocator);
     table->next = state->vars;
@@ -3260,8 +3271,6 @@ id_table *parser_push_typevar_table(parserstate *state, bool reset) {
   id_table *table = alloc_empty_table(&state->allocator);
   table->next = state->vars;
   state->vars = table;
-
-  return table;
 }
 
 NODISCARD