keisan 0.3.0 → 0.4.0

data/lib/keisan/functions/sample.rb

@@ -1,6 +1,6 @@
 module Keisan
   module Functions
-    class Sample < Keisan::Function
+    class Sample < ProcFunction
       def initialize
         @name = "sample"
       end

data/lib/keisan/parser.rb

@@ -17,6 +17,7 @@ module Keisan
       @components = []
 
       parse_components!
+      remove_unary_identity!
     end
 
     def ast
@@ -36,6 +37,12 @@ module Keisan
       end
     end
 
+    def remove_unary_identity!
+      @components = @components.select do |component|
+        !component.is_a?(Keisan::Parsing::Operator) || !(component.node_class <= Keisan::AST::UnaryIdentity)
+      end
+    end
+
     # Elements are groups of tokens separated by (non-unary) operators
     # The following are basic elements:
     # number
@@ -58,8 +65,10 @@ module Keisan
         end
 
       elsif @components[-1].is_a?(Parsing::UnaryOperator)
-        # Expect an element
+        # Expect an element or another unary operator
         case token.type
+        when :operator
+          add_unary_operator_to_components!(token)
         when :number, :string, :word, :group, :null, :boolean
           add_element_to_components!(token)
         else
@@ -154,6 +163,9 @@ module Keisan
 
     def add_operator_to_components!(token)
       case token.operator_type
+      # Assignment
+      when :"="
+        @components << Keisan::Parsing::Assignment.new
       # Arithmetic
       when :+
         @components << Keisan::Parsing::Plus.new

data/lib/keisan/parsing/assignment.rb

@@ -0,0 +1,9 @@
+module Keisan
+  module Parsing
+    class Assignment < Operator
+      def node_class
+        Keisan::AST::Assignment
+      end
+    end
+  end
+end

data/lib/keisan/parsing/operator.rb

@@ -1,10 +1,18 @@
 module Keisan
   module Parsing
     class Operator < Component
+      def arity
+        node_class.arity
+      end
+
       def priority
         node_class.priority
       end
 
+      def associativity
+        node_class.associativity
+      end
+
       def node_class
         raise Keisan::Exceptions::NotImplementedError.new
       end

data/lib/keisan/parsing/unary_operator.rb

@@ -1,6 +1,6 @@
 module Keisan
   module Parsing
-    class UnaryOperator < Component
+    class UnaryOperator < Operator
       def node_class
         raise Keisan::Exponent::NotImplementedError.new
       end

data/lib/keisan/tokenizer.rb

@@ -10,6 +10,7 @@ module Keisan
       Tokens::ArithmeticOperator,
       Tokens::LogicalOperator,
       Tokens::BitwiseOperator,
+      Tokens::Assignment,
       Tokens::Comma,
       Tokens::Dot
     ]

data/lib/keisan/tokens/assignment.rb

@@ -0,0 +1,15 @@
+module Keisan
+  module Tokens
+    class Assignment < Operator
+      REGEX = /(\=)/
+
+      def self.regex
+        REGEX
+      end
+
+      def operator_type
+        :"="
+      end
+    end
+  end
+end

data/lib/keisan/variables/default_registry.rb

@@ -7,13 +7,13 @@ module Keisan
       end
 
       VARIABLES = {
-        "pi" => Math::PI,
-        "e" => Math::E,
-        "i" => Complex(0,1)
+        "PI" => Math::PI,
+        "E" => Math::E,
+        "I" => Complex(0,1)
       }
 
       def self.registry
-        @registry ||= Registry.new(variables: VARIABLES, parent: nil).freeze
+        @registry ||= Registry.new(variables: VARIABLES, parent: nil, force: true).freeze
       end
     end
   end

data/lib/keisan/variables/registry.rb

@@ -1,19 +1,23 @@
 module Keisan
   module Variables
     class Registry
-      def initialize(variables: {}, parent: nil, use_defaults: true)
+      def initialize(variables: {}, parent: nil, use_defaults: true, force: false)
         @hash = {}
         @parent = parent
         @use_defaults = use_defaults
 
         variables.each do |name, value|
