skeem 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d588cbeb0a65a6d0821ca4298fb15f577b873a0f
-  data.tar.gz: b71fd66e1970299cef3e5802be3a8800cef3dd83
+  metadata.gz: ba107706c9483fb97e9a628b621ca7932c00f16d
+  data.tar.gz: 14ddf9ec1cebab58ae123ffbef3786f306824cb3
 SHA512:
-  metadata.gz: e2aa7dec8f113fe704d859201f4176d7dcea1870a02d2fd7d6c89e96b1e2f3848d3e99c6283f95326a40a54af7c153834d8a213d6dcf8b3afd772bfbf2d28989
-  data.tar.gz: 3f46e06c1c4b603b3b0af8d49bfd2180ffd4aba3906492ae845dc2e0d2c727286f8e63e09d9e8aeb1ca5dae7f6e47635f7364022e688d713086ec7ed63e2428f
+  metadata.gz: bfb3e078734b6e7ed68161f095c5c5c3287afd8c4fd1583b7a0e7f1d79c112aead08dd4e95d804ee68d7bfc7c1da73841252ef8eb8acdf88700d929682a2dc35
+  data.tar.gz: 5fd3ed354914cb9af65fd0e7836d3a474c45f980fcbf4a0535162d08d8944f14e72f8168e723ea024f46b8861292d47ae0e53ba419250f38e4a2a5fd1df2aaf3

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## [0.0.13] - 2018-09-18
+Added primitive `if` (conditional form)
+
+### Added
+- Class `SkmCondition` for representing a specific conditional.
+
+### Changed
+- File `grammar.rb` Added syntax rules for conditional expression.
+- Class `SkmBuilder`. Added method to implement the semantic action for `if`.
+- File `interpreter_spec.rb` added tests for `if`.
+- File `README.md` Changed demo snippet with example of conditional expression.
+
 ## [0.0.12] - 2018-09-17
 Added primitive `define` and variable reference
 

data/README.md

@@ -31,15 +31,25 @@ At this stage, the gem consists of a bare-bones interpreter.
   require 'skeem'
 
   schemer = Skeem::Interpreter.new
+  
   scheme_code =<<-SKEEM
+    ; This heredoc consists of Scheme code...
     ; Let's define a Scheme variable
     (define foobar (* 2 3 7))
 
