teptris 0.2.29-aarch64-linux → 0.2.30-aarch64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 477a02cb5a2389ff022cbb1b6589e4a684b11b29836afac63e6e9e6e85bc622f
-  data.tar.gz: 057a9b7e89921edc84147357d44d8844155a9e79a1fc54f84a9151a9ac32bc12
+  metadata.gz: '059989b3fe2865a88701cd0f3fa6017e6a7d1858d9f1f4acb92b775a6678002b'
+  data.tar.gz: 83c5727792a555111b7e9d8fe48d3250022b5b8fed521930973f57b4c60f5add
 SHA512:
-  metadata.gz: f77168573b78bcbc4b4051c74e7be7296ff42b4727eea93fc91c48711698e7013143401a18e8b4eac539d56f5087d05e3deeb0eb1216e4852f25f3370f4ae9b0
-  data.tar.gz: e489a2f3b3eb893126ab803c539eb7e2df63da5fc38850d83cf4ffd4377fc3d044b7ac6abb6fe92a234b9d4378907a023e97cfa91b56904517a12cae91904317
+  metadata.gz: 5bc284eabb37a3f900fae5acb85f4ab84e7400d28bc2bfc1088cd3744026c310dfc2feba6bcb547ad285976897ea3109f2323bf14b5f94683f217a0c3c4300ba
+  data.tar.gz: 8e3395e4e6543dea2d6dd0409bd8caa4768bad3a8c21298874b5c2e5f3f17ae6a616e7737cf32ea28aee4a8c34e4996b35d5f399dd5d9c927c14bb0af64a1e95

data/lib/teptris/descriptor.rb

@@ -27,11 +27,35 @@ class Teptris::Descriptor
   attr_reader :rows, :first_row
 
   def self.build(tree)
-    rows = []
-    first_row = [0] # plan 0 = the root: asm walks plan index 0
-    counter = [0]
-    compile(tree, rows, first_row, counter)
-    first_row << rows.length # sentinel: end of the last plan's rows
+    # Pre-order plan numbering (root = plan 0) with each plan's rows
+    # assigned a DISJOINT reserved range. Interleaved appending leaks
+    # siblings that follow a :nested child into the sub-plan's range —
+    # the 0.2.29 bug (every array-of-tables element grew stray nil
+    # rows).
+    plans = []
+    index_of = {}
+    collect = lambda do |t|
+      unless index_of.key?(t.object_id)
+        index_of[t.object_id] = plans.length
+        plans << t
+      end
+      (t[:children] || []).each do |ch|
+        collect.call(ch[:plan]) if KINDS.fetch(ch[:kind]) == 3
+      end
+    end
+    collect.call(tree)
+
+    first_row = [0]
+    plans.each { |t| first_row << first_row[-1] + (t[:children] || []).length }
+    rows = Array.new(first_row[-1])
+    plans.each_with_index do |t, i|
+      (t[:children] || []).each_with_index do |ch, j|
+        kind = KINDS.fetch(ch[:kind])
+        sub = kind == 3 ? index_of[ch[:plan].object_id] : 0
+        rows[first_row[i] + j] = [ch[:name].to_s, kind, sub]
+      end
+    end
+
     d = allocate
     d.instance_variable_set(:@rows, rows.freeze)
     d.instance_variable_set(:@first_row, first_row.freeze)
@@ -40,30 +64,6 @@ class Teptris::Descriptor
     d.freeze
   end
 
-  # Pre-order: each plan's rows are one CONTIGUOUS block; nested
-  # sub-plans are compiled after the parent's block starts and their
-  # indices patch the parent's NESTED rows. first_row must eventually
-  # carry plan_count + 1 entries (the sentinel is rows.length).
-  def self.compile(tree, rows, first_row, counter)
-    idx = counter[0]
-    counter[0] += 1
-    first_row[idx] = rows.length
-    (tree[:children] || []).each do |ch|
-      kind = KINDS.fetch(ch[:kind])
-      if kind == 3
-        sub = counter[0]
-        pos = rows.length
-        rows << nil # patched with the real sub index below
-        sub = compile(ch[:plan], rows, first_row, counter)
-        rows[pos] = [ch[:name].to_s, kind, sub]
-      else
-        rows << [ch[:name].to_s, kind, 0]
-      end
-    end
-    idx
-  end
-  private_class_method :compile
-
   def walk(toml)
     TeptrisExt.plan_emit(@handle, toml)
   end

data/lib/teptris/version.rb

@@ -1,3 +1,3 @@
 module Teptris
-  VERSION = "0.2.29"
+  VERSION = "0.2.30"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teptris
 version: !ruby/object:Gem::Version
-  version: 0.2.29
+  version: 0.2.30
 platform: aarch64-linux
 authors:
 - teptris contributors