konpeito 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e06886ab2b9bd1bcc2638dcc1c0788c7a0bbe40c0416a630eb89ca8e86945a7a
-  data.tar.gz: 3921d4b460e10864329173fcdf6ba0c925c89ad9d7959fab5ac74c640041e0e4
+  metadata.gz: 7d7f18a84d8cfece0c51becca2067ab474195205b4d5ce09b7a4e197b129851a
+  data.tar.gz: ca0f8a113919d8ca6b28e8109fd2ed031979de67e695c9aaad9f659b425dab89
 SHA512:
-  metadata.gz: 970fff312f787c003978377350ff5cbeeccd46aab454999b1214d1c17a2e04530c2ec9149a4015b6c477cd21984b43ebf03390120cd1ce9b22670fe767845338
-  data.tar.gz: 32b1f3c137e224a89f57df986f667a3bc4fbe9ea12997b340927ed70e7b00458b10106be3b1f827f86ff4e147e79eafc94601b4026ce225284e4fe2d06a4597c
+  metadata.gz: 62a1bd26cf53ddc918f1129772574021154079e492c33f48437290179fd71bdba65ca78c95890f16c224cf58930fbc879040c595580eb73a1d7e6868f0460cd9
+  data.tar.gz: 295d6ac004cda8c7823ad711dca5015a95c78302fd0f3c2da0796cb30ef0c638a13bac53f0c8ae439fc50556bb1262e6a304facdd4dfaa3c6b425f1d3842f85a

data/CHANGELOG.md

@@ -5,6 +5,20 @@ 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.1.1] - 2026-02-16
+
+### Fixed
+- JVM backend: detect and resolve field type conflicts in `dedup_inherited_fields` to prevent runtime NPE when parent/child classes use same ivar with different types
+- JVM backend: UI layout fixes for Castella dashboard (`.class` dispatch, `attr_accessor` field access, scrollbar thumb rendering, etc.)
+- Remove duplicate `source_code_uri` from gemspec metadata
+- Remove debug `puts` from data_table widget
+
+### Added
+- Castella UI: visual properties (`bg_color`, `border_radius`, `border_color`, `border_width`) directly on Column/Row layouts, eliminating Container wrapper boilerplate
+
+### Changed
+- Documentation: note that JVM backend might be more mature than LLVM backend
+
 ## [0.1.0] - 2026-02-13
 
 ### Added
@@ -72,4 +86,5 @@ 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.1.1]: https://github.com/i2y/konpeito/compare/v0.1.0...v0.1.1
 [0.1.0]: https://github.com/i2y/konpeito/releases/tag/v0.1.0

data/lib/konpeito/codegen/jvm_generator.rb

@@ -187,6 +187,10 @@ module Konpeito
         # Classes are generated before main class, so we need this early.
         prescan_top_level_constants(hir_program)
 
+        # Pre-scan: register global variable static fields early so that
+        # global variables referenced inside blocks have fields available.
+        prescan_global_variables(hir_program)
+
         # Generate module interfaces FIRST (before classes that may implement them)
         hir_program.modules.each do |module_def|
           @block_methods = []
@@ -294,17 +298,43 @@ module Konpeito
         }
       end
 
+      # Yield every instruction in basic_blocks, recursing into block bodies
+      # attached to HIR::Call nodes.
+      def each_instruction_recursive(basic_blocks, &blk)
+        basic_blocks.each do |bb|
+          bb.instructions.each do |inst|
+            blk.call(inst)
+            if inst.is_a?(HIR::Call) && inst.block
+              each_instruction_recursive(inst.block.body, &blk)
+            end
+          end
+        end
+      end
+
       # Pre-scan top-level StoreConstant instructions to populate @constant_fields early.
       # This is needed because user classes are generated before the main class, and
       # class constructors may reference top-level constants (e.g. EXPANDING = 1).
+      # Recurses into block bodies so constants defined inside lambdas are also found.
       def prescan_top_level_constants(hir_program)
         hir_program.functions.each do |func|
           next if func.owner_class || func.owner_module
-          func.body.each do |bb|
-            bb.instructions.each do |inst|
-              if inst.is_a?(HIR::StoreConstant) && inst.scope.nil?
-                @constant_fields << inst.name.to_s
-              end
+          each_instruction_recursive(func.body) do |inst|
+            if inst.is_a?(HIR::StoreConstant) && inst.scope.nil?
+              @constant_fields << inst.name.to_s
+            end
+          end
+        end
+      end
+
+      # Pre-scan all functions for global variable access (LoadGlobalVar/StoreGlobalVar)
+      # and register the corresponding static fields early. This ensures global variables
+      # referenced inside blocks have their fields available during code generation.
+      def prescan_global_variables(hir_program)
+        hir_program.functions.each do |func|
+          each_instruction_recursive(func.body) do |inst|
+            if inst.is_a?(HIR::LoadGlobalVar) || inst.is_a?(HIR::StoreGlobalVar)
+              field_name = inst.name.sub(/^\$/, "GLOBAL_")
+              register_global_field(field_name)
             end
           end
         end
