keisan 0.5.0 → 0.6.0

data/lib/keisan/parsing/assignment.rb

@@ -2,7 +2,7 @@ module Keisan
   module Parsing
     class Assignment < Operator
       def node_class
-        Keisan::AST::Assignment
+        AST::Assignment
       end
     end
   end

data/lib/keisan/parsing/bitwise_and.rb

@@ -2,7 +2,7 @@ module Keisan
   module Parsing
     class BitwiseAnd < BitwiseOperator
       def node_class
-        Keisan::AST::BitwiseAnd
+        AST::BitwiseAnd
       end
     end
   end

data/lib/keisan/parsing/bitwise_not.rb

@@ -2,7 +2,7 @@ module Keisan
   module Parsing
     class BitwiseNot < UnaryOperator
       def node_class
-        Keisan::AST::UnaryBitwiseNot
+        AST::UnaryBitwiseNot
       end
     end
   end

data/lib/keisan/parsing/bitwise_not_not.rb

@@ -2,7 +2,7 @@ module Keisan
   module Parsing
     class BitwiseNotNot < UnaryOperator
       def node_class
-        Keisan::AST::UnaryIdentity
+        AST::UnaryIdentity
       end
     end
   end

data/lib/keisan/parsing/bitwise_or.rb

@@ -2,7 +2,7 @@ module Keisan
   module Parsing
     class BitwiseOr < BitwiseOperator
       def node_class
-        Keisan::AST::BitwiseOr
+        AST::BitwiseOr
       end
     end
   end

data/lib/keisan/parsing/bitwise_xor.rb

@@ -2,7 +2,7 @@ module Keisan
   module Parsing
     class BitwiseXor < BitwiseOperator
       def node_class
-        Keisan::AST::BitwiseXor
+        AST::BitwiseXor
       end
     end
   end

data/lib/keisan/parsing/curly_group.rb

@@ -0,0 +1,6 @@
+module Keisan
+  module Parsing
+    class CurlyGroup < Group
+    end
+  end
+end

data/lib/keisan/parsing/divide.rb

@@ -2,7 +2,7 @@ module Keisan
   module Parsing
     class Divide < ArithmeticOperator
       def node_class
-        Keisan::AST::Times
+        AST::Times
       end
     end
   end

data/lib/keisan/parsing/exponent.rb

@@ -2,7 +2,7 @@ module Keisan
   module Parsing
     class Exponent < ArithmeticOperator
       def node_class
-        Keisan::AST::Exponent
+        AST::Exponent
       end
     end
   end

data/lib/keisan/parsing/function.rb

@@ -5,7 +5,7 @@ module Keisan
 
       def initialize(name, arguments)
         @name = name
-        @arguments = arguments
+        @arguments = Array.wrap(arguments)
       end
     end
   end

data/lib/keisan/parsing/group.rb

@@ -4,7 +4,7 @@ module Keisan
       attr_reader :components
 
       def initialize(sub_tokens)
-        @components = Keisan::Parser.new(tokens: sub_tokens).components
+        @components = Parser.new(tokens: sub_tokens).components
       end
     end
   end

data/lib/keisan/parsing/indexing.rb

@@ -7,7 +7,7 @@ module Keisan
       end
 
       def node_class
-        Keisan::AST::Indexing
+        AST::Indexing
       end
     end
   end

data/lib/keisan/parsing/line_separator.rb

@@ -0,0 +1,6 @@
+module Keisan
+  module Parsing
+    class LineSeparator < Component
+    end
+  end
+end

data/lib/keisan/parsing/logical_and.rb

@@ -2,7 +2,7 @@ module Keisan
   module Parsing
     class LogicalAnd < LogicalOperator
       def node_class
-        Keisan::AST::LogicalAnd
+        AST::LogicalAnd
       end
     end
   end

data/lib/keisan/parsing/logical_equal.rb

@@ -2,7 +2,7 @@ module Keisan
   module Parsing
     class LogicalEqual < LogicalOperator
       def node_class
