keisan 0.5.0 → 0.6.0

data/lib/keisan/ast/list.rb

@@ -1,14 +1,41 @@
 module Keisan
   module AST
     class List < Parent
+      def initialize(children = [])
+        super(children)
+        cellify!
+      end
+
+      def evaluate(context = nil)
+        context ||= Context.new
+        super(context)
+        cellify!
+        self
+      end
+
+      def simplify(context = nil)
+        context ||= Context.new
+        super(context)
+        cellify!
+        self
+      end
+
       def value(context = nil)
-        context ||= Keisan::Context.new
+        context ||= Context.new
         children.map {|child| child.value(context)}
       end
 
       def to_s
         "[#{children.map(&:to_s).join(',')}]"
       end
+
+      private
+
+      def cellify!
+        @children = @children.map do |child|
+          child.is_a?(Cell) ? child : Cell.new(child)
+        end
+      end
     end
   end
 end

data/lib/keisan/ast/literal.rb

@@ -1,14 +1,6 @@
 module Keisan
   module AST
     class Literal < Node
-      def ==(other)
-        case other
-        when Literal
-          value == other.value
-        else
-          false
-        end
-      end
     end
   end
 end

data/lib/keisan/ast/logical_and.rb

@@ -14,7 +14,7 @@ module Keisan
       end
 
       def value(context = nil)
-        context ||= Keisan::Context.new
+        context ||= Context.new
         children[0].value(context) && children[1].value(context)
       end
     end

data/lib/keisan/ast/logical_or.rb

@@ -14,7 +14,7 @@ module Keisan
       end
 
       def value(context = nil)
-        context ||= Keisan::Context.new
+        context ||= Context.new
         children[0].value(context) || children[1].value(context)
       end
     end

data/lib/keisan/ast/multi_line.rb

@@ -0,0 +1,28 @@
+module Keisan
+  module AST
+    class MultiLine < Parent
+      def value(context = nil)
+        context ||= Context.new
+        evaluate(context).value(context)
+      end
+
+      def evaluate_assignments(context = nil)
+        self
+      end
+
+      def evaluate(context = nil)
+        context ||= Context.new
+        @children = children.map {|child| child.evaluate(context)}
+        @children.last
+      end
+
+      def simplify(context = nil)
+        evaluate(context)
+      end
+
+      def to_s
+        children.map(&:to_s).join(";")
+      end
+    end
+  end
+end

data/lib/keisan/ast/node.rb

@@ -2,7 +2,7 @@ module Keisan
   module AST
     class Node
       def value(context = nil)
-        raise Keisan::Exceptions::NotImplementedError.new
+        raise Exceptions::NotImplementedError.new
       end
 
       def unbound_variables(context = nil)
@@ -29,12 +29,20 @@ module Keisan
         self
       end
 
+      def evaluated(context = nil)
+        deep_dup.evaluate(context)
+      end
+
       def evaluate(context = nil)
+        value(context)
+      end
+
+      def evaluate_assignments(context = nil)
         self
       end
 
       def differentiate(variable, context = nil)
-        raise Keisan::Exceptions::NonDifferentiableError.new
+        raise Exceptions::NonDifferentiableError.new
       end
 
       def replace(variable, replacement)
@@ -50,41 +58,41 @@ module Keisan
       end
 
       def +(other)
