keisan 0.8.12 → 0.8.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39ac1f6356b788327b43e6819d18b136da5bbada5f410b64c3f6995b2877973b
-  data.tar.gz: 60522376948b4806c0e45cb4f8e09e5187d37448fae0831630fea1f07608485c
+  metadata.gz: '05596336b8e5f1de3f7787b6a36120152f4e13c8caa822da225fe989f6af3c72'
+  data.tar.gz: 9a4d79fbc8ed709ec7d0f9b90d0e31f4f3e65c7e43b067800b66a0ea7c568ffb
 SHA512:
-  metadata.gz: 964905af3a5734456ea5e3f81ddb5183a7512e9cf81567c72586dbab813123160d4aaa085467f2626bd0e29df861f87e44425e216b8ccf174cb9f1251d578122
-  data.tar.gz: be653ccfd93f2fa6ce3a33e26be4e14db33e9ccea8d2273d491e8df0aaa16b400291b08e90d66cd48020efc691742bf49667b3547fcae57e8adeaab52bf18d5d
+  metadata.gz: d040a4d12325c74a8775d7a87a7d450fd0218de3e639b7ac43fe53bbb1310000cd53207e98727266f59535c5f7347d74392b941b66ad10359d97c515d5e02f75
+  data.tar.gz: 81ce4fe88b6d215a194bd8cf45388957689353c275cb8e60ec921a26eac8cb86d10c067ed34e09f6f303482f2b913005bc07c3448aed413d291b3beb66ecbf4f

data/lib/keisan/ast/cell.rb

@@ -66,7 +66,7 @@ module Keisan
       end
 
       def to_cell
-        self.class.new(node.to_cell)
+        self.class.new(node.to_node)
       end
 
       def to_s

data/lib/keisan/ast/logical_and.rb

@@ -26,7 +26,7 @@ module Keisan
 
       def short_circuit_do(method, context)
         context ||= Context.new
-        lhs = children[0].send(method, context)
+        lhs = children[0].send(method, context).to_node
         case lhs
         when AST::Boolean
           lhs.false? ? AST::Boolean.new(false) : children[1].send(method, context)

data/lib/keisan/ast/logical_or.rb

@@ -26,7 +26,7 @@ module Keisan
 
       def short_circuit_do(method, context)
         context ||= Context.new
-        lhs = children[0].send(method, context)
+        lhs = children[0].send(method, context).to_node
         case lhs
         when AST::Boolean
           lhs.true? ? AST::Boolean.new(true) : children[1].send(method, context)

data/lib/keisan/functions/filter.rb