-    ; Now retrieve its value
-    foobar
+    ; Now test its value against a lower value
+    (if (> foobar 40) #true #false)
   SKEEM
+
+  # Ask Ruby to execute Scheme code
+  result = schemer.run(scheme_code)
+  puts result.value # => true
+
+  # The interpreter object keeps the bindings of variable
+  # Let's test that...
+  scheme_code = '(* foobar foobar)'
   result = schemer.run(scheme_code)
-  puts result.value # => 42
+  puts result.value # => 1764
 ```
 
 Roadmap:

data/lib/skeem/grammar.rb

@@ -8,8 +8,8 @@ module Skeem
   # https://bitbucket.org/cowan/r7rs/src/draft-10/rnrs/r7rs.pdf
   # Names of grammar elements are based on the R7RS documentation
   builder = Rley::Syntax::GrammarBuilder.new do
-    # Delimitersn, separators...
-    # add_terminals('APOSTROPHE', 'BACKQUOTE')    
+    # Delimiters, separators...
+    # add_terminals('APOSTROPHE', 'BACKQUOTE')
     add_terminals('LPAREN', 'RPAREN')
     # add_terminals('PERIOD')
 
@@ -18,9 +18,8 @@ module Skeem
     add_terminals('STRING_LIT', 'IDENTIFIER')
 
     # Keywords...
-    # add_terminals('BEGIN', 'DEFINE')
-    add_terminals('DEFINE')
-    
+    add_terminals('DEFINE', 'IF')
+
     rule('program' => 'cmd_or_def_plus').as 'main'
     rule('cmd_or_def_plus' => 'cmd_or_def_plus cmd_or_def').as 'multiple_cmd_def'
     rule('cmd_or_def_plus' => 'cmd_or_def').as 'last_cmd_def'
@@ -31,6 +30,7 @@ module Skeem
     rule('expression' =>  'IDENTIFIER').as 'variable_reference'
     rule 'expression' =>  'literal'
     rule 'expression' =>  'procedure_call'
+    rule 'expression' =>  'conditional'
     rule 'literal' => 'self-evaluating'
     rule 'self-evaluating' => 'BOOLEAN'
     rule 'self-evaluating' => 'number'
@@ -41,6 +41,11 @@ module Skeem
     rule('operand_plus' => 'operand').as 'last_operand'
     rule 'operator' => 'expression'
     rule 'operand' => 'expression'
+    rule('conditional' => 'LPAREN IF test consequent alternate RPAREN').as 'conditional'
+    rule 'test' => 'expression'
+    rule 'consequent' => 'expression'
+    rule 'alternate' => 'expression'
+    rule 'alternate' => []
     rule 'number' => 'INTEGER'
     rule 'number' => 'REAL'
   end

data/lib/skeem/s_expr_builder.rb

@@ -81,6 +81,11 @@ module Skeem
     def reduce_last_operand(_production, _range, _tokens, theChildren)
       [theChildren.last]
     end
+    
+    # rule('conditional' => 'LPAREN IF test consequent alternate RPAREN').as 'conditional'
+    def reduce_conditional(_production, aRange, _tokens, theChildren)
+      SkmCondition.new(aRange, theChildren[2], theChildren[3], theChildren[4])
+    end    
   end # class
 end # module
 # End of file

data/lib/skeem/s_expr_nodes.rb

@@ -4,6 +4,13 @@
 require 'forwardable'
 
 module Skeem
+  class SkmUndefined
+    def value
+      :UNDEFINED
+    end
+  end # class
+
+
   # Abstract class. Generalization of any S-expr element.
   SkmElement = Struct.new(:position) do
     def initialize(aPosition)
@@ -272,5 +279,29 @@ module Skeem
 
     alias children operands
   end # class
+  
+  class SkmCondition < SkmElement
+    attr_reader :test
+    attr_reader :consequent
+    attr_reader :alternate
+
+    def initialize(aPosition, aTest, aConsequent, anAlternate)
+      super(aPosition)
+      @test = aTest
+      @consequent = aConsequent
+      @alternate = anAlternate
+    end
+
+    def evaluate(aRuntime)
+      test_result = test.evaluate(aRuntime)
+      condition_result = nil
+      if test_result.boolean? && test_result.value == false
+        # Only #f is considered as false, everything else is true
+        condition_result = alternate ? alternate.evaluate(aRuntime) : SkmUndefined.new
+      else
+        condition_result = consequent.evaluate(aRuntime)
+      end
+    end
+  end # class
 end # module
 # End of file

data/lib/skeem/tokenizer.rb

@@ -28,6 +28,7 @@ module Skeem
     # Here are all the SRL keywords (in uppercase)
     @@keywords = %w[
       BEGIN
+      IF
       DEFINE
     ].map { |x| [x, x] } .to_h
 

data/lib/skeem/version.rb

@@ -1,3 +1,3 @@
 module Skeem
-  VERSION = '0.0.12'.freeze
+  VERSION = '0.0.13'.freeze
 end

data/spec/skeem/interpreter_spec.rb

@@ -93,7 +93,37 @@ SKEEM
         result = subject.run(source)
         expect(result).to be_kind_of(SkmInteger)
         expect(result.value).to eq(28)
-      end      
+      end
+
+      it 'should implement the simple conditional form' do
+         checks = [
+          ['(if (> 3 2) "yes")', 'yes'],
+          ['(if (> 2 3) "yes")', :UNDEFINED]
+        ]
+        checks.each do |(skeem_expr, expectation)|
+          result = subject.run(skeem_expr)
+          expect(result.value).to eq(expectation)
+        end      
+      end
+      
+      it 'should implement the complete conditional form' do
+         checks = [
+          ['(if (> 3 2) "yes" "no")', 'yes'],
+          ['(if (> 2 3) "yes" "no")', 'no']
+        ]
+        checks.each do |(skeem_expr, expectation)|
+          result = subject.run(skeem_expr)
+          expect(result.value).to eq(expectation)
+        end
+        source = <<-SKEEM
+  ; Example from R7RS section 4.1.5
+  (if (> 3 2)
+    (- 3 2)
+    (+ 3 2))
+SKEEM
+        result = subject.run(source)
+        expect(result.value).to eq(1)      
+      end
     end # context
 
     context 'Built-in primitive procedures' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skeem
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-17 00:00:00.000000000 Z
+date: 2018-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rley