-        AST::Plus.new(
+        Plus.new(
           [self, other.to_node]
         )
       end
 
       def -(other)
-        AST::Plus.new(
-          [self, AST::UnaryMinus.new(other.to_node)]
+        Plus.new(
+          [self, UnaryMinus.new(other.to_node)]
         )
       end
 
       def *(other)
-        AST::Times.new(
+        Times.new(
           [self, other.to_node]
         )
       end
 
       def /(other)
-        AST::Times.new(
-          [self, AST::UnaryInverse.new(other.to_node)]
+        Times.new(
+          [self, UnaryInverse.new(other.to_node)]
         )
       end
 
       def %(other)
-        AST::Modulo.new(
+        Modulo.new(
           [self, other.to_node]
         )
       end
 
       def !
-        AST::UnaryLogicalNot.new(self)
+        UnaryLogicalNot.new(self)
       end
 
       def ~
-        AST::UnaryBitwiseNot.new(self)
+        UnaryBitwiseNot.new(self)
       end
 
       def +@
@@ -92,55 +100,55 @@ module Keisan
       end
 
       def -@
-        AST::UnaryMinus.new(self)
+        UnaryMinus.new(self)
       end
 
       def **(other)
-        AST::Exponent.new([self, other.to_node])
+        Exponent.new([self, other.to_node])
       end
 
       def &(other)
-        AST::BitwiseAnd.new([self, other.to_node])
+        BitwiseAnd.new([self, other.to_node])
       end
 
       def ^(other)
-        AST::BitwiseXor.new([self, other.to_node])
+        BitwiseXor.new([self, other.to_node])
       end
 
       def |(other)
-        AST::BitwiseOr.new([self, other.to_node])
+        BitwiseOr.new([self, other.to_node])
       end
 
       def >(other)
-        AST::LogicalGreaterThan.new([self, other.to_node])
+        LogicalGreaterThan.new([self, other.to_node])
       end
 
       def >=(other)
-        AST::LogicalGreaterThanOrEqualTo.new([self, other.to_node])
+        LogicalGreaterThanOrEqualTo.new([self, other.to_node])
       end
 
       def <(other)
-        AST::LogicalLessThan.new([self, other.to_node])
+        LogicalLessThan.new([self, other.to_node])
       end
 
       def <=(other)
-        AST::LogicalLessThanOrEqualTo.new([self, other.to_node])
+        LogicalLessThanOrEqualTo.new([self, other.to_node])
       end
 
       def equal(other)
-        AST::LogicalEqual.new([self, other.to_node])
+        LogicalEqual.new([self, other.to_node])
       end
 
       def not_equal(other)
-        AST::LogicalNotEqual.new([self, other.to_node])
+        LogicalNotEqual.new([self, other.to_node])
       end
 
       def and(other)
-        AST::LogicalAnd.new([self, other.to_node])
+        LogicalAnd.new([self, other.to_node])
       end
 
       def or(other)
-        AST::LogicalOr.new([self, other.to_node])
+        LogicalOr.new([self, other.to_node])
       end
     end
   end

data/lib/keisan/ast/number.rb

@@ -12,18 +12,18 @@ module Keisan
       end
 
       def -@
-        AST::Number.new(-value)
+        Number.new(-value)
       end
 
       def +@
-        AST::Number.new(value)
+        Number.new(value)
       end
 
       def +(other)
         other = other.to_node
         case other
-        when AST::Number
-          AST::Number.new(value + other.value)
+        when Number
+          Number.new(value + other.value)
         else
           super
         end
@@ -36,8 +36,8 @@ module Keisan
       def *(other)
         other = other.to_node
         case other
-        when AST::Number
-          AST::Number.new(value * other.value)
+        when Number
+          Number.new(value * other.value)
         else
           super
         end
@@ -46,8 +46,8 @@ module Keisan
       def /(other)
         other = other.to_node
         case other
-        when AST::Number
-          AST::Number.new(Rational(value, other.value))
+        when Number
+          Number.new(Rational(value, other.value))
         else
           super
         end
@@ -56,8 +56,8 @@ module Keisan
       def **(other)
         other = other.to_node
         case other
-        when AST::Number
-          AST::Number.new(value ** other.value)
+        when Number
+          Number.new(value ** other.value)
         else
           super
         end
@@ -66,8 +66,8 @@ module Keisan
       def %(other)
         other = other.to_node
         case other
-        when AST::Number
-          AST::Number.new(value % other.value)
+        when Number
+          Number.new(value % other.value)
         else
           super
         end
@@ -76,22 +76,22 @@ module Keisan
       def &(other)
         other = other.to_node
         case other
-        when AST::Number
-          AST::Number.new(value & other.value)
+        when Number
+          Number.new(value & other.value)
         else
           super
         end
       end
 
       def ~
-        AST::Number.new(~value)
+        Number.new(~value)
       end
 
       def ^(other)
         other = other.to_node
         case other
-        when AST::Number
-          AST::Number.new(value ^ other.value)
+        when Number
+          Number.new(value ^ other.value)
         else
           super
         end
@@ -100,8 +100,8 @@ module Keisan
       def |(other)
         other = other.to_node
         case other
-        when AST::Number
-          AST::Number.new(value | other.value)
+        when Number
+          Number.new(value | other.value)
         else
           super
         end
@@ -110,8 +110,8 @@ module Keisan
       def >(other)
         other = other.to_node
         case other
-        when AST::Number
-          AST::Boolean.new(value > other.value)
+        when Number
+          Boolean.new(value > other.value)
         else
           super
         end
@@ -120,8 +120,8 @@ module Keisan
       def >=(other)
         other = other.to_node
         case other
-        when AST::Number
-          AST::Boolean.new(value >= other.value)
+        when Number
+          Boolean.new(value >= other.value)
         else
           super
         end
@@ -130,8 +130,8 @@ module Keisan
       def <(other)
         other = other.to_node
         case other
-        when AST::Number
-          AST::Boolean.new(value < other.value)
+        when Number
+          Boolean.new(value < other.value)
         else
           super
         end
@@ -140,8 +140,8 @@ module Keisan
       def <=(other)
         other = other.to_node
         case other
-        when AST::Number
-          AST::Boolean.new(value <= other.value)
+        when Number
+          Boolean.new(value <= other.value)
         else
           super
         end
@@ -150,8 +150,8 @@ module Keisan
       def equal(other)
         other = other.to_node
         case other
-        when AST::Number
-          AST::Boolean.new(value == other.value)
+        when Number
+          Boolean.new(value == other.value)
         else
           super
         end
@@ -160,8 +160,8 @@ module Keisan
       def not_equal(other)
         other = other.to_node
         case other
-        when AST::Number
-          AST::Boolean.new(value != other.value)
+        when Number
+          Boolean.new(value != other.value)
         else
           super
         end

data/lib/keisan/ast/operator.rb

@@ -38,7 +38,7 @@ module Keisan
 
       def initialize(children = [], parsing_operators = [])
         unless parsing_operators.empty? || children.count == parsing_operators.count + 1
-          raise Keisan::Exceptions::ASTError.new("Mismatch of children and operators")
+          raise Exceptions::ASTError.new("Mismatch of children and operators")
         end
 
         children = Array.wrap(children)
@@ -47,6 +47,14 @@ module Keisan
         @parsing_operators = parsing_operators
       end
 
+      def evaluate_assignments(context = nil)
+        context ||= Context.new
+        @children = children.map do |child|
+          child.evaluate_assignments(context)
+        end
+        self
+      end
+
       def self.associativity_of_priority(priority)
         ASSOCIATIVITY_OF_PRIORITY[priority]
       end
@@ -80,11 +88,11 @@ module Keisan
       end
 
       def self.symbol
-        raise Keisan::Exceptions::NotImplementedError.new
+        raise Exceptions::NotImplementedError.new
       end
 
       def blank_value
-        raise Keisan::Exceptions::NotImplementedError.new
+        raise Exceptions::NotImplementedError.new
       end
 
       def value(context = nil)
@@ -103,7 +111,7 @@ module Keisan
       def to_s
         children.map do |child|
           case child
-          when AST::Operator
+          when Operator
             "(#{child.to_s})"
           else
             "#{child.to_s}"