skeem 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4738bc3d483df0325cce143200b02e5c8cac7afe
-  data.tar.gz: 8f4560eaa88c6e754bd423bdf3c1f62a35063b75
+  metadata.gz: 17793fa7c6e636874b0d7fe8515d745b7ff664af
+  data.tar.gz: f24f83ad056e1af1ecac866e2daa649c94e544e6
 SHA512:
-  metadata.gz: 99e55d28f19fe7d4cb9a2d18a066a12fa43ffc2dfe59b1e5ac3e2795202c67b122e0fce2a9862871accb936eb58320870588c7eb622b4ee714c3e7bcb22eb5bc
-  data.tar.gz: 12e216d00ceb2e16ca2d27711bc47449e0ff49438ad9b42d52ae677368624cf15c3c80babef8a70aa740e0cdee8b619697aae871fb2962767e87af2f633068c0
+  metadata.gz: 64d9feba80f8ac945161c326a8783cdd34babf4f46bbec94020192ad7643a408be059c72e922bf452387dff253708d2b855d7adbac93b9bb9fff0cf4f354bbce
+  data.tar.gz: 00f745fc5abeaa2f1f6d83007b21bc0cb7a4fbc3974d79f71be89c19324857a543339328d406a04ca5dd130e36c789c163e3b982c3be87b879b1978fbb277492

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [0.0.15] - 2018-09-30
+Recursive functions are now supported.  
+Interpreter pre-loads a Scheme file with standard procedures (zero?, positive?, negative?, abs)
+
+### Added
+- File `base.skm` with standard Scheme procedures `zero?`, `positive?`, `negative?`, `abs`
+
+### Changed
+- Class `Interpreter#initialize` now execute a Scheme file containing a number of standard procedures.
+- File `README.md` Added third demo snippet showing example of recursive lambda function.
+
+### Fixed
+- Method `SkmLambda#bind_locals` now execute any procedure call in argument list before executing the lambda itself.
+
 ## [0.0.14] - 2018-09-23
 Added `lambda` (anonymous function). This is an initial implementation that doesn't support recursion yet.
 

data/README.md

@@ -55,7 +55,6 @@ At this stage, the gem consists of a bare-bones interpreter.
 ```
 
 ### Example 2 (Defining a function)
-Remark: Skeem 0.0.14 doesn't support recursive functions yet.
 
 ```ruby
   require 'skeem'
