feel 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edefdae3c70a4358387f8f37f1a046f4b4f385547b7182bb2a36bbbf98b6f03e
-  data.tar.gz: a042d4d5cb4215a0adef33de6fe3e9d67d13be9bd49d749bdd7425061c60edb5
+  metadata.gz: 5e3c6cadc65effe99f563dcd6ceca765770c00205f0b5236795da8a59e18d39b
+  data.tar.gz: a3989725d4ea3f5d13319afd0576b332d7372bf17621c874985746fdffc09027
 SHA512:
-  metadata.gz: 23e7dad7a59cf974865c29dac18c97ab12167a49e5b90295e731fff08f7dc0b7b0deef44f29ced81f873781636bc8f6f7d4c1af613d489fb2389d505bef4546a
-  data.tar.gz: 5e287d05c9f463350f6fdc34771d51cf05a90e4f76e0932dc79ce7704cc8c19c1887f3456ee33da5dfcb9698cc03ce8ed7a368ec5c44f3fcbca3bc95ed1e8839
+  metadata.gz: 8591d4a8b94eb173eb1b05e3d739dfccc23eabf40cabd9e98c0e5216cefd59e83deb6080d8c62288f2170254c21b7ea27a91cd858defe6a8ac2e7de4fea49b7e
+  data.tar.gz: 68c18813491cce3e569e864afe54b674b869c2c7fa9b616deb59ca1e39698c5c0cad1f813ad57eadf06df11787ead485bd261396d38bf0ac9c0aeaa65bff4018

data/lib/feel/feel.treetop

@@ -51,15 +51,91 @@ grammar FEEL
   # 4.d arithmetic negation ;
   #
   rule arithmetic_expression
-    addition /
-    subtraction /
-    multiplication /
-    division /
+    additive_operation /
+    multiplicative_operation /
     exponentiation /
     arithmetic_negation /
     bracketed_arithmetic_expression
   end
 