@@ -3709,6 +3739,11 @@ module Konpeito
       # Remove fields from child classes that are already declared on a parent class.
       # Must run AFTER all classes are registered (register_class_info) since the
       # HIR class order may register children before parents.
+      #
+      # Type conflict detection: when a child class assigns a concrete but different type
+      # to a field that the parent typed narrowly (e.g. parent :i64, child :string), widen
+      # the parent's field to :value (Object) to prevent runtime NPE.
+      # If the child type is :value (unresolved/unknown), keep the parent's concrete type.
       def dedup_inherited_fields
         @class_info.each do |class_name, info|
           parent = info[:super_name]
@@ -3719,6 +3754,16 @@ module Konpeito
             if parent_info[:fields]
               parent_info[:fields].each_key do |fname|
                 if info[:fields].key?(fname)
+                  child_type = info[:fields][fname]
+                  parent_type = parent_info[:fields][fname]
+                  # Only widen when both types are concrete but different.
+                  # If child is :value (unknown), trust the parent's type.
+                  # If parent is :value, trust it (already wide enough).
+                  if child_type != parent_type && child_type != :value && parent_type != :value
+                    warn "[konpeito] JVM field type conflict: #{parent_name}##{fname} is :#{parent_type}, " \
+                         "but subclass #{class_name} uses :#{child_type}. Widening to :value (Object)."
+                    parent_info[:fields][fname] = :value
+                  end
                   info[:fields].delete(fname)
                 end
               end
@@ -5189,8 +5234,13 @@ module Konpeito
                     end
         instructions = []
 
-        # Load self
-        instructions << { "op" => "aload", "var" => 0 }
+        # Load self — use @block_self_slot if inside a block that captured self
+        self_slot = @block_self_slot || 0
+        instructions << { "op" => "aload", "var" => self_slot }
+        # If self was captured as Object, checkcast to the expected class
+        if @block_self_slot
+          instructions << { "op" => "checkcast", "type" => jvm_class }
+        end
 
         # Prefer registered descriptor for consistency with method definition
         registered = @method_descriptors["#{@current_class_name}##{method_name}"]
@@ -6478,7 +6528,8 @@ module Konpeito
         instructions
       end
 
-      # Check if a block body accesses instance variables (needs self reference).
+      # Check if a block body accesses instance variables or calls methods on
+      # implicit self (receiver-less calls like `kpi_card(label, value)`).
       # Recursively checks nested blocks (e.g., on_click inside a yield block)
       # so that outer blocks capture self when inner blocks need it.
       def block_needs_self?(block_def)
