skeem 0.2.16 → 0.2.20

data/lib/skeem/tokenizer.rb

@@ -16,8 +16,13 @@ module Skeem
   # Delimiters: parentheses '(',  ')'
   # Separators: comma
   class Tokenizer
+    # @return [StringScanner]
     attr_reader(:scanner)
+
+    # @return [Integer] Current line number
     attr_reader(:lineno)
+
+    # @return [Integer] Offset of start of current line
     attr_reader(:line_start)
 
     @@lexeme2name = {
@@ -53,7 +58,7 @@ module Skeem
       SYNTAX-RULES
       UNQUOTE
       UNQUOTE-SPLICING
-    ].map { |x| [x, x] } .to_h
+    ].map { |x| [x, x.sub(/\*$/, '_STAR')] }.to_h
 
     class ScanError < StandardError; end
 
@@ -84,6 +89,8 @@ module Skeem
 
     private
 
+    # rubocop: disable Lint/DuplicateBranch
+
     def _next_token
       skip_intertoken_spaces
       curr_ch = scanner.peek(1)
@@ -109,7 +116,7 @@ module Skeem
       elsif (lexeme = scanner.scan(/[+-]?[0-9]+(?:\.[0-9]*)?(?:(?:e|E)[+-]?[0-9]+)?/))
         # Order dependency: must be tested after INTEGER case
         token = build_token('REAL', lexeme)
