Extract rb_builtin_find

Refactor out the same code from `rb_builtin_ast_value` and
`pm_builtin_ast_value.

mini_builtin.c

@@ -6,15 +6,43 @@
 
 #include "miniprelude.c"
 
+static VALUE
+prelude_ast_value(VALUE name, VALUE code, int line)
+{
+    rb_ast_t *ast;
+    VALUE ast_value = rb_parser_compile_string_path(rb_parser_new(), name, code, line);
+    ast = rb_ruby_ast_data_get(ast_value);
+    if (!ast || !ast->body.root) {
+        if (ast) rb_ast_dispose(ast);
+        rb_exc_raise(rb_errinfo());
+    }
+    return ast_value;
+}
 
-bool pm_builtin_ast_value(pm_parse_result_t *result, const char *feature_name, VALUE *name_str);
+static void
-VALUE rb_builtin_ast_value(const char *feature_name, VALUE *name_str);
+pm_prelude_load(pm_parse_result_t *result, VALUE name, VALUE code, int line)
+{
+    pm_options_line_set(&result->options, line);
+    VALUE error = pm_parse_string(result, code, name, NULL);
+
+    if (!NIL_P(error)) {
+        pm_parse_result_free(result);
+        rb_exc_raise(error);
+    }
+}
 
 static const rb_iseq_t *
 builtin_iseq_load(const char *feature_name, const struct rb_builtin_function *table)
 {
     VALUE name_str = 0;
+    int start_line;
     const rb_iseq_t *iseq;
+    VALUE code = rb_builtin_find(feature_name, &name_str, &start_line);
+    if (NIL_P(code)) {
+        rb_fatal("builtin_iseq_load: can not find %s; "
+                 "probably miniprelude.c is out of date",
+                 feature_name);
+    }
 
     rb_vm_t *vm = GET_VM();
     static const rb_compile_option_t optimization = {
@@ -32,33 +60,22 @@ builtin_iseq_load(const char *feature_name, const struct rb_builtin_function *ta
 
     if (*rb_ruby_prism_ptr()) {
         pm_parse_result_t result = { 0 };
-        if (!pm_builtin_ast_value(&result, feature_name, &name_str)) {
+        pm_prelude_load(&result, name_str, code, start_line);
-            rb_fatal("builtin_iseq_load: can not find %s; "
-                     "probably miniprelude.c is out of date",
-                     feature_name);
-        }
 
         vm->builtin_function_table = table;
         iseq = pm_iseq_new_with_opt(&result.node, name_str, name_str, Qnil, 0, NULL, 0, ISEQ_TYPE_TOP, &optimization);
 
-        GET_VM()->builtin_function_table = NULL;
+        vm->builtin_function_table = NULL;
         pm_parse_result_free(&result);
     }
     else {
-        VALUE ast_value = rb_builtin_ast_value(feature_name, &name_str);
+        VALUE ast_value = prelude_ast_value(name_str, code, start_line);
-
-        if (NIL_P(ast_value)) {
-            rb_fatal("builtin_iseq_load: can not find %s; "
-                     "probably miniprelude.c is out of date",
-                     feature_name);
-        }
-
         rb_ast_t *ast = rb_ruby_ast_data_get(ast_value);
 
         vm->builtin_function_table = table;
         iseq = rb_iseq_new_with_opt(ast_value, name_str, name_str, Qnil, 0, NULL, 0, ISEQ_TYPE_TOP, &optimization, Qnil);
 
-        GET_VM()->builtin_function_table = NULL;
+        vm->builtin_function_table = NULL;
         rb_ast_dispose(ast);
     }
 

template/prelude.c.tmpl

@@ -58,7 +58,7 @@ class Prelude
       if line.size > LINE_LIMIT
         raise "#{filename}:#{lines.size+1}: too long line"
       end
-      line.sub!(/require(_relative)?\s*\(?\s*(["'])(.*?)(?:\.rb)?\2\)?/) do
+      line.sub!(/require(_relative)?\s*\(?\s*([\"\'])(.*?)(?:\.rb)?\2\)?/) do
         orig, rel, path = $&, $2, $3
         if rel
           path = File.join(File.dirname(filename), path)
@@ -141,73 +141,29 @@ COMPILER_WARNING_POP
 #define PRELUDE_NAME(n) rb_usascii_str_new_static(prelude_name##n, sizeof(prelude_name##n)-1)
 #define PRELUDE_CODE(n) rb_utf8_str_new_static(prelude_code##n.L0, sizeof(prelude_code##n))
 
-static VALUE
-prelude_ast_value(VALUE name, VALUE code, int line)
-{
-    rb_ast_t *ast;
-    VALUE ast_value = rb_parser_compile_string_path(rb_parser_new(), name, code, line);
-    ast = rb_ruby_ast_data_get(ast_value);
-    if (!ast || !ast->body.root) {
-        if (ast) rb_ast_dispose(ast);
-        rb_exc_raise(rb_errinfo());
-    }
-    return ast_value;
-}
-
-static void
-pm_prelude_load(pm_parse_result_t *result, VALUE name, VALUE code, int line)
-{
-    pm_options_line_set(&result->options, line);
-    VALUE error = pm_parse_string(result, code, name, NULL);
-
-    if (!NIL_P(error)) {
-        pm_parse_result_free(result);
-        rb_exc_raise(error);
-    }
-}
-
 % end
 % if @builtin_count > 0
-#define PRELUDE_VAST(n, name_str, start_line) \
+#define PRELUDE_MATCH(n) \
     (((sizeof(prelude_name<%='##'%><%=%>n) - prefix_len - 2) == namelen) && \
-     (strncmp(prelude_name<%='##'%><%=%>n + prefix_len, feature_name, namelen) == 0) ? \
+     (strncmp(prelude_name<%='##'%><%=%>n + prefix_len, feature_name, namelen) == 0))
-     prelude_ast_value((name_str) = PRELUDE_NAME(n), PRELUDE_CODE(n), start_line) : Qnil)
 
 VALUE
-rb_builtin_ast_value(const char *feature_name, VALUE *name_str)
+rb_builtin_find(const char *feature_name, VALUE *name_str, int *start_line)
-{
-    const size_t prefix_len = rb_strlen_lit("<internal:");
-    size_t namelen = strlen(feature_name);
-    VALUE ast_value = Qnil;
-
-%   @preludes.each_value do |i, prelude, lines, sub, start_line|
-%     if sub
-    if (!NIL_P(ast_value = PRELUDE_VAST(<%=i%><%=%>, *name_str, <%=start_line%>))) return ast_value;
-%     end
-%   end
-    return ast_value;
-}
-
-bool
-pm_builtin_ast_value(pm_parse_result_t *result, const char *feature_name, VALUE *name_str)
 {
     const size_t prefix_len = rb_strlen_lit("<internal:");
     size_t namelen = strlen(feature_name);
 
+#define PRELUDE_FOUND(n, l) \
+    (*name_str = PRELUDE_NAME(n), *start_line = (l), PRELUDE_CODE(n))
+
 %   @preludes.each_value do |i, prelude, lines, sub, start_line|
 %     if sub
-    if (
+    if (PRELUDE_MATCH(<%=i%>)) return PRELUDE_FOUND(<%=i%>, <%=start_line%>);
-        (sizeof(prelude_name<%= i %>) - prefix_len - 2 == namelen) &&
-        (strncmp(prelude_name<%= i %> + prefix_len, feature_name, namelen) == 0)
-    ) {
-        *name_str = PRELUDE_NAME(<%= i %>);
-        pm_prelude_load(result, *name_str, PRELUDE_CODE(<%= i %>), <%= start_line %>);
-        return true;
-    }
 %     end
 %   end
+#undef PRELUDE_FOUND
 
-    return false;
+    return Qnil;
 }
 
 % end