skeem 0.2.15 → 0.2.19

data/lib/skeem/skm_unary_expression.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'skm_expression'
 
 module Skeem
@@ -29,7 +31,7 @@ module Skeem
       super(nil, aDatum)
     end
 
-    def evaluate(aRuntime)
+    def evaluate(_runtime)
       datum
     end
 
@@ -47,7 +49,6 @@ module Skeem
     def inspect_specific
       datum.inspect
     end
-
   end # class
 
   class SkmQuasiquotation < SkmQuotation
@@ -60,7 +61,6 @@ module Skeem
     def quasiquote(aRuntime)
       child.quasiquote(aRuntime)
     end
-
   end # class
 
   class SkmUnquotation < SkmUnaryExpression
@@ -76,8 +76,7 @@ module Skeem
     end
 
     def quasiquote(aRuntime)
-      result = evaluate(aRuntime)
-      result
+      evaluate(aRuntime)
     end
 
     protected
@@ -87,7 +86,7 @@ module Skeem
     end
   end # class
 
-  class SkmVariableReference  < SkmUnaryExpression
+  class SkmVariableReference < SkmUnaryExpression
     alias variable child
 
     def eqv?(other)
@@ -100,13 +99,13 @@ module Skeem
       aRuntime.evaluate(var_key)
     end
 
-    def quasiquote(aRuntime)
+    def quasiquote(_runtime)
       self
     end
 
     # Confusing!
     # Value, here, means the value of the identifier (the variable's name).
-    def value()
+    def value
       variable.value
     end
   end # class
@@ -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)
@@ -155,7 +158,6 @@ module Skeem
       # $stderr.puts "Result SkmBindingBlock#evaluate: " + result.inspect
       result
     end
-
   end # class
 
   # Sequencing construct
@@ -187,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 => exc
-          $stderr.puts self.inspect
-          $stderr.puts sequence.inspect
-          $stderr.puts cmd.inspect
-          raise exc
+        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
@@ -216,27 +216,24 @@ 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 => exc
-            $stderr.puts self.inspect
-            $stderr.puts sequence[:sequence].inspect
-            $stderr.puts cmd.inspect
-            raise exc
+          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
-      elsif
+      else
         result = sequence.evaluate(aRuntime)
       end
 
       aRuntime.pop
-      
+
       result
     end
   end # class
-
-end # module
+end # module

data/lib/skeem/tokenizer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # File: tokenizer.rb
 # Tokenizer for Skeem language (a small subset of Scheme)
 require 'strscan'
@@ -14,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 = {
@@ -25,9 +32,11 @@ module Skeem
       '(' => 'LPAREN',
       ')' => 'RPAREN',
       '.' => 'PERIOD',
+      '...' => 'ELLIPSIS',
       ',' => 'COMMA',
       ',@' =>  'COMMA_AT_SIGN',
-      '#(' => 'VECTOR_BEGIN'
+      '#(' => 'VECTOR_BEGIN',
+      '_' => 'UNDERSCORE'
     }.freeze
 
     # Here are all the implemented Scheme keywords (in uppercase)
@@ -35,18 +44,21 @@ module Skeem
       BEGIN
       COND
       DEFINE
+      DEFINE-SYNTAX
       DO
       ELSE
       IF
+      INCLUDE
       LAMBDA
       LET
       LET*
       QUASIQUOTE
       QUOTE
       SET!
+      SYNTAX-RULES
       UNQUOTE
       UNQUOTE-SPLICING
-    ].map { |x| [x, x] } .to_h
+    ].map { |x| [x, x.sub(/\*$/, '_STAR')] }.to_h
 
     class ScanError < StandardError; end
 
@@ -57,7 +69,6 @@ module Skeem
       reinitialize(source)
     end
 
-
     # @param source [String] Skeem text to tokenize.
     def reinitialize(source)
       @scanner.string = source
@@ -88,9 +99,9 @@ module Skeem
       if "()'`".include? curr_ch
         # Delimiters, separators => single character token
         token = build_token(@@lexeme2name[curr_ch], scanner.getch)
