lib/hotcell/node/expression.rb in hotcell-0.2.0 vs lib/hotcell/node/expression.rb in hotcell-0.3.0

@@ -1,26 +1,28 @@
 module Hotcell
   class Expression < Hotcell::Node
     HANDLERS = {
-      :PLUS => ->(value1, value2) { value1 + value2 },
-      :MINUS => ->(value1, value2) { value1 - value2 },
-      :UMINUS => ->(value) { -value },
-      :UPLUS => ->(value) { value },
-      :MULTIPLY => ->(value1, value2) { value1 * value2 },
-      :POWER => ->(value1, value2) { value1 ** value2 },
-      :DIVIDE => ->(value1, value2) { value1 / value2 },
-      :MODULO => ->(value1, value2) { value1 % value2 },
-      :AND => ->(value1, value2) { value1 && value2 },
-      :OR => ->(value1, value2) { value1 || value2 },
-      :NOT => ->(value) { !value },
-      :EQUAL => ->(value1, value2) { value1 == value2 },
-      :INEQUAL => ->(value1, value2) { value1 != value2 },
-      :GT => ->(value1, value2) { value1 > value2 },
-      :GTE => ->(value1, value2) { value1 >= value2 },
-      :LT => ->(value1, value2) { value1 < value2 },
-      :LTE => ->(value1, value2) { value1 <= value2 },
-      :RANGE => ->(value1, value2) { Range.new value1, value2 },
-      :ERANGE => ->(value1, value2) { Range.new value1, value2, true }
+      PLUS: ->(value1, value2) { value1 + value2 },
+      MINUS: ->(value1, value2) { value1 - value2 },
+      UMINUS: ->(value) { -value },
+      UPLUS: ->(value) { value },
+      MULTIPLY: ->(value1, value2) { value1 * value2 },
+      POWER: ->(value1, value2) { value1 ** value2 },
+      DIVIDE: ->(value1, value2) { value1 / value2 },
+      MODULO: ->(value1, value2) { value1 % value2 },
+      AND: ->(value1, value2) { value1 && value2 },
+      OR: ->(value1, value2) { value1 || value2 },
+      NOT: ->(value) { !value },
+      EQUAL: ->(value1, value2) { value1 == value2 },
+      INEQUAL: ->(value1, value2) { value1 != value2 },
+      GT: ->(value1, value2) { value1 > value2 },
+      GTE: ->(value1, value2) { value1 >= value2 },
+      LT: ->(value1, value2) { value1 < value2 },
+      LTE: ->(value1, value2) { value1 <= value2 },
+      TERNARY: ->(value1, value2, value3) { value1 ? value2 : value3 },
+      RANGE: ->(value1, value2) { Range.new value1, value2 },
+      ERANGE: ->(value1, value2) { Range.new value1, value2, true },
+      DSTRING: ->(*values) { values.map(&:to_s).join }
     }
 
     def optimize
       handler = HANDLERS[name]
       reducible = handler && children.none? { |child| child.is_a? Hotcell::Node }