-      elsif (lexeme = scanner.scan(/#(?:(?:true)|(?:false)|(?:u8)|[\\\(tfeiodx]|(?:\d+[=#]))/))
+      elsif (lexeme = scanner.scan(/#(?:(?:true)|(?:false)|(?:u8)|[\\(tfeiodx]|(?:\d+[=#]))/))
         token = cardinal_token(lexeme)
       elsif (lexeme = scanner.scan(/"(?:\\"|[^"])*"/)) # Double quotes literal?
         token = build_token('STRING_LIT', lexeme)
@@ -119,7 +126,7 @@ module Skeem
         token = build_token(tok_type, lexeme)
       elsif (lexeme = scanner.scan(/\|(?:[^|])*\|/)) # Vertical bar delimited
         token = build_token('IDENTIFIER', lexeme)
-      elsif (lexeme = scanner.scan(/([\+\-])((?=\s|[|()";])|$)/))
+      elsif (lexeme = scanner.scan(/([+\-])((?=\s|[|()";])|$)/))
         #  # R7RS peculiar identifiers case 1: isolated plus and minus as identifiers
         token = build_token('IDENTIFIER', lexeme)
       elsif (lexeme = scanner.scan(/[+-][a-zA-Z!$%&*\/:<=>?@^_~+-@][a-zA-Z0-9!$%&*+-.\/:<=>?@^_~+-]*/))
@@ -138,6 +145,8 @@ module Skeem
       return token
     end
 
+    # rubocop: enable Lint/DuplicateBranch
+
 =begin
 #u8( This introduces a bytevector constant (section 6.9).
 Bytevector constants are terminated by ) .
@@ -162,11 +171,10 @@ other literal data (section 2.4).
       if (lexeme = scanner.scan(/#\\/))
         if (lexeme = scanner.scan(/(?:alarm|backspace|delete|escape|newline|null|return|space|tab)/))
           token = build_token('CHAR', lexeme, :name)
-        elsif (lexeme = scanner.scan(/[^x]/))
-          token = build_token('CHAR', lexeme, :escaped)
         elsif (lexeme = scanner.scan(/x[0-9a-fA-F]+/))
           token = build_token('CHAR', lexeme, :hex_value)
-        elsif (lexeme = scanner.scan(/x/))
+        else
+          lexeme = scanner.getch
           token = build_token('CHAR', lexeme, :escaped)
         end
       end
@@ -352,7 +360,6 @@ other literal data (section 2.4).
     end
 
     def skip_block_comment
-      # require 'debug'
       scanner.skip(/#\|/)
       nesting_level = 1
       loop do

data/lib/skeem/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Skeem
-  VERSION = '0.2.16'
+  VERSION = '0.2.20'
 end

data/skeem.gemspec

@@ -10,6 +10,7 @@ module PkgExtending
     file_list = Dir[
       '.rubocop.yml',
       '.rspec',
+      '.travis.yml',
       '.yardopts',
       'appveyor.yml',
       'Gemfile',
@@ -23,7 +24,8 @@ module PkgExtending
       'lib/**/*.rb',
       'lib/**/*.skm',
       'spec/**/*.rb',
-      'spec/**/*.skm'
+      'spec/**/*.skm',
+      'spec/**/*.yml'
     ]
     aPackage.files = file_list
     aPackage.test_files = Dir['spec/**/*_spec.rb']
@@ -52,7 +54,7 @@ DESCR
 SUMMARY
   spec.homepage      = 'https://github.com/famished-tiger/Skeem'
   spec.license       = 'MIT'
-  spec.required_ruby_version = '>= 2.3.0'  
+  spec.required_ruby_version = '>= 2.5.0'
 
   spec.bindir = 'bin'
   spec.executables << 'skeem'
@@ -60,12 +62,10 @@ SUMMARY
   PkgExtending.pkg_files(spec)
   PkgExtending.pkg_documentation(spec)
   # Runtime dependencies
-  spec.add_dependency 'rley', '~> 0.7'
+  spec.add_dependency 'rley', '~> 0.8.08'
 
   # Development dependencies
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  
-
 end

data/spec/skeem/element_visitor_spec.rb

@@ -12,7 +12,9 @@ module Skeem
     let(:simple_datum) { integer 42 }
     let(:listener) do
       fake = double('fake-subscriber')
-      fake.define_singleton_method(:accept_all) {}
+      fake.define_singleton_method(:accept_all) do
+        # Dummy block
+      end
       fake
     end
 

data/spec/skeem/interpreter_spec.rb

@@ -16,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
@@ -67,6 +67,7 @@ module Skeem
         end
       end
 
+      # rubocop: disable Style/ExponentialNotation
       it 'should evaluate isolated real numbers' do
         samples = [
           ['0.0', 0.0],
@@ -80,6 +81,7 @@ module Skeem
           expect(result).to eq(predicted)
         end
       end
+      # rubocop: enable Style/ExponentialNotation
 
       it 'should evaluate isolated strings' do
         samples = [

data/spec/skeem/lambda_spec.rb

@@ -31,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
@@ -41,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
@@ -65,14 +65,14 @@ 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)

data/spec/skeem/parser_spec.rb

@@ -45,6 +45,7 @@ module Skeem
         end
       end
 
+      # rubocop: disable Style/ExponentialNotation
       it 'should parse isolated real numbers' do
         samples = [
           ['0.0', 0.0],
@@ -59,6 +60,7 @@ module Skeem
           expect(ptree.root.value).to eq(predicted)
         end
       end
+      # rubocop: enable Style/ExponentialNotation
 
       it 'should parse isolated strings' do
         samples = [

data/spec/skeem/primitive/primitive_builder_spec.rb

@@ -654,8 +654,8 @@ SKEEM
             ["(append '(a b) '(c d))", array2list_ids(%w[a b c d])],
             ["(append '(a b) '(c) 'd)", array2list_ids(%w[a b c d])],
             ["(append '(a (b)) '((c)))", [SkmIdentifier.create('a'),
-                                          SkmPair.create_from_a(array2list_ids(['b'])),
-                                          SkmPair.create_from_a(array2list_ids(['c']))]],
+              SkmPair.create_from_a(array2list_ids(['b'])),
+              SkmPair.create_from_a(array2list_ids(['c']))]],
             ["(append '() 'a)", SkmIdentifier.create('a')]
           ]
           compare_to_predicted(checks) do |result, expectation|
@@ -919,8 +919,8 @@ SKEEM
           result = subject.run(source)
           expect(result).to be_kind_of(SkmVector)
           expectation = [SkmInteger.create(0),
-                         SkmPair.new(SkmString.create('Sue'), SkmPair.new(SkmString.create('Sue'), SkmEmptyList.instance)),
-                         SkmString.create('Anna')]
+            SkmPair.new(SkmString.create('Sue'), SkmPair.new(SkmString.create('Sue'), SkmEmptyList.instance)),
+            SkmString.create('Anna')]
           expect(result).to eq(expectation)
 
           source = <<-SKEEM
@@ -1010,7 +1010,7 @@ SKEEM
           err = StandardError
           msg1 = 'Error: assertion failed on line 3, column 4'
           msg2 = 'with <Skeem::SkmBoolean: false>'
-          expect { subject.run(source) }.to raise_error(err, msg1 + ', ' + msg2)
+          expect { subject.run(source) }.to raise_error(err, "#{msg1}, #{msg2}")
         end
       end # context
     end # describe

data/spec/skeem/primitive/primitive_procedure_spec.rb

@@ -149,7 +149,7 @@ module Skeem
           expect(pproc.call(rtime, no_arg)).to eq(0)
 
           many = [SkmString.create('foo'), SkmString.create('bar'),
-                  SkmString.create('quux')]
+            SkmString.create('quux')]
           expect(pproc.call(rtime, many)).to eq(3)
         end
       end # context

data/spec/skeem/runtime_spec.rb

@@ -96,11 +96,11 @@ module Skeem
 
       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.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)
+        expect(subject.call_stack.size).to eq(2)
       end
 
       it 'should pop a call from the call stack' do

data/spec/skeem/skm_compound_datum_spec.rb

@@ -50,7 +50,7 @@ module Skeem
       it 'should return its text representation' do
         txt1 = '<Skeem::SkmCompoundDatum: <Skeem::SkmInteger: 1>,'
         txt2 = '<Skeem::SkmInteger: 2>, <Skeem::SkmInteger: 3>>'
-        expect(subject.inspect).to eq(txt1 + ' ' + txt2)
+        expect(subject.inspect).to eq("#{txt1} #{txt2}")
       end
     end # context
 

data/spec/skeem/skm_pair_spec.rb

@@ -37,7 +37,7 @@ module Skeem
 
     context 'Provided services:' do
       let(:runtime) { Runtime.new(SkmFrame.new) }
-      let(:list_length_2) { SkmPair.new(integer(10), subject) }
+      let(:list_length2) { SkmPair.new(integer(10), subject) }
       let(:quirk_element) { double('three') }
       let(:quirk_members) { [integer(10), quirk_element] }
 
@@ -71,7 +71,7 @@ module Skeem
         expect(subject.length).to eq(1)
 
         # Use a list of length 2
-        expect(list_length_2.length).to eq(2)
+        expect(list_length2.length).to eq(2)
       end
 
       it 'should respond false to `eqv?` message' do
@@ -113,7 +113,7 @@ module Skeem
         expect(subject.to_a).to eq([sample_car])
 
         # Use a list of length 2
-        expect(list_length_2.to_a).to eq([integer(10), sample_car])
+        expect(list_length2.to_a).to eq([integer(10), sample_car])
       end
 
       it 'should return the last pair of a proper list' do
@@ -133,7 +133,7 @@ module Skeem
 
       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)
+         expect(list_length2.last).to eq(sample_car)
       end
 
       it 'should append a new element to a list' do
@@ -227,7 +227,7 @@ module Skeem
         expect(subject.inspect).to eq(predicted)
 
         predicted = '<Skeem::SkmPair: <Skeem::SkmInteger: 10>, <Skeem::SkmInteger: 3>>'
-        expect(list_length_2.inspect).to eq(predicted)
+        expect(list_length2.inspect).to eq(predicted)
       end
     end # context
   end # describe

data/spec/skeem/tokenizer_spec.rb

@@ -47,8 +47,8 @@ module Skeem
         tokens.each { |token| expect(token).to be_kind_of(Rley::Lexical::Token) }
         terminals = tokens.map(&:terminal)
         prediction = %w[LPAREN RPAREN APOSTROPHE
-                        GRAVE_ACCENT PERIOD
-                        COMMA COMMA_AT_SIGN ]
+          GRAVE_ACCENT PERIOD
+          COMMA COMMA_AT_SIGN ]
         expect(terminals).to eq(prediction)
       end
     end # context
@@ -129,6 +129,7 @@ module Skeem
     end # context
 
     context 'Real number recognition:' do
+      # rubocop: disable Style/ExponentialNotation
       it 'should tokenize real numbers' do
         tests = [
           # couple [raw input, expected]
@@ -140,6 +141,7 @@ module Skeem
 
         check_tokens(tests, 'REAL')
       end
+      # rubocop: enable Style/ExponentialNotation
     end # context
 
     context 'Character literal recognition:' do

data/spec/spec_helper.rb

@@ -17,26 +17,29 @@ RSpec.configure do |config|
   config.full_backtrace = true
 end
 
+
 module InterpreterSpec
   def expect_expr(aSkeemExpr)
     result = subject.run(aSkeemExpr)
     expect(result)
   end
 
+  # rubocop: disable Lint/RescueException
+
   # This method assumes that 'subject' is a Skeem::Interpreter instance.
   def compare_to_predicted(arrActualsPredictions)
     arrActualsPredictions.each_with_index do |(source, predicted), index|
-      begin
-        result = subject.run(source)
-        if block_given?
-          yield result, predicted
-        else
-          expect(result).to eq(predicted)
-        end
-      rescue Exception => e
-        $stderr.puts "Row #{index + 1} failed."
-        throw e
+      result = subject.run(source)
+      if block_given?
+        yield result, predicted
+      else
+        expect(result).to eq(predicted)
       end
+
+    rescue Exception => e
+      $stderr.puts "Row #{index + 1} failed."
+      throw e
     end
   end
+  # rubocop: enable Lint/RescueException
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skeem
 version: !ruby/object:Gem::Version
-  version: 0.2.16
+  version: 0.2.20
 platform: ruby
 authors:
 - Dimitri Geshef
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-18 00:00:00.000000000 Z
+date: 2021-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rley
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 0.8.08
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 0.8.08
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -77,6 +77,7 @@ extra_rdoc_files:
 files:
 - ".rspec"
 - ".rubocop.yml"
+- ".travis.yml"
 - ".yardopts"
 - CHANGELOG.md
 - Gemfile
@@ -139,7 +140,7 @@ homepage: https://github.com/famished-tiger/Skeem
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - --charset=UTF-8 --exclude="examples|spec"
 require_paths:
@@ -148,15 +149,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Skeem is an interpreter of a subset of the Scheme programming language. Scheme
   is a descendent of the Lisp language.