kalc 0.9.0 → 0.9.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 78824d628e330b0cea023998c7d855eb7ea61059
+  data.tar.gz: 12eceba2e9e1495b692b725902f859373fc6fd10
+SHA512:
+  metadata.gz: 40aead2c8de8ea0094ff49bcc49fdd6655b44de4c12d4f5564685821b4e06061d4480947c1b0937a5f62c6304ccae47d7decd7d4ff1c3f632cb4c2af63b9ba93
+  data.tar.gz: 2c61afc8a347df7dde81435165339ac0e56d221aa79fb2fd755a915b3d9c55582899248361b9ec9549e87b301bb2547053c1b37842d017112b31ed46f5bdbf65

data/Gemfile.lock

@@ -1,25 +1,25 @@
 PATH
   remote: .
   specs:
-    kalc (0.9.0)
+    kalc (0.9.1)
       parslet (~> 1.5)
 
 GEM
   remote: http://rubygems.org/
   specs:
     blankslate (2.1.2.4)
-    diff-lcs (1.2.4)
+    diff-lcs (1.2.5)
     parslet (1.5.0)
       blankslate (~> 2.0)
-    rake (10.1.0)
+    rake (10.1.1)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.5)
-    rspec-expectations (2.14.2)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.4)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.3)
+    rspec-mocks (2.14.4)
 
 PLATFORMS
   java

data/lib/kalc.rb

@@ -11,7 +11,6 @@ require 'kalc/repl'
 
 module Kalc
   class Runner
-
     attr_accessor :grammar
     attr_accessor :transform
     attr_accessor :interpreter
@@ -39,6 +38,7 @@ module Kalc
     end
 
     private
+
     def load_environment
       @log.debug 'Loading grammar' if @debug
       @grammar = Kalc::Grammar.new
@@ -51,4 +51,3 @@ module Kalc
     end
   end
 end
-

data/lib/kalc/ast.rb

@@ -1,6 +1,5 @@
 module Kalc
   module Ast
-
     class Commands
       attr_reader :commands
 
@@ -129,7 +128,6 @@ module Kalc
           a.eval(context)
         }
       end
-
     end
 
     class Arithmetic
@@ -145,40 +143,40 @@ module Kalc
 
       def eval(context)
         case @operator.to_s.strip
-          when '&&'
-            @left && @right
-          when 'and'
-            @left && @right
-          when '||'
-            @left || @right
-          when 'or'
-            @left || @right
-          when '<='
-            @left <= @right
-          when '>='
-            @left >= @right
-          when '='
-            @left == @right
-          when '=='
-            @left == @right
-          when '!='
-            @left != @right
-          when '-'
-            @left - @right
-          when '+'
-            @left + @right
-          when '^'
-            @left ** @right
-          when '*'
-            @left * @right
-          when '/'
-            @left / @right
-          when '%'
-            @left % @right
-          when '<'
-            @left < @right
-          when '>'
-            @left > @right
+        when '&&'
+          @left && @right
+        when 'and'
+          @left && @right
+        when '||'
+          @left || @right
+        when 'or'
+          @left || @right
+        when '<='
+          @left <= @right
+        when '>='
+          @left >= @right
+        when '='
+          @left == @right
+        when '=='
+          @left == @right
+        when '!='
+          @left != @right
+        when '-'
+          @left - @right
+        when '+'
+          @left + @right
+        when '^'
+          @left**@right
+        when '*'
+          @left * @right
+        when '/'
+          @left / @right
+        when '%'
+          @left % @right
+        when '<'
+          @left < @right
+        when '>'
+          @left > @right
         end
       end
     end

data/lib/kalc/environment.rb

@@ -1,6 +1,5 @@
 module Kalc
   class Environment
-
     attr_reader :functions
     attr_reader :variables
 
@@ -12,7 +11,7 @@ module Kalc
     end
 
     def add_function(name, value)
-      @functions.update({name.to_s.strip => value})
+      @functions.update({ name.to_s.strip => value })
     end
 
     def get_function(name)
@@ -26,7 +25,7 @@ module Kalc
     end
 
     def add_variable(name, value)
-      @variables.update({name.to_s.strip => value})
+      @variables.update({ name.to_s.strip => value })
       value
     end
 

data/lib/kalc/grammar.rb

@@ -1,11 +1,10 @@
 # Started with https://github.com/postmodern/cparser code
 # which is based on http://www.lysator.liu.se/c/ANSI-C-grammar-y.html
 # and worked from there
-# 
+#
 # The second link really helped when it came to functions
 
 class Kalc::Grammar < Parslet::Parser
