skeem 0.1.01 → 0.1.02

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a601349ce09d5671ffb98d698495e52828c3c691
-  data.tar.gz: bbb0008716eed1df4c321b5f6f6d979d5e470e41
+  metadata.gz: d94f383bc1d7de65f89a238b842b70e2c33d82c6
+  data.tar.gz: a2f2c7ee6140a51f3a5ea060d4211076c7f4b61e
 SHA512:
-  metadata.gz: 98e38e4b05f6f448437aa0dfea2eded663408b127183aac1f2b24d6ee6b28d67fad056df6786f95b1024074b0891130d2c3e3560164c261396e314db63d9a614
-  data.tar.gz: 4f0a1f51e6484bbcd8678dea5d136904d0ba41300296219fac36d7dc977982ee84146967deac72102bd961d792e1421c5e0e5b45431aad992d50b11fd529d4c0
+  metadata.gz: ca7c1d2590e6f3dec7a02345e36c8d8fe01df89aa601727e490ead32099c76e858f23a7e6caa49dd37dc144d07cc70a7a1bbe7559efdfb04437ac2e3e8fa0a81
+  data.tar.gz: 8cc56c1209d30ce0470f5281bad9b17cabdd8515f4126881c5bf7815f1fb94e73fc2d73ce33f84826291f0b0c8f2ac7498adfd1c7da8b879519fb0ed20b41e05

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [0.1.02] - 2019-01-13
+### Added
+- File `primitive_builder.rb` implementation of: `equal?`, `make-vector`, `symbol->string` procedures.
+
+### Changed
+- File `.travis.yml` Added newer Ruby versions and more environments in "Allowed failures" because of Bundler issue.
+- File `README.md` udpated to reflect currently implemented features.
+- Class `SkmUndefined` uses now the Singleton pattern.
+
+### Fixed
+- File `skeem.gemspec` Make dependency on Bundler gem depends on the Ruby version.
+- Method `SkmElement#eqv?` was missing. Method is now implemented.
+- Class `PrimitiveProcedure` was unable to cope with procedures with a bounded range of arity.
+
 ## [0.1.01] - 2019-01-01
 - Fixes, added 'set-car!', 'set-cdr!' standard Scheme procedures.
 

data/README.md

@@ -167,7 +167,7 @@ __Syntax:__
 This section lists the implemented standard procedures
 
 #### Equivalence predicates
-* `eqv?`
+* `eqv?`, `equal?`
 
 #### Boolean procedures
 * `boolean?`, `and`, `or`,  `not`
@@ -181,13 +181,13 @@ This section lists the implemented standard procedures
 * `list?`, `null?`, `pair?`, `car`, `cdr`, `cons`,  `length`, `list`, `list->vector`, `set-car!`, `set-cdr!`
 
 #### String procedures
-* `string?`, `string=?`,  `string-append`, `string-length`, `string->symbol`,
+* `string?`, `string=?`,  `string-append`, `string-length`, `string->symbol`
 
 #### Symbol procedures
-* `symbol?`, `symbol=?`
+* `symbol?`, `symbol=?`, `symbol->string`
 
 #### Vector procedures
-* `vector?`, `vector`, `vector-length`, `vector-set!`, `vector->list`
+* `vector?`, `make-vector`, `vector`, `vector-length`, `vector-set!`, `vector->list`
 
 #### Input/output procedures
 * `newline`

data/appveyor.yml

@@ -1,27 +1,30 @@
 version: '{build}'
-max_jobs: 3
+max_jobs: 5
 environment:
   matrix:
-  - Ruby_version: 21
-  - Ruby_version: 21-x64
-  - Ruby_version: 22
-  - Ruby_version: 22-x64
-  - Ruby_version: 23
-  - Ruby_version: 23-x64
-  - Ruby_version: 24  
-  - Ruby_version: 24-x64
-  - Ruby_version: 25  
   - Ruby_version: 25-x64
- 
-# These are failing 
-#  - Ruby_version: 26  
-#  - Ruby_version: 26-x64  
+  - Ruby_version: 24-x64
+  - Ruby_version: 23-x64
+  - Ruby_version: 25
+  - Ruby_version: 24
+  - Ruby_version: 23
+
+# These are failing
+#  - Ruby_version: 26
+#  - Ruby_version: 26-x64
 
 install:
   - set PATH=C:\Ruby%Ruby_version%\bin;%PATH%
+  - gem update --system
+  - gem install bundler
   - bundle install --retry=3 --clean --force
 
 build: off
 
+before_test:
+  - ruby -v
+  - gem -v
+  - bundle -v
+
 test_script:
   - bundle exec rake

data/lib/skeem/datum_dsl.rb

@@ -53,6 +53,8 @@ module Skeem
       result = case aLiteral
         when String
           SkmString.create(aLiteral)
+        when SkmIdentifier
+          SkmString.create(aLiteral.value)
         else
           SkmString.create(aLiteral.to_s)
       end

data/lib/skeem/primitive/primitive_builder.rb

@@ -39,6 +39,10 @@ module Skeem
         SkmArity.new(0, '*')
       end
 
+      def one_or_two
+        SkmArity.new(1, 2)
+      end      
+      
       def one_or_more
         SkmArity.new(1, '*')
       end
@@ -57,6 +61,7 @@ module Skeem
 
       def add_comparison(aRuntime)
         create_eqv?(aRuntime)
+        create_equal?(aRuntime)
         create_equal(aRuntime)
         create_lt(aRuntime)
         create_gt(aRuntime)
@@ -88,6 +93,7 @@ module Skeem
 
       def add_symbol_procedures(aRuntime)
         create_object_predicate(aRuntime, 'symbol?')
+        create_symbol2string(aRuntime)
       end
 
       def add_list_procedures(aRuntime)
@@ -107,6 +113,7 @@ module Skeem
         create_object_predicate(aRuntime, 'vector?')
         create_vector(aRuntime)
         create_vector_length(aRuntime)
+        create_make_vector(aRuntime)
         create_vector_ref(aRuntime)
         create_vector2list(aRuntime)
       end
@@ -220,12 +227,23 @@ module Skeem
           operand_1 = argument1.evaluate(runtime)
           operand_2 = argument2.evaluate(runtime)
           raw_result = operand_1.eqv?(operand_2)
-          to_datum(raw_result)
+          boolean(raw_result)
         end
 
         define_primitive_proc(aRuntime, 'eqv?', binary, primitive)
       end
 
+      def create_equal?(aRuntime)
+        primitive = ->(runtime, argument1, argument2) do
+          operand_1 = argument1.evaluate(runtime)
+          operand_2 = argument2.evaluate(runtime)
+          raw_result = operand_1.skm_equal?(operand_2)
+          boolean(raw_result)
+        end
+
+        define_primitive_proc(aRuntime, 'equal?', binary, primitive)
+      end
+
       def create_equal(aRuntime)
         primitive = ->(runtime, first_operand, arglist) do
           first_one = first_operand.evaluate(runtime)
@@ -423,12 +441,14 @@ module Skeem
         define_primitive_proc(aRuntime, 'string->symbol', unary, primitive)
       end
 
-      def create_cons(aRuntime)
-        primitive = ->(runtime, obj1, obj2) do
-          SkmPair.new(obj1.evaluate(aRuntime), obj2.evaluate(aRuntime))
+      def create_symbol2string(aRuntime)
+        primitive = ->(runtime, arg) do
+          arg_evaluated = arg.evaluate(runtime)
+          check_argtype(arg_evaluated, SkmIdentifier, 'symbol', 'symbol->string')
+          string(arg_evaluated)
         end
 
-        define_primitive_proc(aRuntime, 'cons', binary, primitive)
+        define_primitive_proc(aRuntime, 'symbol->string', unary, primitive)
       end
 
       def create_car(aRuntime)
@@ -451,6 +471,14 @@ module Skeem
         define_primitive_proc(aRuntime, 'cdr', unary, primitive)
       end
 
+      def create_cons(aRuntime)
+        primitive = ->(runtime, obj1, obj2) do
+          SkmPair.new(obj1.evaluate(aRuntime), obj2.evaluate(aRuntime))
+        end
+
+        define_primitive_proc(aRuntime, 'cons', binary, primitive)
+      end
+
       def create_length(aRuntime)
         primitive = ->(runtime, arg) do
           arg_evaluated = arg.evaluate(runtime)
@@ -542,6 +570,23 @@ module Skeem
 
         define_primitive_proc(aRuntime, 'vector-length', unary, primitive)
       end
+      
+      def create_make_vector(aRuntime)
+        primitive = ->(runtime, count_arg, arglist) do
+          count = count_arg.evaluate(runtime)
+          check_argtype(count, SkmInteger, 'integer', 'make_vector')
+          if arglist.empty?
+            filler = SkmUndefined.instance
+          else
+            filler = arglist.car.evaluate(runtime)
+          end
+          elements = Array.new(count.value, filler)
+
+          vector(elements)      
+        end
+
+        define_primitive_proc(aRuntime, 'make-vector', one_or_two, primitive)
+      end      
 
       def create_vector_ref(aRuntime)
           # argument 1: a vector, argument 2: an index(integer)

data/lib/skeem/primitive/primitive_procedure.rb

@@ -21,6 +21,10 @@ module Skeem
         aProcedureCall.operands_consumed = true
         do_call(aRuntime, actuals)
       end
+      
+      def skm_equal?(other)
+        equal?(other)
+      end
 
       private
 
@@ -61,6 +65,13 @@ module Skeem
           if count_actuals < arity.low
             wrong_number_arguments(arity.low, count_actuals)
           end
+        elsif arity.low < arity.high # Arity range
+          if count_actuals < arity.low
+            wrong_number_arguments(arity.low, count_actuals)
+          end
+          if count_actuals > arity.high
+            wrong_number_arguments(arity.high, count_actuals)
+          end
         else # fixed non-zero arity...
           if count_actuals != arity.high
             wrong_number_arguments(arity.high, count_actuals)
@@ -71,7 +82,7 @@ module Skeem
       def do_call(aRuntime, operands)
         if arity.nullary?
           result = code.call(aRuntime)
-        elsif arity.variadic?
+        elsif arity.variadic? || (arity.low < arity.high)
           if arity.low.zero?
             result = code.call(aRuntime, operands)
           else
@@ -83,8 +94,8 @@ module Skeem
             #p count_delta
             #p arguments.inspect
             result = code.send(:call, aRuntime, *arguments.flatten)
-          end
-        else
+          end       
+        else # Fixed arity...
           result = code.send(:call, aRuntime, *operands)
         end
 

data/lib/skeem/s_expr_nodes.rb

@@ -1,11 +1,14 @@
 # Classes that implement nodes of Abstract Syntax Trees (AST) representing
 # Skeem parse results.
+require 'singleton'
 
 require_relative 'datum_dsl'
 require_relative 'skm_unary_expression'
 
 module Skeem
   class SkmUndefined
+    include Singleton
+    
     def value
       :UNDEFINED
     end
@@ -22,6 +25,12 @@ module Skeem
           raise StandardError, other.inspect
       end
     end
+    
+    private
+    
+    def initialize
+      self.freeze
+    end
   end # class
 
   class SkmMultiExpression < SkmExpression
@@ -227,7 +236,7 @@ module Skeem
       condition_result = nil
       if test_result.boolean? && test_result.value == false
         # Only #f is considered as false, everything else is true
