skeem 0.0.21 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 848f771b4fb717e1c491f6afae9a88a9c34e5302
-  data.tar.gz: 349587e3837e36893a5aaaad4a32986708d24979
+  metadata.gz: 4b1748ebcacd81d8e56ece9deb9a8087d28ebb50
+  data.tar.gz: b4263783f841a2f3577c5cb885554f01f44c067e
 SHA512:
-  metadata.gz: 89778cee179ca6cd65a5f45804471637d31a0db36f094cbedadc8ef72cb46cc3b0c75193e4b458b16091388a2a02db8c13e27444b7642da56ffc899504d451ce
-  data.tar.gz: cecc4f9aca3391d4abf695b593822988b49145e6bf55e66ed468cb10bda9e4fca5f9ad569c2c9e3de1d6220943437eabbd88067b3a5282abeea3bee2d2764679
+  metadata.gz: fda3cea9741f1b2da1016b41b90b7ff627e54d37a3c3ac851b5afe6f85eaab943e2a245e1bbde96796179a464c1bcc6e8384fe03aaed3a4a40efe71110ff9483
+  data.tar.gz: 75fec756b836694aa1b2ac8874fbdb503017fb99328ce440ea9c8a45ea95f9a8232c5e16e8e5288aa4a3144c52d4de37ebfb22d1a913e1abd71886ea0c412cd7

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [0.0.22] - 2018-10-23
+### Added
+- Class `SkmBuilder`added support for list datum.
+- File `primitive_builder.rb` implementation of: standard `and` procedure.
+
+### Fixed
+- File `interpreter_spec.rb` Added test example of list quotation.
+
+
 ## [0.0.21] - 2018-10-22
 ### Added
 - Added support for alternative `define` syntax.

data/README.md

@@ -1,6 +1,8 @@
 # Skeem