-          register!(name, value)
+          register!(name, value, force: force)
         end
       end
 
       def [](name)
         return @hash[name] if @hash.has_key?(name)
-        return @parent[name] if !@parent.nil? && @parent.has_name?(name)
+
+        if @parent && (parent_value = @parent[name])
+          return parent_value
+        end
+
         return default_registry[name] if @use_defaults && default_registry.has_name?(name)
         raise Keisan::Exceptions::UndefinedVariableError.new name
       end
@@ -24,16 +28,21 @@ module Keisan
         false
       end
 
+      def register!(name, value, force: false)
+        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
+      end
+
+      protected
+
       # For checking if locally defined
       def has_name?(name)
         @hash.has_key?(name)
       end
 
-      def register!(name, value)
-        raise Keisan::Exceptions::UnmodifiableError.new("Cannot modify frozen variables registry") if frozen?
-        self[name.to_s] = value
-      end
-
       private
 
       def []=(name, value)

data/lib/keisan/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: keisan
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Christopher Locke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-25 00:00:00.000000000 Z
+date: 2017-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -112,15 +112,20 @@ files:
 - bin/setup
 - keisan.gemspec
 - lib/keisan.rb
+- lib/keisan/ast.rb
 - lib/keisan/ast/arithmetic_operator.rb
+- lib/keisan/ast/assignment.rb
 - lib/keisan/ast/bitwise_and.rb
 - lib/keisan/ast/bitwise_operator.rb
 - lib/keisan/ast/bitwise_or.rb
 - lib/keisan/ast/bitwise_xor.rb
 - lib/keisan/ast/boolean.rb
 - lib/keisan/ast/builder.rb
+- 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
@@ -140,7 +145,6 @@ files:
 - lib/keisan/ast/operator.rb
 - lib/keisan/ast/parent.rb
 - lib/keisan/ast/plus.rb
-- lib/keisan/ast/priorities.rb
 - lib/keisan/ast/string.rb
 - lib/keisan/ast/times.rb
 - lib/keisan/ast/unary_bitwise_not.rb
@@ -156,13 +160,20 @@ files:
 - lib/keisan/evaluator.rb
 - lib/keisan/exceptions.rb
 - lib/keisan/function.rb
+- lib/keisan/function_definition_context.rb
 - lib/keisan/functions/default_registry.rb
+- lib/keisan/functions/diff.rb
+- lib/keisan/functions/expression_function.rb
+- lib/keisan/functions/if.rb
+- lib/keisan/functions/proc_function.rb
 - lib/keisan/functions/rand.rb
 - lib/keisan/functions/registry.rb
+- lib/keisan/functions/replace.rb
 - lib/keisan/functions/sample.rb
 - lib/keisan/parser.rb
 - lib/keisan/parsing/argument.rb
 - lib/keisan/parsing/arithmetic_operator.rb
+- lib/keisan/parsing/assignment.rb
 - lib/keisan/parsing/bitwise_and.rb
 - lib/keisan/parsing/bitwise_not.rb
 - lib/keisan/parsing/bitwise_not_not.rb
@@ -209,6 +220,7 @@ files:
 - lib/keisan/token.rb
 - lib/keisan/tokenizer.rb
 - lib/keisan/tokens/arithmetic_operator.rb
+- lib/keisan/tokens/assignment.rb
 - lib/keisan/tokens/bitwise_operator.rb
 - lib/keisan/tokens/boolean.rb
 - lib/keisan/tokens/comma.rb

data/lib/keisan/ast/priorities.rb

@@ -1,27 +0,0 @@
-module Keisan
-  module AST
-    class Priorities
-      PRIORITIES = {
-        "**": 100,
-        "*": 95,
-        "%": 90,
-        "+": 85,
-        "&": 80,
-        "|": 75,
-        "^": 70,
-        ">": 65,
-        ">=": 60,
-        "<": 55,
-        "<=": 50,
-        "==": 45,
-        "!=": 40,
-        "&&": 35,
-        "||": 30
-      }.freeze
-
-      def self.priorities
-        PRIORITIES
-      end
-    end
-  end
-end