-
   rule(:new_line) { match('[\n\r]').repeat(1) }
 
   rule(:space) { match('[ \t\v\n\f]') }
@@ -36,7 +35,7 @@ class Kalc::Grammar < Parslet::Parser
           :colon => ':',
           :question_mark => '?'
 
-  def self.operators(operators={})
+  def self.operators(operators = {})
     trailing_chars = Hash.new { |hash, symbol| hash[symbol] = [] }
 
     operators.each_value do |symbol|
@@ -290,4 +289,3 @@ class Kalc::Grammar < Parslet::Parser
 
   root :lines
 end
-

data/lib/kalc/interpreter.rb

@@ -4,7 +4,6 @@ require 'pp'
 
 module Kalc
   class Interpreter
-
     attr_accessor :env
 
     def initialize
@@ -111,10 +110,11 @@ module Kalc
         # Strings
         string_funs =
             %w(chomp chop chr clear count
-            downcase
-            hex
-            inspect intern
-            to_sym length size lstrip succ next oct ord reverse rstrip strip swapcase to_c to_f to_i to_r upcase)
+               downcase
+               hex
+               inspect intern
+               to_sym length size lstrip succ next oct ord reverse rstrip strip
+               swapcase to_c to_f to_i to_r upcase)
 
         string_funs.each do |str_fun|
           env.add_function(str_fun.upcase.to_sym, lambda { |cxt, val|

data/lib/kalc/repl.rb

@@ -5,13 +5,11 @@ require 'parslet/convenience'
 
 module Kalc
   class Repl
-
     def load_env
       @kalc = Kalc::Runner.new(true)
     end
 
     def run
-
       puts heading
 
       # Load Kalc with debug
@@ -30,18 +28,18 @@ module Kalc
         while input = Readline.readline("kalc-#{Kalc::VERSION} > ", true)
           begin
             case
-              when (input == 'quit' || input == 'exit')
-                break
-              when input == 'functions'
-                puts @kalc.interpreter.env.functions.map { |f| f.first }.join(', ')
-              when input == 'variables'
-                puts @kalc.interpreter.env.variables.map { |v| "#{v[0]} = #{v[1]}" }.join("\n\r")
-              when input == 'reload'
-                load_env
-              when input == 'ast'
-                pp @kalc.ast
-              when input != ''
-                puts @kalc.run(input)
+            when (input == 'quit' || input == 'exit')
+              break
+            when input == 'functions'
+              puts @kalc.interpreter.env.functions.map { |f| f.first }.join(', ')
+            when input == 'variables'
+              puts @kalc.interpreter.env.variables.map { |v| "#{v[0]} = #{v[1]}" }.join("\n\r")
+            when input == 'reload'
+              load_env
+            when input == 'ast'
+              pp @kalc.ast
+            when input != ''
+              puts @kalc.run(input)
             end
           rescue Parslet::ParseFailed => e
             puts e, g.root.error_tree
@@ -58,12 +56,11 @@ module Kalc
 
     def heading
       %q{
-This is Kalc, a small line-based language.
-More information about Kalc can be found at https://github.com/mrcsparker/kalc.
+        This is Kalc, a small line-based language.
+        More information about Kalc can be found at https://github.com/mrcsparker/kalc.
 
-Kalc is free software, provided as is, with no warranty.
+        Kalc is free software, provided as is, with no warranty.
       }
     end
-
   end
 end

data/lib/kalc/version.rb

@@ -1,3 +1,3 @@
 module Kalc
-  VERSION = '0.9.0'
+  VERSION = '0.9.1'
 end

metadata

@@ -1,64 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: kalc
 version: !ruby/object:Gem::Version
-  version: 0.9.0
-  prerelease:
+  version: 0.9.1
 platform: ruby
 authors:
 - Chris Parker
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-21 00:00:00.000000000 Z
+date: 2014-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rspec
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+- !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: parslet
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
-    none: false
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: parslet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
-    none: false
-  prerelease: false
   type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
 description: Calculation language slightly based on Excel's formula language.
 email:
 - mrcsparker@gmail.com
@@ -93,33 +86,26 @@ files:
 - spec/stdlib_spec.rb
 homepage: https://github.com/mrcsparker/kalc
 licenses: []
-post_install_message:
+metadata: {}
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      segments:
-      - 0
       version: '0'
-      hash: 2
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      segments:
-      - 0
       version: '0'
-      hash: 2
-  none: false
 requirements: []
 rubyforge_project: kalc
-rubygems_version: 1.8.24
-signing_key:
-specification_version: 3
+rubygems_version: 2.2.0
+signing_key: 
+specification_version: 4
 summary: Small calculation language.
 test_files:
 - spec/grammar_spec.rb