-        Keisan::AST::LogicalEqual
+        AST::LogicalEqual
       end
     end
   end

data/lib/keisan/parsing/logical_greater_than.rb

@@ -2,7 +2,7 @@ module Keisan
   module Parsing
     class LogicalGreaterThan < LogicalOperator
       def node_class
-        Keisan::AST::LogicalGreaterThan
+        AST::LogicalGreaterThan
       end
     end
   end

data/lib/keisan/parsing/logical_greater_than_or_equal_to.rb

@@ -2,7 +2,7 @@ module Keisan
   module Parsing
     class LogicalGreaterThanOrEqualTo < LogicalOperator
       def node_class
-        Keisan::AST::LogicalGreaterThanOrEqualTo
+        AST::LogicalGreaterThanOrEqualTo
       end
     end
   end

data/lib/keisan/parsing/logical_less_than.rb

@@ -2,7 +2,7 @@ module Keisan
   module Parsing
     class LogicalLessThan < LogicalOperator
       def node_class
-        Keisan::AST::LogicalLessThan
+        AST::LogicalLessThan
       end
     end
   end

data/lib/keisan/parsing/logical_less_than_or_equal_to.rb

@@ -2,7 +2,7 @@ module Keisan
   module Parsing
     class LogicalLessThanOrEqualTo < LogicalOperator
       def node_class
-        Keisan::AST::LogicalLessThanOrEqualTo
+        AST::LogicalLessThanOrEqualTo
       end
     end
   end

data/lib/keisan/parsing/logical_not.rb

@@ -2,7 +2,7 @@ module Keisan
   module Parsing
     class LogicalNot < UnaryOperator
       def node_class
-        Keisan::AST::UnaryLogicalNot
+        AST::UnaryLogicalNot
       end
     end
   end

data/lib/keisan/parsing/logical_not_equal.rb

@@ -2,7 +2,7 @@ module Keisan
   module Parsing
     class LogicalNotEqual < LogicalOperator
       def node_class
-        Keisan::AST::LogicalNotEqual
+        AST::LogicalNotEqual
       end
     end
   end

data/lib/keisan/parsing/logical_not_not.rb

@@ -2,7 +2,7 @@ module Keisan
   module Parsing
     class LogicalNotNot < UnaryOperator
       def node_class
-        Keisan::AST::UnaryIdentity
+        AST::UnaryIdentity
       end
     end
   end

data/lib/keisan/parsing/logical_or.rb

@@ -2,7 +2,7 @@ module Keisan
   module Parsing
     class LogicalOr < LogicalOperator
       def node_class
-        Keisan::AST::LogicalOr
+        AST::LogicalOr
       end
     end
   end

data/lib/keisan/parsing/minus.rb

@@ -2,7 +2,7 @@ module Keisan
   module Parsing
     class Minus < ArithmeticOperator
       def node_class
-        Keisan::AST::Plus
+        AST::Plus
       end
     end
   end

data/lib/keisan/parsing/modulo.rb

@@ -2,7 +2,7 @@ module Keisan
   module Parsing
     class Modulo < ArithmeticOperator
       def node_class
-        Keisan::AST::Modulo
+        AST::Modulo
       end
     end
   end

data/lib/keisan/parsing/operator.rb

@@ -14,7 +14,7 @@ module Keisan
       end
 
       def node_class
-        raise Keisan::Exceptions::NotImplementedError.new
+        raise Exceptions::NotImplementedError.new
       end
     end
   end

data/lib/keisan/parsing/plus.rb

@@ -2,7 +2,7 @@ module Keisan
   module Parsing
     class Plus < ArithmeticOperator
       def node_class
-        Keisan::AST::Plus
+        AST::Plus
       end
     end
   end

data/lib/keisan/parsing/times.rb

@@ -2,7 +2,7 @@ module Keisan
   module Parsing
     class Times < ArithmeticOperator
       def node_class
-        Keisan::AST::Times
+        AST::Times
       end
     end
   end

data/lib/keisan/parsing/unary_minus.rb

