skeem 0.0.25 → 0.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb979d01736d3b23101b56c2b7c21dff003eed46
-  data.tar.gz: 91dddadb24f3e6cc1aa146f7c5420d4d88708d56
+  metadata.gz: dac0bc87694eef9365c7c7ba6dab9b1827eab533
+  data.tar.gz: 5097264ce99da2c1e9a8e662e2276144a31b1660
 SHA512:
-  metadata.gz: 1a3db261dbca2bf57909b90de1db6897026eea3baa739e80a52c2ee045eee1be23d685d903757ed1fb1ca92daac80cbbcdc9fb015d7f6daeb7d275262f5952fe
-  data.tar.gz: 27f38b7d92bbe22f339de58945fd7dad7efc9b57ffc1257f626fd3d97b5bd063c3432eb124e28e75d67ff35f7bf75470af15ea8ddb633850d4b21b76e122012f
+  metadata.gz: 25d09cd405ff9463eba60c098933df4804ff28051a663af4b1bed8217aee280ebfba0a4ff86391d7500b606ccbede4f3cb2021e9713c0535600ce0c30291f72d
+  data.tar.gz: 5e36e23fe874f945b394adb866b4ffb85b62a014a7afacd5653c279d4d7d9902f2b012ddf19b680259e8cc73e69385a0a9bd556b47f2c4ae46b7a35297d2974b

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+## [0.0.26] - 2018-11-25
+
+### Added
+- Procedure `eqv?` 
+- Procedure `assert`
+- Class `Runtime`, call stack added.
+- Class `ProcedureCall`, attribute `call_site` added. It contains the location of the call (line and column)
+
+### Changed 
+- File `primitive_builder.rb` implementation of: not procedure removed, `not` is now implemented in `base.skm`.
+- Method `Tokenizer#build_token` updated to remain compatible with new Rley (> 0.7.x)) 
+
+### Removed
+- File `stoken.rb`: Class `SkmToken` is no more necessary.
+
+## [0.0.25] - 2018-11-11
+Aliasing of procedures with 'set!' is supported.
+
+### Added 
+- Procedures `string=?`, `symbol=?`
+
 ## [0.0.24] - 2018-11-08
 Many internal refactoring, augmented spec files base, initial quasiquotation implementation.  
 

data/README.md

@@ -166,6 +166,9 @@ __Syntax:__
 ### Standard library
 This section lists the implemented standard procedures
 
+#### Equivalence predicates
+* `eqv?`
+
 #### Boolean procedures
 * `boolean?`, `and`, `or`,  `not`
 
@@ -189,6 +192,9 @@ This section lists the implemented standard procedures
 #### Input/output procedures
 * `newline`
 
+#### Special procedures
+* `assert`
+
 Roadmap:
 - Extend language support
 - Implement REPL

data/lib/skeem/primitive/primitive_builder.rb

@@ -55,6 +55,7 @@ module Skeem
       end
 
       def add_comparison(aRuntime)
+        create_eqv?(aRuntime)
         create_equal(aRuntime)
         create_lt(aRuntime)
         create_gt(aRuntime)
@@ -66,11 +67,11 @@ module Skeem
         create_object_predicate(aRuntime, 'number?')
         create_object_predicate(aRuntime, 'real?')
         create_object_predicate(aRuntime, 'integer?')
+        create_object_predicate(aRuntime, 'exact?')
         create_number2string(aRuntime)
       end
 
       def add_boolean_procedures(aRuntime)
-        create_not(aRuntime)
         create_and(aRuntime)
         create_or(aRuntime)
         create_object_predicate(aRuntime, 'boolean?')
@@ -106,6 +107,7 @@ module Skeem
       end
 
       def add_special_procedures(aRuntime)
+        create_assert(aRuntime)
         create_debug(aRuntime)
       end
 
@@ -194,7 +196,7 @@ module Skeem
       end
 
       def create_modulo(aRuntime)
-          primitive = ->(runtime, argument1, argument2) do
+        primitive = ->(runtime, argument1, argument2) do
           operand_1 = argument1.evaluate(runtime)
           operand_2 = argument2.evaluate(runtime)
           raw_result = operand_1.value.modulo(operand_2.value)
