skeem 0.2.17 → 0.2.18

data/lib/skeem/skm_element.rb

@@ -138,7 +138,7 @@ module Skeem
     end
 
     def inspect_specific
-      raise NotImplementedError, "Missing #{self.class.to_s + '#' + 'inspect_specific'}"
+      raise NotImplementedError, "Missing #{self.class}#inspect_specific"
     end
   end # struct
 end # module

data/lib/skeem/skm_pair.rb

@@ -4,7 +4,10 @@ require_relative 'skm_empty_list'
 
 module Skeem
   class SkmPair < SkmElement
+    # @return [SkmElement]
     attr_accessor :car
+
+    # @return [SkmElement]
     attr_accessor :cdr
 
     alias first car
@@ -168,8 +171,8 @@ module Skeem
         begin
           result = clone_evaluate(aRuntime)
         rescue NoMethodError => e
-          $stderr.puts 'SkmPair#evaluate:   ' + inspect
-          $stderr.puts 'SkmPair as Array:   ' + to_a.inspect
+          $stderr.puts "SkmPair#evaluate:   #{inspect}"
+          $stderr.puts "SkmPair as Array:   #{to_a.inspect}"
           raise e
         end
       end

data/lib/skeem/skm_procedure_exec.rb

@@ -4,7 +4,10 @@ require_relative 'runtime'
 
 module Skeem
   class SkmProcedureExec
+    # @return [SkmFrame]
     attr_reader :frame
+
+    # @return [SkmLambda]
     attr_reader :definition
 
     def initialize(aLambda)

data/lib/skeem/skm_simple_datum.rb

@@ -6,7 +6,10 @@ module Skeem
   # Abstract class. Root of class hierarchy needed for Interpreter
   # design pattern
   class SkmSimpleDatum < SkmElement
+    # @return [Rley::Syntax::Token] token object corresponding to Skeem element
     attr_reader :token
+
+    # @return [Object]
     attr_reader :value
 
     def initialize(aToken, aPosition)
@@ -37,13 +40,11 @@ module Skeem
     def ==(other)
       return true if equal?(other)
 
-      result = if other.kind_of?(SkmSimpleDatum)
-          value == other.value
-        else
-          value == other
-        end
-
-      result
+      if other.kind_of?(SkmSimpleDatum)
+        value == other.value
+      else
+        value == other
+      end
     end
 
     alias eqv? ==
@@ -104,10 +105,12 @@ module Skeem
       false
     end
 
+    # rubocop: disable Style/NegatedIfElseCondition
+
     def eqv?(other)
       return true if equal?(other)
 
-      result = if other.kind_of?(SkmNumber)
+      if other.kind_of?(SkmNumber)
         if exact? != other.exact?
           false
         else
@@ -116,9 +119,8 @@ module Skeem
       else
         value == other
       end
-
-      result
     end
+    # rubocop: enable Style/NegatedIfElseCondition
   end # class
 
   class SkmReal < SkmNumber

data/lib/skeem/skm_unary_expression.rb

@@ -76,8 +76,7 @@ module Skeem
     end
 
     def quasiquote(aRuntime)
-      result = evaluate(aRuntime)
-      result
+      evaluate(aRuntime)
     end
 
     protected
@@ -115,7 +114,10 @@ module Skeem
   class SkmBindingBlock < SkmUnaryExpression
     alias body child
 
+    # @return [Symbol] One of: :let, :let_star
     attr_reader :kind
+
+    # @return [Array<SkmBinding>]
     attr_reader :bindings
 
     def initialize(theKind, theBindings, aBody)
@@ -126,14 +128,15 @@ module Skeem
 
     def evaluate(aRuntime)
       aRuntime.push(SkmFrame.new(aRuntime.environment))
-      if kind == :let
+      case kind
+      when :let
         locals = bindings.map do |bnd|
           SkmBinding.new(bnd.variable, bnd.value.evaluate(aRuntime))
         end
         locals.each do |bnd|
           aRuntime.add_binding(bnd.variable.evaluate(aRuntime), bnd.value)
         end
-      elsif kind == :let_star
+      when :let_star
         bindings.each do |bnd|
           val = bnd.value.evaluate(aRuntime)
           aRuntime.add_binding(bnd.variable.evaluate(aRuntime), val)
@@ -186,18 +189,16 @@ module Skeem
     def eval_pair(aRuntime)
       result = nil
       sequence.to_a.each do |cmd|
-        begin
-          if cmd.kind_of?(SkmLambda)
-            result = cmd.dup_cond(aRuntime)
-          else
-            result = cmd.evaluate(aRuntime)
-          end
-        rescue NoMethodError => e
-          $stderr.puts inspect
-          $stderr.puts sequence.inspect
-          $stderr.puts cmd.inspect
-          raise e
+        if cmd.kind_of?(SkmLambda)
+          result = cmd.dup_cond(aRuntime)
+        else
+          result = cmd.evaluate(aRuntime)
         end
+      rescue NoMethodError => e
+        $stderr.puts inspect
+        $stderr.puts sequence.inspect
+        $stderr.puts cmd.inspect
+        raise e
       end
 
       result
@@ -215,18 +216,16 @@ module Skeem
 
       if sequence[:sequence].kind_of?(SkmPair)
         sequence[:sequence].to_a.each do |cmd|
-          begin
-            if cmd.kind_of?(SkmLambda)
-              result = cmd.dup_cond(aRuntime)
-            else
-              result = cmd.evaluate(aRuntime)
-            end
-          rescue NoMethodError => e
-            $stderr.puts inspect
-            $stderr.puts sequence[:sequence].inspect
-            $stderr.puts cmd.inspect
-            raise e
+          if cmd.kind_of?(SkmLambda)
+            result = cmd.dup_cond(aRuntime)
+          else
+            result = cmd.evaluate(aRuntime)
           end
+        rescue NoMethodError => e
+          $stderr.puts inspect
+          $stderr.puts sequence[:sequence].inspect
+          $stderr.puts cmd.inspect
+          raise e
         end
       else
         result = sequence.evaluate(aRuntime)

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
 
@@ -162,11 +167,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

data/lib/skeem/version.rb

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

data/skeem.gemspec

@@ -24,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']
@@ -53,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'
@@ -61,7 +62,7 @@ SUMMARY
   PkgExtending.pkg_files(spec)
   PkgExtending.pkg_documentation(spec)
   # Runtime dependencies
-  spec.add_dependency 'rley', '~> 0.7'
+  spec.add_dependency 'rley', '~> 0.8.03'
 
   # Development dependencies
   spec.add_development_dependency 'bundler', '~> 2.0'

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/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