teptris 0.2.29-x86_64-linux → 0.2.30-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cccbf99940e4d7d287948d648cf16d3ee019a3a060d5485dda7314079936972e
-  data.tar.gz: 6444b5d86d72aaed9d03f1a222b201bb1f73cf655d9101ed07816ef216f05528
+  metadata.gz: 8481b0ddbaecff804ac851e3b54e3b16a76d005064b3e1ac535d82993d20faf4
+  data.tar.gz: a46a7f679ac29526967f004df07aad98d268935b6ad25db1b4b74a7035a20310
 SHA512:
-  metadata.gz: 3d1684fe3b82c343c75a2fefc8ecdb09ad519ebb490fbe7943a42e0dcc374b120f9ad2c0558075afc032921ad9223ea7a4791c3285669b0673ab12620eb7dc33
-  data.tar.gz: 75214513eaf23d1f65b94800c1bad0fdc7003ef67d6f5f57c66337da5a431395977b5d2a3936b236142d15f0b61c20db2eecc5336f649be472dad8218cef65f5
+  metadata.gz: 73eeb15033381b2d8da0a657b2c6e9d3d59597a4d94c8c5f586cbb49341ce4e5d154f3923c4246f2e52c9d2ff33ac31e1e9e67093d2a7caaadb521490453c140
+  data.tar.gz: 054db779514589be18599d58c29873ac673905d640232ef797b49aef489fc3a812f6693026d63717532f9ef787993432611bbc54feda547d5146bb3e8474a0a2

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: x86_64-linux
 authors:
 - teptris contributors