@@ -6486,6 +6537,8 @@ module Konpeito
           bb.instructions.any? { |inst|
             if inst.is_a?(HIR::LoadInstanceVar) || inst.is_a?(HIR::StoreInstanceVar)
               true
+            elsif inst.is_a?(HIR::Call) && (inst.receiver.nil? || inst.receiver.is_a?(HIR::SelfRef))
+              true
             elsif inst.is_a?(HIR::Call) && inst.block
               block_needs_self?(inst.block)
             else

data/lib/konpeito/hir/builder.rb

@@ -2072,12 +2072,14 @@ module Konpeito
             # Check if this is a keyword hash argument
             if arg.node.is_a?(Prism::KeywordHashNode)
               # Extract keyword arguments from the hash
-              arg.node.elements.each do |elem|
+              # arg.children are typed AssocNode wrappers; each has children[0]=key, children[1]=value
+              arg.node.elements.each_with_index do |elem, ei|
                 if elem.is_a?(Prism::AssocNode) && elem.key.is_a?(Prism::SymbolNode)
                   key_name = elem.key.unescaped.to_sym
-                  # Find the typed value from the children
-                  value_typed = arg.children.find { |c| c.node == elem.value }
-                  if value_typed
+                  # Navigate through the typed AssocNode to get the typed value child
+                  typed_assoc = arg.children[ei]
+                  if typed_assoc && typed_assoc.children && typed_assoc.children.size >= 2
+                    value_typed = typed_assoc.children[1]
                     keyword_args[key_name] = visit(value_typed)
                   else
                     # Fallback: create typed node for the value

data/lib/konpeito/ui/column.rb

@@ -77,20 +77,35 @@ class Column < Layout
 
   #: (untyped painter) -> void
   def relocate_children(painter)
-    remaining = @height
+    # Account for padding
+    inner_w = @width - @pad_left - @pad_right
+    inner_h = @height - @pad_top - @pad_bottom
+    if inner_w < 0.0
+      inner_w = 0.0
+    end
+    if inner_h < 0.0
+      inner_h = 0.0
+    end
+
+    remaining = inner_h
     expanding_total_flex = 0
 
     # First pass: measure FIXED/CONTENT children, collect EXPANDING
+    # In a Column, non-FIXED children fill the column width (for centering, word-wrap, etc.)
     i = 0
     while i < @children.length
       c = @children[i]
       if c.get_height_policy != EXPANDING
         # Set width before measure so word-wrapping can calculate line count
-        if c.get_width_policy == EXPANDING
-          c.resize_wh(@width, c.get_height)
+        if c.get_width_policy != FIXED
+          c.resize_wh(inner_w, c.get_height)
         end
         cs = c.measure(painter)
-        c.resize_wh(@width, cs.height)
+        if c.get_width_policy == FIXED
+          c.resize_wh(cs.width, cs.height)
+        else
+          c.resize_wh(inner_w, cs.height)
+        end
         remaining = remaining - cs.height
       else
         expanding_total_flex = expanding_total_flex + c.get_flex
@@ -104,7 +119,7 @@ class Column < Layout
     end
 
     # Second pass: distribute remaining space to EXPANDING children, position all
-    cy = @y
+    cy = @y + @pad_top
     if @is_scrollable
       cy = cy - @scroll_offset
     end
@@ -117,14 +132,14 @@ class Column < Layout
         if expanding_total_flex > 0 && remaining > 0.0
           h = remaining * c.get_flex / expanding_total_flex
         end
-        c.resize_wh(@width, h)
+        c.resize_wh(inner_w, h)
       else
-        # Set width for non-expanding too
-        if c.get_width_policy == EXPANDING
-          c.resize_wh(@width, c.get_height)
+        # In a Column, non-FIXED children fill the column width
+        if c.get_width_policy != FIXED
+          c.resize_wh(inner_w, c.get_height)
         end
       end
-      c.move_xy(@x, cy)
+      c.move_xy(@x + @pad_left, cy)
       cy = cy + c.get_height + @spacing
       total_content_h = total_content_h + c.get_height
       total_content_h = total_content_h + @spacing if i > 0
@@ -134,7 +149,7 @@ class Column < Layout
 
     # Auto-scroll to bottom when pinned
     if @pin_bottom && @is_scrollable
-      max_scroll = @content_height - @height
+      max_scroll = @content_height - inner_h
       if max_scroll > 0.0
         @scroll_offset = max_scroll
       end
@@ -143,9 +158,24 @@ class Column < Layout
 
   #: (untyped painter, bool completely) -> void
   def redraw(painter, completely)
+    saved_bg = $__bg_clear_color
+    # When this layout has a custom background and is dirty, we handle clearing
+    # ourselves to preserve rounded corners. Clear dirty flag so redraw_children
+    # won't overwrite with a solid fill_rect.
+    if @custom_bg && is_dirty
+      parent_bg = saved_bg
+      if parent_bg == nil || parent_bg == 0
+        parent_bg = $theme.bg_canvas
+      end
+      painter.fill_rect(0.0, 0.0, @width, @height, parent_bg)
+      set_dirty(false)
+      completely = true
+    end
+    draw_visual_background(painter)
     relocate_children(painter)
     redraw_children(painter, completely)
     draw_scrollbar(painter) if @is_scrollable
+    $__bg_clear_color = saved_bg
   end
 
   #: (untyped painter) -> void

data/lib/konpeito/ui/core.rb

@@ -1864,6 +1864,51 @@ class Layout < Widget
   def initialize
     super
     @children = []
+    # Visual properties (background, border)
+    @bg_color_val = 0
+    @border_color_val = 0
+    @custom_bg = false
+    @custom_border = false
+    @border_radius_val = 0.0
+    @border_width_val = 1.0
+    @bg_clear_color = nil
+  end
+
+  # --- Visual Properties (method chaining) ---
+
+  #: (Integer c) -> Layout
+  def bg_color(c)
+    @bg_color_val = c
+    @custom_bg = true
+    self
+  end
+
+  #: (Integer c) -> Layout
+  def border_color(c)
+    @border_color_val = c
+    @custom_border = true
+    self
+  end
+
+  #: (Float r) -> Layout
+  def border_radius(r)
+    @border_radius_val = r
+    self
+  end
+
+  #: (Float w) -> Layout
+  def border_width(w)
+    @border_width_val = w
+    self
+  end
+
+  # Draw background and border if visual properties are set.
+  #: (untyped painter) -> void
+  def draw_visual_background(painter)
+    if @custom_bg
+      painter.fill_round_rect(0.0, 0.0, @width, @height, @border_radius_val, @bg_color_val)
+      @bg_clear_color = @bg_color_val
+    end
   end
 
   #: () -> Array

data/lib/konpeito/ui/row.rb

@@ -74,7 +74,17 @@ class Row < Layout
 
   #: (untyped painter) -> void
   def relocate_children(painter)
-    remaining = @width
+    # Account for padding
+    inner_w = @width - @pad_left - @pad_right
+    inner_h = @height - @pad_top - @pad_bottom
+    if inner_w < 0.0
+      inner_w = 0.0
+    end
+    if inner_h < 0.0
+      inner_h = 0.0
+    end
+
+    remaining = inner_w
     expanding_total_flex = 0
 
     # First pass: measure FIXED/CONTENT children, collect EXPANDING
@@ -84,10 +94,14 @@ class Row < Layout
       if c.get_width_policy != EXPANDING
         # Set height before measure so height-dependent layouts work
         if c.get_height_policy == EXPANDING
-          c.resize_wh(c.get_width, @height)
+          c.resize_wh(c.get_width, inner_h)
         end
         cs = c.measure(painter)
-        c.resize_wh(cs.width, @height)
+        if c.get_height_policy == EXPANDING
+          c.resize_wh(cs.width, inner_h)
+        else
+          c.resize_wh(cs.width, cs.height)
+        end
         remaining = remaining - cs.width
       else
         expanding_total_flex = expanding_total_flex + c.get_flex
@@ -101,7 +115,7 @@ class Row < Layout
     end
 
     # Second pass: distribute remaining space, position all
-    cx = @x
+    cx = @x + @pad_left
     if @is_scrollable
       cx = cx - @scroll_offset
     end
@@ -114,13 +128,13 @@ class Row < Layout
         if expanding_total_flex > 0 && remaining > 0.0
           w = remaining * c.get_flex / expanding_total_flex
         end
-        c.resize_wh(w, @height)
+        c.resize_wh(w, inner_h)
       else
         if c.get_height_policy == EXPANDING
-          c.resize_wh(c.get_width, @height)
+          c.resize_wh(c.get_width, inner_h)
         end
       end
-      c.move_xy(cx, @y)
+      c.move_xy(cx, @y + @pad_top)
       cx = cx + c.get_width + @spacing
       total_content_w = total_content_w + c.get_width
       total_content_w = total_content_w + @spacing if i > 0
@@ -130,7 +144,7 @@ class Row < Layout
 
     # Auto-scroll to end when pinned
     if @pin_right && @is_scrollable
-      max_scroll = @content_width - @width
+      max_scroll = @content_width - inner_w
       if max_scroll > 0.0
         @scroll_offset = max_scroll
       end
@@ -139,9 +153,21 @@ class Row < Layout
 
   #: (untyped painter, bool completely) -> void
   def redraw(painter, completely)
+    saved_bg = $__bg_clear_color
+    if @custom_bg && is_dirty
+      parent_bg = saved_bg
+      if parent_bg == nil || parent_bg == 0
+        parent_bg = $theme.bg_canvas
+      end
+      painter.fill_rect(0.0, 0.0, @width, @height, parent_bg)
+      set_dirty(false)
+      completely = true
+    end
+    draw_visual_background(painter)
     relocate_children(painter)
     redraw_children(painter, completely)
     draw_scrollbar(painter) if @is_scrollable
+    $__bg_clear_color = saved_bg
   end
 
   #: (untyped painter) -> void

data/lib/konpeito/version.rb

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

data/tools/konpeito-asm/src/konpeito/runtime/RubyDispatch.java

@@ -56,6 +56,9 @@ public class RubyDispatch {
         RUBY_NAME_ALIASES.put("to_s", new String[]{"toString"});
         RUBY_NAME_ALIASES.put("to_a", new String[]{"toArray_"});
 
+        // Reserved name aliases (jvm_method_name mangles these)
+        RUBY_NAME_ALIASES.put("k_class", new String[]{"getClass"});
+
         // Hash: keys/values → Ruby-specific methods returning KArray
         RUBY_NAME_ALIASES.put("keys", new String[]{"rubyKeys"});
         RUBY_NAME_ALIASES.put("values", new String[]{"rubyValues"});

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: konpeito
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Yasushi Itoh