skeem 0.0.20 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91492f1d990da9deecf2146b21c13a5721cbf327
-  data.tar.gz: 06355e700c51894615aea3c34c7f26794a2482b4
+  metadata.gz: 848f771b4fb717e1c491f6afae9a88a9c34e5302
+  data.tar.gz: 349587e3837e36893a5aaaad4a32986708d24979
 SHA512:
-  metadata.gz: eb0d9f83f9816fbc881fef46b75e9587111539e3f4254772478e3e05bcb1c4fcd26d6dc16d83053f41c2fab55fe96e1d5d4cc1b02a7fc120218d09dcaa000088
-  data.tar.gz: cad77c7dab37087ff75202d2429d5213dd1ccf04e04d6a45993f41f9dc7ef587b897e2c677e10f1eb3d800c46f47a742f2378d95b2c020edb0f2d2da34d5171f
+  metadata.gz: 89778cee179ca6cd65a5f45804471637d31a0db36f094cbedadc8ef72cb46cc3b0c75193e4b458b16091388a2a02db8c13e27444b7642da56ffc899504d451ce
+  data.tar.gz: cecc4f9aca3391d4abf695b593822988b49145e6bf55e66ed468cb10bda9e4fca5f9ad569c2c9e3de1d6220943437eabbd88067b3a5282abeea3bee2d2764679

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## [0.0.21] - 2018-10-22
+### Added
+- Added support for alternative `define` syntax.
+- File `primitive_builder.rb` implementation of: standard `vector-ref` procedure.
+- Added `SkmQuotation#inspect`, `SkmVector#inspect` method
+
+### Changed
+- File `README.md` added sub-section with links for Scheme language.
+
+### Fixed
+- Method `Convertible#to_skm` now returns a SkmElement-like object without attempting a convertion.
+
 ## [0.0.20] - 2018-10-21
 ### Added
 - Added support for quotation: (quote foo) or 'foo

data/README.md

@@ -23,10 +23,27 @@ Or install it yourself as:
 
     $ gem install skeem
 
-## Usage
 
