fbe 0.0.19 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d25c37b43cfba051943236b5a62e33f24e64569c638cabe65aff2a9bca5823dd
-  data.tar.gz: 99870b5a82826ea29fee426e357c6cf51533ad480c14a7b46a8a408a238b4a91
+  metadata.gz: a57f0e5f562ad6ac7400355614f0af933b2130470759a877d34ea35878a4e52c
+  data.tar.gz: 0c93b9b7d1de5cf6f2c5bac41f71b663e19d7c1af667f5e6a41c53a361392afc
 SHA512:
-  metadata.gz: 64c1b1d1be331458fe3c34a99a80c81f5bf2e77a6e7b378d1269d5c421024e049b61cdf5651ccd435b7a1233eb8d315e8e39f8d04091cbcf813468e1417b94e0
-  data.tar.gz: b2feba50e12a9b157b09cbea421f87c97d50201afc0da2619f144f1b6963937718ffdf4fc050995d8c8b7c38798955989bb7b4dcf6d14f0c525c451c8002e738
+  metadata.gz: 1ec9cb12e7388c4260e9740255af73d8993e5b05abb0ee613bde3ee87e140a9b4b2bb1177c3dd14025e2a83c3eb3f87e8f5b84293f2b52256491860dd67b0807
+  data.tar.gz: e11c60c5bedc1abe4eb68702285c8a76f08c03e3b3e76a3dbf01f8ab514a1c024e1af0f1b38408cff5b5e7d370e011e5da1fee7d9c11e0be50d8e0ccd641de89

data/lib/fbe/award.rb

@@ -67,6 +67,12 @@ class Fbe::Award
         rescue StandardError => e
           raise "Failure in #{o}: #{e.message}"
         end
+      when :aka
+        @operands[0..-2].each do |o|
+          o.bill_to(bill)
+        rescue StandardError => e
+          raise "Failure in #{o}: #{e.message}"
+        end
       when :let, :set
         bill.set(@operands[0], to_val(@operands[1], bill))
       when :give
@@ -145,31 +151,31 @@ class Fbe::Award
       when :total
         'total'
       when :if
-        "if #{to_str(@operands[0])} then #{to_str(@operands[1])} else #{to_str(@operands[2])}"
+        "if #{to_p(@operands[0])} then #{to_p(@operands[1])} else #{to_p(@operands[2])}"
       when :eq
-        "#{to_str(@operands[0])} == #{to_str(@operands[1])}"
+        "#{to_p(@operands[0])} = #{to_p(@operands[1])}"
       when :lt
-        "#{to_str(@operands[0])} < #{to_str(@operands[1])}"
+        "#{to_p(@operands[0])} < #{to_p(@operands[1])}"
       when :lte
-        "#{to_str(@operands[0])} ≤ #{to_str(@operands[1])}"
+        "#{to_p(@operands[0])} ≤ #{to_p(@operands[1])}"
       when :gt
-        "#{to_str(@operands[0])} > #{to_str(@operands[1])}"
+        "#{to_p(@operands[0])} > #{to_p(@operands[1])}"
       when :gte
-        "#{to_str(@operands[0])} ≥ #{to_str(@operands[1])}"
+        "#{to_p(@operands[0])} ≥ #{to_p(@operands[1])}"
       when :div
-        "#{to_str(@operands[0])} ÷ #{to_str(@operands[1])}"
+        "#{to_p(@operands[0])} ÷ #{to_p(@operands[1])}"
       when :times
-        "#{to_str(@operands[0])} × #{to_str(@operands[1])}"
+        "#{to_p(@operands[0])} × #{to_p(@operands[1])}"
       when :plus
-        "#{to_str(@operands[0])} + #{to_str(@operands[1])}"
+        "#{to_p(@operands[0])} + #{to_p(@operands[1])}"
       when :minus
-        "#{to_str(@operands[0])} - #{to_str(@operands[1])}"
+        "#{to_p(@operands[0])} - #{to_p(@operands[1])}"
       when :max
-        "maximum of #{to_str(@operands[0])} and #{to_str(@operands[1])}"
+        "maximum of #{to_p(@operands[0])} and #{to_p(@operands[1])}"
       when :min
-        "minimum of #{to_str(@operands[0])} and #{to_str(@operands[1])}"
+        "minimum of #{to_p(@operands[0])} and #{to_p(@operands[1])}"
       when :between
-        "at least #{to_str(@operands[0])} and at most #{to_str(@operands[1])}"
+        "at least #{to_p(@operands[0])} and at most #{to_p(@operands[1])}"
       else
         raise "Unknown term '#{@op}'"
       end
@@ -183,26 +189,52 @@ class Fbe::Award
         rescue StandardError => e
           raise "Failure in #{o}: #{e.message}"
         end
+      when :aka
+        @operands[0..-2].each do |o|
+          o.publish_to(policy)
+        rescue StandardError => e
+          raise "Failure in #{o}: #{e.message}"
+        end
+        policy.revert(@operands.size - 1)
+        policy.line(to_p(@operands[@operands.size - 1]))
       when :explain
