konpeito 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b559f8a6de1d213b466939fb5fbde0a797a6808a7ce664f28d55ed0496696dde
-  data.tar.gz: 6809762994527a50fcf96c1644f24cde5f2324b668e1dc646bf32077ea679af0
+  metadata.gz: 85de87c8abf1bbf3ecaf6303ba4fd875f16016099a38734c55c108f123fa4086
+  data.tar.gz: 843f4b6d722d68526d031734c035c9126c520d9869a2488259dbf39ce1eade84
 SHA512:
-  metadata.gz: c8c43cca2f5e3812ee706a9b2b2c833ad9036d98e997b4481ce701d0edfa98b03a967f935c2b6aec7b8b2dfb19d27225b0e7a6f5e091ecc993a0786cec3cc2d7
-  data.tar.gz: 27acd8361e403febf7fd4e45b5ab832f1c767deedf329b8e164c8b62f7f1aa127c0ea75eeccaee7d5ef6767ea7f45c787baa526461bfa6dbf6ba034f90815bff
+  metadata.gz: eaf22b341a9135b2d81fcda350790330a78f2da9255771833676047086fbcd861919295f8cf7f4967f380cc62c8ea882499cd6b89a863b86bbd1c53e6e6f2b9e
+  data.tar.gz: ab456db3432eca45ff8b658b80c07d38cdbec33c1e4cd6e379d59dbb0cf8f3384b6f715b3bac61f7d120dfb25e479fe86b65dc4c44ad5c7e86ab18703ff6e6a9

data/CHANGELOG.md

@@ -5,6 +5,19 @@ All notable changes to Konpeito will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.2.0] - 2026-02-19
+
+### Added
+- Inliner: keyword argument mapping for correct inlining of functions with keyword params
+- Inliner: ProcNew/BlockDef deep cloning with proper captured variable renaming
+- Vendor setup script (`scripts/setup_vendor.sh`) to download yyjson source files
+
+### Fixed
+- HIR builder: save/restore `@current_block` in NativeHashEach to emit into correct basic block
+- Inliner: ProcCall handler for proc_value and args renaming during inlining
+- JSON stdlib: add tracked `yyjson_wrapper.c` providing non-inline wrappers for LLVM-generated code (fixes SEGV in `parse_as`/`parse_array_as` tests)
+- CRuby backend: reference yyjson wrapper from tracked source location instead of vendor directory
+
 ## [0.1.3] - 2026-02-18
 
 ### Fixed
@@ -108,6 +121,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `%a{extern}` - external C struct wrappers
 - `%a{simd}` - SIMD vectorization
 
+[0.2.0]: https://github.com/i2y/konpeito/compare/v0.1.3...v0.2.0
 [0.1.3]: https://github.com/i2y/konpeito/compare/v0.1.2...v0.1.3
 [0.1.2]: https://github.com/i2y/konpeito/compare/v0.1.1...v0.1.2
 [0.1.1]: https://github.com/i2y/konpeito/compare/v0.1.0...v0.1.1

data/lib/konpeito/codegen/cruby_backend.rb

@@ -893,7 +893,10 @@ module Konpeito
         yyjson_dir = File.expand_path("../../../vendor/yyjson", __dir__)
         yyjson_c = File.join(yyjson_dir, "yyjson.c")
         yyjson_obj = File.join(yyjson_dir, "yyjson.o")
-        wrapper_c = File.join(yyjson_dir, "yyjson_wrapper.c")
+
+        # Wrapper source is tracked in repo alongside JSON stdlib
+        json_stdlib_dir = File.expand_path("../stdlib/json", __dir__)
+        wrapper_c = File.join(json_stdlib_dir, "yyjson_wrapper.c")
         wrapper_obj = File.join(yyjson_dir, "yyjson_wrapper.o")
 
         return [] unless File.exist?(yyjson_c) && File.exist?(wrapper_c)
@@ -906,7 +909,7 @@ module Konpeito
           system(*cmd) or return []
         end
 
-        # Compile wrapper
+        # Compile wrapper (needs yyjson.h from vendor dir)
         unless File.exist?(wrapper_obj) && File.mtime(wrapper_obj) > File.mtime(wrapper_c)
           cmd = [cc, "-c", "-O3", "-fPIC", "-I#{yyjson_dir}", "-o", wrapper_obj, wrapper_c]
           system(*cmd) or return []

data/lib/konpeito/codegen/inliner.rb

@@ -178,6 +178,17 @@ module Konpeito
             param_map[param.name] = call_inst.args[i]
           end
         end
+        # Also map keyword arguments by name
+        if call_inst.respond_to?(:keyword_args) && call_inst.has_keyword_args?
+          call_inst.keyword_args.each do |kw_name, kw_value|
+            # Find the callee param with matching name
+            callee.params.each do |param|
+              if param.name.to_s == kw_name.to_s
+                param_map[param.name] = kw_value
+              end
+            end
+          end
+        end
 
         # Clone and transform instructions from callee
         result_instructions = []
@@ -438,6 +449,17 @@ module Konpeito
           new_args = inst.args.map { |a| transform_value(a, prefix, param_map) }
           HIR::SuperCall.new(args: new_args, type: inst.type, result_var: new_result)
 
+        when HIR::ProcNew
+          new_result = inst.result_var ? prefix + inst.result_var : nil
+          new_block_def = clone_block_def(inst.block_def, prefix, param_map)
+          HIR::ProcNew.new(block_def: new_block_def, result_var: new_result)
+
+        when HIR::ProcCall
+          new_result = inst.result_var ? prefix + inst.result_var : nil
+          new_proc = transform_value(inst.proc_value, prefix, param_map)
+          new_args = inst.args.map { |a| transform_value(a, prefix, param_map) }
+          HIR::ProcCall.new(proc_value: new_proc, args: new_args, type: inst.type, result_var: new_result)
+
         else
           # For other instructions, just return as-is with renamed result
           inst
@@ -481,6 +503,90 @@ module Konpeito
           value
         end
       end
+
+      # Deep-clone a BlockDef, renaming captured (non-block-local) variables.
+      # Block parameters are NOT renamed (they are local to the closure).
+      def clone_block_def(block_def, prefix, param_map)
+        return block_def unless block_def
+
+        block_param_names = Set.new(block_def.params.map { |p| p.name.to_s })
+
+        new_body = block_def.body.map do |bb|
+          if bb.respond_to?(:instructions)
+            new_bb = HIR::BasicBlock.new(label: bb.label)
+            bb.instructions.each do |bi|
+              new_inst = clone_block_instruction(bi, prefix, param_map, block_param_names)
+              new_bb.add_instruction(new_inst) if new_inst
+            end
+            new_bb.set_terminator(bb.terminator) if bb.terminator
+            new_bb
+          else
+            clone_block_instruction(bb, prefix, param_map, block_param_names)
+          end
+        end
+
+        HIR::BlockDef.new(
+          params: block_def.params,
+          body: new_body,
+          captures: block_def.captures,
+          is_lambda: block_def.is_lambda
+        )
+      end
+
+      # Clone a single instruction inside a block body, renaming captured vars.
+      def clone_block_instruction(inst, prefix, param_map, block_param_names)
+        case inst
+        when HIR::LoadLocal
+          var_name = inst.var.name.to_s
+          if block_param_names.include?(var_name)
+            # Block-local parameter: don't rename
+            inst
+          else
+            # Captured variable: rename with prefix
+            new_var = HIR::LocalVar.new(
+              name: prefix + var_name,
+              type: inst.var.type
+            )
+            HIR::LoadLocal.new(var: new_var, type: inst.type, result_var: inst.result_var)
+          end
+        when HIR::StoreLocal
+          var_name = inst.var.name.to_s
+          new_value = clone_block_value(inst.value, prefix, param_map, block_param_names)
+          if block_param_names.include?(var_name)
+            HIR::StoreLocal.new(var: inst.var, value: new_value, type: inst.type)
+          else
+            new_var = HIR::LocalVar.new(name: prefix + var_name, type: inst.var.type)
+            HIR::StoreLocal.new(var: new_var, value: new_value, type: inst.type)
+          end
+        when HIR::Call
+          new_receiver = clone_block_value(inst.receiver, prefix, param_map, block_param_names)
+          new_args = inst.args.map { |a| clone_block_value(a, prefix, param_map, block_param_names) }
+          HIR::Call.new(
+            receiver: new_receiver, method_name: inst.method_name,
+            args: new_args, block: inst.block,
+            type: inst.type, result_var: inst.result_var
+          )
+        else
+          # Other instructions: return as-is (literals, etc.)
+          inst
+        end
+      end
+
+      # Clone a value reference inside a block, renaming captured variables.
+      def clone_block_value(value, prefix, param_map, block_param_names)
+        case value
+        when HIR::LoadLocal
+          var_name = value.var.name.to_s
+          if block_param_names.include?(var_name)
+            value
+          else
+            new_var = HIR::LocalVar.new(name: prefix + var_name, type: value.var.type)
+            HIR::LoadLocal.new(var: new_var, type: value.type, result_var: nil)
+          end
+        else
+          value
+        end
+      end
     end
   end
 end

data/lib/konpeito/hir/builder.rb

@@ -4038,13 +4038,15 @@ module Konpeito
         key_var = param_names[0] || "k"
         value_var = param_names[1] || "v"
 
-        # Build block body
+        # Build block body — save/restore @current_block so NativeHashEach
+        # is emitted into the original block, not the loop body block
+        saved_block = @current_block
         body_child = block_child.children.find { |c| c.node_type == :statements }
         block_body = []
 
         if body_child
           # Create a new basic block for the iteration body