@@ -203,6 +205,17 @@ module Skeem
 
         define_primitive_proc(aRuntime, 'floor-remainder', binary, primitive)
       end
+      
+      def create_eqv?(aRuntime)
+        primitive = ->(runtime, argument1, argument2) do
+          operand_1 = argument1.evaluate(runtime)
+          operand_2 = argument2.evaluate(runtime)
+          raw_result = operand_1.eqv?(operand_2)
+          to_datum(raw_result)
+        end
+
+        define_primitive_proc(aRuntime, 'eqv?', binary, primitive)      
+      end
 
       def create_equal(aRuntime)
         primitive = ->(runtime, first_operand, arglist) do
@@ -303,19 +316,6 @@ module Skeem
         define_primitive_proc(aRuntime, 'number->string', unary, primitive)
       end
 
-      def create_not(aRuntime)
-        primitive = ->(runtime, arg) do
-          arg_evaluated = arg.evaluate(runtime)
-          if arg_evaluated.boolean? && arg_evaluated.value == false
-            boolean(true)
-          else
-            boolean(false)
-          end
-        end
-
-        define_primitive_proc(aRuntime, 'not', unary, primitive)
-      end
-
       def create_and(aRuntime)
         # arglist should be a Ruby Array
         primitive = ->(runtime, arglist) do
@@ -466,6 +466,23 @@ module Skeem
 
         define_primitive_proc(aRuntime, 'newline', nullary, primitive)
       end
+      
+      def create_assert(aRuntime)
+        primitive = ->(runtime, arg) do
+          arg_evaluated = arg.evaluate(runtime)
+          if arg_evaluated.boolean? && arg_evaluated.value == false
+            assert_call = aRuntime.caller
+            pos = assert_call.call_site          
+            # Error: assertion failed: (> 1 2)
+            msg = "assertion failed on line #{pos.line}, column #{pos.column}"
+            raise StandardError, 'Error: ' + msg
+          else
+            boolean(true)
+          end
+        end
+
+        define_primitive_proc(aRuntime, 'assert', unary, primitive)
+      end
 
       def create_debug(aRuntime)
         primitive = ->(runtime) do

data/lib/skeem/runtime.rb

@@ -4,9 +4,11 @@ require_relative 'environment'
 module Skeem
   class Runtime
     attr_reader(:environment)
+    attr_reader(:call_stack)
 
     def initialize(anEnvironment)
       @environment = anEnvironment
+      @call_stack = []
     end
 
     def include?(anIdentifier)
@@ -65,15 +67,34 @@ module Skeem
       return environment.depth
     end
 
+    def push(anEnvironment)
+      @environment = anEnvironment
+    end    
+    
     # Make the outer enviromnent thecurrent one inside the provided block
     def pop
       env = environment
       @environment = environment.outer
       env
     end
-
-    def push(anEnvironment)
-      @environment = anEnvironment
+    
+    def push_call(aProcCall)
+      if aProcCall.kind_of?(ProcedureCall)
+        call_stack.push(aProcCall)
+      else
+        raise StandardError, "Invalid call object #{aProcCall.inspect}"
+      end
+    end
+    
+    def pop_call()
+      if call_stack.empty?
+        raise StandardError, 'Skeem call stack empty!'
+      end
+      call_stack.pop
+    end
+    
+    def caller
+      call_stack.last
     end
 
     private

data/lib/skeem/s_expr_builder.rb

@@ -112,7 +112,12 @@ module Skeem
 
     # rule('proc_call_args' => 'LPAREN operator operand_plus RPAREN')
     def reduce_proc_call_args(_production, aRange, _tokens, theChildren)
-      ProcedureCall.new(aRange, theChildren[1], theChildren[2])
+      pcall = ProcedureCall.new(aRange, theChildren[1], theChildren[2])
+      if theChildren[1].kind_of?(SkmVariableReference)
+          pcall.call_site = theChildren[1].child.token.position
+      end
+
+      pcall
     end
 
     # rule('operand_plus' => 'operand_plus operand').as 'multiple_operands'