+  # Precedence hierarchy used within operator rules (low to high):
+  #   additive > multiplicative > exponential > atom
+
+  rule additive_expression
+    additive_operation /
+    multiplicative_expression
+  end
+
+  rule multiplicative_expression
+    multiplicative_operation /
+    exponential_expression
+  end
+
+  #
+  # 21. addition = expression , "+" , expression ;
+  # 22. subtraction = expression , "-" , expression ;
+  #
+  rule additive_operation
+    head:multiplicative_expression tail:(__ op:("+" / "-") __ multiplicative_expression)+ {
+      def eval(context={})
+        result = head.eval(context)
+        tail.elements.each do |e|
+          operand = e.multiplicative_expression.eval(context)
+          if e.op.text_value == "+"
+            return nil if result.nil? || operand.nil?
+            result = result + operand
+          else
+            return nil if result.nil? || operand.nil?
+            result = result - operand
+          end
+        end
+        result
+      end
+    }
+  end
+
+  #
+  # 23. multiplication = expression , "\*" , expression ;
+  # 24. division = expression , "/" , expression ;
+  #
+  rule multiplicative_operation
+    head:exponential_expression tail:(__ op:("*" !"*" / "/") __ exponential_expression)+ {
+      def eval(context={})
+        result = head.eval(context)
+        tail.elements.each do |e|
+          operand = e.exponential_expression.eval(context)
+          if e.op.text_value.start_with?("*")
+            return nil if result.nil? || operand.nil?
+            result = result * operand
+          else
+            return nil if result.nil? || operand.nil?
+            result = result / operand
+          end
+        end
+        result
+      end
+    }
+  end
+
+  rule exponential_expression
+    exponentiation /
+    arithmetic_atom
+  end
+
+  rule arithmetic_atom
+    arithmetic_negation /
+    bracketed_additive_expression /
+    simple_value
+  end
+
+  rule bracketed_additive_expression
+    "(" __ additive_expression __ ")" {
+      def eval(context={})
+        additive_expression.eval(context)
+      end
+    }
+  end
+
   rule bracketed_arithmetic_expression
     "(" __ arithmetic_expression __ ")" {
       def eval(context={})
@@ -219,49 +295,16 @@ grammar FEEL
     head:name tail:(__ "." __ name)* <QualifiedName>
   end
 
-  #
-  # 21. addition = expression , "+" , expression ;
-  #
-  rule addition
-    head:non_recursive_simple_expression_for_arithmetic_expression __ "+" __ tail:expression <Addition>
-  end
-
-  rule non_recursive_simple_expression_for_arithmetic_expression
-    bracketed_arithmetic_expression /
-    simple_value
-  end
-
   rule non_recursive_simple_expression_for_comparison
     arithmetic_expression /
     simple_value
   end
 
-  #
-  # 22. subtraction = expression , "-" , expression ;
-  #
-  rule subtraction
-    head:non_recursive_simple_expression_for_arithmetic_expression __ "-" __ tail:expression <Subtraction>
-  end
-
-  #
-  # 23. multiplication = expression , "\*" , expression ;
-  #
-  rule multiplication
-    head:non_recursive_simple_expression_for_arithmetic_expression __ "*" __ tail:expression <Multiplication>
-  end
-
-  #
-  # 24. division = expression , "/" , expression ;
-  #
-  rule division
-    head:non_recursive_simple_expression_for_arithmetic_expression __ "/" __ tail:expression <Division>
-  end
-
   #
   # 25. exponentiation = expression, "\*\*", expression ;
   #
   rule exponentiation
-    head:non_recursive_simple_expression_for_arithmetic_expression __ "**" __ tail:expression <Exponentiation>
+    head:arithmetic_atom __ "**" __ tail:exponential_expression <Exponentiation>
   end
 
   #
@@ -270,7 +313,9 @@ grammar FEEL
   rule arithmetic_negation
     "-" __ "(" __ expr:expression __ ")" {
       def eval(context={})
-        -expr.eval(context)
+        val = expr.eval(context)
+        return nil if val.nil?
+        -val
       end
     }
   end
@@ -370,9 +415,14 @@ grammar FEEL
     numeric_literal /
     string_literal /
     boolean_literal /
+    at_literal /
     date_time_literal
   end
 
+  rule at_literal
+    "@" string_literal <AtLiteral>
+  end
+
   #
   # 35. string literal = '"' , { character - ('"' | vertical space) }, '"' ;
   #
@@ -453,7 +503,7 @@ grammar FEEL
   # 40. function invocation = expression , parameters ;
   #
   rule function_invocation
-    fn_name:(!reserved_word qualified_name) __ "(" __ params:(positional_parameters)? __ ")" <FunctionInvocation>
+    fn_name:(!reserved_word qualified_name) __ "(" __ params:(positional_parameters)? __ ")" property:(__ "." __ name)? <FunctionInvocation>
   end
 
   #
@@ -623,7 +673,7 @@ grammar FEEL
   # 62. date time literal = ( "date" | "time" | "date and time" | "duration" ) , "(" , string literal , ")" ;
   #
   rule date_time_literal
-    keyword:date_time_keyword __ "(" __ head:expression __ tail:("," __ expression)* __ ")" <DateTimeLiteral>
+    keyword:date_time_keyword __ "(" __ head:expression __ tail:("," __ expression)* __ ")" property:(__ "." __ name)? <DateTimeLiteral>
   end
 
   rule date_time_keyword

data/lib/feel/nodes.rb

@@ -19,6 +19,51 @@ module FEEL
       qualified_names.to_a
     end
 
+    def access_property(result, property_name)
+      case result
+      when DateTime
+        case property_name
+        when "year" then result.year
+        when "month" then result.month
+        when "day" then result.day
+        when "weekday" then result.cwday
+        when "hour" then result.hour
+        when "minute" then result.min
+        when "second" then result.sec
+        end
+      when Date
+        case property_name
+        when "year" then result.year
+        when "month" then result.month
+        when "day" then result.day
+        when "weekday" then result.cwday
+        end
+      when Time
+        case property_name
+        when "hour" then result.hour
+        when "minute" then result.min
+        when "second" then result.sec
+        when "time offset" then result.utc_offset
+        when "timezone" then result.zone
+        end
+      when ActiveSupport::Duration
+        case property_name
+        when "years" then result.parts[:years] || 0
+        when "months" then result.parts[:months] || 0
+        when "days" then result.parts[:days] || 0
+        when "hours" then result.parts[:hours] || 0
+        when "minutes" then result.parts[:minutes] || 0
+        when "seconds" then result.parts[:seconds] || 0
+        end
+      when Hash
+        if result.key?(property_name.to_sym)
+          result[property_name.to_sym]
+        else
+          result[property_name]
+        end
+      end
+    end
+
     def raise_evaluation_error(missing_name, ctx = {})
       names = qualified_names_in_context(ctx)
       checker = DidYouMean::SpellChecker.new(dictionary: names)
@@ -84,13 +129,13 @@ module FEEL
 
       case operator
       when "<"
-        ->(input) { input < endpoint }
+        ->(input) { input.nil? || endpoint.nil? ? nil : input < endpoint }
       when "<="
-        ->(input) { input <= endpoint }
+        ->(input) { input.nil? || endpoint.nil? ? nil : input <= endpoint }
       when ">"
-        ->(input) { input > endpoint }
+        ->(input) { input.nil? || endpoint.nil? ? nil : input > endpoint }
       when ">="
-        ->(input) { input >= endpoint }
+        ->(input) { input.nil? || endpoint.nil? ? nil : input >= endpoint }
       else
         ->(input) { input == endpoint }
       end
@@ -112,16 +157,17 @@ module FEEL
       finish = end_token.text_value
       first_val = first.eval(context)
       second_val = second.eval(context)
+      return ->(_input) { nil } if first_val.nil? || second_val.nil?
 
       case [start, finish]
       when ["(", ")"]
-        ->(input) { first_val < input && input < second_val }
+        ->(input) { input.nil? ? nil : first_val < input && input < second_val }
       when ["[", "]"]
-        ->(input) { first_val <= input && input <= second_val }
+        ->(input) { input.nil? ? nil : first_val <= input && input <= second_val }
       when ["(", "]"]
-        ->(input) { first_val < input && input <= second_val }
+        ->(input) { input.nil? ? nil : first_val < input && input <= second_val }
       when ["[", ")"]
-        ->(input) { first_val <= input && input < second_val }
+        ->(input) { input.nil? ? nil : first_val <= input && input < second_val }
       end
     end
   end
@@ -232,11 +278,15 @@ module FEEL
         initial_value = context_get(context, head_name)
 
         # Process each segment in the tail, evaluating names to handle backticks
-        tail.elements.inject(initial_value) do |hash, element|
-          return nil unless hash
+        tail.elements.inject(initial_value) do |value, element|
+          return nil unless value
 
           key = element.name.eval(context)
-          context_get(hash, key, root: context)
+          if value.respond_to?(:key?)
+            context_get(value, key, root: context)
+          else
+            access_property(value, key)
+          end
         end
       end
     end
@@ -258,50 +308,14 @@ module FEEL
   end
 
   #
-  # 21. addition = expression , "+" , expression ;
+  # 25. exponentiation = expression, "\*\*", expression ;
   #
-  class Addition < Node
+  class Exponentiation < Node
     def eval(context = {})
       head_val = head.eval(context)
       tail_val = tail.eval(context)
       return nil if head_val.nil? || tail_val.nil?
-      head.eval(context) + tail.eval(context)
-    end
-  end
-
-  #
-  # 22. subtraction = expression , "-" , expression ;
-  #
-  class Subtraction < Node
-    def eval(context = {})
-      head.eval(context) - tail.eval(context)
-    end
-  end
-
-  #
-  # 23. multiplication = expression , "\*" , expression ;
-  #
-  class Multiplication < Node
-    def eval(context = {})
-      head.eval(context) * tail.eval(context)
-    end
-  end
-
-  #
-  # 24. division = expression , "/" , expression ;
-  #
-  class Division < Node
-    def eval(context = {})
-      head.eval(context) / tail.eval(context)
-    end
-  end
-
-  #
-  # 25. exponentiation = expression, "\*\*", expression ;
-  #
-  class Exponentiation < Node
-    def eval(context = {})
-      head.eval(context) ** tail.eval(context)
+      head_val ** tail_val
     end
   end
 
@@ -427,6 +441,23 @@ module FEEL
     end
   end
 
+  class AtLiteral < Node
+    def eval(_context = {})
+      value = string_literal.eval
+      return nil if value.nil?
+      case value
+      when /\AP/
+        ActiveSupport::Duration.parse(value)
+      when /\A\d{4}-\d{2}-\d{2}T/
+        DateTime.parse(value)
+      when /\A\d{4}-\d{2}-\d{2}\z/
+        Date.parse(value)
+      when /\A\d{2}:\d{2}/
+        Time.parse(value)
+      end
+    end
+  end
+
   #
   # 38. digit = [0-9] ;
   #
@@ -449,7 +480,11 @@ module FEEL
 
       args = params.present? ? params.eval(context) : []
 
-      fn.call(*args)
+      result = fn.call(*args)
+      if defined?(property) && property.present?
+        result = access_property(result, property.name.eval(context))
+      end
+      result
     end
   end
 
@@ -549,13 +584,14 @@ module FEEL
   #
   class Comparison < Node
     def eval(context = {})
+      left_val = left.eval(context)
+      right_val = right.eval(context)
       case operator.text_value
-      when "<" then left.eval(context) < right.eval(context)
-      when "<=" then left.eval(context) <= right.eval(context)
-      when ">=" then left.eval(context) >= right.eval(context)
-      when ">" then left.eval(context) > right.eval(context)
-      when "!=" then left.eval(context) != right.eval(context)
-      when "=" then left.eval(context) == right.eval(context)
+      when "<", "<=", ">=", ">"
+        return nil if left_val.nil? || right_val.nil?
+        left_val.send(operator.text_value, right_val)
+      when "!=" then left_val != right_val
+      when "=" then left_val == right_val
       end
     end
   end
@@ -686,7 +722,7 @@ module FEEL
   class ContextEntryList < Node
     def eval(context = {})
       context_entries.inject({}) do |hash, entry|
-        hash.merge(entry.eval(context))
+        hash.merge(entry.eval(context.merge(hash)))
       end
     end
 
@@ -717,7 +753,7 @@ module FEEL
       return nil if head_val.nil?
       return head_val if head_val.is_a?(ActiveSupport::Duration) || head_val.is_a?(DateTime) || head_val.is_a?(Date) || head_val.is_a?(Time)
 
-      case keyword.text_value
+      result = case keyword.text_value
       when "date and time"
         DateTime.parse(head_val)
       when "date"
@@ -731,6 +767,11 @@ module FEEL
           ActiveSupport::Duration.parse(head_val)
         end
       end
+
+      if defined?(property) && property.present?
+        result = access_property(result, property.name.eval(context))
+      end
+      result
     end
 
     def duration_range(start_date, end_date)

data/lib/feel/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FEEL
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: feel
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Connected Bits
 bindir: bin
 cert_chain: []
-date: 2026-02-06 00:00:00.000000000 Z
+date: 2026-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel