skeem 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40345a7d71935a1329252989a9203c2acd2df799
-  data.tar.gz: d6825f7d3703966a81261551dbcde76e3aa9633f
+  metadata.gz: 9cb4724d17594667921a2ccd39d5c39891edf55b
+  data.tar.gz: e5ac55b88a2c71fb84e5752881e11c36546e5c98
 SHA512:
-  metadata.gz: a8a2f3b40f5869a33962577afa77b33ec6e117bdbcba6764ef485cd9a7941fb15d3fd1b708f1488d8b1f5cacea302d186c2c07165ba3fb42ee8ba755aa99e5f1
-  data.tar.gz: e3ebc87f20fd00380e020e0ca9e24b29e1943d1504bdc4606fda873b05cda6c8af58ed1d497bebc5ee8f0abd40aa2fc2bdf6d9e74250e7c1d4a28acdee831e1d
+  metadata.gz: f70733db86074f7828e19bfb069f957372bfc10e95d2fa0d85484de418b147d6392ff357f533977d6d10db4fa08a29372f916274dd2d192fa6bdd8887561f608
+  data.tar.gz: 5ed2a9db63d57adb2d93cb1c99d4b5d40a452f5174531d3c06522c80c6f1914c34fd4e97ca02059e3c733a227d3dfb22c9eeba363b01dadb7d75786ad90f3c48

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## [0.0.19] - 2018-10-15
+Added primitive procedures `list?`, `null?`, `length`
+
+### Added
+- File `primitive_builder.rb` implementation of: `list?`, `null?`, `length` procedures.
+- File `primitive_builder_spec.rb` spec examples for: `list?`, `null?`, `length` procedures.
+
+### Fixed
+- Method `SkmLambda#bind_locals` Fix: a variadic procedure with no argument provided, should have empty list as actual argument.
+- File `interpreter_spec.rb` Added test case for calling `list` procedure without argument.
+
 ## [0.0.18] - 2018-10-14
 Reworked procedure argument-passing. 
 

data/lib/skeem/primitive/primitive_builder.rb

@@ -12,6 +12,7 @@ module Skeem
         add_boolean_procedures(aRuntime)
         add_string_procedures(aRuntime)
         add_symbol_procedures(aRuntime)
+        add_list_procedures(aRuntime)
         add_io_procedures(aRuntime)
         add_special_procedures(aRuntime)
       end
@@ -72,6 +73,12 @@ module Skeem
       def add_symbol_procedures(aRuntime)
         create_symbol?(aRuntime)
       end
+      
+      def add_list_procedures(aRuntime)
+        create_list?(aRuntime)
+        create_null?(aRuntime)
+        create_length(aRuntime)
+      end
 
       def add_io_procedures(aRuntime)(aRuntime)
         create_newline(aRuntime)
@@ -317,6 +324,38 @@ module Skeem
 
         define_primitive_proc(aRuntime, 'symbol?', unary, primitive)
       end
+      
+      def create_list?(aRuntime)
+        primitive = ->(runtime, arg) do
+          arg_evaluated = arg.evaluate(runtime)
+          to_skm(arg_evaluated.list?)
+        end
+
+        define_primitive_proc(aRuntime, 'list?', unary, primitive)
+      end
+
+      def create_null?(aRuntime)
+        primitive = ->(runtime, arg) do
+          arg_evaluated = arg.evaluate(runtime)
+          to_skm(arg_evaluated.null?)
+        end
+
+        define_primitive_proc(aRuntime, 'null?', unary, primitive)
+      end       
+      
+      def create_length(aRuntime)
+        primitive = ->(runtime, arg) do
+          arg_evaluated = arg.evaluate(runtime)
+          unless arg_evaluated.kind_of?(SkmList)
+            msg1 = "Procedure 'length': list argument required,"
+            msg2 = "but got #{arg_evaluated.value}"
+            raise StandardError, msg1 + ' ' + msg2
+          end
+          to_skm(arg_evaluated.length)
+        end
+
+        define_primitive_proc(aRuntime, 'length', unary, primitive)
+      end
 
       def create_newline(aRuntime)
         primitive = ->(runtime) do