data/lib/skeem/s_expr_nodes.rb

@@ -10,28 +10,28 @@ module Skeem
     def value
       :UNDEFINED
     end
-    
+
     def ==(other)
       return true if other.kind_of?(SkmUndefined)
-      
+
       result = case other
         when Symbol
           self.value == other
         when String
           self.value.to_s == other
-        else 
+        else
           raise StandardError, other.inspect
       end
     end
   end # class
-  
+
   class SkmMultiExpression < SkmExpression
     # Part of the 'visitee' role in Visitor design pattern.
     # @param _visitor [SkmElementVisitor] the visitor
     def accept(aVisitor)
       aVisitor.visit_multi_expression(self)
     end
-    
+
     # @return [Array] the names of attributes referencing child SkmElement.
     def associations
       raise NotImplementedError
@@ -66,7 +66,7 @@ module Skeem
               if entry.expression.kind_of?(SkmLambda)
                 @expression = entry.expression
               end
-            end                        
+            end
           else
             # INFINITE LOOP DANGER: definition of 'x' is a reference to 'x'!
             # Way out: the lookup for the reference should start from outer
@@ -82,11 +82,11 @@ module Skeem
 
       result
     end
-    
+
     def quasiquote(aRuntime)
       quasi_var = variable.quasiquote(aRuntime)
       quasi_expression = variable.quasiquote(aRuntime)
-      
+
       if quasi_var.equal?(variable) && quasi_expression.equal?(expression)
         self
       else
@@ -96,7 +96,7 @@ module Skeem
 
     # call method should only invoked when the expression is a SkmLambda
     def call(aRuntime, aProcedureCall)
-      unless [SkmLambda, Primitive::PrimitiveProcedure].include?(expression.class) 
+      unless [SkmLambda, Primitive::PrimitiveProcedure].include?(expression.class)
         err_msg = "Expected a SkmLambda instead of #{expression.class}"
         raise StandardError, err_msg
       end
@@ -111,7 +111,7 @@ module Skeem
       result << inspect_suffix
       result
     end
-    
+
     def associations
       [:variable, :expression]
     end
@@ -120,6 +120,7 @@ module Skeem
   class ProcedureCall < SkmMultiExpression
     attr_reader :operator
     attr_reader :operands
+    attr_accessor :call_site
 
     def initialize(aPosition, anOperator, theOperands)
       super(aPosition)
@@ -147,16 +148,18 @@ module Skeem
         # $stderr.puts "## CALL(#{var_key.value}) ###################"
         # $stderr.puts operands.inspect
       end
+      aRuntime.push_call(self)
       result = procedure.call(aRuntime, self)
+      aRuntime.pop_call
       # $stderr.puts "## RETURN #{result.inspect}"
       result
     end
-    
+
     def quasiquote(aRuntime)
       quasi_operator = operator.quasiquote(aRuntime)
       quasi_operands = operands.map { |oper | oper.quasiquote(aRuntime) }
-      
-       self.class.new(position, quasi_operator, quasi_operands)   
+
+       self.class.new(position, quasi_operator, quasi_operands)
     end
 
     def inspect
@@ -164,7 +167,7 @@ module Skeem
       result << '@operands ' + operands.inspect + inspect_suffix
       result
     end
-    
+
     def associations
       [:operator, :operands]
     end
@@ -194,14 +197,14 @@ module Skeem
         condition_result = consequent.evaluate(aRuntime)
       end
     end
-    
+
     def quasiquote(aRuntime)
       quasi_test = test.quasiquote(aRuntime)
       quasi_consequent = consequent.quasiquote(aRuntime)
       quasi_alternate = alternate.quasiquote(aRuntime)
-      
-       self.class.new(position, quasi_test, quasi_consequent, quasi_alternate)   
-    end    
+
+       self.class.new(position, quasi_test, quasi_consequent, quasi_alternate)
+    end
 
     def inspect
       result = inspect_prefix + '@test ' + test.inspect + ', '