@@ -79,6 +78,21 @@ Remark: Skeem 0.0.14 doesn't support recursive functions yet.
   result = schemer.run(scheme_code)
   puts result.value # => 3
 ```
+### Example 3 (Defining a recursive function)
+```ruby
+  require 'skeem'
+
+  schemer = Skeem::Interpreter.new
+  scheme_code = <<-SKEEM
+    ; Compute the factorial of 100
+    (define fact (lambda (n)
+      (if (<= n 1) 1 (* n (fact (- n 1))))))
+    (fact 100)
+  SKEEM
+
+  result = schemer.run(scheme_code)
+  puts result.value # => 9332621544394415268169923885626670049071596826438162146859296389521759999322991560894146397615651828625369792082722375825118521091686400000000000000000000000 
+```
 
 Roadmap:
 - Extend language support

data/lib/skeem/interpreter.rb

@@ -12,6 +12,7 @@ module Skeem
     def initialize()
       @runtime = Runtime.new(Environment.new)
       add_primitives(runtime)
+      add_standard(runtime)
     end
     
     def run(source)
@@ -19,5 +20,20 @@ module Skeem
       @ptree = parser.parse(source)
       return @ptree.root.evaluate(runtime)
     end
+    
+    private
+    
+    def add_standard(aRuntime)
+      std_pathname = File.dirname(__FILE__) + '/standard/base.skm'
+      load_lib(std_pathname)
+    end
+    
+    def load_lib(aPathname)
+      lib_source = nil
+      File.open(aPathname, 'r') do |lib| 
+        lib_source = lib.read 
+        run(lib_source)
+      end
+    end
   end # class
 end # module

data/lib/skeem/s_expr_builder.rb

@@ -85,8 +85,6 @@ module Skeem
     # rule('lambda_expression' => 'LPAREN LAMBDA formals body RPAREN').as 'lambda_expression'
     def reduce_lambda_expression(_production, _range, _tokens, theChildren)
       lmbd = SkmLambda.new(_range, theChildren[2], theChildren[3])
-      # puts lmbd.inspect
-      lmbd
     end
     
     # rule('formals' => 'LPAREN identifier_star RPAREN').as 'identifiers_as_formals'

data/lib/skeem/s_expr_nodes.rb

@@ -325,7 +325,11 @@ module Skeem
         raise err, err_msg
       end
       procedure = aRuntime.environment.fetch(var_key.value)
+      # puts "## CALL(#{var_key.value}) ###################"
+      # puts operands.inspect
       result = procedure.call(aRuntime, self)
+      # puts "## RETURN #{result.inspect}"
+      result
     end
 
     def inspect
@@ -367,21 +371,6 @@ module Skeem
       result
     end
   end # class
-  
-=begin
-<Skeem::SkmLambda: 
-  @formals [<Skeem::SkmIdentifier: x>]
-  @definitions nil
-  @sequence <Skeem::SkmList: 
-    <Skeem::SkmCondition: 
-      @test <Skeem::ProcedureCall: <Skeem::SkmIdentifier: <>, 
-        <Skeem::SkmList: <Skeem::SkmVariableReference: <Skeem::SkmIdentifier: x>>, 
-        <Skeem::SkmInteger: 0>>>, 
-      @consequent <Skeem::ProcedureCall: 
-        <Skeem::SkmIdentifier: ->, 
-        <Skeem::SkmList: <Skeem::SkmVariableReference: <Skeem::SkmIdentifier: x>>>>,
-      @alternate <Skeem::SkmVariableReference: <Skeem::SkmIdentifier: x>>>>>
-=end
 
   class SkmLambda < SkmElement
     # @!attribute [r] formals
@@ -427,12 +416,14 @@ module Skeem
       formals.each_with_index do |arg_name, index|
         arg = arguments[index]
         if arg.nil?
-          p aProcedureCall.operands.members
           raise StandardError, "Unbound variable: '#{arg_name.value}'"
         end
-
+        
+        # IMPORTANT: execute procedure call in argument list now
+        arg = arg.evaluate(aRuntime) if arg.kind_of?(ProcedureCall)
         a_def = SkmDefinition.new(position, arg_name, arg)
         a_def.evaluate(aRuntime)
+        # puts "LOCAL #{a_def.inspect}"
       end
     end
 

data/lib/skeem/standard/base.skm

@@ -0,0 +1,25 @@
+; Standard R7RS procedures from section 6.2.6
+(define zero? 
+  (lambda (z)
+    (if (= z 0)
+      #t
+      #f)))
+
+; Return true if x greater or equal to zero; false otherwise
+(define positive? 
+  (lambda (x)
+    (if (>= x 0)
+      #t
+      #f)))
+
+(define negative? 
+  (lambda (x)
+    (if (< x 0)
+      #t
+      #f)))
+      
+(define abs 
+  (lambda (x)
+    (if (>= x 0)
+      x
+      (- x))))

data/lib/skeem/version.rb

@@ -1,3 +1,3 @@
 module Skeem
-  VERSION = '0.0.14'.freeze
+  VERSION = '0.0.15'.freeze
 end

data/skeem.gemspec

@@ -19,6 +19,7 @@ module PkgExtending
       'bin/*.rb',
       'lib/*.*',
       'lib/**/*.rb',
+      'lib/**/*.skm',
       'spec/**/*.rb',
     ]
     aPackage.files = file_list

data/spec/skeem/interpreter_spec.rb

@@ -8,8 +8,8 @@ module Skeem
         expect { Interpreter.new() }.not_to raise_error
       end
 
-      it 'should not have a parser' do
-        expect(subject.parser).to be_nil
+      it 'should have a parser' do
+        expect(subject.parser).not_to be_nil
       end
 
       it 'should have a runtime object' do
@@ -154,17 +154,17 @@ SKEEM
         result = subject.run('(min 2 2)')
         expect(result.value).to eq(2)
       end      
-      
-      # it 'should implement recursive functions' do
-        # source = <<-SKEEM
-  # ; Example from R7RS section 4.1.5
-  # (define fact (lambda (n) 
-    # (if (<= n 1) 1 (* n (fact (- n 1))))))
-  # (fact 10)
-# SKEEM
-        # subject.run(source)
-        # expect(result.value).to eq(3628800)    
-      # end
+     
+      it 'should implement recursive functions' do
+        source = <<-SKEEM
+  ; Example from R7RS section 4.1.5
+  (define fact (lambda (n) 
+    (if (<= n 1) 1 (* n (fact (- n 1))))))
+  (fact 10)
+SKEEM
+        result = subject.run(source)
+        expect(result.value).to eq(3628800)    
+      end
     end # context
 
     context 'Built-in primitive procedures' do
@@ -377,5 +377,82 @@ SKEEM
         end
       end
     end # context
+    
+    context 'Built-in standard procedures' do
+      it 'should implement the zero? predicate' do
+        checks = [
+          ['(zero? 3.1)', false],
+          ['(zero? -3.1)', false],       
+          ['(zero? 0)', true],
+          ['(zero? 0.0)', true],
+          ['(zero? 3)', false],
+          ['(zero? -3)', false]
+        ]
+        checks.each do |(skeem_expr, expectation)|
+          result = subject.run(skeem_expr)
+          expect(result.value).to eq(expectation)
+        end
+      end
+
+      it 'should implement the positive? predicate' do      
+        checks = [
+          ['(positive? 3.1)', true],
+          ['(positive? -3.1)', false],       
+          ['(positive? 0)', true],
+          ['(positive? 0.0)', true],
+          ['(positive? 3)', true],
+          ['(positive? -3)', false]
+        ]
+        checks.each do |(skeem_expr, expectation)|
+          result = subject.run(skeem_expr)
+          expect(result.value).to eq(expectation)
+        end
+      end
+
+      it 'should implement the positive? predicate' do      
+        checks = [
+          ['(positive? 3.1)', true],
+          ['(positive? -3.1)', false],       
+          ['(positive? 0)', true],
+          ['(positive? 0.0)', true],
+          ['(positive? 3)', true],
+          ['(positive? -3)', false]
+        ]
+        checks.each do |(skeem_expr, expectation)|
+          result = subject.run(skeem_expr)
+          expect(result.value).to eq(expectation)
+        end
+      end
+
+      it 'should implement the negative? predicate' do      
+        checks = [
+          ['(negative? 3.1)', false],
+          ['(negative? -3.1)', true],       
+          ['(negative? 0)', false],
+          ['(negative? 0.0)', false],
+          ['(negative? 3)', false],
+          ['(negative? -3)', true]
+        ]
+        checks.each do |(skeem_expr, expectation)|
+          result = subject.run(skeem_expr)
+          expect(result.value).to eq(expectation)
+        end
+      end
+
+      it 'should implement the abs function' do      
+        checks = [
+          ['(abs 3.1)', 3.1],
+          ['(abs -3.1)', 3.1],       
+          ['(abs 0)', 0],
+          ['(abs 0.0)', 0],
+          ['(abs 3)', 3],
+          ['(abs -7)', 7]
+        ]
+        checks.each do |(skeem_expr, expectation)|
+          result = subject.run(skeem_expr)
+          expect(result.value).to eq(expectation)
+        end
+      end       
+    end # context
   end # describe
 end # module

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skeem
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-23 00:00:00.000000000 Z
+date: 2018-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rley
@@ -95,6 +95,7 @@ files:
 - lib/skeem/runtime.rb
 - lib/skeem/s_expr_builder.rb
 - lib/skeem/s_expr_nodes.rb
+- lib/skeem/standard/base.skm
 - lib/skeem/stoken.rb
 - lib/skeem/tokenizer.rb
 - lib/skeem/version.rb