-        policy.intro(to_str(@operands[0]))
+        policy.intro(to_p(@operands[0]))
       when :in
-        policy.line("assume that #{to_str(@operands[0])} is #{to_str(@operands[1])}")
+        policy.line("assume that #{to_p(@operands[0])} is #{to_p(@operands[1])}")
       when :let
-        policy.line("let #{to_str(@operands[0])} be equal to #{to_str(@operands[1])}")
+        policy.line("let #{to_p(@operands[0])} be equal to #{to_p(@operands[1])}")
+        policy.let(@operands[0], @operands[1])
       when :set
-        policy.line("set #{to_str(@operands[0])} to #{to_str(@operands[1])}")
+        policy.line("set #{to_p(@operands[0])} to #{to_p(@operands[1])}")
       when :give
-        policy.line("award #{to_str(@operands[0])}")
+        policy.line("award #{to_p(@operands[0])}")
       else
         raise "Unknown term '#{@op}'"
       end
     end
 
-    def to_str(any)
-      if any.is_a?(PTerm)
+    def to_p(any)
+      case any
+      when PTerm
         any.to_s
-      elsif any.is_a?(Symbol)
-        "_#{any}_"
+      when Symbol
+        s = any.to_s
+        subs = {
+          0 => '₀',
+          1 => '₁',
+          2 => '₂',
+          3 => '₃',
+          4 => '₄',
+          5 => '₅',
+          6 => '₆',
+          7 => '₇',
+          8 => '₈',
+          9 => '₉'
+        }
+        s.gsub!(/([a-z]+)([0-9])/) { |_| "#{Regexp.last_match[1]}#{subs[Regexp.last_match[2].to_i]}" }
+        "_#{s.gsub('_', '-')}_"
+      when Integer, Float
+        "**#{any}**"
       else
         any
       end
@@ -245,6 +277,11 @@ class Fbe::Award
     def initialize
       @lines = []
       @intro = ''
+      @lets = {}
+    end
+
+    def revert(num)
+      @lines.slice!(-num, num)
     end
 
     def intro(text)
@@ -252,11 +289,24 @@ class Fbe::Award
     end
 
     def line(line)
+      line = line.gsub(/\$\{([a-z_0-9]+)\}/) { |_x| @lets[Regexp.last_match[1].to_sym] }
       @lines << line
     end
 
+    def let(key, value)
+      @lets[key] = value
+    end
+
     def markdown
-      "#{@intro}. Here it how it's calculated: First, #{@lines.join('. Then, ')}."
+      pars = []
+      pars << "#{@intro}." unless @intro.empty?
+      pars << 'Here is how it\'s calculated:'
+      if @lines.size == 1
+        pars << "Just #{@lines.first}."
+      else
+        pars += @lines.each_with_index.map { |t, i| "#{i.zero? ? 'First' : 'Then'}, #{t}." }
+      end
+      pars.join(' ').gsub('. Then, award ', ', and award ')
     end
   end
 end

data/lib/fbe.rb

@@ -27,5 +27,5 @@
 # License:: MIT
 module Fbe
   # Current version of the gem (changed by .rultor.yml on every release)
-  VERSION = '0.0.19'
+  VERSION = '0.0.21'
 end

data/test/fbe/test_award.rb

@@ -40,8 +40,11 @@ class TestAward < Minitest::Test
         (let max 36)
         (let basis 30)
         (give basis "as a basis")
-        (set b1 (if (lt hours max) 10 0))
-        (give b1 "for resolving the bug in ${hours} (<${max}) hours")
+        (let fee 10)
+        (aka
+          (set b1 (if (lt hours max) fee 0))
+          (give b1 "for resolving the bug in ${hours} (<${max}) hours")
+          "add ${+fee} if it was resolved in less than ${max} hours")
         (set days (div hours 24))
         (set b2 (times days -1))
         (let worst -20)
@@ -67,7 +70,7 @@ class TestAward < Minitest::Test
     md = a.policy.markdown
     [
       'First, assume that _hours_ is hours',
-      'Then, award _b2_'
+      ', and award _b₂_'
     ].each { |t| assert(md.include?(t), md) }
   end
 
@@ -83,4 +86,16 @@ class TestAward < Minitest::Test
       assert_equal(v, a.bill.points, q)
     end
   end
+
+  def test_some_policies
+    {
+      '(award (let x_a 25) (set z (plus x_a 1)) (give z "..."))' =>
+        'First, let _x-a_ be equal to **25**. Then, set _z_ to _x-a_ + **1**, and award _z_.',
+      '(award (aka (let x 17) (give x "hey") "add ${x} when necessary"))' =>
+        'Just add 17 when necessary'
+    }.each do |q, t|
+      md = Fbe::Award.new(q).policy.markdown
+      assert(md.include?(t), md)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fbe
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.21
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-17 00:00:00.000000000 Z
+date: 2024-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace