skeem 0.2.05 → 0.2.06

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8c3a61e9162fe0df33e51f373614d56cac6e5bc9c4743a101b8805bad158843
-  data.tar.gz: 52feb4bc5edf9e9cf64089ef0e3fbb6cff2d917d964ecdf4d1e00d1d1409caed
+  metadata.gz: f14377aa793138a9eb14281b8f72ea29a8008da684b5d462c0060f635b2b5a9b
+  data.tar.gz: 2e37d741b3a156c4dabf20138cc604db4e9fb59dd78e2a8b518ad59566c2ecb5
 SHA512:
-  metadata.gz: 1e99664327739a23130244b2cff9b81e9ad9be83773efc057cdb636f8642a3a1492a8de5ed0133857582c036228f27c22c5bf3e17949bd577f162b679c7aa090
-  data.tar.gz: 9014bdfed6b945a604ab55f940de00c9288773a0dd9a192825b5cd83e99d79c6434252e96289abbfe10b7f742ffa117034f767685c929b5dbefcb2d27e7c36d3
+  metadata.gz: 45a19a92c4c3e9b7033edebb197af870b20cd139db4246d14c6e9d9520105f6057435a60bdef2ad39466fa86b5179404cd19b79a604f70ea7d30abfc6ea80803
+  data.tar.gz: 5ecb615aef9290a912919272c6f47f372b2b9b990a3867f66205fcc2cf21005c2b0d7cfc38479dad9137c142969d36b7b856ded9cd297a426a0c6ba1f8ea0e64

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+## [0.2.06] - 2019-05-30
+- NEW Special `cond` (= condional) form implemented. Supports `else` alternative and arrow (=>) syntax.
+- FIX Corner case in procedure `append`.
+
+### Added
+- Class `SkmConditional`. Internal representation of `cond`forms.
+
+### Changed
+- Class `Skeem::Tokenizer`. Added keywords `cond`, `else` and `=>` separator.
+- Method `Tokenizer#_next_token` updated to accept new keywords and arrows `=>`
+- File `grammar.rb`: Added new terminals and new production rules for parsing the `cond` form
+- File `s_expr_builder.rb`: Added new methods for building parse tree of `cond` forms
+- File `interpreter_spec.rb`: Added tests for `cond`form.
+- File `README.md` Updated for `cond` form. Added fifth example illustrating the `cond` form.
+
+### Fixed
+- Method `Primitive#create_append`: test case (append '() 'a)) failed to return a (as identifier)
+
+
 ## [0.2.05] - 2019-05-26
 - Passing more standard Scheme tests, `append` procedure implemented.
 

data/README.md

@@ -80,7 +80,7 @@ Here are a few pointers for the Scheme programming language:
 
   scheme_code =<<-SKEEM
     ; Let's implement the 'min' function
-    (define min (lambda(x y) (if (< x y) x y)))
+    (define min (lambda (x y) (if (< x y) x y)))
 
     ; What is the minimum of 2 and 3?
     (min 2 3)
@@ -142,6 +142,30 @@ Here are a few pointers for the Scheme programming language:
   puts result.last.value # => 3
 ```
 
+### Example 5 (Conditional branching)
+
+```ruby
+  require 'skeem'
+
+  schemer = Skeem::Interpreter.new
+
+  scheme_code =<<-SKEEM
+    ; Let's implement the 'signum' function
+    (define signum (lambda (x)
+       (cond
+         ((positive? x) 1)
+         ((zero? x) 0)
+         (else -1))))
+
+    (signum -3)
+  SKEEM
+
+  # Ask Ruby to execute Scheme code
+  result = schemer.run(scheme_code)
+  puts result.value # => -1
+```
+
+
 ## Currently implemented R7RS features
 ### Data type literals
 - Booleans: `#t`, `#true`, `#f`, `#false`
@@ -160,7 +184,7 @@ Here are a few pointers for the Scheme programming language:
 - Variable references
 - Procedure calls
 - Lambda expressions
-- If conditionals
+- Conditionals (if, cond)
 - Definitions
 - Assignments
 
@@ -195,6 +219,12 @@ __Syntax:__
 * (set! <identifier\> <expression\>)  
 
 ### Derived expressions