@@ -2,7 +2,7 @@ module Keisan
   module Parsing
     class UnaryMinus < UnaryOperator
       def node_class
-        Keisan::AST::UnaryMinus
+        AST::UnaryMinus
       end
     end
   end

data/lib/keisan/parsing/unary_operator.rb

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

data/lib/keisan/parsing/unary_plus.rb

@@ -2,7 +2,7 @@ module Keisan
   module Parsing
     class UnaryPlus < UnaryOperator
       def node_class
-        Keisan::AST::UnaryPlus
+        AST::UnaryPlus
       end
     end
   end

data/lib/keisan/repl.rb

@@ -20,7 +20,7 @@ module Keisan
     end
 
     def reset
-      @calculator = Keisan::Calculator.new
+      @calculator = Calculator.new
     end
 
     def start

data/lib/keisan/tokenizer.rb

@@ -12,7 +12,8 @@ module Keisan
       Tokens::BitwiseOperator,
       Tokens::Assignment,
       Tokens::Comma,
-      Tokens::Dot
+      Tokens::Dot,
+      Tokens::LineSeparator
     ]
 
     TOKEN_REGEX = Regexp::new(
@@ -30,13 +31,11 @@ module Keisan
     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/
+      expression = expression.gsub(/\n/, ";")
 
       # Only strip whitespace outside of strings, e.g.
       # "1 + 2 + 'hello world'" => "1+2+'hello world'"
-      expression.split(Keisan::Tokens::String.regex).map.with_index {|s,i| i.even? ? s.gsub(/\s+/, "") : s}.join
+      expression.split(Tokens::String.regex).map.with_index {|s,i| i.even? ? s.gsub(/\s+/, " ") : s}.join
     end
 
     private
@@ -51,10 +50,6 @@ module Keisan
         token_class = TOKEN_CLASSES[i].new(token_string)
       end
 
-      unless tokenizing_check == @expression
-        raise Keisan::Exceptions::TokenizingError.new("Expected \"#{@expression}\", tokenized \"#{tokenizing_check}\"")
-      end
-
       tokens
     end
   end

data/lib/keisan/tokens/group.rb

@@ -1,7 +1,7 @@
 module Keisan
   module Tokens
     class Group < Token
-      REGEX = /(\((?:[^\[\]\(\)]*\g<1>*)*\)|\[(?:[^\[\]\(\)]*\g<1>*)*\])/
+      REGEX = /(\((?:[^\[\]\(\)\{\}]*+\g<1>*+)*+\)|\[(?:[^\[\]\(\)\{\}]*+\g<1>*+)*+\]|\{(?:[^\[\]\(\)\{\}]*+\g<1>*+)*+\})/
 
       attr_reader :sub_tokens
 
@@ -21,6 +21,8 @@ module Keisan
           :round
         when "["
           :square
+        when "{"
+          :curly
         end
       end
     end

data/lib/keisan/tokens/line_separator.rb

@@ -0,0 +1,11 @@
+module Keisan
+  module Tokens
+    class LineSeparator < Token
+      REGEX = /([;\n]+)/
+
+      def self.regex
+        REGEX
+      end
+    end
+  end
+end

data/lib/keisan/variables/default_registry.rb

@@ -1,11 +1,6 @@
 module Keisan
   module Variables
     class DefaultRegistry < Registry
-      def initialize
-        @hash = {}
-        @parent = self.class.registry
-      end
-
       VARIABLES = {
         "PI" => Math::PI,
         "E" => Math::E,

data/lib/keisan/variables/registry.rb

@@ -16,14 +16,14 @@ module Keisan
 
       def [](name)
         return @hash[name] if @hash.has_key?(name)
-        raise Keisan::Exceptions::UndefinedVariableError.new if @shadowed.include?(name)
+        raise Exceptions::UndefinedVariableError.new if @shadowed.include?(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
+        raise Exceptions::UndefinedVariableError.new name
       end
 
       def locals
@@ -32,19 +32,19 @@ module Keisan
 
       def has?(name)
         !self[name].nil?
-      rescue Keisan::Exceptions::UndefinedVariableError
+      rescue Exceptions::UndefinedVariableError
         false
       end
 
       def register!(name, value, force: false)
         name = name.to_s
-        name = name.name if name.is_a?(Keisan::AST::Variable)
+        name = name.name if name.is_a?(AST::Variable)
 
-        raise Keisan::Exceptions::UnmodifiableError.new("Cannot modify frozen variables registry") if frozen?
+        raise 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")
+          raise Exceptions::UnmodifiableError.new("Cannot overwrite default variable")
         end
-        self[name.to_s] = value.to_node
+        self[name.to_s] = AST::Cell.new(value.to_node)
       end
 
       protected

data/lib/keisan/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: keisan
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Christopher Locke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-14 00:00:00.000000000 Z
+date: 2017-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.2
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -120,12 +134,15 @@ files:
 - lib/keisan/ast/bitwise_operator.rb
 - lib/keisan/ast/bitwise_or.rb
 - lib/keisan/ast/bitwise_xor.rb
+- lib/keisan/ast/block.rb
 - lib/keisan/ast/boolean.rb
 - lib/keisan/ast/builder.rb
+- lib/keisan/ast/cell.rb
 - lib/keisan/ast/constant_literal.rb
 - lib/keisan/ast/exponent.rb
 - lib/keisan/ast/function.rb
 - lib/keisan/ast/indexing.rb
+- lib/keisan/ast/line_builder.rb
 - lib/keisan/ast/list.rb
 - lib/keisan/ast/literal.rb
 - lib/keisan/ast/logical_and.rb
@@ -138,6 +155,7 @@ files:
 - lib/keisan/ast/logical_operator.rb
 - lib/keisan/ast/logical_or.rb
 - lib/keisan/ast/modulo.rb
+- lib/keisan/ast/multi_line.rb
 - lib/keisan/ast/node.rb
 - lib/keisan/ast/null.rb
 - lib/keisan/ast/number.rb
@@ -170,16 +188,19 @@ files:
 - lib/keisan/functions/csch.rb
 - lib/keisan/functions/default_registry.rb
 - lib/keisan/functions/diff.rb
+- lib/keisan/functions/erf.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/let.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/range.rb
 - lib/keisan/functions/real.rb
 - lib/keisan/functions/reduce.rb
 - lib/keisan/functions/registry.rb
@@ -192,6 +213,7 @@ files:
 - lib/keisan/functions/sqrt.rb
 - lib/keisan/functions/tan.rb
 - lib/keisan/functions/tanh.rb
+- lib/keisan/functions/while.rb
 - lib/keisan/parser.rb
 - lib/keisan/parsing/argument.rb
 - lib/keisan/parsing/arithmetic_operator.rb
@@ -204,6 +226,7 @@ files:
 - lib/keisan/parsing/bitwise_xor.rb
 - lib/keisan/parsing/boolean.rb
 - lib/keisan/parsing/component.rb
+- lib/keisan/parsing/curly_group.rb
 - lib/keisan/parsing/divide.rb
 - lib/keisan/parsing/dot.rb
 - lib/keisan/parsing/dot_operator.rb
@@ -213,6 +236,7 @@ files:
 - lib/keisan/parsing/function.rb
 - lib/keisan/parsing/group.rb
 - lib/keisan/parsing/indexing.rb
+- lib/keisan/parsing/line_separator.rb
 - lib/keisan/parsing/list.rb
 - lib/keisan/parsing/logical_and.rb
 - lib/keisan/parsing/logical_equal.rb
@@ -249,6 +273,7 @@ files:
 - lib/keisan/tokens/comma.rb
 - lib/keisan/tokens/dot.rb
 - lib/keisan/tokens/group.rb
+- lib/keisan/tokens/line_separator.rb
 - lib/keisan/tokens/logical_operator.rb
 - lib/keisan/tokens/null.rb
 - lib/keisan/tokens/number.rb