@@ -209,10 +212,10 @@ module Skeem
       result << '@alternate ' + alternate.inspect + inspect_suffix
       result
     end
-    
+
     def associations
       [:test, :consequent, :alternate]
-    end    
+    end
   end # class
 
   SkmArity = Struct.new(:low, :high) do
@@ -301,15 +304,15 @@ module Skeem
     def evaluate(aRuntime)
       formals.evaluate(aRuntime)
     end
-=begin    
+=begin
   TODO
     def quasiquote(aRuntime)
       quasi_test = test.quasiquote(aRuntime)
       quasi_consequent = consequent.quasiquote(aRuntime)
       quasi_alternate = alternate.quasiquote(aRuntime)
-      
-       self.class.new(position, quasi_test, quasi_consequent, quasi_alternate)   
-    end    
+
+       self.class.new(position, quasi_test, quasi_consequent, quasi_alternate)
+    end
 =end
     def call(aRuntime, aProcedureCall)
       aRuntime.nest
@@ -331,13 +334,15 @@ module Skeem
       formals.required_arity
     end
 
+    alias eqv? equal?
+
     def inspect
       result = inspect_prefix + '@formals ' + formals.inspect + ', '
       result << '@definitions ' + definitions.inspect + ', '
       result << '@sequence ' + sequence.inspect + inspect_suffix
       result
     end
-    
+
     def associations
       [:formals, :definitions, :sequence]
     end

data/lib/skeem/skm_compound_datum.rb

@@ -26,6 +26,8 @@ module Skeem
           members == other
       end
     end
+    
+    alias eqv? equal?
 
     def evaluate(aRuntime)
       members_eval = members.map { |elem| elem.evaluate(aRuntime) }

data/lib/skeem/skm_simple_datum.rb

@@ -19,9 +19,13 @@ module Skeem
       return lightweight
     end
 
-    def symbol()
+    def symbol
       token.terminal
     end
+    
+    def position
+      token.position
+    end
 
     # Equality operator.
     # Returns true when: self and 'other' are identical, or
@@ -39,6 +43,8 @@ module Skeem
 
       result
     end
+    
+    alias eqv? ==
 
     def done!()
       # Do nothing
@@ -87,18 +93,42 @@ module Skeem
     def number?
       true
     end
+    
+    def eqv?(other)
+      return true if self.equal?(other)
+
+      result = if other.kind_of?(SkmNumber)
+        if self.exact? != other.exact?
+          false
+        else
+          self.value == other.value
+        end
+      else
+        self.value == other
+      end
+
+      result
+    end  
   end # class
 
   class SkmReal < SkmNumber
     def real?
       true
     end
+    
+    def exact?
+      false
+    end
   end # class
 
   class SkmInteger < SkmReal
     def integer?
       true
     end
+    
+    def exact?
+      true
+    end    
   end # class
 
   class SkmString < SkmSimpleDatum
@@ -111,6 +141,8 @@ module Skeem
       true
     end
     
+    alias eqv? equal?
+    
     def length
       value.length
     end

data/lib/skeem/skm_unary_expression.rb

@@ -88,6 +88,10 @@ module Skeem
 
   class SkmVariableReference  < SkmUnaryExpression
     alias variable child
+    
+    def eqv?(other)
+      child == other.child
+    end
 
     def evaluate(aRuntime)
       var_key = variable.evaluate(aRuntime)

data/lib/skeem/standard/base.skm

@@ -1,10 +1,14 @@
 ; Standard R7RS procedures from section 6.2.6
