skeem 0.2.15 → 0.2.19

data/spec/skeem/element_visitor_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../spec_helper'
 require_relative '../../lib/skeem/datum_dsl'
 
@@ -7,12 +9,14 @@ require_relative '../../lib/skeem/element_visitor'
 module Skeem
   describe SkmElementVisitor do
     include DatumDSL
-  let(:simple_datum) { integer 42 }
-  let(:listener) do
-    fake = double('fake-subscriber')
-    fake.define_singleton_method(:accept_all) {}
-    fake
-  end
+    let(:simple_datum) { integer 42 }
+    let(:listener) do
+      fake = double('fake-subscriber')
+      fake.define_singleton_method(:accept_all) do
+        # Dummy block
+      end
+      fake
+    end
 
     # Default instantiation rule
     subject { SkmElementVisitor.new(simple_datum) }
@@ -122,7 +126,7 @@ module Skeem
       end
 
       it 'should allow the visit of a nested compound datum' do
-        nested_list = list ['uno', 'twei', 'three']
+        nested_list = list %w[uno twei three']
         vec = vector ['#false', 3, nested_list, 'foo']
         instance = SkmElementVisitor.new(vec)
         instance.subscribe(listener)
@@ -132,7 +136,7 @@ module Skeem
         expect(listener).to receive(:after_simple_datum).with(runtime, vec.members[0]).ordered
         expect(listener).to receive(:before_simple_datum).with(runtime, vec.members[1]).ordered
         expect(listener).to receive(:after_simple_datum).with(runtime, vec.members[1]).ordered
-        
+
         expect(listener).to receive(:before_pair).with(runtime, nested_list).ordered
         expect(listener).to receive(:before_car).with(runtime, nested_list, nested_list.car).ordered
         expect(nested_list.car).to eq('uno')
@@ -159,7 +163,7 @@ module Skeem
         expect(listener).to receive(:after_cdr).with(runtime, nested_list.cdr, nested_list.cdr.cdr).ordered
         expect(listener).to receive(:after_pair).with(runtime, nested_list.cdr).ordered
         expect(listener).to receive(:after_cdr).with(runtime, nested_list, nested_list.cdr).ordered
-        expect(listener).to receive(:after_pair).with(runtime, nested_list).ordered        
+        expect(listener).to receive(:after_pair).with(runtime, nested_list).ordered
         expect(listener).to receive(:before_simple_datum).with(runtime, vec.members[3]).ordered
         expect(listener).to receive(:after_simple_datum).with(runtime, vec.members[3]).ordered
         expect(listener).to receive(:after_children).with(runtime, vec, vec.members).ordered
@@ -168,4 +172,4 @@ module Skeem
       end
     end # context
   end # describe
-end # module
+end # module

data/spec/skeem/interpreter_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'stringio'
 require_relative '../spec_helper' # Use the RSpec framework
 require_relative '../../lib/skeem/datum_dsl'
@@ -14,7 +16,7 @@ module Skeem
       end
 
       it 'could be initialized with a block argument' do
-        expect { Interpreter.new { |interp| }  }.not_to raise_error
+        expect { Interpreter.new(&:runtime) }.not_to raise_error
       end
 
       it 'should have a parser' do
@@ -65,6 +67,7 @@ module Skeem
         end
       end
 
+      # rubocop: disable Style/ExponentialNotation
       it 'should evaluate isolated real numbers' do
         samples = [
           ['0.0', 0.0],
@@ -78,6 +81,7 @@ module Skeem
           expect(result).to eq(predicted)
         end
       end
+      # rubocop: enable Style/ExponentialNotation
 
       it 'should evaluate isolated strings' do
         samples = [
@@ -90,6 +94,7 @@ module Skeem
       end
 
       it 'should evaluate vector of constants' do
+        require 'benchmark'
         source = '#(2018 10 20 "Sat")'
         result = subject.run(source)
         expect(result).to be_kind_of(SkmVector)
@@ -108,7 +113,7 @@ module Skeem
 
     context 'Built-in primitives' do
       it 'should implement variable definition' do
-        result = subject.run('(define x 28)')
+        subject.run('(define x 28)')
         expect(subject.fetch('x')).to eq(28)
       end
 
@@ -125,7 +130,7 @@ SKEEM
       end
 
       it 'should implement the simple conditional form' do
-         checks = [
+        checks = [
           ['(if (> 3 2) "yes")', 'yes'],
           ['(if (> 2 3) "yes")', SkmUndefined.instance]
         ]
@@ -157,7 +162,7 @@ SKEEM
       ((< x 0) -1)
     )))
 SKEEM
-        result = subject.run(source)
+        subject.run(source)
         checks = [
           ['(signum 3)', 1],
           ['(signum 0)', 0],
@@ -175,7 +180,7 @@ SKEEM
       ((< x 0) => -1)
     )))
 SKEEM
