ruby
diff --git a/‎ext/ripper/ripper_init.c.tmpl
Lines changed: 8 additions & 17 deletions b/‎ext/ripper/ripper_init.c.tmpl
Lines changed: 8 additions & 17 deletions
diff --git a/‎internal/ruby_parser.h
Lines changed: 2 additions & 1 deletion b/‎internal/ruby_parser.h
Lines changed: 2 additions & 1 deletion
diff --git a/‎node.c
Lines changed: 0 additions & 10 deletions b/‎node.c
Lines changed: 0 additions & 10 deletions
diff --git a/‎parse.y
Lines changed: 0 additions & 24 deletions b/‎parse.y
Lines changed: 0 additions & 24 deletions
@@ -115,10 +115,7 @@ ripper_s_allocate(VALUE klass)
                                        &parser_data_type, r);
 
 #ifdef UNIVERSAL_PARSER
-    rb_parser_config_t *config;
-    config = rb_ruby_parser_config_new(ruby_xmalloc);
-    rb_parser_config_initialize(config);
-    r->p = rb_ruby_parser_allocate(config);
+    r->p = rb_parser_params_allocate();
 #else
     r->p = rb_ruby_ripper_parser_allocate();
 #endif
@@ -260,11 +257,11 @@ parser_dedent_string0(VALUE a)
 }
 
 static VALUE
-parser_config_free(VALUE a)
+parser_free(VALUE a)
 {
-    rb_parser_config_t *config = (void *)a;
+    struct parser_params *p = (void *)a;
 
-    rb_ruby_parser_config_free(config);
+    rb_ruby_parser_free(p);
     return Qnil;
 }
 #endif
@@ -283,17 +280,14 @@ static VALUE
 parser_dedent_string(VALUE self, VALUE input, VALUE width)
 {
     struct parser_params *p;
-    rb_parser_config_t *config;
     struct dedent_string_arg args;
 
-    config = rb_ruby_parser_config_new(ruby_xmalloc);
-    rb_parser_config_initialize(config);
-    p = rb_ruby_parser_new(config);
+    p = rb_parser_params_new();
 
     args.p = p;
     args.input = input;
     args.width = width;
-    return rb_ensure(parser_dedent_string0, (VALUE)&args, parser_config_free, (VALUE)config);
+    return rb_ensure(parser_dedent_string0, (VALUE)&args, parser_free, (VALUE)p);
 }
 #else
 static VALUE
@@ -530,17 +524,14 @@ static VALUE
 ripper_lex_state_name(VALUE self, VALUE state)
 {
     struct parser_params *p;
-    rb_parser_config_t *config;
     struct lex_state_name_arg args;
 
-    config = rb_ruby_parser_config_new(ruby_xmalloc);
-    rb_parser_config_initialize(config);
-    p = rb_ruby_parser_new(config);
+    p = rb_parser_params_new();
 
     args.p = p;
     args.state = state;
 
-    return rb_ensure(lex_state_name0, (VALUE)&args, parser_config_free, (VALUE)config);
+    return rb_ensure(lex_state_name0, (VALUE)&args, parser_free, (VALUE)p);
 }
 #else
 static VALUE
 
@@ -12,7 +12,8 @@
 
 RUBY_SYMBOL_EXPORT_BEGIN
 #ifdef UNIVERSAL_PARSER
-void rb_parser_config_initialize(rb_parser_config_t *config);
+rb_parser_t *rb_parser_params_allocate(void);
+rb_parser_t *rb_parser_params_new(void);
 #endif
 VALUE rb_parser_set_context(VALUE, const struct rb_iseq_struct *, int);
 VALUE rb_parser_new(void);
 
@@ -426,18 +426,8 @@ void
 rb_ast_free(rb_ast_t *ast)
 {
     if (ast->node_buffer) {
-#ifdef UNIVERSAL_PARSER
-        rb_parser_config_t *config = ast->node_buffer->config;
-#endif
-
         rb_node_buffer_free(ast, ast->node_buffer);
         ast->node_buffer = 0;
-#ifdef UNIVERSAL_PARSER
-        config->counter--;
-        if (config->counter <= 0) {
-            rb_ruby_parser_config_free(config);
-        }
-#endif
     }
 }
 
 
@@ -15905,9 +15905,6 @@ rb_ruby_parser_free(void *ptr)
 {
     struct parser_params *p = (struct parser_params*)ptr;
     struct local_vars *local, *prev;
-#ifdef UNIVERSAL_PARSER
-    rb_parser_config_t *config = p->config;
-#endif
 
     if (p->tokenbuf) {
         ruby_sized_xfree(p->tokenbuf, p->toksiz);
@@ -15926,13 +15923,6 @@ rb_ruby_parser_free(void *ptr)
         }
     }
     xfree(ptr);
-
-#ifdef UNIVERSAL_PARSER
-    config->counter--;
-    if (config->counter <= 0) {
-        rb_ruby_parser_config_free(config);
-    }
-#endif
 }
 
 size_t
@@ -15950,20 +15940,6 @@ rb_ruby_parser_memsize(const void *ptr)
     return size;
 }
 
-#ifdef UNIVERSAL_PARSER
-rb_parser_config_t *
-rb_ruby_parser_config_new(void *(*malloc)(size_t size))
-{
-    return (rb_parser_config_t *)malloc(sizeof(rb_parser_config_t));
-}
-
-void
-rb_ruby_parser_config_free(rb_parser_config_t *config)
-{
-    config->free(config);
-}
-#endif
-
 #ifndef UNIVERSAL_PARSER
 #ifndef RIPPER
 static const rb_data_type_t parser_data_type = {
Original file line number	Diff line number	Diff line change
`@@ -426,18 +426,8 @@ void`
`426`	`426`	`rb_ast_free(rb_ast_t *ast)`
`427`	`427`	`{`
`428`	`428`	`if (ast->node_buffer) {`
`429`		`-#ifdef UNIVERSAL_PARSER`
`430`		`- rb_parser_config_t *config = ast->node_buffer->config;`
`431`		`-#endif`
`432`		`-`
`433`	`429`	`rb_node_buffer_free(ast, ast->node_buffer);`
`434`	`430`	`ast->node_buffer = 0;`
`435`		`-#ifdef UNIVERSAL_PARSER`
`436`		`- config->counter--;`
`437`		`- if (config->counter <= 0) {`
`438`		`- rb_ruby_parser_config_free(config);`
`439`		`- }`
`440`		`-#endif`
`441`	`431`	`}`
`442`	`432`	`}`
`443`	`433`