+
+; (zero? z)
+; Returns true iff z is zero
 (define zero?
   (lambda (z)
     (if (= z 0)
       #t
       #f)))
 
+; (positive? x)      
 ; Return true if x greater or equal to zero; false otherwise
 (define positive?
   (lambda (x)
@@ -12,29 +16,43 @@
       #t
       #f)))
 
+; (negative? x)
+; Returns true iff x < 0      
 (define negative?
   (lambda (x)
     (if (< x 0)
       #t
       #f)))
 
+; (inexact? z)
+; Returns true iff z is not an exact number      
+(define inexact?
+  (lambda (z) 
+    (not (exact? z))))
+
 ; For backwards compatibility
 (define modulo
   (lambda (x y)
     (floor-remainder x y)))
 
+; (odd? n)
+; Returns true iff n is odd
 (define odd?
   (lambda (n)
     (if (= (modulo n 2) 1)
       #t
       #f)))
 
+; (even? n)
+; Returns true iff n is even
 (define even?
   (lambda (n)
     (if (= (modulo n 2) 0)
       #t
       #f)))
 
+; (abs x)
+; Returns the absolute value of a number
 (define abs
   (lambda (x)
     (if (positive? x)
@@ -45,7 +63,15 @@
   (lambda (z)
     (* z z)))
 
-(define symbol=? string=?)
-    
+; (not obj)
+; Logical inverse of obj
+(define (not obj)
+  (if obj #f #t))
+
+; (list arg ...)
+; Allocates and returns a new list from its arguments   
 (define list
-  (lambda args args))
+  (lambda args args))
+
+
+(define symbol=? string=?)

data/lib/skeem/tokenizer.rb

@@ -1,7 +1,7 @@
 # File: tokenizer.rb
 # Tokenizer for Skeem language (a small subset of Scheme)
 require 'strscan'
-require_relative 'stoken'
+require 'rley'
 
 module Skeem
   # A tokenizer for the Skeem dialect.
@@ -58,7 +58,7 @@ module Skeem
       @line_start = 0
     end
 
-    # @return [Array<SToken>] | Returns a sequence of tokens
+    # @return [Array<SkmToken>] | Returns a sequence of tokens
     def tokens
       tok_sequence = []
       until @scanner.eos?
@@ -148,8 +148,8 @@ other literal data (section 2.4).
       begin
         value = convert_to(aLexeme, aSymbolName, aFormat)
         col = scanner.pos - aLexeme.size - @line_start + 1
-        pos = Position.new(@lineno, col)
-        token = SToken.new(value, aSymbolName, pos)
+        pos = Rley::Lexical::Position.new(@lineno, col)
+        token = Rley::Lexical::Token.new(value, aSymbolName, pos)
       rescue StandardError => exc
         puts "Failing with '#{aSymbolName}' and '#{aLexeme}'"
         raise exc

data/lib/skeem/version.rb

@@ -1,3 +1,3 @@
 module Skeem
-  VERSION = '0.0.25'.freeze
+  VERSION = '0.0.26'.freeze
 end

data/skeem.gemspec

@@ -55,7 +55,7 @@ SUMMARY
   PkgExtending.pkg_files(spec)
   PkgExtending.pkg_documentation(spec)
   # Runtime dependencies
-  spec.add_dependency 'rley', '~> 0.6'
+  spec.add_dependency 'rley', '~> 0.7'
 
   # Development dependencies
   spec.add_development_dependency 'bundler', '~> 1.16'

data/spec/skeem/interpreter_spec.rb

@@ -568,18 +568,22 @@ SKEEM
         end
       end
       
-      it 'should implement the symbol=? procedure' do
+      it 'should implement the not procedure' do
         checks = [
-          ["(symbol=? 'a 'a)", true],
-          ["(symbol=? 'a (string->symbol \"a\"))", true],
-          ["(symbol=? 'a 'b)", false]
+          ['(not #t)', false],
+          ['(not 3)', false],
+          ['(not (list 3))', false],
+          ['(not #f)', true],
+          ["(not '())", false],
+          ['(not (list))', false],
+          ["(not 'nil)", false]
         ]
         checks.each do |(skeem_expr, expectation)|
           result = subject.run(skeem_expr)
           expect(result).to eq(expectation)
         end
-      end       
-
+      end      
+      
       it 'should implement the list procedure' do
         checks = [
           ['(list)', []],
@@ -591,6 +595,18 @@ SKEEM
           expect(result.members).to eq(expectation)
         end
       end
+      
+      it 'should implement the symbol=? procedure' do
+        checks = [
+          ["(symbol=? 'a 'a)", true],
+          ["(symbol=? 'a (string->symbol \"a\"))", true],
+          ["(symbol=? 'a 'b)", false]
+        ]
+        checks.each do |(skeem_expr, expectation)|
+          result = subject.run(skeem_expr)
+          expect(result).to eq(expectation)
+        end
+      end      
     end # context
   end # describe
 end # module

data/spec/skeem/primitive/primitive_builder_spec.rb

@@ -88,6 +88,26 @@ SKEEM
       end # context
 
       context 'Comparison operators' do
+        it 'should implement the eqv? procedure' do
+          checks = [
+            ['(eqv? #f #f)', true],
+            ['(eqv? #t #t)', true],
+            ['(eqv? #f #t)', false],
+            ["(eqv? 'a 'a)", true],
+            ["(eqv? 'a 'b)", false],
+            ['(eqv? 2 2)', true],
+            ['(eqv? 2 2.0)', false],
+            ['(eqv? 3 2)', false],
+            ['(eqv? 100000000 100000000)', true],
+            ['(eqv? "a" "a")', false],
+            ['(eqv? "a" "b")', false]
+          ]
+          checks.each do |(skeem_expr, expectation)|
+            result = subject.run(skeem_expr)
+            expect(result).to eq(expectation)
+          end          
+        end
+        
         it 'should implement the equality operator' do
           checks = [
             ['(= 3)', true], # '=' as unary operator
@@ -222,18 +242,6 @@ SKEEM
       end # context
 
       context 'Boolean procedures:' do
-        it 'should implement the not procedure' do
-          checks = [
-            ['(not #t)', false],
-            ['(not 3)', false],
-            ['(not #f)', true]
-          ]
-          checks.each do |(skeem_expr, expectation)|
-            result = subject.run(skeem_expr)
-            expect(result).to eq(expectation)
-          end
-        end
-
         it 'should implement the and procedure' do
           checks = [
             ['(and (= 2 2) (> 2 1))', true],
@@ -280,7 +288,8 @@ SKEEM
         it 'should implement the boolean? procedure' do
           checks = [
             ['(boolean? #f)', true],
-            ['(boolean? 0)', false]
+            ['(boolean? 0)', false],
+            ["(boolean? '())", false]
           ]
           checks.each do |(skeem_expr, expectation)|
             result = subject.run(skeem_expr)
@@ -469,6 +478,28 @@ SKEEM
           $stdout = default_stdout
         end
       end # context
+      
+      context 'Miscellaneous procedures' do
+        it 'should return true when an assertion succeeds' do
+          source = <<-SKEEM
+  (define x 2)
+  (define y 1)
+  (assert (> x y))
+SKEEM
+          expect(subject.run(source).last).to eq(true)
+        end       
+      
+        it 'should raise an error when an assertion fails' do
+          source = <<-SKEEM
+  (define x 1)
+  (define y 2)
+  (assert (> x y))
+SKEEM
+          err = StandardError
+          msg = 'Error: assertion failed on line 3, column 4'
+          expect { subject.run(source) }.to raise_error(err, msg)
+        end      
+      end # context
     end # describe
   end # module
 end # module

data/spec/skeem/runtime_spec.rb

@@ -1,5 +1,6 @@
 require_relative '../spec_helper' # Use the RSpec framework
 require_relative '../../lib/skeem/datum_dsl'
+require_relative '../../lib/skeem/s_expr_nodes'
 require_relative '../../lib/skeem/primitive/primitive_builder'
 
 require_relative '../../lib/skeem/runtime' # Load the class under test
@@ -19,6 +20,10 @@ module Skeem
       it 'should know the environment' do
         expect(subject.environment).to eq(some_env)
       end
+      
+      it 'should have an empty call stack' do
+        expect(subject.call_stack).to be_empty
+      end
     end # context
 
     context 'Provided services:' do
@@ -56,7 +61,7 @@ module Skeem
       end
     end # context
       
-    context 'Environment nesting' do
+    context 'Environment nesting:' do
       it 'should add nested environment' do
         expect(subject.depth).to be_zero
         env_before = subject.environment
@@ -78,5 +83,31 @@ module Skeem
         expect(subject.depth).to be_zero
       end
     end # context
+    
+    context 'Call stack operations:' do
+      let(:sample_call) do
+        pos = double('fake-position')
+        ProcedureCall.new(pos, identifier('boolean?'), [integer(42)])      
+      end
+      
+      it 'should push a call to the stack call' do
+        expect { subject.push_call(sample_call) }.not_to raise_error
+        expect(subject.call_stack.size). to eq(1)
+        expect(subject.caller).to eq(sample_call)
+        
+        subject.push_call(sample_call.clone)
+        expect(subject.call_stack.size). to eq(2)
+      end
+
+      it 'should pop a call from the call stack' do
+        subject.push_call(sample_call)
+        expect { subject.pop_call }.not_to raise_error
+        expect(subject.call_stack).to be_empty
+        
+        err = StandardError
+        msg = 'Skeem call stack empty!'
+        expect { subject.pop_call }.to raise_error(err, msg)
+      end
+    end # context    
   end # describe
 end # module

data/spec/skeem/skm_simple_datum_spec.rb

@@ -155,6 +155,19 @@ module Skeem
       it 'should react positively to real? predicate' do
         expect(subject).to be_real
       end
+      
+      it 'should react negatively to exact? predicate' do
+        expect(subject).not_to be_exact
+      end
+
+      it 'should implement the eqv? predicate' do
+        same = SkmReal.create(0.51)
+        different = SkmReal.create(1.21)
+        
+        expect(subject).to be_eqv(subject)
+        expect(subject).to be_eqv(same)
+        expect(subject).not_to be_eqv(different)
+      end      
     end # context
   end # describe
 
@@ -182,6 +195,20 @@ module Skeem
       it 'should react positively to integer? predicate' do
         expect(subject).to be_real
       end
+      
+      it 'should react positively to exact? predicate' do
+        expect(subject).to be_exact
+      end
+
+      it 'should implement the eqv? predicate' do
+        three = SkmInteger.create(3)
+        real_3 = SkmReal.create(3.0)
+        four = SkmInteger.create(4)
+        
+        expect(subject).to be_eqv(three)
+        expect(subject).not_to be_eqv(real_3)
+        expect(subject).not_to be_eqv(four)
+      end
     end # context
   end # describe
 

data/spec/skeem/tokenizer_spec.rb

@@ -32,7 +32,7 @@ module Skeem
       it 'should tokenize single char delimiters' do
         subject.reinitialize("( ) ' ` . , ,@")
         tokens = subject.tokens
-        tokens.each { |token| expect(token).to be_kind_of(SToken) }
+        tokens.each { |token| expect(token).to be_kind_of(Rley::Lexical::Token) }
         terminals = tokens.map(&:terminal)
         prediction = %w[LPAREN RPAREN APOSTROPHE
           GRAVE_ACCENT PERIOD

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skeem
 version: !ruby/object:Gem::Version
-  version: 0.0.25
+  version: 0.0.26
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-11 00:00:00.000000000 Z
+date: 2018-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rley
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -102,7 +102,6 @@ files:
 - lib/skeem/skm_simple_datum.rb
 - lib/skeem/skm_unary_expression.rb
 - lib/skeem/standard/base.skm
-- lib/skeem/stoken.rb
 - lib/skeem/tokenizer.rb
 - lib/skeem/version.rb
 - skeem.gemspec

data/lib/skeem/stoken.rb

@@ -1,22 +0,0 @@
-require 'rley' # Load the Rley gem
-
-module Skeem
-  Position = Struct.new(:line, :column) do
-    def to_s
-      "line #{line}, column #{column}"
-    end
-  end
-
-  # Specialization of Token class.
-  # It stores the position in (line, row) of the token
-  class SToken < Rley::Lexical::Token
-    attr_reader(:position)
-
-    def initialize(theLexeme, aTerminal, aPosition)
-      super(theLexeme, aTerminal)
-      @position = aPosition
-    end
-  end # class
-end # module
-
-# End of file