Remove "internal/complex.h"

yui-knk · Apr 13, 2023 · e738293 · e738293
1 parent 5914d48
commit e738293
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 3 deletions.
diff --git a/external/parse.h b/external/parse.h
@@ -54,6 +54,12 @@ typedef struct rb_parser_config_struct {
     void (*rational_set_num)(VALUE r, VALUE n);
     VALUE (*rational_get_num)(VALUE obj);
 
+    /* Complex */
+    void (*rcomplex_set_real)(VALUE cmp, VALUE r);
+    void (*rcomplex_set_imag)(VALUE cmp, VALUE i);
+    VALUE (*rcomplex_get_real)(VALUE obj);
+    VALUE (*rcomplex_get_imag)(VALUE obj);
+
 
 } rb_parser_config_t;
 

diff --git a/parse.y b/parse.y
@@ -41,7 +41,6 @@ struct lex_context;
 #include "internal.h"
 #include "internal/compile.h"
 #include "internal/compilers.h"
-#include "internal/complex.h"
 #include "internal/encoding.h"
 #include "internal/error.h"
 #include "internal/imemo.h"
@@ -61,6 +60,7 @@ struct lex_context;
 #include "symbol.h"
 
 #ifdef RIPPER
+#include "internal/complex.h"
 #include "internal/numeric.h"
 #include "internal/hash.h"
 #include "internal/rational.h"
@@ -137,6 +137,11 @@ RBIMPL_WARNING_POP()
 #define rational_set_num p->config.rational_set_num
 #define rational_get_num p->config.rational_get_num
 
+#define rcomplex_set_real p->config.rcomplex_set_real
+#define rcomplex_set_imag p->config.rcomplex_set_imag
+#define rcomplex_get_real p->config.rcomplex_get_real
+#define rcomplex_get_imag p->config.rcomplex_get_imag
+
 #endif
 
 #define NO_LEX_CTXT (struct lex_context){0}
@@ -12554,8 +12559,8 @@ negate_lit(struct parser_params *p, VALUE lit)
         rational_set_num(lit, negate_lit(p, rational_get_num(lit)));
         break;
       case T_COMPLEX:
-        RCOMPLEX_SET_REAL(lit, negate_lit(p, RCOMPLEX(lit)->real));
-        RCOMPLEX_SET_IMAG(lit, negate_lit(p, RCOMPLEX(lit)->imag));
+        rcomplex_set_real(lit, negate_lit(p, rcomplex_get_real(lit)));
+        rcomplex_set_imag(lit, negate_lit(p, rcomplex_get_imag(lit)));
         break;
       case T_FLOAT:
         lit = DBL2NUM(-RFLOAT_VALUE(lit));

diff --git a/ruby_parser.c b/ruby_parser.c
@@ -2,6 +2,7 @@
 
 #include "internal/array.h"
 #include "internal/bignum.h"
+#include "internal/complex.h"
 #include "internal/hash.h"
 #include "internal/parse.h"
 #include "internal/rational.h"
@@ -65,6 +66,30 @@ rational_get_num(VALUE obj)
     return RRATIONAL(obj)->num;
 }
 
+static void
+rcomplex_set_real(VALUE cmp, VALUE r)
+{
+    RCOMPLEX_SET_REAL(cmp, r);
+}
+
+static void
+rcomplex_set_imag(VALUE cmp, VALUE i)
+{
+    RCOMPLEX_SET_REAL(cmp, i);
+}
+
+static VALUE
+rcomplex_get_real(VALUE obj)
+{
+    return RCOMPLEX(obj)->real;
+}
+
+static VALUE
+rcomplex_get_imag(VALUE obj)
+{
+    return RCOMPLEX(obj)->imag;
+}
+
 void
 rb_parser_config_initialize(rb_parser_config_t *config)
 {
@@ -109,6 +134,10 @@ rb_parser_config_initialize(rb_parser_config_t *config)
     config->rational_set_num = rational_set_num;
     config->rational_get_num = rational_get_num;
 
+    config->rcomplex_set_real = rcomplex_set_real;
+    config->rcomplex_set_imag = rcomplex_set_imag;
+    config->rcomplex_get_real = rcomplex_get_real;
+    config->rcomplex_get_imag = rcomplex_get_imag;
 }
 
 VALUE