skeem 0.2.15 → 0.2.16

data/spec/skeem/skm_unary_expression_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../spec_helper' # Use the RSpec framework
 require_relative '../../lib/skeem/datum_dsl'
 require_relative '../../lib/skeem/s_expr_nodes'
@@ -12,7 +14,7 @@ module Skeem
 
     context 'Initialization:' do
       it 'should be initialized with a position and a child element' do
-        expect{ SkmUnaryExpression.new(pos, sample_child) }.not_to raise_error
+        expect { SkmUnaryExpression.new(pos, sample_child) }.not_to raise_error
       end
 
       it 'should know its child' do
@@ -38,7 +40,7 @@ module Skeem
 
     context 'Initialization:' do
       it 'should be initialized with a Skeem element' do
-        expect{ SkmQuotation.new(sample_literal) }.not_to raise_error
+        expect { SkmQuotation.new(sample_literal) }.not_to raise_error
       end
 
       it 'should know its datum' do
@@ -84,7 +86,7 @@ module Skeem
 
     context 'Initialization:' do
       it 'should be initialized with a Skeem element' do
-        expect{ SkmQuasiquotation.new(sample_literal) }.not_to raise_error
+        expect { SkmQuasiquotation.new(sample_literal) }.not_to raise_error
       end
     end # context
 
@@ -116,7 +118,7 @@ module Skeem
   end # describe
 
 
- describe SkmUnquotation do
+  describe SkmUnquotation do
     include DatumDSL
 
     let(:sample_literal) { string('foo') }
@@ -125,7 +127,7 @@ module Skeem
 
     context 'Initialization:' do
       it 'should be initialized with a Skeem element' do
-        expect{ SkmUnquotation.new(sample_literal) }.not_to raise_error
+        expect { SkmUnquotation.new(sample_literal) }.not_to raise_error
       end
     end # context
 
@@ -156,7 +158,7 @@ module Skeem
       end
     end # context
   end # describe
-  
+
   describe SkmVariableReference do
     include DatumDSL
 
@@ -167,7 +169,7 @@ module Skeem
 
     context 'Initialization:' do
       it 'should be initialized with a position and a symbol' do
-        expect{ SkmVariableReference.new(pos, sample_var) }.not_to raise_error
+        expect { SkmVariableReference.new(pos, sample_var) }.not_to raise_error
       end
 
       it 'should know its variable' do
@@ -187,7 +189,7 @@ module Skeem
         expect(subject.evaluate(runtime)).to eq(3)
       end
 
-      it "should return itself at quasiquotation" do
+      it 'should return itself at quasiquotation' do
         expect(subject.quasiquote(runtime)).to be_equal(subject)
       end
 
@@ -197,4 +199,4 @@ module Skeem
       end
     end # context
   end # describe
-end # module
+end # module

data/spec/skeem/tokenizer_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
 
@@ -12,14 +14,14 @@ module Skeem
     end
 
     # Assumption: subject is a Skeem::Tokenizer
-		def check_tokens(tokenTests, tokType)
-		  tokenTests.each do |(input, prediction)|
+    def check_tokens(tokenTests, tokType)
+      tokenTests.each do |(input, prediction)|
         subject.reinitialize(input)
         token = subject.tokens.first
         expect(token.terminal).to eq(tokType)
         expect(token.lexeme).to eq(prediction)
-		  end
-		end
+      end
+    end
 
     def unquoted(aString)
       aString.gsub(/(^")|("$)/, '')
@@ -45,9 +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
@@ -80,7 +81,7 @@ module Skeem
 
         check_tokens(tests, 'INTEGER')
       end
-      
+
       it 'should tokenize integers with explicit radix 10' do
         tests = [
           # couple [raw input, expected]
@@ -106,7 +107,7 @@ module Skeem
         ]
 
         check_tokens(tests, 'INTEGER')
-      end      
+      end
     end # context
 
     context 'Rational literals recognition:' do
@@ -114,7 +115,7 @@ module Skeem
         tests = [
           # couple [raw input, expected]
           ['1/2', Rational(1, 2)],
-          ['-22/7', -Rational(22, 7)],
+          ['-22/7', -Rational(22, 7)]
         ]
 
         check_tokens(tests, 'RATIONAL')
@@ -145,9 +146,9 @@ module Skeem
       it 'should tokenize named characters' do
         tests = [
           # couple [raw input, expected]
-          ["#\\alarm", ?\a],
-          ["#\\newline", ?\n],
-          ["#\\return", ?\r]
+          ['#\alarm', ?\a],
+          ['#\newline', ?\n],
+          ['#\return', ?\r]
         ]
 
         check_tokens(tests, 'CHAR')
