Remove "internal/encoding.h" and "ruby/encoding.h"

yui-knk · Apr 14, 2023 · 8f5b699 · 8f5b699
1 parent c27bd8b
commit 8f5b699
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/external/parse.h b/external/parse.h
@@ -77,6 +77,10 @@ typedef struct rb_parser_config_struct {
     VALUE (*debug_output_stdout)(void);
     VALUE (*debug_output_stderr)(void);
 
+    /* Encoding */
+    // rb_encoding *enc
+    int (*is_usascii_enc)(void *enc);
+
     /* Ractor */
     VALUE (*ractor_make_shareable)(VALUE obj);
 

diff --git a/parse.y b/parse.y
@@ -39,11 +39,9 @@ struct lex_context;
 #include "ruby/internal/config.h"
 
 #include "internal.h"
-#include "internal/encoding.h"
 #include "internal/imemo.h"
 #include "internal/variable.h"
 #include "probes.h"
-#include "ruby/encoding.h"
 #include "ruby/st.h"
 #include "ruby/util.h"
 #include "symbol.h"
@@ -52,6 +50,7 @@ struct lex_context;
 #include "internal/compile.h"
 #include "internal/compilers.h"
 #include "internal/complex.h"
+#include "internal/encoding.h"
 #include "internal/error.h"
 #include "internal/numeric.h"
 #include "internal/hash.h"
@@ -61,6 +60,7 @@ struct lex_context;
 #include "internal/symbol.h"
 #include "internal/thread.h"
 
+#include "ruby/encoding.h"
 #include "ruby/ractor.h"
 #include "ruby/regex.h"
 #include "ruby/ruby.h"
@@ -157,6 +157,8 @@ RBIMPL_WARNING_POP()
 #define rb_ractor_stdout   p->config.debug_output_stdout
 #define rb_ractor_stderr   p->config.debug_output_stderr
 
+#define rb_is_usascii_enc p->config.is_usascii_enc
+
 #define rb_ractor_make_shareable p->config.ractor_make_shareable
 
 #define ruby_vm_keep_script_lines p->config.vm_keep_script_lines()

diff --git a/ruby_parser.c b/ruby_parser.c
@@ -5,6 +5,7 @@
 #include "internal/bignum.h"
 #include "internal/compile.h"
 #include "internal/complex.h"
+#include "internal/encoding.h"
 #include "internal/error.h"
 #include "internal/hash.h"
 #include "internal/io.h"
@@ -157,6 +158,12 @@ literal_hash(VALUE a)
     return rb_iseq_cdhash_hash(a);
 }
 
+static int
+is_usascii_enc(void *enc)
+{
+    return rb_is_usascii_enc((rb_encoding *)enc);
+}
+
 void
 rb_parser_config_initialize(rb_parser_config_t *config)
 {
@@ -218,6 +225,8 @@ rb_parser_config_initialize(rb_parser_config_t *config)
     config->debug_output_stdout = rb_ractor_stdout;
     config->debug_output_stderr = rb_ractor_stderr;
 
+    config->is_usascii_enc = is_usascii_enc;
+
     config->ractor_make_shareable = rb_ractor_make_shareable;
 
     config->vm_keep_script_lines = vm_keep_script_lines;