-The __Skeem__ project has just started.  
-At this stage, the gem consists of a bare-bones interpreter.
+The __Skeem__ project has started recently and at this stage, the gem supports  a small Scheme subset.
+
+## About Scheme
+
+The Scheme programming language is a Lisp dialect that supports multiple paradigms, including functional programming and imperative programming.
+
+### Resources on Scheme  
+Here are a few pointers for the Scheme programming language:  
+- Wikipedia article on [Scheme](https://en.m.wikipedia.org/wiki/Scheme_\(programming_language\))
+- Latest official Scheme standard: [R7RS](https://bitbucket.org/cowan/r7rs-wg1-infra/src/default/R7RSHomePage.md)
+#### Online tutorials and books:
+- [The Scheme Programming Language, 4th Edition](https://www.scheme.com/tspl4/) by Kent Dybvig. An complete, introductory textbook on Scheme based on the older R5RS standard.
+- [Teach Yourself Scheme in Fixnum Days](http://ds26gte.github.io/tyscheme/index.html) by Dorai Sitaram
+
+## Other similar Ruby projects
+__Skeem__ isn't the sole implementation of the Scheme language in Ruby.  
+Here are a few other ones:  
+- [Heist gem](https://rubygems.org/gems/heist) -- Probably one of best Scheme implementation in Ruby. Really worth a try. Alas, the [project](https://github.com/jcoglan/heist) seems to be dormant for several years.
+
+## Usage
 
 ### Example 1 (Variable definition)
 
@@ -116,14 +133,17 @@ At this stage, the gem consists of a bare-bones interpreter.
 #### define  
 __Purpose:__ Create a new variable and bind an expression/value to it.  
 __Syntax:__   
-* (define <identifier\> <expression\>)
+* (define <identifier\> <expression\>)  
+* (define (<variable\> <formals\>) <body\>)
 
 #### if  
 __Purpose:__ Conditional evaluation based on a test expression.  
 __Syntax:__   
+* (if <test\> <consequent\>)  
 * (if <test\> <consequent\> <alternate\>)  
 
 
+
 #### lambda  
 __Purpose:__ Definition of a procedure.  
 __Syntax:__   
@@ -164,19 +184,6 @@ Roadmap:
 - Extend the language in order to support [Minikanren](https://github.com/TheReasonedSchemer2ndEd/CodeFromTheReasonedSchemer2ndEd)
 - Make it pass all examples from the [Reasoned Schemer](https://mitpress.mit.edu/books/reasoned-schemer-second-edition) book.
 
-
-Good to know:
-Online book: [The Scheme Programming Language (4th Ed.)](https://www.scheme.com/tspl4/). Remark: covers an older version of Scheme.
-
-
-
-
-
-## Other similar Ruby projects
-__Skeem__ isn't the sole implementation of the Scheme language in Ruby.  
-Here are a few other ones:  
-- [Heist gem](https://rubygems.org/gems/heist) -- Probably one of best Scheme implementation in Ruby. Really worth a try. Alas, the [project](https://github.com/jcoglan/heist) seems to be dormant for several years.
-
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/famished-tiger/Skeem.

data/lib/skeem/convertible.rb

@@ -4,6 +4,8 @@ module Skeem
   module Convertible
     # Convert Ruby object into its Skeem counterpart
     def to_skm(native_obj)
+      return native_obj if native_obj.kind_of?(SkmElement)
+
       case native_obj
         when TrueClass, FalseClass
           SkmBoolean.create(native_obj)

data/lib/skeem/grammar.rb

@@ -65,8 +65,8 @@ module Skeem
     rule('operand_plus' => 'operand').as 'last_operand'
     rule 'operator' => 'expression'
     rule 'operand' => 'expression'
-    rule 'def_formals' => 'identifier_star'
-    # rule('def_formals' => 'identifier_star period identifier').as 'OTHER_NAME_formals'    
+    rule('def_formals' => 'identifier_star').as 'def_formals'
+    rule('def_formals' => 'identifier_star PERIOD IDENTIFIER').as 'pair_formals'    
     rule('lambda_expression' => 'LPAREN LAMBDA formals body RPAREN').as 'lambda_expression'
     rule('formals' => 'LPAREN identifier_star RPAREN').as 'fixed_arity_formals'
     rule('formals' => 'IDENTIFIER').as 'variadic_formals'

data/lib/skeem/interpreter.rb

@@ -15,10 +15,11 @@ module Skeem
       add_standard(runtime)
     end
 
-    def run(source)
+    def run(source, mode = nil)
       @parser ||= Parser.new
       @ptree = parser.parse(source)
-      # $stderr.puts @ptree.root.inspect
+      # $stderr.puts @ptree.root.inspect if mode.nil?
+      # require 'debug' if mode.nil?
       return @ptree.root.evaluate(runtime)
     end
     
@@ -37,7 +38,7 @@ module Skeem
       lib_source = nil
       File.open(aPathname, 'r') do |lib|
         lib_source = lib.read
-        run(lib_source)
+        run(lib_source, :silent)
       end
     end
   end # class

data/lib/skeem/primitive/primitive_builder.rb

@@ -85,7 +85,7 @@ module Skeem
         create_object_predicate(aRuntime, 'vector?')
         create_vector(aRuntime)
         create_vector_length(aRuntime)
-        # create_vector_ref(aRuntime)
+        create_vector_ref(aRuntime)
       end
 
       def add_io_procedures(aRuntime)(aRuntime)

data/lib/skeem/s_expr_builder.rb

@@ -66,6 +66,7 @@ module Skeem
     # Equivalent to: (define IDENTIFIER (lambda (formals) body))
     def reduce_alt_definition(_production, aRange, _tokens, theChildren)
       lmbd = SkmLambda.new(aRange, theChildren[4], theChildren[6])
+      # $stderr.puts lmbd.inspect
       SkmDefinition.new(aRange, theChildren[3], lmbd)
     end
 
@@ -124,6 +125,17 @@ module Skeem
       [theChildren.last]
     end
     
+    # rule('def_formals' => 'identifier_star').as 'def_formals'
+    def reduce_def_formals(_production, _range, _tokens, theChildren)
+      SkmFormals.new(theChildren[0], :fixed)
+    end    
+    
+    # rule('def_formals' => 'identifier_star PERIOD identifier').as 'pair_formals'
+    def reduce_pair_formals(_production, _range, _tokens, theChildren)
+      formals = theChildren[0] << theChildren[2]
+      SkmFormals.new(formals, :variadic)      
+    end    
+    
     # rule('lambda_expression' => 'LPAREN LAMBDA formals body RPAREN').as 'lambda_expression'
     def reduce_lambda_expression(_production, aRange, _tokens, theChildren)
       lmbd = SkmLambda.new(aRange, theChildren[2], theChildren[3])

data/lib/skeem/s_expr_nodes.rb

@@ -68,8 +68,8 @@ module Skeem
       raise NotImplementedError
     end
 
-   def inspect()
-      raise NotImplementedError
+   def inspect
+      raise NotImplementedError, "Missing #{self.class}#inspect method."
     end
 
     protected
@@ -270,7 +270,15 @@ module Skeem
     def evaluate(aRuntime)
       elements_evaluated = elements.map { |elem| elem.evaluate(aRuntime) }
       SkmVector.new(elements_evaluated)
-    end    
+    end
+
+    def inspect()
+      result = inspect_prefix
+      elements.each { |elem| result << elem.inspect + ', ' }
+      result.sub!(/, $/, '')
+      result << inspect_suffix
+      result
+    end   
   
   end # class
   
@@ -286,6 +294,13 @@ module Skeem
     def evaluate(aRuntime)
       datum
     end
+    
+    def inspect
+      result = inspect_prefix
+      result << datum.inspect
+      result << inspect_suffix
+      result      
+    end
   end # class
 
   class SkmDefinition < SkmElement

data/lib/skeem/version.rb

@@ -1,3 +1,3 @@
 module Skeem
-  VERSION = '0.0.20'.freeze
+  VERSION = '0.0.21'.freeze
 end

data/spec/skeem/interpreter_spec.rb

@@ -83,7 +83,7 @@ module Skeem
           expect(result.value).to eq(predicted)
         end
       end
-      
+
       it 'should evaluate vector of constants' do
         source = '#(2018 10 20 "Sat")'
         result = subject.run(source)
@@ -97,7 +97,7 @@ module Skeem
         predictions.each_with_index do |(type, value), index|
           expect(result.elements[index]).to be_kind_of(type)
           expect(result.elements[index].value).to eq(value)
-        end        
+        end
       end
     end # context
 
@@ -158,7 +158,7 @@ SKEEM
           ["'a", 'a'],
           ["'145932", 145932],
           ["'\"abc\"", 'abc'],
-          ["'#t", true]          
+          ["'#t", true]
         ]
         checks.each do |(skeem_expr, expectation)|
           result = subject.run(skeem_expr)
@@ -178,9 +178,9 @@ SKEEM
         predictions.each_with_index do |(type, value), index|
           expect(result.elements[index]).to be_kind_of(type)
           expect(result.elements[index].value).to eq(value)
-        end        
-      end      
-      
+        end
+      end
+
 
       it 'should implement the lambda function with one arg' do
         source = <<-SKEEM
@@ -237,7 +237,6 @@ SKEEM
         expect(result.value).to eq(8)
       end
 
-
       it 'should support procedures with variable number of arguments' do
         # Example from R7RS section 4.1.4
         source = '((lambda x x) 3 4 5 6)'
@@ -255,7 +254,7 @@ SKEEM
         expect(result.head.value).to eq(5)
         expect(result.last.value).to eq(6)
       end
-=begin
+
       it 'should implement the compact define + lambda syntax' do
           source = <<-SKEEM
   ; Alternative syntax to: (define f (lambda x (+ x 42)))
@@ -264,9 +263,19 @@ SKEEM
   (f 23)
 SKEEM
           result = subject.run(source)
-          expect(result.value).to eq(65)
+          expect(result.last.value).to eq(65)
+      end
+
+      it 'should implement the compact define + pair syntax' do
+          source = <<-SKEEM
+  ; Alternative syntax to: (define nlist (lambda args args))
+  (define (nlist . args)
+  args)
+  (nlist 0 1 2 3 4)
+SKEEM
+          result = subject.run(source)
+          expect(result.last.last.value).to eq(4)
       end
-=end
     end # context
 
     context 'Built-in primitive procedures' do

data/spec/skeem/primitive/primitive_builder_spec.rb

@@ -330,12 +330,12 @@ module Skeem
           end
         end 
 
-        # it 'should implement the vector-ref procedure' do
-          # source = "(vector-ref '#(1 1 2 3 5 8 13 21) 5)"
-          # result = subject.run(source)
-          # expect(result).to be_kind_of(SkmInteger)
-          # expect(result.value).to eq(8)         
-        # end         
+        it 'should implement the vector-ref procedure' do
+          source = "(vector-ref '#(1 1 2 3 5 8 13 21) 5)"
+          result = subject.run(source)
+          expect(result).to be_kind_of(SkmInteger)
+          expect(result.value).to eq(8)         
+        end         
       end # context      
       
       context 'IO procedures:' do          

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skeem
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.21
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-20 00:00:00.000000000 Z
+date: 2018-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rley