+#### cond  
+__Purpose:__ Define one or more branchings.  
+__Syntax:__   
+* (cond (<test\> <consequent\>)\+)  
+* (cond (<test\><consequent\>)* (else <alternate\>))
+
 #### let  
 __Purpose:__ Define one or more variable local to the block.  
 __Syntax:__   

data/lib/skeem/grammar.rb

@@ -11,7 +11,7 @@ module Skeem
     # Delimiters, separators...
     add_terminals('APOSTROPHE', 'COMMA', 'COMMA_AT_SIGN')
     add_terminals('GRAVE_ACCENT', 'LPAREN', 'RPAREN')
-    add_terminals('PERIOD')
+    add_terminals('PERIOD', 'ARROW')
     add_terminals('VECTOR_BEGIN')
 
     # Literal values...
@@ -19,8 +19,8 @@ module Skeem
     add_terminals('STRING_LIT', 'IDENTIFIER')
 
     # Keywords...
-    add_terminals('BEGIN', 'DEFINE', 'IF', 'LAMBDA')
-    add_terminals('LET', 'LET*')
+    add_terminals('BEGIN', 'COND', 'DEFINE', 'ELSE')
+    add_terminals('IF', 'LAMBDA', 'LET', 'LET*')
     add_terminals('QUOTE', 'QUASIQUOTE', 'SET!')
     add_terminals('UNQUOTE', 'UNQUOTE-SPLICING')
 
@@ -95,6 +95,8 @@ module Skeem
     rule 'number' => 'INTEGER'
     rule 'number' => 'REAL'
     rule('assignment' => 'LPAREN SET! IDENTIFIER expression RPAREN').as 'assignment'
+    rule('derived_expression' => 'LPAREN COND cond_clause_plus RPAREN').as 'cond_form'
+    rule('derived_expression' => 'LPAREN COND cond_clause_star LPAREN ELSE sequence RPAREN RPAREN').as 'cond_else_form'
     rule('derived_expression' => 'LPAREN LET LPAREN binding_spec_star RPAREN body RPAREN').as 'short_let_form'
     rule('derived_expression' => 'LPAREN LET* LPAREN binding_spec_star RPAREN body RPAREN').as 'let_star_form'
 
@@ -102,6 +104,14 @@ module Skeem
     # the next rule was made more general than its standard counterpart
     rule('derived_expression' => 'LPAREN BEGIN body RPAREN').as 'begin_expression'
     rule 'derived_expression' => 'quasiquotation'
+    rule('cond_clause_plus' => 'cond_clause_plus cond_clause').as 'multiple_cond_clauses'
+    rule('cond_clause_plus' => 'cond_clause').as 'last_cond_clauses'
+    rule('cond_clause_star' => 'cond_clause_star cond_clause').as 'cond_clauses_star'
+    rule('cond_clause_star' => []).as 'last_cond_clauses_star'
+    rule('cond_clause' => 'LPAREN test sequence RPAREN').as 'cond_clause'
+    rule('cond_clause' => 'LPAREN test RPAREN')
+    rule('cond_clause' => 'LPAREN test ARROW recipient RPAREN').as 'cond_arrow_clause'
+    rule('recipient' => 'expression')
     rule('quasiquotation' => 'LPAREN QUASIQUOTE qq_template RPAREN').as 'quasiquotation'
     rule('quasiquotation' => 'GRAVE_ACCENT qq_template').as 'quasiquotation_short'
     rule('binding_spec_star' => 'binding_spec_star binding_spec').as 'multiple_binding_specs'

data/lib/skeem/primitive/primitive_builder.rb

@@ -514,7 +514,11 @@ module Skeem
                 when SkmEmptyList
                   # Do nothing
                 else
-                  result.append(arg)
+                  if result.kind_of?(SkmEmptyList)
+                    result = arg
+                  else
+                    result.append(arg)
+                  end
               end
             end
           end

data/lib/skeem/s_expr_builder.rb

@@ -56,13 +56,13 @@ module Skeem
 
     # rule('cmd_or_def_plus' => 'cmd_or_def').as 'last_cmd_def'
     def reduce_last_cmd_def(_production, _range, _tokens, theChildren)
-      SkmPair.create_from_a([theChildren.last])
+      SkmPair.new(theChildren.last, SkmEmptyList.instance)
     end
