kalc 0.5.9 → 0.6.0

data/Gemfile.lock

@@ -0,0 +1,30 @@
+PATH
+  remote: .
+  specs:
+    kalc (0.5.9)
+      parslet (~> 1.3)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    blankslate (2.1.2.4)
+    diff-lcs (1.1.3)
+    parslet (1.4.0)
+      blankslate (~> 2.0)
+    rake (0.9.2.2)
+    rspec (2.10.0)
+      rspec-core (~> 2.10.0)
+      rspec-expectations (~> 2.10.0)
+      rspec-mocks (~> 2.10.0)
+    rspec-core (2.10.1)
+    rspec-expectations (2.10.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.10.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  kalc!
+  rake
+  rspec

data/README.textile

@@ -14,6 +14,16 @@ h2. Syntax
 kalc is a tiny language, and it has very little syntax.  It does support
 functions, variable assignment, and arithmetic.
 
+h3. Numbers
+
+All numbers are floating point.
+
+<pre>
+1 => 1.0
+2.020 => 2.02
+1.23E => 12300000000.0
+</pre>
+
 h3. Arithmetic
 
 <pre>

data/lib/kalc/grammar.rb

@@ -109,8 +109,13 @@ class Kalc::Grammar < Parslet::Parser
     str('"')
   }
 
+  rule(:exponent) {
+    match('[eE]') >> match('[-+]').maybe >> digits
+  }
+
   rule(:number) {
-    (match('[+-]').maybe >> digits >> (str('.') >> digits).maybe).as(:number) >> spaces?
+    (match('[+-]').maybe >> 
+     digits >> (str('.') >> digits).maybe >> exponent.maybe).as(:number) >> spaces?
   }
 
   rule(:identifier) {

data/lib/kalc/interpreter.rb

@@ -5,7 +5,7 @@ require 'pp'
 module Kalc
   class Interpreter
 
-    attr_reader :env
+    attr_accessor :env
 
     def initialize
       @env = Environment.new do |env|
@@ -40,6 +40,32 @@ module Kalc
           retval
         })
 
+        env.add_function(:RAND, lambda { |cxt, val|  
+          rand(val.eval(cxt))
+        })
+
+        env.add_function(:SYSTEM, lambda { |cxt, val|  
+          throw "Nope.  I don't think so!"
+        })
+
+        # IS?
+        env.add_function(:ISLOGICAL, lambda { |cxt, val|  
+          newval = val.eval(cxt)
+          newval == true || newval == false
+        })
+
+        env.add_function(:ISNONTEXT, lambda { |cxt, val|  
+          !val.eval(cxt).is_a? String
+        })
+
+        env.add_function(:ISNUMBER, lambda { |cxt, val|  
+          val.eval(cxt).is_a? Numeric
+        })
+
+        env.add_function(:ISTEXT, lambda { |cxt, val|  
+          val.eval(cxt).is_a? String
+        })
+
         # Math
         env.add_function(:ABS, lambda { |cxt, val|
           val.eval(cxt).abs
@@ -88,6 +114,16 @@ module Kalc
           })
         end
 
+        # Change case of text
+        env.add_function(:UPPER, lambda { |cxt, val|  
+          val.eval(cxt).upcase
+        })
+
+        env.add_function(:LOWER, lambda { |cxt, val|  
+          val.eval(cxt).downcase
+        })
+
+        # Debug
         env.add_function(:P, lambda { |cxt, *output|  
           p output
         })
@@ -101,7 +137,6 @@ module Kalc
         })
 
       end
-
     end
 
     def load_stdlib(grammar, transform)

data/lib/kalc/repl.rb

@@ -6,12 +6,16 @@ require 'parslet/convenience'
 module Kalc
   class Repl
 
+    def load_env
+      @kalc = Kalc::Runner.new(true)
+    end
+
     def run
 
       puts heading
 
       # Load Kalc with debug
-      @kalc = Kalc::Runner.new(true)
+      load_env
 
       puts "You are ready to go.  Have fun!"
       puts ""
@@ -36,6 +40,8 @@ module Kalc
               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 != ""

data/lib/kalc/version.rb

@@ -1,3 +1,3 @@
 module Kalc
-  VERSION = "0.5.9"
+  VERSION = "0.6.0"
 end

data/spec/interpreter_spec.rb

@@ -73,6 +73,11 @@ describe Kalc::Interpreter do
     it { evaluate("1.01 = 1.02").should == false }
   end
 
+  context "Exponents" do
+    it { evaluate("1.23e+10").should == 12300000000.0 }
+    it { evaluate("1.23e-10").should == 1.23e-10 }
+  end
+
   private
   def evaluate(expression)
     g = @grammar.parse(expression)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kalc
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-29 00:00:00.000000000 Z
+date: 2012-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -69,6 +69,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.textile
 - bin/ikalc
@@ -119,3 +120,4 @@ test_files:
 - spec/interpreter_spec.rb
 - spec/spec_helper.rb
 - spec/stdlib_spec.rb
+has_rdoc: