keisan 0.8.6 → 0.8.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 496551eafa9e9774866f8322a750ec0e0b88c463c9cb0f9174cd3461003d95a5
-  data.tar.gz: 9d509cb07d53c12758bf3cbc1ddb45c4e75809432267cbf3215ab0ce9451404f
+  metadata.gz: 982db21218a4096daa15314fb7de88f1710e1a82be5b122c1b1c4a76323fb44a
+  data.tar.gz: 4df1eec9b4afd5da69db4a6d40d6900dc4bd9bd249dd1b67646766ba8468fd36
 SHA512:
-  metadata.gz: a0047d2ffeea473809ce46b8e7a0c5458012a5ee27182384d28f9ce5706eeaf0385a7c6aecf4619b637760ec235d8c55f8815c537665f03af58ed388180d5fe4
-  data.tar.gz: 29d2bf8124706bc44129abec0839bba5809678e71c50ac6b2b6d56e2584f4d7cf3f094005db1e8f6e2606334a637f6df90ab95f1a80ac8e6f9e844f67aaf032d
+  metadata.gz: bcc26f352e4f13139a9f0e2c0e1e97be8b3801ca6c2590349aad746fb1283776bf14d4f8ff4eb98049dfd624e7d1b71ce5be5770080f3187a4349c01a5fba4a6
+  data.tar.gz: 70e240222845d98e231ceb577939a37020b03ba1e3a5b9b88165a3c62ce4ffb6d5aa16cff0d4d2eed3078746b4595d3e104a2545b09f55f6d5b784dba1307bf1

data/.github/workflows/ruby.yml

@@ -0,0 +1,28 @@
+name: Ruby
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby-version: [2.3, 2.4, 2.5, 2.6, 2.7, 3.0]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby ${{ matrix.ruby-version }}
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true
+    - name: Install dependencies
+      run: bundle install
+    - name: Run tests
+      run: bundle exec rspec

data/README.md

@@ -83,6 +83,18 @@ calculator.evaluate("3*x + 1")
 #=> 61
 ```
 
+To perform multiple assignments, lists can be used
+
+```ruby
+calculator = Keisan::Calculator.new
+calculator.evaluate("x = [1, 2]")
+calculator.evaluate("[x[1], y] = [11, 22]")
+calculator.evaluate("x")
+#=> [1, 11]
+calculator.evaluate("y")
+#=> 22
+```
+
 
 ##### Specifying functions
 

data/lib/keisan/ast/assignment.rb

@@ -1,5 +1,6 @@
 require_relative "variable_assignment"
 require_relative "function_assignment"
+require_relative "list_assignment"
 require_relative "cell_assignment"
 
 module Keisan
@@ -31,6 +32,8 @@ module Keisan
           evaluate_variable_assignment(context, lhs, rhs)
         elsif is_function_definition?
           evaluate_function_assignment(context, lhs, rhs)
+        elsif is_list_assignment?
+          evaluate_list_assignment(context, lhs, rhs)
         else
           # Try cell assignment
           evaluate_cell_assignment(context, lhs, rhs)
@@ -71,6 +74,10 @@ module Keisan
         children.first.is_a?(Function)
       end
 
+      def is_list_assignment?
+        children.first.is_a?(List)
+      end
+
       private
 
       def evaluate_variable_assignment(context, lhs, rhs)
@@ -82,6 +89,10 @@ module Keisan
         FunctionAssignment.new(context, lhs, rhs, local).evaluate
       end
 
+      def evaluate_list_assignment(context, lhs, rhs)
+        ListAssignment.new(self, context, lhs, rhs).evaluate
+      end
+
       def evaluate_cell_assignment(context, lhs, rhs)
         CellAssignment.new(self, context, lhs, rhs).evaluate
       end

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/cell_assignment.rb

@@ -30,7 +30,11 @@ module Keisan
       private
 
       def lhs_evaluate_and_check_modifiable
-        lhs.evaluate(context)
+        res = lhs.evaluate(context)
+        if res.frozen?
+          raise Exceptions::UnmodifiableError.new("Cannot modify frozen variables")
+        end
+        res
       rescue RuntimeError => e
         raise Exceptions::UnmodifiableError.new("Cannot modify frozen variables") if e.message =~ /can't modify frozen/
         raise

data/lib/keisan/ast/hash.rb

@@ -21,11 +21,20 @@ 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)
+        return self if frozen?
         context ||= Context.new
 
         @hash = ::Hash[

data/lib/keisan/ast/list.rb

@@ -6,6 +6,7 @@ module Keisan
       end
 
       def evaluate(context = nil)
+        return self if frozen?
         context ||= Context.new
         @children = children.map {|child| child.is_a?(Cell) ? child : child.evaluate(context)}
         self

data/lib/keisan/ast/list_assignment.rb

@@ -0,0 +1,38 @@
+module Keisan
+  module AST
+    class ListAssignment
+      attr_reader :assignment, :context, :lhs, :rhs
+
+      def initialize(assignment, context, lhs, rhs)
+        @assignment = assignment
+        @context = context
+        @lhs = lhs
+        @rhs = rhs
+      end
+
+      def evaluate
+        rhs = @rhs.evaluate(context)
+
+        if !rhs.is_a?(List)
+          raise Exceptions::InvalidExpression.new("To do multiple assignment, RHS must be a list")
+        end
+        if lhs.children.size != rhs.children.size
+          raise Exceptions::InvalidExpression.new("To do multiple assignment, RHS list must have same length as LHS list")
+        end
+
+        i = 0
+        while i < lhs.children.size
+          lhs_variable = lhs.children[i]
+          rhs_assignment = rhs.children[i]
+          individual_assignment = Assignment.new(
+            children = [lhs_variable, rhs_assignment],
+            local: assignment.local,
+            compound_operator: assignment.compound_operator
+          )
+          individual_assignment.evaluate(context)
+          i += 1
+        end
+      end
+    end
+  end
+end

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/number.rb

@@ -5,6 +5,11 @@ module Keisan
 
       def initialize(number)
         @number = number
+        # Reduce the number if possible
+        case @number
+        when Rational
+          @number = @number.numerator if @number.denominator == 1
+        end
       end
 
       def value(context = nil)

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,7 +114,13 @@ module Keisan
     end
 
     def random
-      @random || @parent&.random || Random.new
+      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
 
     protected

data/lib/keisan/variables/registry.rb

@@ -1,3 +1,5 @@
+require "set"
+
 module Keisan
   module Variables
     class Registry
@@ -5,7 +7,7 @@ module Keisan
 
       def initialize(variables: {}, shadowed: [], parent: nil, use_defaults: true, force: false)
         @hash = {}
-        @shadowed = Set.new(shadowed.map(&:to_s))
+        @shadowed = ::Set.new(shadowed.map(&:to_s))
         @parent = parent
         @use_defaults = use_defaults
 

data/lib/keisan/version.rb

@@ -1,3 +1,3 @@
 module Keisan
-  VERSION = "0.8.6"
+  VERSION = "0.8.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: keisan
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.8.11
 platform: ruby
 authors:
 - Christopher Locke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-26 00:00:00.000000000 Z
+date: 2021-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cmath
@@ -115,9 +115,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Gemfile
 - MIT-LICENSE
 - README.md
@@ -151,6 +151,7 @@ files:
 - lib/keisan/ast/indexing.rb
 - lib/keisan/ast/line_builder.rb
 - lib/keisan/ast/list.rb
+- lib/keisan/ast/list_assignment.rb
 - lib/keisan/ast/literal.rb
 - lib/keisan/ast/logical_and.rb
 - lib/keisan/ast/logical_equal.rb
@@ -328,7 +329,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: An equation parser and evaluator

data/.travis.yml

@@ -1,9 +0,0 @@
-sudo: false
-language: ruby
-before_install:
-  - gem install bundler
-rvm:
-  - 2.4.9
-  - 2.5.7
-  - 2.6.5
-  - 2.7.0