-      elsif (lexeme = scanner.scan(/(?:\.)(?=\s)/)) # Single char occurring alone
-        token = build_token('PERIOD', lexeme)
-      elsif (lexeme = scanner.scan(/(?:,@?)|(?:=>)/))
+      elsif (lexeme = scanner.scan(/(?:\.|_)(?=\s|\()/)) # Single char occurring alone
+        token = build_token(@@lexeme2name[curr_ch], scanner.getch)
+      elsif (lexeme = scanner.scan(/(?:,@?)|(?:=>)|(?:\.\.\.)/))
         token = build_token(@@lexeme2name[lexeme], lexeme)
       elsif (token = recognize_char_token)
         # Do nothing
@@ -99,21 +110,21 @@ module Skeem
       elsif (lexeme = scanner.scan(/(?:#[dD])?[+-]?[0-9]+(?:.0+)?(?=\s|[|()";]|$)/))
         token = build_token('INTEGER', lexeme) # Decimal radix
       elsif (lexeme = scanner.scan(/#[xX][+-]?[0-9a-fA-F]+(?=\s|[|()";]|$)/))
-        token = build_token('INTEGER', lexeme) # Hexadecimal radix        
+        token = build_token('INTEGER', lexeme) # Hexadecimal radix
       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+[=#]))/))
-        token = cardinal_token(lexeme)        
+      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)
       elsif (lexeme = scanner.scan(/[a-zA-Z!$%&*\/:<=>?@^_~][a-zA-Z0-9!$%&*+-.\/:<=>?@^_~+-]*/))
         keyw = @@keywords[lexeme.upcase]
-        tok_type = keyw ? keyw : 'IDENTIFIER'
+        tok_type = keyw || 'IDENTIFIER'
         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!$%&*+-.\/:<=>?@^_~+-]*/))
@@ -151,17 +162,16 @@ other literal data (section 2.4).
       return token
     end
 
-    def recognize_char_token()
+    def recognize_char_token
       token = nil
-      if lexeme = scanner.scan(/#\\/)
-        if lexeme = scanner.scan(/(?:alarm|backspace|delete|escape|newline|null|return|space|tab)/)
+      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]+/)
+        elsif (lexeme = scanner.scan(/x[0-9a-fA-F]+/))
           token = build_token('CHAR', lexeme, :hex_value)
-        elsif lexeme = scanner.scan(/x/)
-          token = build_token('CHAR', lexeme, :escaped)          
+        else
+          lexeme = scanner.getch
+          token = build_token('CHAR', lexeme, :escaped)
         end
       end
 
@@ -174,9 +184,9 @@ other literal data (section 2.4).
         col = scanner.pos - aLexeme.size - @line_start + 1
         pos = Rley::Lexical::Position.new(@lineno, col)
         token = Rley::Lexical::Token.new(value, symb, pos)
-      rescue StandardError => exc
+      rescue StandardError => e
         puts "Failing with '#{aSymbolName}' and '#{aLexeme}'"
-        raise exc
+        raise e
       end
 
       return token
@@ -207,11 +217,11 @@ other literal data (section 2.4).
       return [value, symb]
     end
 
-    def to_boolean(aLexeme, aFormat)
-      result = (aLexeme =~ /^#t/) ? true : false
+    def to_boolean(aLexeme, _format)
+      (aLexeme =~ /^#t/) ? true : false
     end
 
-    def to_integer(aLexeme, aFormat)
+    def to_integer(aLexeme, _format)
       literal = aLexeme.downcase
       prefix_pattern = /^#[dx]/
       matching = literal.match(prefix_pattern)
@@ -226,7 +236,7 @@ other literal data (section 2.4).
       else
         format = :default
       end
-      
+
       case format
         when :default, :base10
           value = literal.to_i
@@ -303,11 +313,11 @@ other literal data (section 2.4).
 
       name2char[name]
     end
-    
+
     def escaped_char(aLexeme)
       aLexeme.chr
     end
-    
+
     def hex_value_char(aLexeme)
       hex_literal = aLexeme.sub(/^x/, '')
       hex_value = hex_literal.to_i(16)
@@ -338,15 +348,14 @@ other literal data (section 2.4).
           skip_block_comment
           next
         end
-        break unless ws_found or cmt_found
+        break unless ws_found || cmt_found
       end
 
       curr_pos = scanner.pos
       return if curr_pos == pre_pos
     end
 
-    def skip_block_comment()
-      # require 'debug'
+    def skip_block_comment
       scanner.skip(/#\|/)
       nesting_level = 1
       loop do
@@ -354,6 +363,7 @@ other literal data (section 2.4).
         unless comment_part
           raise ScanError, "Unterminated '#| ... |#' comment on line #{lineno}"
         end
+
         case scanner.matched
           when /(?:(?:\r\n)|\r|\n)/
             next_line

data/lib/skeem/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Skeem
-  VERSION = '0.2.15'.freeze
+  VERSION = '0.2.19'
 end

data/lib/skeem.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # File: skeem.rb
 # This file acts as a jumping-off point for loading dependencies expected
 # for a Skeem client.

data/skeem.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'skeem/version'
@@ -8,6 +10,7 @@ module PkgExtending
     file_list = Dir[
       '.rubocop.yml',
       '.rspec',
+      '.travis.yml',
       '.yardopts',
       'appveyor.yml',
       'Gemfile',
@@ -21,6 +24,8 @@ module PkgExtending
       'lib/**/*.rb',
       'lib/**/*.skm',
       'spec/**/*.rb',
+      'spec/**/*.skm',
+      'spec/**/*.yml'
     ]
     aPackage.files = file_list
     aPackage.test_files = Dir['spec/**/*_spec.rb']
@@ -49,6 +54,7 @@ DESCR
 SUMMARY
   spec.homepage      = 'https://github.com/famished-tiger/Skeem'
   spec.license       = 'MIT'
+  spec.required_ruby_version = '>= 2.5.0'
 
   spec.bindir = 'bin'
   spec.executables << 'skeem'
@@ -56,14 +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.03'
 
   # 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', '~> 12.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
 end

data/spec/skeem/add4.skm

@@ -0,0 +1,4 @@
+(define add4
+  (let ((x 4))
+    (lambda (y) (+ x y))))
+(add4 6) ; => 10

data/spec/skeem/datum_dsl_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../spec_helper'
 
 
@@ -35,15 +37,15 @@ module Skeem
         ['+456', 456]
       ]
     end
-    
+
     let(:rational_tests) do
       [
-        [-Rational(2,3), -Rational(2, 3)],
+        [-Rational(2, 3), -Rational(2, 3)],
         [Rational(22, 7), Rational(22, 7)],
         ['-2/3', -Rational(2, 3)],
         ['+22/7', Rational(22, 7)]
       ]
-    end    
+    end
 
     let(:real_tests) do
       [
@@ -60,13 +62,13 @@ module Skeem
 
     let(:string_tests) do
       [
-        ['hello', 'hello']
+        %w[hello hello]
       ]
     end
 
     let(:identifier_tests) do
       [
-        ['define', 'define'],
+        %w[define define],
         [SkmString.create('positive?'), 'positive?']
       ]
     end
@@ -76,7 +78,7 @@ module Skeem
         ['#t', SkmBoolean.create(true)],
         [-1, SkmInteger.create(-1)],
         [1.41, 1.41],
-        ['foo', 'foo']
+        %w[foo foo]
       ]
     end
 
@@ -92,12 +94,12 @@ module Skeem
           expect(subject.integer(literal)).to eq(predicted)
         end
       end
-      
+
       it 'should convert rational literals' do
         rational_tests.each do |(literal, predicted)|
           expect(subject.rational(literal)).to eq(predicted)
         end
-      end      
+      end
 
       it 'should convert real number literals' do
         real_tests.each do |(literal, predicted)|
@@ -178,12 +180,12 @@ module Skeem
           expect(subject.to_datum(literal)).to eq(predicted)
         end
       end
-      
+
       it 'should recognize & convert rational literals' do
         rational_tests.each do |(literal, predicted)|
           expect(subject.to_datum(literal)).to eq(predicted)
         end
-      end      
+      end
 
       it 'should recognize & convert real number literals' do
         real_tests.each do |(literal, predicted)|
@@ -219,6 +221,5 @@ module Skeem
       # $stderr.puts duplicate.inspect
       expect(duplicate.to_a).to eq([f, g])
     end
-
   end # describe
-end # module
+end # module