tina4ruby 3.10.30 → 3.10.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f356bd29729293ca6cbc614d058d1f36e587d24734ac95dc09dc2cb0dc8f106
-  data.tar.gz: 2fa1c1a2bd95599261b53b1790e27401abf8a9a9e308d03a05e33ccdafcbe7c2
+  metadata.gz: f58284436d1c4f21bf16c723f02d174c6b4090395eb59a8357387b776cdb3c07
+  data.tar.gz: e19f24eac4a4010d9377a74f7e5da9ab437c062b3c4773f1a0932995b661e298
 SHA512:
-  metadata.gz: ff0588fb70c881e2b1a0a696df8b2ae1f7067b61c85dc29e64268a4f19b26e552e018c22321574e45b97814f86d708691f78120c74c7aaac0c76ad77f45bdbf4
-  data.tar.gz: c64f603f1d3cf692cfbbf45e476e16f7c69be7e4a0d127f9d10b3144b64edf3b82704ad2affdfc7ea127cbd67bef51c55b0b7f5416e741ef1c1210a6d75affdb
+  metadata.gz: 9191ea613953492469a000a221cc0c18f819eb48493c6a3128b04f5ef1e85d99ab08c29fe38ebbdb3b1fdfc85db1eaa648c6d327888d0f57ad19af7a14f4155d
+  data.tar.gz: 7d431e996a22db4a25879f148e891ceaeb6a7b8e186e2e5c9ccecb631234122c8a463b35f4bf4c963435973dc1b6c58dd819053ae2966917742c2baa0860a45d

data/lib/tina4/frond.rb

@@ -45,7 +45,7 @@ module Tina4
     HASH_LIT_RE     = /\A\{(.+)\}\z/m
     HASH_PAIR_RE    = /\A\s*["']?(\w+)["']?\s*:\s*(.+)\z/
     RANGE_LIT_RE    = /\A(\d+)\.\.(\d+)\z/
-    ARITHMETIC_RE   = /\A(.+?)\s*(\+|-|\*|\/|%)\s*(.+)\z/
+    ARITHMETIC_OPS  = [" + ", " - ", " * ", " // ", " / ", " % ", " ** "].freeze
     FUNC_CALL_RE    = /\A(\w+)\s*\((.*)\)\z/m
     FILTER_WITH_ARGS_RE = /\A(\w+)\s*\((.*)\)\z/m
     FILTER_CMP_RE   = /\A(\w+)\s*(!=|==|>=|<=|>|<)\s*(.+)\z/
@@ -933,12 +933,15 @@ module Tina4
         return eval_comparison(expr, context)
       end
 
-      # Arithmetic: +, -, *, /, %
-      if expr =~ ARITHMETIC_RE
-        left  = eval_expr(Regexp.last_match(1), context)
-        op    = Regexp.last_match(2)
-        right = eval_expr(Regexp.last_match(3), context)
-        return apply_math(left, op, right)
+      # Arithmetic: +, -, *, //, /, %, ** (lowest to highest precedence)
+      ARITHMETIC_OPS.each do |op|
+        pos = find_outside_quotes(expr, op)
+        next unless pos && pos >= 0
+        left_s = expr[0...pos].strip
+        right_s = expr[(pos + op.length)..].strip
+        l_val = eval_expr(left_s, context)
+        r_val = eval_expr(right_s, context)
+        return apply_math(l_val, op.strip, r_val)
       end
 
       # Function call: name(arg1, arg2)
@@ -1144,17 +1147,21 @@ module Tina4
     # -----------------------------------------------------------------------
 
     def apply_math(left, op, right)
-      l = left.to_f
-      r = right.to_f
+      l = (left || 0).to_f
+      r = (right || 0).to_f
+      # Preserve int type when both operands are int-like (except for / which returns float)
+      both_int = l == l.to_i && r == r.to_i && op != "/"
       result = case op
-               when "+" then l + r
-               when "-" then l - r
-               when "*" then l * r
-               when "/" then r != 0 ? l / r : 0
-               when "%" then l % r
+               when "+"  then l + r
+               when "-"  then l - r
+               when "*"  then l * r
+               when "/"  then r != 0 ? l / r : 0
+               when "//" then r != 0 ? (l / r).floor : 0
+               when "%"  then r != 0 ? l % r : 0
+               when "**" then l ** r
                else 0
                end
-      result == result.to_i ? result.to_i : result
+      both_int && result == result.to_i ? result.to_i : result.to_f == result.to_i ? result.to_i : result
     end
 
     # -----------------------------------------------------------------------
@@ -1354,7 +1361,7 @@ module Tina4
       if content =~ SET_RE
         name = Regexp.last_match(1)
         expr = Regexp.last_match(2).strip
-        context[name] = eval_expr(expr, context)
+        context[name] = eval_var_raw(expr, context)
       end
     end
 

data/lib/tina4/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Tina4
-  VERSION = "3.10.30"
+  VERSION = "3.10.31"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: tina4ruby
 version: !ruby/object:Gem::Version
-  version: 3.10.30
+  version: 3.10.31
 platform: ruby
 authors:
 - Tina4 Team
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-03-30 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -400,7 +399,6 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://tina4.com
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -415,8 +413,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
-signing_key:
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Simple. Fast. Human. This is not a framework.
 test_files: []