-[![Linux Build Status](https://travis-ci.org/famished-tiger/Skeem.svg?branch=master)](https://travis-ci.org/famished-tiger/Skeem)
-[![Build status](https://ci.appveyor.com/api/projects/status/qs19wn6o6bpo8lm6?svg=true)](https://ci.appveyor.com/project/famished-tiger/skeem)
+|Linux|Windows|  
+|:-:|:-:|  
+|[![Linux Build Status](https://travis-ci.org/famished-tiger/Skeem.svg?branch=master)](https://travis-ci.org/famished-tiger/Skeem)|[![Windows Build Status](https://ci.appveyor.com/api/projects/status/qs19wn6o6bpo8lm6?svg=true)](https://ci.appveyor.com/project/famished-tiger/skeem)|
+
 [![Gem Version](https://badge.fury.io/rb/skeem.svg)](https://badge.fury.io/rb/skeem)
 [![License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat)](https://github.com/famished-tiger/Skeem/blob/master/LICENSE.txt)
 
@@ -170,7 +172,7 @@ This section lists the implemented standard procedures
 * `symbol?`
 
 #### Vector procedures
-* `vector?`, `vector`, `vector-length`
+* `vector?`, `vector`, `vector-length`, `vector-set!`
 
 #### Input/output procedures
 * `newline`

data/lib/skeem/grammar.rb

@@ -51,7 +51,7 @@ module Skeem
     rule 'simple_datum' => 'symbol'
     rule 'compound_datum' => 'list'
     rule 'compound_datum' => 'vector'
-    rule 'list' => 'LPAREN datum_star RPAREN'
+    rule('list' => 'LPAREN datum_star RPAREN').as 'list'
     rule 'list' => 'LPAREN datum_plus PERIOD datum RPAREN'
     rule('vector' => 'VECTOR_BEGIN datum_star RPAREN').as 'vector'
     rule('datum_plus' => 'datum_plus datum').as 'multiple_datums'

data/lib/skeem/primitive/primitive_builder.rb

@@ -64,6 +64,7 @@ module Skeem
 
       def add_boolean_procedures(aRuntime)
         create_not(aRuntime)
+        create_and(aRuntime)
         create_object_predicate(aRuntime, 'boolean?')
       end
 
@@ -278,6 +279,27 @@ module Skeem
 
         define_primitive_proc(aRuntime, 'not', unary, primitive)
       end
+      
+      def create_and(aRuntime)
+        # arglist should be a Ruby Array
+        primitive = ->(runtime, arglist) do
+          if arglist.empty?
+            to_skm(true) # in conformance with 4.2.1
+          else
+            raw_result = true
+            last_result = nil
+            arglist.each do |raw_arg|
+              argument = raw_arg.evaluate(aRuntime)
+              last_result = argument
+              raw_result &&= !(argument.boolean? && !argument.value)
+              break unless raw_result
+            end
+            raw_result = last_result if raw_result
+            to_skm(raw_result)
+          end
+        end
+        define_primitive_proc(aRuntime, 'and', zero_or_more, primitive)      
+      end
 
       def create_length(aRuntime)
         primitive = ->(runtime, arg) do

data/lib/skeem/s_expr_builder.rb

@@ -85,6 +85,11 @@ module Skeem
       SkmQuotation.new(theChildren[2])
     end
     
+    # rule('list' => 'LPAREN datum_star RPAREN').as 'list'
+    def reduce_list(_production, aRange, _tokens, theChildren)
+      SkmList.new(theChildren[1])
+    end     
+    
     # rule('vector' => 'VECTOR_BEGIN datum_star RPAREN').as 'vector'
     def reduce_vector(_production, aRange, _tokens, theChildren)
       SkmVector.new(theChildren[1])

data/lib/skeem/version.rb

@@ -1,3 +1,3 @@
 module Skeem
-  VERSION = '0.0.21'.freeze
+  VERSION = '0.0.22'.freeze
 end

data/spec/skeem/interpreter_spec.rb

@@ -166,7 +166,7 @@ SKEEM
         end
       end
 
-      it 'should implement the quotation of vector' do
+      it 'should implement the quotation of vectors' do
         source = '(quote #(a b c))'
         result = subject.run(source)
         expect(result).to be_kind_of(SkmVector)
@@ -181,6 +181,25 @@ SKEEM
         end
       end
 
+      it 'should implement the quotation of lists' do
+        source = '(quote (+ 1 2))'
+        result = subject.run(source)
+        expect(result).to be_kind_of(SkmList)
+        predictions = [
+          [SkmIdentifier, '+'],
+          [SkmInteger, 1],
+          [SkmInteger, 2]
+        ]
+        predictions.each_with_index do |(type, value), index|
+          expect(result.members[index]).to be_kind_of(type)
+          expect(result.members[index].value).to eq(value)
+        end
+        
+        source = "'()"
+        result = subject.run(source)
+        expect(result).to be_kind_of(SkmList)
+        expect(result).to be_empty
+      end      
 
       it 'should implement the lambda function with one arg' do
         source = <<-SKEEM

data/spec/skeem/primitive/primitive_builder_spec.rb

@@ -203,6 +203,24 @@ module Skeem
           end
         end
         
+        it 'should implement the and procedure' do
+          checks = [
+            ['(and (= 2 2) (> 2 1))', true],
+            ['(and (= 2 2) (< 2 1))', false],
+            ['(and)', true]
+          ]
+          checks.each do |(skeem_expr, expectation)|
+            result = subject.run(skeem_expr)
+            expect(result.value).to eq(expectation)
+          end
+          
+          # If all the expressions evaluate to true values,
+          # the values of the last expression are returned.
+          source = "(and 1 2 'c '(f g))"
+          result = subject.run(source)
+          p result
+        end        
+        
         it 'should implement the boolean? procedure' do
           checks = [
             ['(boolean? #f)', true],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skeem
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-22 00:00:00.000000000 Z
+date: 2018-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rley