-        condition_result = alternate ? alternate.evaluate(aRuntime) : SkmUndefined.new
+        condition_result = alternate ? alternate.evaluate(aRuntime) : SkmUndefined.instance
       else
         condition_result = consequent.evaluate(aRuntime)
       end
@@ -374,6 +383,7 @@ module Skeem
     end
 
     alias eqv? equal?
+    alias skm_equal? equal?
 
     def inspect
       result = inspect_prefix + '@formals ' + formals.inspect + ', '

data/lib/skeem/skm_compound_datum.rb

@@ -28,7 +28,8 @@ module Skeem
     end
 
     alias eqv? equal?
-    
+    alias skm_equal? ==
+
     def verbatim?
       found = members.find_index { |elem| !elem.verbatim? }
       found ? false : true
@@ -46,14 +47,14 @@ module Skeem
       quasi_members = members.map { |elem| elem.quasiquote(aRuntime) }
       self.class.new(quasi_members)
     end
-    
+
     def quoted!
       members.each(&:quoted!)
     end
-    
+
     def unquoted!
       members.each(&:unquoted!)
-    end    
+    end
 
     # Part of the 'visitee' role in Visitor design pattern.
     # @param aVisitor [SkmElementVisitor] the visitor

data/lib/skeem/skm_element.rb

@@ -45,6 +45,15 @@ module Skeem
       false
     end
     
+    def eqv?(other)
+      equal?(other)
+    end
+    
+    def skm_equal?(_other)
+      msg = "Missing implementation of method #{self.class.name}##{__method__}"
+      raise NotImplementedError, msg
+    end
+    
     # @return [TrueClass, FalseClass] true if quoted element is identical to itself
     def verbatim?
       false

data/lib/skeem/skm_empty_list.rb

@@ -31,6 +31,10 @@ module Skeem
       true
     end
     
+    def skm_equal?(other)
+      equal?(other)
+    end
+    
     def to_a
       []
     end    
@@ -59,6 +63,7 @@ module Skeem
 
     def initialize()
       super(0)
+      self.freeze
     end
   end # class
 end # module

data/lib/skeem/skm_pair.rb

@@ -86,6 +86,30 @@ module Skeem
       self.to_a.last
     end
 
+    def eqv?(_other)
+      false
+    end
+
+    def skm_equal?(other)
+      return true if equal?(other)
+
+      equal = true
+      if car.nil?
+        equal = other.car.nil?
+      else
+        equal &&= car.skm_equal?(other.car)
+      end
+      return false unless equal
+
+      if cdr.nil?
+        equal &&= other.cdr.nil?
+      else
+        equal &&= cdr.skm_equal?(other.cdr)
+      end
+
+      equal
+    end
+
     def each(&aBlock)
       aBlock.call(car)
       cdr.each(&aBlock) if cdr && !cdr.null?

data/lib/skeem/skm_simple_datum.rb

@@ -45,6 +45,7 @@ module Skeem
     end
 
     alias eqv? ==
+    alias skm_equal? eqv?
 
     def verbatim?
       true

data/lib/skeem/version.rb

@@ -1,3 +1,3 @@
 module Skeem
-  VERSION = '0.1.01'.freeze
+  VERSION = '0.1.02'.freeze
 end

data/skeem.gemspec

@@ -58,7 +58,11 @@ SUMMARY
   spec.add_dependency 'rley', '~> 0.7'
 
   # Development dependencies
+if RUBY_VERSION <= '2.2' 
   spec.add_development_dependency 'bundler', '~> 1.16'
+else
+  spec.add_development_dependency 'bundler', '~> 2.0'
+end
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
 end

data/spec/skeem/primitive/primitive_builder_spec.rb

@@ -98,13 +98,53 @@ SKEEM
             ['(eqv? 2 2)', true],
             ['(eqv? 2 2.0)', false],
             ['(eqv? 3 2)', false],
+            ["(eqv? '() '())", true],
             ['(eqv? 100000000 100000000)', true],
             ['(eqv? "a" "a")', false],
