keisan 0.8.7 → 0.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7bc1aae204b2b2e112ca0c8f2567023684ddbec83cd1c5c4c1a354cf27eb75b
-  data.tar.gz: 6353f1b48be09dbbef2cf30167b9fe2d0ac9400fb728def8c75a2241294196e6
+  metadata.gz: d539ead6f33b2151b228dfe6c30a0e3f7d40bb7b1113c90b851d020e04106df5
+  data.tar.gz: c36af3538e6f448c285b9857aa5ea14e3bc90853e5d3f4a74fd726d8b0c35068
 SHA512:
-  metadata.gz: 8fa93fed5b5fd0e55c0330e017e1628b3a3c4dc2b9fcdb2dbbf521b6e7149c9f2ee44544cb1f3cdbc84d09d171fb794f4d6a3a22997b5d8728607ea07542d3ee
-  data.tar.gz: 471b9f1378dab5e0dae5556ed693e00bd73c2e841f463486b5f7e013867dd1f05b52e675c381607b5f564d84ee0cfd1a4c69a49805f338d7823798bed7f94bff
+  metadata.gz: 67557029c43754d862406fc0491594b94dcc4dac5a925e518232accfd75c42582f8e5d11b5f99eec7f44dcb1ea29ea31f087668bf70a68c56fa25fc4ca8f2929
+  data.tar.gz: 2451bd2dbe844af1bc3a4f2ec9d0819aeb4df52f96bd45dbbc5ada1993b2c6003245c8f6191ce3f5dc59de18b106f313e07dedd3aef9ba670525d4bacabfb43a

data/lib/keisan/ast/block.rb

@@ -17,8 +17,8 @@ module Keisan
         child.unbound_functions(local)
       end
 
-      def contains_a?(klass)
-        super || child.contains_a?(klass)
+      def traverse(&block)
+        super(&block) || child.traverse(&block)
       end
 
       def deep_dup

data/lib/keisan/ast/cell.rb

@@ -15,8 +15,8 @@ module Keisan
         node.unbound_functions(context)
       end
 
-      def contains_a?(klass)
-        super || node.contains_a?(klass)
+      def traverse(&block)
+        super(&block) || node.traverse(&block)
       end
 
       def deep_dup

data/lib/keisan/ast/hash.rb

@@ -21,8 +21,16 @@ module Keisan
         end
       end
 
-      def contains_a?(klass)
-        super || @hash.any? {|k, v| k.to_node.contains_a?(klass) || v.contains_a?(klass) }
+      def traverse(&block)
+        value = super(&block)
+        return value if value
+        @hash.each do |k, v|
+          value = k.to_node.traverse(&block)
+          return value if value
+          value = v.traverse(&block)
+          return value if value
+        end
+        false
       end
 
       def evaluate(context = nil)

data/lib/keisan/ast/node.rb

@@ -37,12 +37,26 @@ module Keisan
         value(context)
       end
 
+      # Takes a block, and does a DFS down the AST, evaluating the received block
+      # at each node, passing in the node as the single argument. If the block
+      # returns a truthy value at any point, the DFS ends and the return value is
+      # percolated up the tree.
+      def traverse(&block)
+        block.call(self)
+      end
+
       def contains_a?(klass)
         case klass
         when Array
-          klass.any? {|k| is_a?(k) }
+          klass.any? do |k|
+            traverse do |node|
+              node.is_a?(k)
+            end
+          end
         else
-          is_a?(klass)
+          traverse do |node|
+            node.is_a?(klass)
+          end
         end
       end
 

data/lib/keisan/ast/parent.rb

@@ -25,8 +25,14 @@ module Keisan
         end
       end
 
-      def contains_a?(klass)
-        super || children.any? {|child| child.contains_a?(klass) }
+      def traverse(&block)
+        value = super(&block)
+        return value if value
+        children.each do |child|
+          value = child.traverse(&block)
+          return value if value
+        end
+        false
       end
 
       def freeze

data/lib/keisan/calculator.rb

@@ -4,11 +4,12 @@ module Keisan
 
     # Note, allow_recursive would be more appropriately named:
     # allow_unbound_functions_in_function_definitions, but it is too late for that.
-    def initialize(context: nil, allow_recursive: false, allow_blocks: true, allow_multiline: true)
+    def initialize(context: nil, allow_recursive: false, allow_blocks: true, allow_multiline: true, allow_random: true)
       @context = context || Context.new(
         allow_recursive: allow_recursive,
         allow_blocks: allow_blocks,
-        allow_multiline: allow_multiline
+        allow_multiline: allow_multiline,
+        allow_random: allow_random
       )
     end
 
@@ -28,6 +29,10 @@ module Keisan
       context.allow_multiline
     end
 
+    def allow_random
+      context.allow_random
+    end
+
     def evaluate(expression, definitions = {})
       Evaluator.new(self).evaluate(expression, definitions)
     end

data/lib/keisan/context.rb

@@ -4,13 +4,15 @@ module Keisan
       :variable_registry,
       :allow_recursive,
       :allow_multiline,
-      :allow_blocks
+      :allow_blocks,
+      :allow_random
 
     def initialize(parent: nil,
                    random: nil,
                    allow_recursive: false,
                    allow_multiline: true,
                    allow_blocks: true,
+                   allow_random: true,
                    shadowed: [])
       @parent = parent
       @function_registry = Functions::Registry.new(parent: @parent&.function_registry)
@@ -19,6 +21,7 @@ module Keisan
       @allow_recursive   = allow_recursive
       @allow_multiline   = allow_multiline
       @allow_blocks      = allow_blocks
+      @allow_random      = allow_random
     end
 
     def allow_recursive!
@@ -111,10 +114,12 @@ module Keisan
     end
 
     def random
+      raise Keisan::Exceptions::InvalidExpression.new("Context does not permit expressions with randomness") unless allow_random
       @random ||= @parent&.random || Random.new
     end
 
     def set_random(random)
+      raise Keisan::Exceptions::InvalidExpression.new("Context does not permit expressions with randomness") unless allow_random
       @random = random
     end
 

data/lib/keisan/version.rb

@@ -1,3 +1,3 @@
 module Keisan
-  VERSION = "0.8.7"
+  VERSION = "0.8.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: keisan
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.8.8
 platform: ruby
 authors:
 - Christopher Locke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-29 00:00:00.000000000 Z
+date: 2021-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cmath