-    
+
     # rule('cmd_or_def' => 'LPAREN BEGIN cmd_or_def_plus RPAREN').as 'begin_cmd'
     def reduce_begin_cmd(_production, _range, _tokens, theChildren)
-       SkmSequencingBlock.new(theChildren[2])  
-    end    
+       SkmSequencingBlock.new(theChildren[2])
+    end
 
     # rule('definition' => 'LPAREN DEFINE IDENTIFIER expression RPAREN')
     #  .as 'definition'
@@ -77,10 +77,10 @@ module Skeem
       # $stderr.puts lmbd.inspect
       SkmBinding.new(theChildren[3], lmbd)
     end
-    
+
     # rule('definition' => 'LPAREN BEGIN definition_star RPAREN').as 'definitions_within_begin'
     def reduce_definitions_within_begin(_production, aRange, _tokens, theChildren)
-      SkmSequencingBlock.new(SkmPair.create_from_a(theChildren[2]))     
+      SkmSequencingBlock.new(SkmPair.create_from_a(theChildren[2]))
     end
 
     # rule('expression' =>  'IDENTIFIER').as 'variable_reference'
@@ -236,22 +236,21 @@ module Skeem
       definitions = theChildren[0].nil? ? [] : theChildren[0]
       { defs: definitions, sequence: theChildren[1] }
     end
-    
+
     # rule('definition_star' => 'definition_star definition').as 'definition_star'
     def reduce_definition_star(_production, _range, _tokens, theChildren)
       theChildren[0] << theChildren[1]
     end
-    
-    
-    # rule('definition_star' => []).as 'no_definition_yet' 
+
+
+    # rule('definition_star' => []).as 'no_definition_yet'
     def reduce_no_definition_yet(_production, _range, _tokens, theChildren)
       []
-    end    
+    end
 
     # rule('sequence' => 'command_star expression').as 'sequence'
     def reduce_sequence(_production, _range, _tokens, theChildren)
       SkmPair.create_from_a(theChildren[0] << theChildren[1])
-      
     end
 
     # rule('command_star' => 'command_star command').as 'multiple_commands'
@@ -274,20 +273,60 @@ module Skeem
       SkmUpdateBinding.new(theChildren[2], theChildren[3])
     end
 
+    # rule('derived_expression' => 'LPAREN COND cond_clause_plus RPAREN').as 'cond_form'
+    def reduce_cond_form(_production, aRange, _tokens, theChildren)
+      SkmConditional.new(aRange.low, theChildren[2], nil)
+    end
+
+    # rule('derived_expression' => 'LPAREN COND cond_clause_star LPAREN ELSE sequence RPAREN RPAREN').as 'cond_else_form'
+    def reduce_cond_else_form(_production, aRange, _tokens, theChildren)
+      SkmConditional.new(aRange.low, theChildren[2], SkmSequencingBlock.new(theChildren[5]))
+    end
+
     # rule('derived_expression' => 'LPAREN LET LPAREN binding_spec_star RPAREN body RPAREN').as 'short_let_form'
     def reduce_short_let_form(_production, aRange, _tokens, theChildren)
       SkmBindingBlock.new(:let, theChildren[3], theChildren[5])
     end
-    
+
     # rule('derived_expression' => 'LPAREN LET* LPAREN binding_spec_star RPAREN body RPAREN').as 'let_star_form'
-    def reduce_let_star_form(_production, aRange, _tokens, theChildren)
+    def reduce_let_star_form(_production, _range, _tokens, theChildren)
       SkmBindingBlock.new(:let_star, theChildren[3], theChildren[5])
     end
 
     # rule('derived_expression' => 'LPAREN BEGIN body RPAREN').as 'begin_expression'