-            ['(eqv? "a" "b")', false]
+            ['(eqv? "a" "b")', false],
+            ['(eqv? (cons 1 2) (cons 1 2))', false],
+            ['(eqv? (lambda () 1) (lambda () 2))', false],
+            ['(define p (lambda (x) x)) (eqv? p p)', true],
+            ["(eqv? #f 'nil)", false]
           ]
           checks.each do |(skeem_expr, expectation)|
             result = subject.run(skeem_expr)
-            expect(result).to eq(expectation)
+            if result.length > 1
+              expect(result.last).to eq(expectation)
+            else
+              expect(result).to eq(expectation)
+            end
+          end
+        end
+
+        it 'should implement the equal? procedure' do
+          checks = [
+            ['(equal? #f #f)', true],
+            ['(equal? #t #t)', true],
+            ['(equal? #f #t)', false],
+            ["(equal? 'a 'a)", true],
+            ["(equal? 'a 'b)", false],
+            ["(equal? '(a) '(a))", true],
+            ["(equal? '(a) '(b))", false],
+            ["(equal? '(a (b) c) '(a (b) c))", true],
+            ["(equal? (cdr '(a)) '())", true],
+            ['(equal? "abc" "abc")', true],
+            ['(equal? "abc" "acb")', false],
+            ['(equal? 2 2)', true],
+            ["(equal? '#(a) '#(b))", false],
+            ["(equal? '#(a) '#(a))", true],
+            ["(equal? (make-vector 5 'a) (make-vector 5 'a))", true],
+            ['(equal? car car)', true],
+            ['(equal? car cdr)', false],
+            ['(equal? (lambda (x) x) (lambda (y) y))', false],
+          ]
+          checks.each do |(skeem_expr, expectation)|
+            result = subject.run(skeem_expr)
+            if result.length > 1
+              expect(result.last).to eq(expectation)
+            else
+              expect(result).to eq(expectation)
+            end
           end
         end
 
@@ -362,10 +402,25 @@ SKEEM
       context 'Symbol procedures:' do
         it 'should implement the symbol? procedure' do
           checks = [
-            ['(symbol? #f)', false],
+            ["(symbol? 'foo)", true],
+            ["(symbol? (car '(a b)))", true],
             ['(symbol? "bar")', false],
+            ["(symbol? 'nil)", true],
             ["(symbol? '())", false],
-            ["(symbol? 'foo)", true],
+            ['(symbol? #f)', false]
+          ]
+          checks.each do |(skeem_expr, expectation)|
+            result = subject.run(skeem_expr)
+            expect(result).to eq(expectation)
+          end
+        end
+
+        it 'should implement the symbol->string procedure' do
+          checks = [
+            ["(equal? (symbol->string 'Hi) \"Hi\")", true],
+            ["(equal? (symbol->string 'flying-fish) \"flying-fish\")", true],
+            ["(equal? (symbol->string 'Martin) \"Martin\")", true],
+            ['(equal? (symbol->string (string->symbol "Malvina")) "Malvina")', true]
           ]
           checks.each do |(skeem_expr, expectation)|
             result = subject.run(skeem_expr)
@@ -378,9 +433,9 @@ SKEEM
         it 'should implement the pair? procedure' do
           checks = [
             ["(pair? '(a . b))", true],
-            #["(pair? '(a b c))", true],
-            #["(pair? '())", false],
-            #["(pair? '#(a b))", false]
+            ["(pair? '(a b c))", true],
+            ["(pair? '())", false],
+            ["(pair? '#(a b))", false]
           ]
           checks.each do |(skeem_expr, expectation)|
             result = subject.run(skeem_expr)
@@ -468,9 +523,9 @@ SKEEM
           expect(result.length).to eq(1)
           expect(result.car).to eq('a')
 