data/lib/skeem/s_expr_nodes.rb

@@ -48,6 +48,14 @@ module Skeem
     def symbol?
       false
     end
+    
+    def list?
+      false
+    end
+    
+    def null?
+      false
+    end
 
     # Abstract method.
     # Part of the 'visitee' role in Visitor design pattern.
@@ -185,6 +193,14 @@ module Skeem
     def tail()
       SkmList.new(members.slice(1..-1))
     end
+    
+    def list?
+      true
+    end
+    
+    def null?
+      empty?
+    end
 
     def evaluate(aRuntime)
       list_evaluated = members.map { |elem| elem.evaluate(aRuntime) }
@@ -519,9 +535,8 @@ module Skeem
         ((count_actuals > required_arity) && !formals.variadic?)
         raise StandardError, msg_arity_mismatch(aProcedureCall)
       end
-      return if count_actuals.zero?
+      return if count_actuals.zero? && !formals.variadic?
       bind_required_locals(aRuntime, aProcedureCall)
-      
       if formals.variadic?
         variadic_part_raw = actuals.drop(required_arity)
         variadic_part = variadic_part_raw.map do |actual|
@@ -558,7 +573,11 @@ module Skeem
       formals.formals.each_with_index do |arg_name, index|
         arg = actuals[index]
         if arg.nil?
-          raise StandardError, "Unbound variable: '#{arg_name.value}'"
+          if actuals.empty? && formals.variadic?
+            arg = SkmList.new([])
+          else
+            raise StandardError, "Unbound variable: '#{arg_name.value}'"
+          end
         end
 
         # IMPORTANT: execute procedure call in argument list now

data/lib/skeem/version.rb

@@ -1,3 +1,3 @@
 module Skeem
-  VERSION = '0.0.18'.freeze
+  VERSION = '0.0.19'.freeze
 end

data/spec/skeem/interpreter_spec.rb

@@ -352,7 +352,7 @@ SKEEM
       
       it 'should implement the list procedure' do
         checks = [
-          #['(list)', []],
+          ['(list)', []],
           ['(list 1)', [1]],
           ['(list 1 2 3 4)', [1, 2, 3, 4]]
         ]

data/spec/skeem/primitive/primitive_builder_spec.rb

@@ -242,6 +242,51 @@ module Skeem
         end
       end # context
       
+      context 'List procedures:' do      
+        it 'should implement the list? procedure' do
+          checks = [
+            ['(list? #f)', false],
+            ['(list? 1)', false],
+            ['(list? "bar")', false],
+            ['(list? (list 1 2 3))', true],
+            ['(list? (list))', true]
+          ]
+          checks.each do |(skeem_expr, expectation)|
+            result = subject.run(skeem_expr)
+            expect(result.value).to eq(expectation)
+          end
+        end
+        
+          it 'should implement the null? procedure' do
+          checks = [
+            ['(null? #f)', false],
+            ['(null? 1)', false],
+            ['(null? 0)', false],
+            ['(null? "bar")', false],
+            ['(null? "")', false],
+            ['(null? (list 1 2 3))', false],
+            ['(list? (list))', true]
+          ]
+          checks.each do |(skeem_expr, expectation)|
+            result = subject.run(skeem_expr)
+            expect(result.value).to eq(expectation)
+          end
+        end 
+
+        it 'should implement the length procedure' do
+          checks = [
+            ['(length (list))', 0],
+            ['(length (list 1))', 1],
+            ['(length (list 1 2))', 2],
+            ['(length (list 1 2 3))', 3]
+          ]
+          checks.each do |(skeem_expr, expectation)|
+            result = subject.run(skeem_expr)
+            expect(result.value).to eq(expectation)
+          end
+        end         
+      end # context      
+      
       context 'IO procedures:' do          
         it 'should implement the newline procedure' do
           default_stdout = $stdout

metadata

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