-    def reduce_begin_expression(_production, aRange, _tokens, theChildren)
-      SkmSequencingBlock.new(theChildren[2]) 
-    end    
+    def reduce_begin_expression(_production, _range, _tokens, theChildren)
+      SkmSequencingBlock.new(theChildren[2])
+    end
+
+    # rule('cond_clause_plus' => 'cond_clause_plus cond_clause').as 'multiple_cond_clauses'
+    def reduce_multiple_cond_clauses(_production, _range, _tokens, theChildren)
+      theChildren[0] << theChildren[1]
+    end
+
+    # rule('cond_clause_plus' => 'cond_clause').as 'last_cond_clauses'
+    def reduce_last_cond_clauses(_production, _range, _tokens, theChildren)
+      [theChildren[0]]
+    end
+
+    # rule('cond_clause_star' => 'cond_clause_star cond_clause').as 'cond_clauses_star'
+    def reduce_cond_clauses_star(_production, _range, _tokens, theChildren)
+      theChildren[0] << theChildren[1]
+    end
+
+    # rule('cond_clause_star' => []).as 'last_cond_clauses_star'
+    def reduce_last_cond_clauses_star(_production, _range, _tokens, _children)
+      []
+    end
+
+    # rule('cond_clause' => 'LPAREN test sequence RPAREN').as 'cond_clause'
+    def reduce_cond_clause(_production, _range, _tokens, theChildren)
+      [theChildren[1], SkmSequencingBlock.new(SkmPair.create_from_a(theChildren[2]))]
+    end
+    
+    # rule('cond_clause' => 'LPAREN test ARROW recipient RPAREN').as 'cond_arrow_clause'
+    def reduce_cond_arrow_clause(_production, _range, _tokens, theChildren)
+      [theChildren[1], theChildren[3]]
+    end
 
     # rule('quasiquotation' => 'LPAREN QUASIQUOTE qq_template RPAREN').as 'quasiquotation'
     def reduce_quasiquotation(_production, aRange, _tokens, theChildren)

data/lib/skeem/s_expr_nodes.rb

@@ -233,6 +233,60 @@ module Skeem
     end
   end # class
 
+
+  class SkmConditional < SkmMultiExpression
+    # An array of couples [test, sequence]
+    attr_reader :clauses
+    attr_reader :alternate
+
+    def initialize(aPosition, theClauses, anAlternate)
+      super(aPosition)
+      @clauses = theClauses
+      @alternate = anAlternate
+    end
+
+    def evaluate(aRuntime)
+      clause_matching = false
+      result = nil
+
+      clauses.each do |(test, consequent)|
+        test_result = test.evaluate(aRuntime)
+        next if test_result.boolean? && test_result.value == false
+
+        clause_matching = true
+        result = consequent.evaluate(aRuntime)
+        break
+      end
+
+      unless clause_matching
+        result = alternate ? alternate.evaluate(aRuntime) : SkmUndefined.instance
+      end
+
+      result
+    end
+    
+    def quasiquote(aRuntime)
+        quasi_clauses = clauses.map do |(test, consequent)|
+          test_qq = test.quasiquote(aRuntime)
+          consequent_qq = consequent.quasiquote(aRuntime)
+          [test_qq, consequent_qq]
+      end
+      quasi_alternate = alternate ? alternate.quasiquote(aRuntime) : nil
+      
+      self.class.new(position, quasi_clauses, quasi_alternate)
+    end
+
+    def inspect
+      result = inspect_prefix + '@test ' + test.inspect + ', '
+      result << "@clauses \n" 
+      clauses.each do |(test, consequent)|
+        result << '  '  << test.inspect << ' ' << consequent.inspect << "\n"
+      end
+      result << '@alternate ' + alternate.inspect + inspect_suffix
+      result
+    end    
+  end # class
+  
   SkmArity = Struct.new(:low, :high) do
     def nullary?
       low.zero? && high == 0
@@ -466,8 +520,8 @@ require_relative 'skm_procedure_exec'
     extend Forwardable
 
     attr_reader :representation
-    attr_reader :environment    
-    
+    attr_reader :environment
+
     def_delegators(:@representation, :formals, :definitions, :sequence)
 
     def initialize(aRepresentation, aRuntime)

data/lib/skeem/tokenizer.rb