-          loop_bb = BasicBlock.new(label: new_label("hash_each_body"))
+          loop_bb = BasicBlock.new(label: "hash_each_body_#{@block_counter}")
           @current_block = loop_bb
           block_body << loop_bb
 
@@ -4052,6 +4054,7 @@ module Konpeito
             visit(stmt)
           end
         end
+        @current_block = saved_block
 
         result_var = new_temp_var
         inst = NativeHashEach.new(

data/lib/konpeito/stdlib/json/yyjson_wrapper.c

@@ -0,0 +1,60 @@
+/*
+ * yyjson_wrapper.c - Non-inline wrappers for yyjson functions
+ *
+ * yyjson uses static inline functions in its header. When linking with
+ * LLVM-generated code, we need non-inline versions that can be called
+ * via external symbol references. This file provides those wrappers.
+ */
+
+#include "yyjson.h"
+#include <stddef.h>
+#include <stdint.h>
+#include <stdbool.h>
+
+yyjson_doc *konpeito_yyjson_read(const char *dat, size_t len, yyjson_read_flag flg) {
+    return yyjson_read(dat, len, flg);
+}
+
+yyjson_val *konpeito_yyjson_doc_get_root(yyjson_doc *doc) {
+    return yyjson_doc_get_root(doc);
+}
+
+void konpeito_yyjson_doc_free(yyjson_doc *doc) {
+    yyjson_doc_free(doc);
+}
+
+yyjson_val *konpeito_yyjson_obj_get(yyjson_val *obj, const char *key) {
+    return yyjson_obj_get(obj, key);
+}
+
+int64_t konpeito_yyjson_get_sint(yyjson_val *val) {
+    return yyjson_get_sint(val);
+}
+
+uint64_t konpeito_yyjson_get_uint(yyjson_val *val) {
+    return yyjson_get_uint(val);
+}
+
+double konpeito_yyjson_get_real(yyjson_val *val) {
+    return yyjson_get_real(val);
+}
+
+bool konpeito_yyjson_get_bool(yyjson_val *val) {
+    return yyjson_get_bool(val);
+}
+
+const char *konpeito_yyjson_get_str(yyjson_val *val) {
+    return yyjson_get_str(val);
+}
+
+size_t konpeito_yyjson_get_len(yyjson_val *val) {
+    return yyjson_get_len(val);
+}
+
+size_t konpeito_yyjson_arr_size(yyjson_val *arr) {
+    return yyjson_arr_size(arr);
+}
+
+yyjson_val *konpeito_yyjson_arr_get(yyjson_val *arr, size_t idx) {
+    return yyjson_arr_get(arr, idx);
+}

data/lib/konpeito/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Konpeito
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/scripts/setup_vendor.sh

@@ -0,0 +1,33 @@
+#!/bin/bash
+# Setup vendored dependencies for Konpeito
+#
+# Downloads yyjson (fast JSON library) source files.
+# Run this after cloning the repository:
+#   bash scripts/setup_vendor.sh
+
+set -e
+
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
+YYJSON_DIR="$PROJECT_ROOT/vendor/yyjson"
+
+YYJSON_VERSION="0.10.0"
+YYJSON_BASE_URL="https://raw.githubusercontent.com/ibireme/yyjson/${YYJSON_VERSION}/src"
+
+echo "Setting up vendored dependencies..."
+
+# --- yyjson ---
+mkdir -p "$YYJSON_DIR"
+
+if [ -f "$YYJSON_DIR/yyjson.h" ] && [ -f "$YYJSON_DIR/yyjson.c" ]; then
+  echo "  yyjson: already present (skipping download)"
+else
+  echo "  yyjson: downloading v${YYJSON_VERSION}..."
+  curl -sL "${YYJSON_BASE_URL}/yyjson.h" -o "$YYJSON_DIR/yyjson.h"
+  curl -sL "${YYJSON_BASE_URL}/yyjson.c" -o "$YYJSON_DIR/yyjson.c"
+  echo "  yyjson: downloaded yyjson.h and yyjson.c"
+fi
+
+echo ""
+echo "Done. Vendor dependencies are ready."
+echo "  yyjson: $YYJSON_DIR"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: konpeito
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Yasushi Itoh
@@ -131,6 +131,7 @@ files:
 - lib/konpeito/stdlib/json/json.rb
 - lib/konpeito/stdlib/json/json.rbs
 - lib/konpeito/stdlib/json/json_native.c
+- lib/konpeito/stdlib/json/yyjson_wrapper.c
 - lib/konpeito/stdlib/ui/extconf.rb
 - lib/konpeito/stdlib/ui/konpeito_ui_native.cpp
 - lib/konpeito/stdlib/ui/konpeito_ui_native.h
@@ -202,6 +203,7 @@ files:
 - lib/konpeito/ui/widgets/text.rb
 - lib/konpeito/ui/widgets/tree.rb
 - lib/konpeito/version.rb
+- scripts/setup_vendor.sh
 - test_native_array.rb
 - test_native_array_class.rb
 - test_native_class.rb