@@ -156,10 +157,10 @@ module Skeem
       it 'should tokenize escaped characters' do
         tests = [
           # couple [raw input, expected]
-          ["#\\a", ?a],
-          ["#\\A", ?A],
-          ["#\\(", ?(],
-          ["#\\ ", ?\s]
+          ['#\a', ?a],
+          ['#\A', ?A],
+          ['#\(', ?(],
+          ['#\ ', ?\s]
         ]
 
         check_tokens(tests, 'CHAR')
@@ -168,9 +169,9 @@ module Skeem
       it 'should tokenize hex-coded characters' do
         tests = [
           # couple [raw input, expected]
-          ["#\\x07", ?\a],
-          ["#\\x1B", ?\e],
-          ["#\\x3BB", ?\u03bb]
+          ['#\x07', ?\a],
+          ['#\x1B', ?\e],
+          ['#\x3BB', ?\u03bb]
         ]
 
         check_tokens(tests, 'CHAR')
@@ -201,10 +202,10 @@ module Skeem
 # "\x03B1; is named GREEK SMALL LETTER ALPHA."
 
     context 'Identifier recognition:' do
-      it 'should tokenize identifier' do
+      it 'should tokenize identifiers' do
         examples = [
           # Examples taken from R7RS document
-          '...', '+', '+soup+', '<=?',
+          '+', '+soup+', '<=?',
           '->string', 'a34kTMNs', 'lambda',
           'list->vector', 'q', 'V17a',
           '|two words|', '|two\x20;words|',
@@ -222,6 +223,14 @@ module Skeem
           expect(token.lexeme).to eq(input)
         end
       end
+
+      it 'should recognize ellipsis' do
+        input = '...'
+        subject.reinitialize(input)
+        token = subject.tokens.first
+        expect(token.terminal).to eq('ELLIPSIS')
+        expect(token.lexeme).to eq(input)
+      end
     end # context
 
     context 'Vector recognition' do
@@ -233,7 +242,7 @@ module Skeem
           ['INTEGER', 0, 3],
           ['INTEGER', -2, 5],
           ['STRING_LIT', 'Sue', 8],
-          ['RPAREN', ')', 13],
+          ['RPAREN', ')', 13]
         ]
         tokens = subject.tokens
         predictions.each_with_index do |(pr_terminal, pr_lexeme, pr_position), i|
@@ -255,7 +264,7 @@ module Skeem
       end
 
       it 'should skip trailing comments' do
-        input = "\"Some text\"; Trailing comment"
+        input = '"Some text"; Trailing comment'
         subject.reinitialize(input)
         token = subject.tokens.first
         expect(token.terminal).to eq('STRING_LIT')
@@ -305,28 +314,28 @@ module Skeem
     context 'Scanning Scheme sample code' do
       it 'should produce a sequence of token objects' do
         # Deeper tokenizer testing
-        source = "(define circle-area (lambda (r) (* pi (* r r))))"
+        source = '(define circle-area (lambda (r) (* pi (* r r))))'
         subject.reinitialize(source)
         predicted = [
-          ['LPAREN', '('],
-          ['DEFINE', 'define'],
-          ['IDENTIFIER', 'circle-area'],
-          ['LPAREN', '('],
-          ['LAMBDA', 'lambda'],
-          ['LPAREN', '('],
-          ['IDENTIFIER', 'r'],
-          ['RPAREN', ')'],
-          ['LPAREN', '('],
-          ['IDENTIFIER', '*'],
-          ['IDENTIFIER', 'pi'],
-          ['LPAREN', '('],
-          ['IDENTIFIER', '*'],
-          ['IDENTIFIER', 'r'],
-          ['IDENTIFIER', 'r'],
-          ['RPAREN', ')'],
-          ['RPAREN', ')'],
-          ['RPAREN', ')'],
-          ['RPAREN', ')']
+          %w[LPAREN (],
+          %w[DEFINE define],
+          %w[IDENTIFIER circle-area],
+          %w[LPAREN (],
+          %w[LAMBDA lambda],
+          %w[LPAREN (],
+          %w[IDENTIFIER r],
+          %w[RPAREN )],
+          %w[LPAREN (],
+          %w[IDENTIFIER *],
+          %w[IDENTIFIER pi],
+          %w[LPAREN (],
+          %w[IDENTIFIER *],
+          %w[IDENTIFIER r],
+          %w[IDENTIFIER r],
+          %w[RPAREN )],
+          %w[RPAREN )],
+          %w[RPAREN )],
+          %w[RPAREN )]
         ]
         match_expectations(subject, predicted)
       end

data/spec/skeem_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe Skeem do
   it 'has a version number' do
     expect(Skeem::VERSION).not_to be nil

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/setup'
 require 'rspec' # Use the RSpec framework
 require_relative '../lib/skeem'
@@ -31,9 +33,9 @@ module InterpreterSpec
         else
           expect(result).to eq(predicted)
         end
-      rescue Exception => exc
+      rescue Exception => e
         $stderr.puts "Row #{index + 1} failed."
-        throw exc
+        throw e
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skeem
 version: !ruby/object:Gem::Version
-  version: 0.2.15
+  version: 0.2.16
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-02 00:00:00.000000000 Z
+date: 2019-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rley
@@ -98,10 +98,12 @@ files:
 - lib/skeem/runtime.rb
 - lib/skeem/s_expr_builder.rb
 - lib/skeem/s_expr_nodes.rb
+- lib/skeem/skeem_exception.rb
 - lib/skeem/skm_binding.rb
 - lib/skeem/skm_compound_datum.rb
 - lib/skeem/skm_element.rb
 - lib/skeem/skm_empty_list.rb
+- lib/skeem/skm_exception.rb
 - lib/skeem/skm_expression.rb
 - lib/skeem/skm_frame.rb
 - lib/skeem/skm_pair.rb
@@ -112,6 +114,7 @@ files:
 - lib/skeem/tokenizer.rb
 - lib/skeem/version.rb
 - skeem.gemspec
+- spec/skeem/add4.skm
 - spec/skeem/datum_dsl_spec.rb
 - spec/skeem/element_visitor_spec.rb
 - spec/skeem/interpreter_spec.rb
@@ -145,14 +148,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Skeem is an interpreter of a subset of the Scheme programming language. Scheme