@@ -29,7 +29,7 @@ module Keisan
         AST::List.new(
           list.children.select do |element|
             local.register_variable!(variable, element)
-            result = expression.evaluated(local)
+            result = expression.evaluated(local).to_node
 
             case result
             when AST::Boolean
@@ -54,7 +54,7 @@ module Keisan
           hash.select do |cur_key, cur_value|
             local.register_variable!(key, cur_key)
             local.register_variable!(value, cur_value)
-            result = expression.evaluated(local)
+            result = expression.evaluated(local).to_node
 
             case result
             when AST::Boolean

data/lib/keisan/functions/if.rb

@@ -13,12 +13,13 @@ module Keisan
       def evaluate(ast_function, context = nil)
         validate_arguments!(ast_function.children.count)
         context ||= Context.new
-
-        bool = ast_function.children[0].evaluate(context)
+        bool = ast_function.children[0].evaluate(context).to_node
 
         if bool.is_a?(AST::Boolean)
           node = bool.value ? ast_function.children[1] : ast_function.children[2]
           node.to_node.evaluate(context)
+        elsif bool.is_constant?
+          raise Keisan::Exceptions::InvalidFunctionError.new("if statement must work on booleans, other constants are not supported")
         else
           ast_function
         end
@@ -27,7 +28,7 @@ module Keisan
       def simplify(ast_function, context = nil)
         validate_arguments!(ast_function.children.count)
         context ||= Context.new
-        bool = ast_function.children[0].simplify(context)
+        bool = ast_function.children[0].simplify(context).to_node
 
         if bool.is_a?(AST::Boolean)
           if bool.value
@@ -37,6 +38,8 @@ module Keisan
           else
             Keisan::AST::Null.new
           end
+        elsif bool.is_constant?
+          raise Keisan::Exceptions::InvalidFunctionError.new("if statement must work on booleans, other constants are not supported")
         else
           ast_function
         end

data/lib/keisan/functions/while.rb

@@ -1,6 +1,9 @@
 module Keisan
   module Functions
     class While < Keisan::Function
+      class WhileLogicalNodeIsNotConstant < Keisan::Exceptions::StandardError; end
+      class WhileLogicalNodeIsNonBoolConstant < Keisan::Exceptions::StandardError; end
+
       def initialize
         super("while", 2)
       end
@@ -13,27 +16,43 @@ module Keisan
       def evaluate(ast_function, context = nil)
         validate_arguments!(ast_function.children.count)
         context ||= Keisan::Context.new
-        simplify(ast_function, context)
+        while_loop(ast_function, context, simplify: false)
       end
 
       def simplify(ast_function, context = nil)
         validate_arguments!(ast_function.children.count)
         context ||= Context.new
-        while_loop(ast_function.children[0], ast_function.children[1], context)
+        while_loop(ast_function, context, simplify: true)
       end
 
       private
 
-      def while_loop(logical_node, body_node, context)
+      def while_loop(ast_function, context, simplify: true)
+        logical_node, body_node = ast_function.children[0], ast_function.children[1]
         current = Keisan::AST::Null.new
 
-        while logical_node_evaluates_to_true(logical_node, context)
-          begin
-            current = body_node.evaluated(context)
-          rescue Exceptions::BreakError
-            break
-          rescue Exceptions::ContinueError
-            next
+        begin
+          while logical_node_evaluates_to_true(logical_node, context)
+            begin
+              current = body_node.evaluated(context)
+            rescue Exceptions::BreakError
+              break
+            rescue Exceptions::ContinueError
+              next
+            end
+          end
+
+        # While loops should work on booleans, not other types of constants
+        rescue WhileLogicalNodeIsNonBoolConstant
+          raise Keisan::Exceptions::InvalidFunctionError.new("while condition must evaluate to a boolean")
+
+        # If the logical expression is not constant (e.g. boolean), then we
+        # cannot simplify the while loop, and an evaluate should raise an error.
+        rescue WhileLogicalNodeIsNotConstant
+          if simplify
+            return ast_function
+          else
+            raise Keisan::Exceptions::InvalidFunctionError.new("while condition must evaluate to a boolean")
           end
         end
 
@@ -41,11 +60,15 @@ module Keisan
       end
 
       def logical_node_evaluates_to_true(logical_node, context)
-        bool = logical_node.evaluated(context)
-        unless bool.is_a?(AST::Boolean)
-          raise Keisan::Exceptions::InvalidFunctionError.new("while condition must evaluate to a boolean")
+        bool = logical_node.evaluated(context).to_node
+
+        if bool.is_a?(AST::Boolean)
+          bool.value(context)
+        elsif bool.is_constant?
+          raise WhileLogicalNodeIsNonBoolConstant.new
+        else
+          raise WhileLogicalNodeIsNotConstant.new
         end
-        bool.value(context)
       end
     end
   end

data/lib/keisan/version.rb

@@ -1,3 +1,3 @@
 module Keisan
-  VERSION = "0.8.12"
+  VERSION = "0.8.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: keisan
 version: !ruby/object:Gem::Version
-  version: 0.8.12
+  version: 0.8.13
 platform: ruby
 authors:
 - Christopher Locke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-20 00:00:00.000000000 Z
+date: 2021-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cmath