keisan 0.6.0 → 0.7.0

data/lib/keisan/parsing/hash.rb

@@ -0,0 +1,36 @@
+module Keisan
+  module Parsing
+    class Hash < Element
+      attr_reader :key_value_pairs
+
+      def initialize(key_value_pairs)
+        @key_value_pairs = Array.wrap(key_value_pairs).map {|key_value_pair|
+          validate_and_extract_key_value_pair(key_value_pair)
+        }
+      end
+
+      private
+
+      def validate_and_extract_key_value_pair(key_value_pair)
+        key, value = key_value_pair.split {|token| token.is_a?(Tokens::Colon)}
+        raise Exceptions::ParseError.new("Invalid hash") unless key.size == 1 && value.size >= 1
+
+        key = key.first
+        if allowed_key?(key)
+          [Parsing::String.new(key.value), Parsing::RoundGroup.new(value)]
+        else
+          raise Exceptions::ParseError.new("Invalid hash (keys must be constants)")
+        end
+      end
+
+      def allowed_key?(key)
+        case key
+        when Tokens::String, Tokens::Boolean, Tokens::Null, Tokens::Number
+          true
+        else
+          false
+        end
+      end
+    end
+  end
+end

data/lib/keisan/repl.rb

@@ -1,4 +1,4 @@
-require "pry"
+require "coderay"
 require "readline"
 
 module Keisan

data/lib/keisan/token.rb

@@ -1,6 +1,7 @@
 module Keisan
   class Token
     attr_reader :string
+
     def initialize(string)
       raise Exceptions::InvalidToken.new(string) unless string.match(regex)
       @string = string

data/lib/keisan/tokenizer.rb

@@ -7,13 +7,15 @@ module Keisan
       Tokens::Boolean,
       Tokens::Word,
       Tokens::Number,
-      Tokens::ArithmeticOperator,
+      Tokens::Assignment,
       Tokens::LogicalOperator,
+      Tokens::ArithmeticOperator,
       Tokens::BitwiseOperator,
-      Tokens::Assignment,
       Tokens::Comma,
+      Tokens::Colon,
       Tokens::Dot,
