flor 1.6.3 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 047da4d33003f19f54b5d646fa488e59a63878f25e5a4b39006375ce9a9b22c4
-  data.tar.gz: e4d955a4984e3eb781ad10eaa657cc3b9432ef67495402f9286a98a479215685
+  metadata.gz: 726f12169dd650e862f4fdcf7f08da2e08f9a06ccf9f9125b2ad0340b4003b1f
+  data.tar.gz: 4864b67e47ee79e8a9b220e2465d23343e554102fd8a8fbdac6dad16eef9327c
 SHA512:
-  metadata.gz: 7be8459b6ce6f98a957c37950682ed558526455e9f329ee952d16f148693b81bb95a98741f83302525d37f9d4f5170d451d393ebbbac686342f7c078d2e171ad
-  data.tar.gz: 81a86bafd33ee08eab5561c3693f030008ff1d65903d70f706376e0f6d917483354b1b7c4f8b20cf2d14a8257644488cd307ecd2a660100d12a9aa975cf55364
+  metadata.gz: 82a526fd4cd0c6185e3778e4b1421c6f120fa3b0a3c3591a54fb7ddb2ddae7943302409a5b1fe1bec118882ebaf125cdd6b35895f442d58b32068c80e17497b4
+  data.tar.gz: 80ab4a60ca328565ce463459ee610face1f9d513da541392c1d6c7b8bf0906c9271120dd1dbd94ea66589eda8c3112233f817d1ef6a38eb931bece7eda1cac7a

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 # CHANGELOG.md
 
 
+## flor 1.6.4  released 2025-09-18
+
+* Introduce `del` and `delf` to delete vars and fields
+* Fix cursor/move vs symbol target
+
+
 ## flor 1.6.3  released 2025-05-29
 
 * Stop Scheduler#notify swallowing errors, gh-43

data/lib/flor/core/procedure.rb

@@ -737,23 +737,28 @@ class Flor::Procedure < Flor::Node
       node = lookup_var_node(@node, mode, path)
       node = lookup_var_node(@node, 'l', path) if node.nil? && mode == ''
 
-      return Dense.set(node['vars'], path, v) if node
+      if node
+        return Dense.unset(node['vars'], path) if v == :UNSET
+        return Dense.set(node['vars'], path, v)
+      end
 
     rescue IndexError
     end
 
     fail IndexError.new(
-      "couldn't set var #{Flor.path_to_s([ "#{mode}v" ] + path)}")
+      "couldn't #{v == :UNSET ? 'un' : ''}set var " +
+      "#{Flor.path_to_s([ "#{mode}v" ] + path)}")
   end
 
   def set_field(path, v)
 
+    return Dense.unset(payload.copy, path) if v == :UNSET
     Dense.set(payload.copy, path, v)
 
   rescue IndexError
 
     fail IndexError.new(
-      "couldn't set field #{Flor.path_to_s(path)}")
+      "couldn't #{v == :UNSET ? 'un' : ''}set field #{Flor.path_to_s(path)}")
   end
 
   def set_value(path, value)
@@ -775,6 +780,11 @@ class Flor::Procedure < Flor::Node
     end
   end
 
+  def unset_value(path)
+
+    set_value(path, :UNSET)
+  end
+
   def splat_value(paths, value)
 
     val = value.dup

data/lib/flor/pcore/break.rb

@@ -7,8 +7,8 @@ class Flor::Pro::Break < Flor::Procedure
   # ```
   # until false
   #   # do something
-  #   continue if f.x == 0
-  #   break if f.x == 1
+  #   continue _ if f.x == 0
+  #   break _ if f.x == 1
   #   # do something more
   # ```
   #
@@ -50,7 +50,7 @@ class Flor::Pro::Break < Flor::Procedure
   #
   # While, until, loop and cursor.
 
-  name 'break', 'continue'
+  names %w[ break continue ]
 
   def pre_execute
 

data/lib/flor/pcore/cursor.rb

@@ -191,6 +191,7 @@ class Flor::Pro::Cursor < Flor::Procedure
     find_string_target(to) ||
     find_name_target(to) ||
     find_att_target(to) ||
+    #find_att_value_target(to) ||
     fail(Flor::FlorError.new("move target #{to.inspect} not found", self))
   end
 
@@ -246,7 +247,16 @@ class Flor::Pro::Cursor < Flor::Procedure
         c[1].find { |cc|
           cc[0] == '_att' &&
           cc[1].is_a?(Array) &&
-          cc[1][0][0, 2] == [ 'here', [] ] } } # FIXME hardcoded...
+          cc[1][0][0, 2] == [ to, [] ] } }
   end
+
+  #def find_att_value_target(to)
+  #  tree[1]
+  #    .index { |c|
+  #      c[1].find { |cc|
+  #        cc[1].length == 2 &&
+  #        cc[1][0][0] != 'to' &&
+  #        Flor.is_string_tree?(cc[1][1], to) } }
+  #end
 end
 

data/lib/flor/pcore/del.rb

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+
+class Flor::Pro::Del < Flor::Procedure
+  #
+  # Removes a field or a variable.
+  #
+  # ```
+  # sequence
+  #   del f.a  # blanks field 'a' from the payload
+  #   del a    # blanks variable 'a'
+  # ```
+  #
+  # Returns the value held in the field or variable or `null` else.
+  #
+  # `del` will raise an error if the target field cannot be reached,
+  # but `delf` will not raise and simply return `null`.
+
+  names %w[ del delf ]
+
+  def pre_execute
+
+    unatt_unkeyed_children
+    rerep_children
+
+    @node['refs'] = []
+  end
+
+  def receive_non_att
+
+    ft = tree[1][@fcid] || []
+
+    if ft[0] == '_rep'
+      @node['refs'] << payload['ret']
+    else
+      payload['ret'] = node_payload_ret
+    end
+
+    super
+  end
+
+  def receive_last
+
+    ret = nil
+
+    @node['refs'].each do |ref|
+
+      ret = (lookup_value(ref) rescue nil)
+      begin
+        unset_value(ref)
+      rescue
+        raise unless tree[0] == 'delf'
+      end
+    end
+
+    wrap('ret' => ret)
+  end
+
+  protected
+
+  def rerep_children
+
+    t = tree
+
+    cn = t[1]
+      .collect { |ct|
+        hd, cn, ln = ct
+        if hd == '_ref'
+          [ '_rep', cn, ln ]
+        elsif hd == '_dqs'
+          [ '_rep', [ ct ], ln ]
+        elsif Flor.is_single_ref_tree?(ct)
+          [ '_rep', [ [ '_sqs', hd, ln ] ], ln ]
+        else
+          ct
+        end }
+
+    @node['tree'] = [ t[0], cn, t[2] ] if cn != t[1]
+  end
+end
+

data/lib/flor.rb

@@ -16,7 +16,7 @@ require 'dense'
 
 module Flor
 
-  VERSION = '1.6.3'
+  VERSION = '1.6.4'
 end
 
 require 'flor/colours'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: flor
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.4
 platform: ruby
 authors:
 - John Mettraux
 bindir: bin
 cert_chain: []
-date: 2025-05-29 00:00:00.000000000 Z
+date: 2025-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: munemo
@@ -180,6 +180,7 @@ files:
 - lib/flor/pcore/cond.rb
 - lib/flor/pcore/cursor.rb
 - lib/flor/pcore/define.rb
+- lib/flor/pcore/del.rb
 - lib/flor/pcore/detect.rb
 - lib/flor/pcore/do_return.rb
 - lib/flor/pcore/each.rb