-        result = subject.run(source)
+        subject.run(source)
         checks = [
           ['(signum 3)', 1],
           ['(signum 0)', 0],
@@ -193,7 +198,7 @@ SKEEM
       (else -1)
     )))
 SKEEM
-        result = subject.run(source)
+        subject.run(source)
         checks = [
           ['(signum 3)', 1],
           ['(signum 0)', 0],
@@ -211,7 +216,7 @@ SKEEM
       end
 
       it 'should implement the quotation of constant literals' do
-         checks = [
+        checks = [
           ['(quote a)', 'a'],
           ['(quote 145932)', 145932],
           ['(quote "abc")', 'abc'],
@@ -367,8 +372,6 @@ SKEEM
         result = subject.run(source)
         expect(result.last.value).to eq(20)
       end
-
-
     end # context
 
     context 'Binding constructs:' do
@@ -406,7 +409,7 @@ SKEEM
       end
 
       it 'should support the nesting of a lambda in a let expression' do
-        source =<<-SKEEM
+        source = <<-SKEEM
   (define make-counter
     (lambda ()
        (let ((count 0))
@@ -477,7 +480,7 @@ SKEEM
 
     context 'Quasiquotation:' do
       it 'should implement the quasiquotation of constant literals' do
-         checks = [
+        checks = [
           ['(quasiquote a)', 'a'],
           ['(quasiquote 145932)', 145932],
           ['(quasiquote "abc")', 'abc'],
@@ -518,7 +521,7 @@ SKEEM
           expect(result.members[index]).to eq(value)
         end
 
-        source = "`#()"
+        source = '`#()'
         result = subject.run(source)
         expect(result).to be_kind_of(SkmVector)
         expect(result).to be_empty
@@ -555,7 +558,7 @@ SKEEM
           result = result.cdr
         end
 
-        source = "`()"
+        source = '`()'
         result = subject.run(source)
         expect(result).to be_kind_of(SkmEmptyList)
         expect(result).to be_null
@@ -576,7 +579,7 @@ SKEEM
           result = result.cdr
         end
 
-        source = "`()"
+        source = '`()'
         result = subject.run(source)
         expect(result).to be_kind_of(SkmEmptyList)
         expect(result).to be_null
@@ -801,46 +804,56 @@ SKEEM
         compare_to_predicted(checks)
       end
 
-        it 'should implement the truncate-quotient procedure' do
-          checks = [
-            ['(truncate-quotient 5 2)', 2],
-            ['(truncate-quotient -5 2)', -2],
-            ['(truncate-quotient 5 -2)', -2],
-            ['(truncate-quotient -5 -2)', 2],
-            ['(quotient 5 2)', 2],
-            ['(quotient -5 2)', -2],
-            ['(quotient 5 -2)', -2],
-            ['(quotient -5 -2)', 2]
-          ]
-          compare_to_predicted(checks)
-        end
+      it 'should implement the truncate-quotient procedure' do
+        checks = [
+          ['(truncate-quotient 5 2)', 2],
+          ['(truncate-quotient -5 2)', -2],
+          ['(truncate-quotient 5 -2)', -2],
+          ['(truncate-quotient -5 -2)', 2],
+          ['(quotient 5 2)', 2],
+          ['(quotient -5 2)', -2],
+          ['(quotient 5 -2)', -2],
+          ['(quotient -5 -2)', 2]
+        ]
+        compare_to_predicted(checks)
+      end
 
-        it 'should implement the truncate-remainder procedure' do
-          checks = [
-            ['(truncate-remainder 5 2)', 1],
-            ['(truncate-remainder -5 2)', -1],
-            ['(truncate-remainder 5 -2)', 1],
-            ['(truncate-remainder -5 -2)', -1],
-            ['(remainder 5 2)', 1],
-            ['(remainder -5 2)', -1],
-            ['(remainder 5 -2)', 1],
-            ['(remainder -5 -2)', -1]
-          ]
-          compare_to_predicted(checks)
-        end
+      it 'should implement the truncate-remainder procedure' do
+        checks = [
+          ['(truncate-remainder 5 2)', 1],
+          ['(truncate-remainder -5 2)', -1],
+          ['(truncate-remainder 5 -2)', 1],
+          ['(truncate-remainder -5 -2)', -1],
+          ['(remainder 5 2)', 1],
+          ['(remainder -5 2)', -1],
+          ['(remainder 5 -2)', 1],
+          ['(remainder -5 -2)', -1]
+        ]
+        compare_to_predicted(checks)
+      end
 
       it 'should implement the test-equal procedure' do
         checks = [
-          ["(test-equal (cons 1 2) (cons 1 2))", true]
+          ['(test-equal (cons 1 2) (cons 1 2))', true]
         ]
         compare_to_predicted(checks)
       end
     end # context
-    
+
     context 'Input/output:' do
+      it 'should implement the include expression' do
+        initial_dir = Dir.pwd
+        filedir = File.dirname(__FILE__)
+        Dir.chdir(filedir)
+        source = '(include "add4.skm")' # Path is assumed to be relative to pwd
+        result = subject.run(source)
+        expect(result.last).to eq(10)
+        Dir.chdir(initial_dir)
+      end
+
       it 'should implement the newline procedure' do
         default_stdout = $stdout
-        $stdout = StringIO.new()
+        $stdout = StringIO.new
         subject.run('(newline) (newline) (newline)')
         expect($stdout.string).to match(/\n\n\n$/)
         $stdout = default_stdout
@@ -895,7 +908,7 @@ SKEEM
 SKEEM
         result = subject.run(source)
         expect(result).to eq([0, 1, 2, 3, 4])
-        
+
         source = <<-SKEEM
           (let ((x '(1 3 5 7 9)))
             (do (
@@ -904,8 +917,25 @@ SKEEM
               ((null? x) sum))) ; => 25
 SKEEM
         result = subject.run(source)
-        expect(result).to eq(25)        
+        expect(result).to eq(25)
       end
     end # context
+
+    context 'Macro processing:' do
+      # it 'should parse macro expressions' do
+        # source = <<-SKEEM
+          # (define-syntax while
+            # (syntax-rules ()
+              # ((while condition body ...)
+               # (let loop ()
+                 # (if condition
+                     # (begin
+                       # body ...
+                       # (loop))
+                     # #f)))))
+# SKEEM
+        # ptree = subject.parse(source)
+      # end
+    end
   end # describe
-end # module
+end # module

data/spec/skeem/lambda_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../spec_helper' # Use the RSpec framework
 
 # Load the class under test
@@ -29,7 +31,7 @@ SKEEM
 
     context 'Defining compound procedures:' do
       it 'should accept the definition of simple procedure with arity 1' do
-        source = definition_set + "\n" + 'square'
+        source = "#{definition_set}\nsquare"
         result = subject.run(source)
 
         square = result.last
@@ -39,7 +41,7 @@ SKEEM
       end
 
       it 'should accept the definition of simple procedure with arity 2' do
-        source = definition_set + "\n" + 'sum-of-squares'
+        source = "#{definition_set}\nsum-of-squares"
         result = subject.run(source)
 
         square = result.last
@@ -63,25 +65,25 @@ SKEEM
       end
 
       it 'should support the call to a simple procedure with arity 2' do
-        source = definition_set + "\n" + '(sum-of-squares 3 4)'
+        source = "#{definition_set}\n(sum-of-squares 3 4)"
         result = subject.run(source)
 
         expect(result.last).to eq(25)
       end
 
       it 'should support the call to a nested lambda procedure' do
-        source = definition_set + "\n" + '(f 5)'
+        source = "#{definition_set}\n(f 5)"
         result = subject.run(source)
 
         expect(result.last).to eq(136)
       end
-      
+
       it 'should accept calls to anonymous procedures' do
         source = '((lambda (x) (+ x x)) 4)'
         result = subject.run(source)
         expect(result).to eq(8)
       end
-      
+
       it 'should accept unary second-order lambdas' do
         source = <<-SKEEM
   (define add-with
@@ -94,10 +96,10 @@ SKEEM
         expect(result).to eq(7)
       end
     end # context
-      
+
     context 'More advanced features:' do
       subject { Interpreter.new }
-    
+
       it 'should implement binary second-order functions' do
         source = <<-SKEEM
   (define compose
@@ -105,10 +107,10 @@ SKEEM
       (lambda (x)
         (f (g x)))))
 SKEEM
-        result = subject.run(source)
+        subject.run(source)
         result = subject.run('((compose list square) 5)')
         expect(result.last).to eq(25)
-      end       
+      end
     end # context
   end # describe
-end # module
+end # module

data/spec/skeem/parser_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../spec_helper' # Use the RSpec framework
 require_relative '../../lib/skeem/tokenizer' # Load the class under test
 
@@ -5,7 +7,7 @@ module Skeem
   describe Parser do
     context 'Initialization:' do
       it 'should be initialized without argument' do
-        expect { Parser.new() }.not_to raise_error
+        expect { Parser.new }.not_to raise_error
       end
 
       it 'should have its parse engine initialized' do
@@ -16,11 +18,11 @@ module Skeem
     context 'Parsing literals:' do
       it 'should parse isolated booleans' do
         samples = [
-        ['#f', false],
+          ['#f', false]
 #        ['#false', false],
 #        ['#t', true],
 #        ['#true', true]
-      ]
+        ]
         samples.each do |source, predicted|
           ptree = subject.parse(source)
           expect(ptree.root).to be_kind_of(SkmBoolean)
@@ -30,12 +32,12 @@ module Skeem
 
       it 'should parse isolated integers' do
         samples = [
-        ['0', 0],
-        ['3', 3],
-        ['-3', -3],
-        ['+12345', 12345],
-        ['-12345', -12345]
-      ]
+          ['0', 0],
+          ['3', 3],
+          ['-3', -3],
+          ['+12345', 12345],
+          ['-12345', -12345]
+        ]
         samples.each do |source, predicted|
           ptree = subject.parse(source)
           expect(ptree.root).to be_kind_of(SkmInteger)
@@ -43,25 +45,27 @@ module Skeem
         end
       end
 
+      # rubocop: disable Style/ExponentialNotation
       it 'should parse isolated real numbers' do
         samples = [
-        ['0.0', 0.0],
-        ['3.14', 3.14],
-        ['-3.14', -3.14],
-        ['+123e+45', 123e+45],
-        ['-123e-45', -123e-45]
-      ]
+          ['0.0', 0.0],
+          ['3.14', 3.14],
+          ['-3.14', -3.14],
+          ['+123e+45', 123e+45],
+          ['-123e-45', -123e-45]
+        ]
         samples.each do |source, predicted|
           ptree = subject.parse(source)
           expect(ptree.root).to be_kind_of(SkmReal)
           expect(ptree.root.value).to eq(predicted)
         end
       end
+      # rubocop: enable Style/ExponentialNotation
 
       it 'should parse isolated strings' do
         samples = [
-        ['"Hello world!"', 'Hello world!']
-      ]
+          ['"Hello world!"', 'Hello world!']
+        ]
         samples.each do |source, predicted|
           ptree = subject.parse(source)
           expect(ptree.root).to be_kind_of(SkmString)
@@ -71,8 +75,8 @@ module Skeem
 
       it 'should parse isolated identifiers' do
         samples = [
-        ['the-word-recursion-has-many-meanings', 'the-word-recursion-has-many-meanings']
-      ]
+          %w[the-word-recursion-has-many-meanings the-word-recursion-has-many-meanings]
+        ]
         samples.each do |source, predicted|
           ptree = subject.parse(source)
           expect(ptree.root).to be_kind_of(SkmVariableReference)