kalc 0.6.0 → 0.7.0

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    kalc (0.5.9)
-      parslet (~> 1.3)
+    kalc (0.7.0)
+      parslet (~> 1.4)
 
 GEM
   remote: http://rubygems.org/
@@ -12,14 +12,14 @@ GEM
     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)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.2)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.10.1)
+    rspec-mocks (2.11.2)
 
 PLATFORMS
   ruby

data/README.md

@@ -0,0 +1,112 @@
+kalc
+====
+
+kalc is a small functional programming language that (gasp) borrows a lot of its
+syntax from the Excel formula language.
+
+ikalc
+-----
+
+kalc comes with its own repl, known as `ikalc`. Start it up in your console by
+typing in `ikalc`
+
+Syntax
+------
+
+kalc is a tiny language, and it has very little syntax. It does support
+functions, variable assignment, and arithmetic.
+
+Numbers
+-------
+
+All numbers are floating point.
+
+    1 =\> 1.0 2.020 =\> 2.02 1.23E =\> 12300000000.0
+
+Arithmetic
+----------
+
+    1 + 1 / (10 \* 100) - 3 + 3 - (3 - 2) 1 \> 1 SUM(1, 2, 3, 4, 5)
+
+Arithmetic is standard infix with nesting via parenthesis.
+
+Logical operations
+------------------
+
+    1 \> 2 ? 1 : 3 # Ternary (1 || 2) \> 3 1 \> 2 or 3 <2 # false OR(1 > 2, 3 \<
+    2, 8 == 8) # true
+
+Variable assignment
+-------------------
+
+    a := 1 b := 2 d := a + b
+
+Functions
+---------
+
+You can create functions in kalc:
+
+    DEFINE FOO(a, b) { a + b }
+
+You can also call functions in kalc:
+
+    \> a = FOO(2, 3) \> a 5
+
+There are a few examples of functions in `lib/stdlib.kalc`
+
+Built-in functions
+------------------
+
+There are some built-in functions (in `lib/kalc/interpreter.rb`). They are based
+on the Excel formula functions, so you should see some overlap.
+
+Some of them are:
+
+    IF, OR, NOT, AND, RAND, SYSTEM, ISLOGICAL, ISNONTEXT, ISNUMBER, ISTEXT, ABS,
+    DEGREES, PRODUCT, RADIANS, ROUND, SUM, TRUNC, LN, ACOS, ACOSH, ASIN, ASINH,
+    ATAN, ATANH, CBRT, COS, COSH, ERF, ERFC, EXP, GAMMA, LGAMMA, LOG, LOG2,
+    LOG10, SIN, SINH, SQRT, TAN, TANH, UPPER, LOWER, 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, P, PP, PUTS, PLUS_ONE, MINUS_ONE, SQUARE, CUBE, FIB, FACTORIAL,
+    TOWERS_OF_HANOI
+
+Loops
+-----
+
+There are no looping mechanisms to speak of, but recursion works (pretty) well.  
+**Note:** *go too deep and you might blow the stack!*
+
+    DEFINE SAMPLE_LOOP(a) { PUTS(a) IF(a == 1, 1, SAMPLE_LOOP(a - 1)) }
+
+There are a few examples of loops via recursion in `lib/stdlib.kalc`
+
+Weirdness
+---------
+
+And here is where it gets a bit weird. It has to look a bit like Excel, so you
+can expect things to look odd in places.
+
+For example, here is how you compare 2 variables:
+
+    # Assign '1' to 'a' and '2' to 'b' a := 1 b := 2
+
+    # Does 'a' equal 'b'? a = b \> false
+
+    # Also, you can do this: a == b \> false
+
+    (a == a) && (b = b) \> true
+
+'=' and '==' are both equality operators. Use ':=' for assignment.
+
+More inside
+-----------
+
+Not everything is documented yet. As you can see, it is a mix of a lot of
+different ideas. The goal is to have an excel-like language that is somewhat
+functional.
+
+Contributing
+------------
+
+Fork on GitHub and after you've committed tested patches, send a pull request.

data/kalc.gemspec

@@ -21,5 +21,5 @@ Gem::Specification.new do |s|
   # specify any dependencies here; for example:
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec"
-  s.add_runtime_dependency "parslet", "~> 1.3"
+  s.add_runtime_dependency "parslet", "~> 1.4"
 end

data/lib/kalc/grammar.rb

@@ -113,7 +113,11 @@ class Kalc::Grammar < Parslet::Parser
     match('[eE]') >> match('[-+]').maybe >> digits
   }
 
+  # We are using a really broad definition of what a number is.
+  # Numbers can be 1, 1.0, 0.1, 1.0e4, +1.0E10, etc
   rule(:number) {
+    (match('[+-]').maybe >> 
+      (str('.') >> digits >> exponent.maybe).as(:number) >> spaces?) |
     (match('[+-]').maybe >> 
      digits >> (str('.') >> digits).maybe >> exponent.maybe).as(:number) >> spaces?
   }

data/lib/kalc/interpreter.rb

@@ -103,7 +103,8 @@ module Kalc
           [ 'acos', 'acosh', 'asin', 'asinh', 'atan', 'atanh',
             'cbrt', 'cos', 'cosh',
             'erf', 'erfc', 'exp',
-            'log', 'log2', 'log10',
+            'gamma',
+            'lgamma', 'log', 'log2', 'log10',
             'sin', 'sinh', 'sqrt',
             'tan', 'tanh',
              ]
@@ -123,6 +124,27 @@ module Kalc
           val.eval(cxt).downcase
         })
 
+        # Strings
+        string_funs = 
+          [
+            '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'
+          ]
+
+        string_funs.each do |str_fun|
+          env.add_function(str_fun.upcase.to_sym, lambda { |cxt, val|
+            String.new(val.eval(cxt)).send(str_fun.to_sym)
+          })
+        end
+
         # Debug
         env.add_function(:P, lambda { |cxt, *output|  
           p output

data/lib/kalc/version.rb

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

data/spec/interpreter_spec.rb

@@ -78,6 +78,11 @@ describe Kalc::Interpreter do
     it { evaluate("1.23e-10").should == 1.23e-10 }
   end
 
+  context "Numbers starting with a decimal point" do
+    it { evaluate("0.4").should == 0.4 }
+    it { evaluate(".4").should == 0.4 }
+  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.6.0
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-04 00:00:00.000000000 Z
+date: 2012-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
 description: Calculation language slightly based on Excel's formula language.
 email:
 - mrcsparker@gmail.com
@@ -71,7 +71,7 @@ files:
 - Gemfile
 - Gemfile.lock
 - LICENSE
-- README.textile
+- README.md
 - bin/ikalc
 - bin/kalc
 - examples/add.kalc

data/README.textile

@@ -1,118 +0,0 @@
-h1. kalc
-
-h2. Introduction
-
-kalc is a small functional programming language that (gasp) borrows a lot of
-its syntax from the Excel formula language.
-
-h2. ikalc
-
-kalc comes with its own repl, known as ikalc.  It evaluates when you press return.
-
-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>
-1 + 1 / (10 * 100) - 3 + 3 - (3 - 2)
-1 > 1
-SUM(1, 2, 3, 4, 5)
-</pre>
-
-Arithmetic is standard infix with nesting via parenthesis.
-
-h3. Logical operations
-
-<pre>
-1 > 2 ? 1 : 3 # Ternary
-(1 || 2) > 3
-1 > 2 or 3 < 2 # false
-OR(1 > 2, 3 < 2, 8 == 8) # true
-</pre>
-
-h3. Variable assignment
-
-<pre>
-a := 1
-b := 2
-d := a + b
-</pre>
-
-h3.  Creating functions
-
-<pre>
-DEFINE FOO(a, b) {
-  a + b
-}
-</pre>
-
-There are a few examples of functions in lib/stdlib.kalc
-
-h3. Loops
-
-There are no looping mechanisms to speak of, but recursion works well.
-
-<pre>
-DEFINE SAMPLE_LOOP(a) {
-  PUTS(a)
-  IF(a == 1, 1, SAMPLE_LOOP(a - 1))
-}
-</pre>
-
-h3. Weirdness
-
-And here is where it gets a bit weird.  It has to look a bit like
-Excel, so you can expect things to look odd in places.
-
-For example, here is how you compare 2 variables:
-
-<pre>
-# Assign '1' to 'a' and '2' to 'b'
-
-a := 1
-b := 2
-
-# Does 'a' equal 'b'?
-
-a = b
-
-> false
-
-# Also, you can do this:
-
-a == b
-
-> false
-
-(a == a) && (b = b)
-
-> true
-
-</pre>
-
-'=' and '==' are both equality operators.  Use
-':=' for assignment.
-
-h4. More inside
-
-Not everything is documented yet.  As you can see, it is a mix of
-a lot of different ideas.  The goal is to have an excel-like language
-that is somewhat functional.
-
-h2. Contributing
-
-Fork on GitHub and after you've committed tested patches, send a pull request.
-