keisan 0.4.0 → 0.5.0

data/lib/keisan/tokenizer.rb

@@ -22,12 +22,15 @@ module Keisan
     attr_reader :expression, :tokens
 
     def initialize(expression)
-      @expression = self.class.strip_whitespace(expression)
+      @expression = self.class.strip_whitespace_and_comments(expression)
       @scan = @expression.scan(TOKEN_REGEX)
       @tokens = tokenize!
     end
 
-    def self.strip_whitespace(expression)
+    def self.strip_whitespace_and_comments(expression)
+      # Remove comments
+      expression = expression.split("#").first || ""
+
       # Do not allow whitespace between variables, numbers, and the like; they must be joined by operators
       raise Keisan::Exceptions::TokenizingError.new if expression.gsub(Tokens::String.regex, "").match /\w\s+\w/
 

data/lib/keisan/tokens/string.rb

@@ -1,7 +1,7 @@
 module Keisan
   module Tokens
     class String < Token
-      REGEX = /(\"[^\"\']*\"|\'[^\"\']*\')/
+      REGEX = /(\"[^\"]*\"|\'[^\']*\')/
 
       def self.regex
         REGEX

data/lib/keisan/variables/registry.rb

@@ -1,8 +1,11 @@
 module Keisan
   module Variables
     class Registry
-      def initialize(variables: {}, parent: nil, use_defaults: true, force: false)
+      attr_reader :shadowed
+
+      def initialize(variables: {}, shadowed: [], parent: nil, use_defaults: true, force: false)
         @hash = {}
+        @shadowed = Set.new(shadowed.map(&:to_s))
         @parent = parent
         @use_defaults = use_defaults
 
@@ -13,6 +16,7 @@ module Keisan
 
       def [](name)
         return @hash[name] if @hash.has_key?(name)
+        raise Keisan::Exceptions::UndefinedVariableError.new if @shadowed.include?(name)
 
         if @parent && (parent_value = @parent[name])
           return parent_value
@@ -22,18 +26,25 @@ module Keisan
         raise Keisan::Exceptions::UndefinedVariableError.new name
       end
 
+      def locals
+        @hash
+      end
+
       def has?(name)
-        !!self[name]
+        !self[name].nil?
       rescue Keisan::Exceptions::UndefinedVariableError
         false
       end
 
       def register!(name, value, force: false)
+        name = name.to_s
+        name = name.name if name.is_a?(Keisan::AST::Variable)
+
         raise Keisan::Exceptions::UnmodifiableError.new("Cannot modify frozen variables registry") if frozen?
         if !force && @use_defaults && default_registry.has_name?(name)
           raise Keisan::Exceptions::UnmodifiableError.new("Cannot overwrite default variable")
         end
-        self[name.to_s] = value
+        self[name.to_s] = value.to_node
       end
 
       protected

data/lib/keisan/version.rb

@@ -1,3 +1,3 @@
 module Keisan
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: keisan
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Christopher Locke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-04 00:00:00.000000000 Z
+date: 2017-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -109,6 +109,7 @@ files:
 - README.md
 - Rakefile
 - bin/console
+- bin/keisan
 - bin/setup
 - keisan.gemspec
 - lib/keisan.rb
@@ -124,8 +125,6 @@ files:
 - lib/keisan/ast/constant_literal.rb
 - lib/keisan/ast/exponent.rb
 - lib/keisan/ast/function.rb
-- lib/keisan/ast/functions/diff.rb
-- lib/keisan/ast/functions/if.rb
 - lib/keisan/ast/indexing.rb
 - lib/keisan/ast/list.rb
 - lib/keisan/ast/literal.rb
@@ -160,16 +159,39 @@ files:
 - lib/keisan/evaluator.rb
 - lib/keisan/exceptions.rb
 - lib/keisan/function.rb
-- lib/keisan/function_definition_context.rb
+- lib/keisan/functions/abs.rb
+- lib/keisan/functions/cbrt.rb
+- lib/keisan/functions/cmath_function.rb
+- lib/keisan/functions/cos.rb
+- lib/keisan/functions/cosh.rb
+- lib/keisan/functions/cot.rb
+- lib/keisan/functions/coth.rb
+- lib/keisan/functions/csc.rb
+- lib/keisan/functions/csch.rb
 - lib/keisan/functions/default_registry.rb
 - lib/keisan/functions/diff.rb
+- lib/keisan/functions/exp.rb
 - lib/keisan/functions/expression_function.rb
+- lib/keisan/functions/filter.rb
 - lib/keisan/functions/if.rb
+- lib/keisan/functions/imag.rb
+- lib/keisan/functions/log.rb
+- lib/keisan/functions/map.rb
+- lib/keisan/functions/math_function.rb
 - lib/keisan/functions/proc_function.rb
 - lib/keisan/functions/rand.rb
+- lib/keisan/functions/real.rb
+- lib/keisan/functions/reduce.rb
 - lib/keisan/functions/registry.rb
 - lib/keisan/functions/replace.rb
 - lib/keisan/functions/sample.rb
+- lib/keisan/functions/sec.rb
+- lib/keisan/functions/sech.rb
+- lib/keisan/functions/sin.rb
+- lib/keisan/functions/sinh.rb
+- lib/keisan/functions/sqrt.rb
+- lib/keisan/functions/tan.rb
+- lib/keisan/functions/tanh.rb
 - lib/keisan/parser.rb
 - lib/keisan/parsing/argument.rb
 - lib/keisan/parsing/arithmetic_operator.rb
@@ -217,6 +239,7 @@ files:
 - lib/keisan/parsing/unary_operator.rb
 - lib/keisan/parsing/unary_plus.rb
 - lib/keisan/parsing/variable.rb
+- lib/keisan/repl.rb
 - lib/keisan/token.rb
 - lib/keisan/tokenizer.rb
 - lib/keisan/tokens/arithmetic_operator.rb
@@ -235,6 +258,7 @@ files:
 - lib/keisan/variables/default_registry.rb
 - lib/keisan/variables/registry.rb
 - lib/keisan/version.rb
+- screenshots/repl.png
 homepage: https://github.com/project-eutopia/keisan
 licenses:
 - MIT
@@ -255,7 +279,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: An equation parser and evaluator

data/lib/keisan/ast/functions/diff.rb

@@ -1,57 +0,0 @@
-module Keisan
-  module AST
-    module Functions
-      class Diff < AST::Function
-        def initialize(arguments, name = "diff")
-          super(arguments, name)
-        end
-
-        def value(context = nil)
-          raise Keisan::Exceptions::InvalidFunctionError.new("Derivative not defined")
-        end
-
-        def unbound_functions(context = nil)
-          context ||= Keisan::Context.new
-
-          children.inject(Set.new) do |res, child|
-            res | child.unbound_functions(context)
-          end
-        end
-
-        def simplify(context = nil)
-          unless children.size > 0
-            raise Keisan::Exceptions::InvalidFunctionError.new("Diff requires at least one argument")
-          end
-
-          vars = children[1..-1]
-
-          unless vars.all? {|var| var.is_a?(AST::Variable)}
-            raise Keisan::Exceptions::InvalidFunctionError.new("Diff must differentiate with respect to variables")
-          end
-
-          result = children.first.simplify(context)
-
-          while vars.size > 0
-            begin
-              var = vars.first
-              if result.unbound_variables(context).include?(var.name)
-                result = result.differentiate(var, context)
-              else
-                return AST::Number.new(0)
-              end
-            rescue Keisan::Exceptions::NonDifferentiableError => e
-              return AST::Functions::Diff.new(
-                [result] + vars,
-                "diff"
-              )
-            end
-
-            vars.shift
-          end
-
-          result
-        end
-      end
-    end
-  end
-end

data/lib/keisan/ast/functions/if.rb

@@ -1,47 +0,0 @@
-module Keisan
-  module AST
-    module Functions
-      class If < AST::Function
-        def value(context = nil)
-          unless (2..3).cover? children.size
-            raise Keisan::Exceptions::InvalidFunctionError.new("Require 2 or 3 arguments to if")
-          end
-
-          context ||= Context.new
-
-          bool = children[0].value(context)
-
-          if bool
-            children[1].value(context)
-          else
-            children.size == 3 ? children[2].value(context) : nil
-          end
-        end
-
-        def simplify(context = nil)
-          context ||= Context.new
-          @children = children.map {|child| child.simplify(context)}
-
-          if children[0].is_a?(AST::Boolean)
-            if children[0].value
-              children[1]
-            else
-              # If no third argument, then children[2] gives nil, and to_node makes this AST::Null
-              children[2].to_node
-            end
-          else
-            self
-          end
-        end
-
-        def unbound_functions(context = nil)
-          context ||= Context.new
-
-          children.inject(Set.new) do |res, child|
-            res | child.unbound_functions(context)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/keisan/function_definition_context.rb

@@ -1,34 +0,0 @@
-module Keisan
-  class FunctionDefinitionContext < Context
-    def initialize(parent:, arguments:)
-      super(parent: parent)
-      @arguments = Set.new(arguments)
-      @arguments_context = Context.new
-      set_transient!
-    end
-
-    def variable(name)
-      if @arguments.member?(name)
-        @arguments_context.variable(name)
-      else
-        super
-      end
-    end
-
-    def has_variable?(name)
-      if @arguments.member?(name)
-        @arguments_context.has_variable?(name)
-      else
-        super
-      end
-    end
-
-    def register_variable!(name, value)
-      if @arguments.member?(name)
-        @arguments_context.register_variable!(name, value)
-      else
-        super
-      end
-    end
-  end
-end