@@ -20,6 +20,7 @@ module Skeem
 
     @@lexeme2name = {
       "'" => 'APOSTROPHE',
+      '=>' => 'ARROW',
       '`' => 'GRAVE_ACCENT',
       '(' => 'LPAREN',
       ')' => 'RPAREN',
@@ -32,7 +33,9 @@ module Skeem
     # Here are all the implemented Scheme keywords (in uppercase)
     @@keywords = %w[
       BEGIN
+      COND
       DEFINE
+      ELSE
       IF
       LAMBDA
       LET
@@ -86,7 +89,7 @@ module Skeem
         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(/(?:,@?)|(?:=>)/))
         token = build_token(@@lexeme2name[lexeme], lexeme)
       elsif (lexeme = scanner.scan(/#(?:(?:true)|(?:false)|(?:u8)|[\\\(tfeiodx]|(?:\d+[=#]))/))
         token = cardinal_token(lexeme)        

data/lib/skeem/version.rb

@@ -1,3 +1,3 @@
 module Skeem
-  VERSION = '0.2.05'.freeze
+  VERSION = '0.2.06'.freeze
 end

data/spec/skeem/interpreter_spec.rb

@@ -156,6 +156,66 @@ SKEEM
         result = subject.run(source)
         expect(result).to eq(1)
       end
+      
+      it 'should implement the cond form' do
+        source = <<-SKEEM
+  (define signum (lambda (x)
+    (cond
+      ((> x 0) 1)
+      ((= x 0) 0)
+      ((< x 0) -1)
+    )))
+SKEEM
+       result = subject.run(source)
+       result = subject.run('(signum 3)')
+       expect(result).to eq(1)
+       
+       result = subject.run('(signum 0)')
+       expect(result).to eq(0)
+
+       result = subject.run('(signum -3)')
+       expect(result).to eq(-1)       
+      end
+      
+      it 'should implement the cond form with arrows' do
+        source = <<-SKEEM
+  (define signum (lambda (x)
+    (cond
+      ((> x 0) => 1)
+      ((= x 0) => 0)
+      ((< x 0) => -1)
+    )))
+SKEEM
+       result = subject.run(source)
+       result = subject.run('(signum 3)')
+       expect(result).to eq(1)
+       
+       result = subject.run('(signum 0)')
+       expect(result).to eq(0)
+
+       result = subject.run('(signum -3)')
+       expect(result).to eq(-1)       
+      end 
+
+      it 'should implement the cond ... else form' do
+        source = <<-SKEEM
+  (define signum (lambda (x)
+    (cond
+      ((> x 0) 1)
+      ((= x 0) 0)
+      (else -1)
+    )))
+SKEEM
+       result = subject.run(source)
+       result = subject.run('(signum 3)')
+       expect(result).to eq(1)
+       
+       result = subject.run('(signum 0)')
+       expect(result).to eq(0)
+
+       result = subject.run('(signum -3)')
+       expect(result).to eq(-1)       
+      end      
 
       it 'should implement the quotation of constant literals' do
          checks = [
@@ -718,7 +778,8 @@ SKEEM
         checks = [
           ['(list)', []],
           ['(list 1)', [1]],
-          ['(list 1 2 3 4)', [1, 2, 3, 4]]
+          ['(list 1 2 3 4)', [1, 2, 3, 4]],
+          ["(list 'a (+ 3 4) 'c)", [identifier('a'), 7, identifier('c')]]
         ]
         checks.each do |(skeem_expr, expectation)|
           result = subject.run(skeem_expr)

data/spec/skeem/primitive/primitive_builder_spec.rb

@@ -558,8 +558,10 @@ SKEEM
             ["(length '())", 0],
             ["(length '(1))", 1],
             ["(length '(1 2))", 2],
-            ["(length '(1 2 3))", 3]
+            ["(length '(1 2 3))", 3],
+           ["(length '(a (b) (c d e)))", 3]
           ]
+
           checks.each do |(skeem_expr, expectation)|
             result = subject.run(skeem_expr)
             expect(result).to eq(expectation)
@@ -580,11 +582,16 @@ SKEEM
             ["(append '(a b) '(c) 'd)", array2list_ids(['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(['c']))]],
+            [ "(append '() 'a)", SkmIdentifier.create('a')]
           ]
           checks.each do |(skeem_expr, expectation)|
             result = subject.run(skeem_expr)
-            expect(result.to_a).to eq(expectation)
+            if result.kind_of?(SkmPair)
+              expect(result.to_a).to eq(expectation)
+            else
+              expect(result).to eq(expectation)
+            end
           end
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skeem
 version: !ruby/object:Gem::Version
-  version: 0.2.05
+  version: 0.2.06
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-26 00:00:00.000000000 Z
+date: 2019-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rley