-          # example = "(car '(1 . 2))" # => 1 # FAILURE
-          # result = subject.run(example)
-          # expect(result.car).to eq(1)
+          example = "(car '(1 . 2))"
+          result = subject.run(example)
+          expect(result).to eq(1)
 
           example = "(car '())" # => error
           expect { subject.run(example) }.to raise_error(StandardError)
@@ -483,9 +538,9 @@ SKEEM
           expect(result.length).to eq(3)
           expect(result.to_a).to eq(['b', 'c', 'd'])
 
-          # example = "(cdr '(1 . 2))" # => 2 # PARSER FAILURE
-          # result = subject.run(example)
-          # expect(result.cdr).to eq(2)
+          example = "(cdr '(1 . 2))"
+          result = subject.run(example)
+          expect(result).to eq(2)
 
           example = "(cdr '())" # => error
           expect { subject.run(example) }.to raise_error(StandardError)
@@ -514,7 +569,7 @@ SKEEM
             expect(result.to_a).to eq(expectation)
           end
         end
-        
+
         it 'should implement the set-car! procedure' do
           source =<<-SKEEM
   (define x '(a b c))
@@ -533,7 +588,7 @@ SKEEM
 SKEEM
           result = subject.run(source)
           expect(result.last.cdr).to eq(1)
-        end         
+        end
       end # context
 
       context 'Vector procedures:' do
@@ -579,6 +634,18 @@ SKEEM
           end
         end
 
+        it 'should implement the make-vector procedure' do
+          checks = [
+            ['(vector-length (make-vector 0))', 0],
+            ["(vector-length (make-vector 0 'a))", 0],
+            ["(equal? (make-vector 5 'a) '#(a a a a a))", true],
+          ]
+          checks.each do |(skeem_expr, expectation)|
+            result = subject.run(skeem_expr)
+            expect(result).to eq(expectation)
+          end
+        end
+
         it 'should implement the vector-ref procedure' do
           source = "(vector-ref '#(1 1 2 3 5 8 13 21) 5)"
           result = subject.run(source)
@@ -586,7 +653,7 @@ SKEEM
           expect(result).to eq(8)
         end
 
-        it 'should implement the vector-> procedure' do
+        it 'should implement the vector->list procedure' do
           checks = [
             ["(vector->list #())", []],
             ["(vector->list '#(a b c))", ['a', 'b', 'c']]

data/spec/skeem/skm_element_spec.rb

@@ -35,6 +35,11 @@ module Skeem
       let(:runtime) { double('fake-runtime') }
       let(:visitor) { double('fake-visitor') }
       let(:not_implemented) { NotImplementedError }
+      
+      it 'should be equivalent to itself' do
+        expect(subject).to be_eqv(subject)
+        expect(subject).not_to be_eqv(subject.clone)
+      end     
 
       it "should ignore the 'done!' message" do
         expect { subject.done! }.not_to raise_error
@@ -47,6 +52,11 @@ module Skeem
       it "should ignore the 'unquoted!' message" do
         expect { subject.unquoted! }.not_to raise_error
       end
+      
+      it "should complain when receiving 'skm_equal?' message" do
+        msg = 'Missing implementation of method Skeem::SkmElement#skm_equal?'
+        expect { subject.skm_equal?('omg') }.to raise_error(NotImplementedError, msg)
+      end       
 
       it "should complain when receiving 'evaluate' message" do
         expect { subject.evaluate(runtime) }.to raise_error(not_implemented)

data/spec/skeem/skm_empty_list_spec.rb

@@ -20,6 +20,11 @@ module Skeem
 
     context 'Provided services:' do
       let(:runtime) { double('fake-runtime') }
+      
+      it 'should be equivalent to itself' do
+        expect(subject).to be_eqv(SkmEmptyList.instance)
+        expect(subject).not_to be_eqv("()")
+      end
 
       it "should return itself when receiving 'evaluate' message" do
         expect(subject.evaluate(runtime)).to eq(subject)

data/spec/skeem/skm_pair_spec.rb

@@ -45,18 +45,37 @@ module Skeem
         # Use a list of length 2
         expect(list_length_2.length).to eq(2)
       end
-      
+
+      it 'should respond false to `eqv?` message' do
+        expect(subject.eqv?(subject)).to eq(false)
+      end
+
+      it 'should be Skeem equal to itself' do
+        expect(subject.skm_equal?(subject)).to eq(true)
+      end
+
+
+      it 'should be equal to other pair when their car and cdr match' do
+        instance = SkmPair.new(sample_car, sample_cdr)
+        expect(subject.skm_equal?(instance)).to eq(true)
+        instance.car = integer(4)
+        expect(subject.skm_equal?(instance)).to eq(false)
+        instance.car = sample_car
+        instance.cdr = subject
+        expect(subject.skm_equal?(instance)).to eq(false)
+      end
+
       it 'should clone itself after member evaluation' do
         # subject contains self-evaluating members
         expect(subject.clone_evaluate(runtime)).to eq(subject)
-        
+
         # Make pair improper...
         subject.cdr = nil
         expect(subject.clone_evaluate(runtime)).to eq(subject)
-        
+
         subject.cdr = integer(4)
         expect(subject.clone_evaluate(runtime)).to eq(subject)
-        
+
         successor = SkmPair.new(string('Hi'), boolean(false))
         subject.cdr = successor
         expect(subject.clone_evaluate(runtime)).to eq(subject)
@@ -68,12 +87,12 @@ module Skeem
         # Use a list of length 2
         expect(list_length_2.to_a).to eq([integer(10), sample_car])
       end
-      
+
       it 'should return the last element of a list' do
          expect(subject.last).to eq(sample_car)
          expect(list_length_2.last).to eq(sample_car)
       end
-      
+
       it 'should append a new element to a list' do
         subject.append(integer(4))
         expect(subject.length).to eq(2)
@@ -86,8 +105,8 @@ module Skeem
         list = SkmPair.create_from_a(array0)
         expect(list).to be_list # It's a proper list...
         expect(list.length).to eq(0)
-        expect(list.to_a).to eq(array0)      
-      
+        expect(list.to_a).to eq(array0)
+
         # List of length 1
         array1 = [boolean(false)]
         list = SkmPair.create_from_a(array1)
@@ -109,14 +128,14 @@ module Skeem
         expect(list.length).to eq(3)
         expect(list.to_a).to eq([4, 5, 6])
       end
-      
+
       it 'should support the each method' do
         my_list = SkmPair.new('w', SkmPair.new('o', SkmPair.new('w', SkmEmptyList.instance)))
         text = ''
         my_list.each { |ch| text << ch.upcase }
         expect(text).to eq('WOW')
       end
-      
+
       it 'should implement the verbatim predicate' do
         expect(subject).to be_verbatim
         subject.cdr = nil

data/spec/skeem/skm_simple_datum_spec.rb

@@ -56,6 +56,24 @@ module Skeem
         expect(instance).to eq(3)
         expect(instance).not_to eq('foo')
       end
+      
+      it 'should be equivalent to itself' do
+        expect(subject).to be_eqv(subject)
+      end
+      
+      it 'should be equivalent by value' do
+        same = SkmSimpleDatum.create(3)
+        expect(instance).to be_eqv(same)
+      end  
+
+      it 'should be Skeem equal to itself' do
+        expect(subject).to be_skm_equal(subject)
+      end      
+      
+      it 'should be Skeem equal by value' do
+        same = SkmSimpleDatum.create(3)
+        expect(instance).to be_skm_equal(same)
+      end       
 
       it 'should be self-evaluating' do
         expect(subject.evaluate(runtime)).to be_equal(subject)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skeem
 version: !ruby/object:Gem::Version
-  version: 0.1.01
+  version: 0.1.02
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-01 00:00:00.000000000 Z
+date: 2019-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rley
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement