keisan 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11f1a2644fbb02817db69dd289564d6fdb9bfd09d294cda62b07156723aebc0e
-  data.tar.gz: 4b9787c0d558af15d466759e40fe4cfac35131d254d227416144588256e5ea9f
+  metadata.gz: e9daac57399adbc7f0028c078c8ec1a74e6a5b7222f2473a871d2ca7ae46c1e4
+  data.tar.gz: 2ffd26dec791b8a88e1edce5aeaf331622ccbb2403b5f17185d3aad36065c173
 SHA512:
-  metadata.gz: 8149fee69d598164334b96f8be59b9763168af97e3803c9abea7285da5ed1d90bb9f87710a3de94498461baec65db335168f8e721fe73c4a837c684a30bc4114
-  data.tar.gz: 8a4e301fb14461b164bf0331684fe7ebe3cd660d4abd38f3c44aba5f50fbed58b6b945082accdf13f9da55bcb76579890fd63db75e8b17e5c098c52d0e2d80ae
+  metadata.gz: 90b892b2b7602af3406bdbd84b18d211e790afcf185268f3d84800d8fe390d099870053e39f39d2c46e82da0ba7b185597c1d462af359a1fdb7a0f3aad07c80a
+  data.tar.gz: 29175b77265433e8e619a098e7e862472c7575bc2de91b38ed8e853355e3a133da5a33f6e43a321295cbff0a900e41502885c1fc4dbe649431fadc1baa767469

data/lib/keisan/ast/assignment.rb

@@ -49,11 +49,13 @@ module Keisan
       end
 
       def unbound_variables(context = nil)
-        variables = super(context)
+        context ||= Context.new
+
         if is_variable_definition?
-          variables.delete(children.first.name)
+          variable_assignment_unbound_variables(context)
         else
-          variables
+          # TODO: Should update to handle function / list assignment.
+          super(context)
         end
       end
 
@@ -70,6 +72,10 @@ module Keisan
         children.first.is_a?(Variable)
       end
 
+      def variable_name
+        children.first.name
+      end
+
       def is_function_definition?
         children.first.is_a?(Function)
       end
@@ -78,6 +84,10 @@ module Keisan
         children.first.is_a?(List)
       end
 
+      def rhs_unbound_variables(context = nil)
+        children.last.unbound_variables(context)
+      end
+
       private
 
       def evaluate_variable_assignment(context, lhs, rhs)
@@ -96,6 +106,16 @@ module Keisan
       def evaluate_cell_assignment(context, lhs, rhs)
         CellAssignment.new(self, context, lhs, rhs).evaluate
       end
+
+      def variable_assignment_unbound_variables(context)
+        rhs = rhs_unbound_variables(context)
+        # If the right-side is fully defined, then this is a valid assignment.
+        if rhs.empty?
+          Set.new
+        else
+          rhs | Set.new([variable_name])
+        end
+      end
     end
   end
 end

data/lib/keisan/ast/multi_line.rb

@@ -20,9 +20,49 @@ module Keisan
         evaluate(context)
       end
 
+      def unbound_variables(context = nil)
+        context ||= Context.new
+        defined_variables = Set.new
+
+        children.inject(Set.new) do |unbound_vars, child|
+          if child.is_a?(Assignment) && child.is_variable_definition?
+            line_unbound_vars = unbound_variables_for_line_variable_assignment(context, child, unbound_vars, defined_variables)
+            if line_unbound_vars.empty?
+              defined_variables.add(child.variable_name)
+            end
+            unbound_vars | line_unbound_vars
+          else
+            unbound_vars | (child.unbound_variables(context) - defined_variables)
+          end
+        end
+      end
+
       def to_s
         children.map(&:to_s).join(";")
       end
+
+      private
+
+      def unbound_variables_for_line_variable_assignment(context, line, unbound_vars, defined_variables)
+        child_unbound_variables = variable_assignment_unbound_variables(context, line, defined_variables)
+        if child_unbound_variables.empty?
+          defined_variables.add(line.variable_name)
+          unbound_vars
+        else
+          unbound_vars | child_unbound_variables
+        end
+      end
+
+      def variable_assignment_unbound_variables(context, assignment, defined_variables)
+        rhs_child_unbound_variables = assignment.rhs_unbound_variables(context) - defined_variables
+
+        # If there are no unbound variables, this is a properly bound assignment.
+        if rhs_child_unbound_variables.empty?
+          Set.new
+        else
+          Set.new([assignment.variable_name]) | rhs_child_unbound_variables
+        end
+      end
     end
   end
 end

data/lib/keisan/version.rb

@@ -1,3 +1,3 @@
 module Keisan
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: keisan
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Christopher Locke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-01 00:00:00.000000000 Z
+date: 2024-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cmath