-      Tokens::LineSeparator
+      Tokens::LineSeparator,
+      Tokens::Unknown
     ]
 
     TOKEN_REGEX = Regexp::new(
@@ -23,34 +25,36 @@ module Keisan
     attr_reader :expression, :tokens
 
     def initialize(expression)
-      @expression = self.class.strip_whitespace_and_comments(expression)
+      @expression = self.class.normalize_expression(expression)
       @scan = @expression.scan(TOKEN_REGEX)
       @tokens = tokenize!
     end
 
-    def self.strip_whitespace_and_comments(expression)
-      # Remove comments
-      expression = expression.split("#").first || ""
-      expression = expression.gsub(/\n/, ";")
-
-      # Only strip whitespace outside of strings, e.g.
-      # "1 + 2 + 'hello world'" => "1+2+'hello world'"
-      expression.split(Tokens::String.regex).map.with_index {|s,i| i.even? ? s.gsub(/\s+/, " ") : s}.join
+    def self.normalize_expression(expression)
+      expression = normalize_line_delimiters(expression)
+      expression = remove_comments(expression)
     end
 
     private
 
-    def tokenize!
-      tokenizing_check = ""
+    def self.normalize_line_delimiters(expression)
+      expression.gsub(/\n/, ";")
+    end
+
+    def self.remove_comments(expression)
+      expression.gsub(/#[^;]*/, "")
+    end
 
-      tokens = @scan.map do |scan_result|
+    def tokenize!
+      @scan.map do |scan_result|
         i = scan_result.find_index {|token| !token.nil?}
         token_string = scan_result[i]
-        tokenizing_check << token_string
-        token_class = TOKEN_CLASSES[i].new(token_string)
+        token = TOKEN_CLASSES[i].new(token_string)
+        if token.is_a?(Tokens::Unknown)
+          raise Keisan::Exceptions::TokenizingError.new("Unexpected token: \"#{token.string}\"")
+        end
+        token
       end
-
-      tokens
     end
   end
 end

data/lib/keisan/tokens/assignment.rb

@@ -1,7 +1,23 @@
 module Keisan
   module Tokens
     class Assignment < Operator
-      REGEX = /(\=)/
+      REGEX = /(
+        (?: # possible compound operators in front of equals
+         \|\| |
+         \&\& |
+         \*\* |
+         \+ |
+         \- |
+         \* |
+         \/ |
+         \% |
+         \& |
+         \| |
+         \^
+        )?
+        \=
+        (?!\=) # negative lookahead to prevent matching ==
+      )/x
 
       def self.regex
         REGEX
@@ -10,6 +26,10 @@ module Keisan
       def operator_type
         :"="
       end
+
+      def compound_operator
+        string[0] == "=" ? nil : string[0...-1].to_sym
+      end
     end
   end
 end

data/lib/keisan/tokens/colon.rb

@@ -0,0 +1,11 @@
+module Keisan
+  module Tokens
+    class Colon < Token
+      REGEX = /(\:)/
+
+      def self.regex
+        REGEX
+      end
+    end
+  end
+end

data/lib/keisan/tokens/unknown.rb

@@ -0,0 +1,11 @@
+module Keisan
+  module Tokens
+    class Unknown < Token
+      REGEX = /([^[[:space:]]]+?)/
+
+      def self.regex
+        REGEX
+      end
+    end
+  end
+end

data/lib/keisan/variables/registry.rb

@@ -26,6 +26,11 @@ module Keisan
         raise Exceptions::UndefinedVariableError.new name
       end
 
+      def freeze
+        @hash.values.each(&:freeze)
+        super
+      end
+
       def locals
         @hash
       end
@@ -36,15 +41,15 @@ module Keisan
         false
       end
 
+      def modifiable?(name)
+        !frozen? && has?(name)
+      end
+
       def register!(name, value, force: false)
+        raise Exceptions::UnmodifiableError.new("Cannot modify frozen variables registry") if frozen?
         name = name.to_s
-        name = name.name if name.is_a?(AST::Variable)
 
-        raise Exceptions::UnmodifiableError.new("Cannot modify frozen variables registry") if frozen?
-        if !force && @use_defaults && default_registry.has_name?(name)
-          raise Exceptions::UnmodifiableError.new("Cannot overwrite default variable")
-        end
-        self[name.to_s] = AST::Cell.new(value.to_node)
+        self[name.to_s] = value.to_node.to_cell
       end
 
       protected

data/lib/keisan/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: keisan
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Christopher Locke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-27 00:00:00.000000000 Z
+date: 2018-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -138,9 +138,12 @@ files:
 - lib/keisan/ast/boolean.rb
 - lib/keisan/ast/builder.rb
 - lib/keisan/ast/cell.rb
+- lib/keisan/ast/cell_assignment.rb
 - lib/keisan/ast/constant_literal.rb
 - lib/keisan/ast/exponent.rb
 - lib/keisan/ast/function.rb
+- lib/keisan/ast/function_assignment.rb
+- lib/keisan/ast/hash.rb
 - lib/keisan/ast/indexing.rb
 - lib/keisan/ast/line_builder.rb
 - lib/keisan/ast/list.rb
@@ -172,6 +175,7 @@ files:
 - lib/keisan/ast/unary_operator.rb
 - lib/keisan/ast/unary_plus.rb
 - lib/keisan/ast/variable.rb
+- lib/keisan/ast/variable_assignment.rb
 - lib/keisan/calculator.rb
 - lib/keisan/context.rb
 - lib/keisan/evaluator.rb
@@ -188,6 +192,7 @@ files:
 - lib/keisan/functions/csch.rb
 - lib/keisan/functions/default_registry.rb
 - lib/keisan/functions/diff.rb
+- lib/keisan/functions/enumerable_function.rb
 - lib/keisan/functions/erf.rb
 - lib/keisan/functions/exp.rb
 - lib/keisan/functions/expression_function.rb
@@ -199,6 +204,7 @@ files:
 - lib/keisan/functions/map.rb
 - lib/keisan/functions/math_function.rb
 - lib/keisan/functions/proc_function.rb
+- lib/keisan/functions/puts.rb
 - lib/keisan/functions/rand.rb
 - lib/keisan/functions/range.rb
 - lib/keisan/functions/real.rb
@@ -213,7 +219,9 @@ files:
 - lib/keisan/functions/sqrt.rb
 - lib/keisan/functions/tan.rb
 - lib/keisan/functions/tanh.rb
+- lib/keisan/functions/to_h.rb
 - lib/keisan/functions/while.rb
+- lib/keisan/interpreter.rb
 - lib/keisan/parser.rb
 - lib/keisan/parsing/argument.rb
 - lib/keisan/parsing/arithmetic_operator.rb
@@ -226,6 +234,7 @@ files:
 - lib/keisan/parsing/bitwise_xor.rb
 - lib/keisan/parsing/boolean.rb
 - lib/keisan/parsing/component.rb
+- lib/keisan/parsing/compound_assignment.rb
 - lib/keisan/parsing/curly_group.rb
 - lib/keisan/parsing/divide.rb
 - lib/keisan/parsing/dot.rb
@@ -235,6 +244,7 @@ files:
 - lib/keisan/parsing/exponent.rb
 - lib/keisan/parsing/function.rb
 - lib/keisan/parsing/group.rb
+- lib/keisan/parsing/hash.rb
 - lib/keisan/parsing/indexing.rb
 - lib/keisan/parsing/line_separator.rb
 - lib/keisan/parsing/list.rb
@@ -270,6 +280,7 @@ files:
 - lib/keisan/tokens/assignment.rb
 - lib/keisan/tokens/bitwise_operator.rb
 - lib/keisan/tokens/boolean.rb
+- lib/keisan/tokens/colon.rb
 - lib/keisan/tokens/comma.rb
 - lib/keisan/tokens/dot.rb
 - lib/keisan/tokens/group.rb
@@ -279,6 +290,7 @@ files:
 - lib/keisan/tokens/number.rb
 - lib/keisan/tokens/operator.rb
 - lib/keisan/tokens/string.rb
+- lib/keisan/tokens/unknown.rb
 - lib/keisan/tokens/word.rb
 - lib/keisan/variables/default_registry.rb
 - lib/keisan/variables/registry.rb