skeem 0.2.07 → 0.2.08

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3dd3d2443ae53822f3ebf6f0ce042b52455fff6592bd8aa26e91e4ac548c2c87
-  data.tar.gz: 8eb8851aa0bf2b643949c1dd21284178a83891982eff75cffc1ec10ab1fbe537
+  metadata.gz: cd3683235600881fa4fdbef83d8921aff335ee90388eef9f564b60e3d9217e49
+  data.tar.gz: 90c6402cc9f6367438ff8121741222edeab5712f747d3e498dc4a55c50f7047b
 SHA512:
-  metadata.gz: ebe0ba16a14e6c08638c63fabb83a38cd001914277a58bada5419020f92fbd83bfe7ad382ffa1bb44bb6307175f34108a407e60401f0c5657f11d484c97973aa
-  data.tar.gz: 4d61121cce897e2d4c4a6d3cb2b070522aa32785e76c18059cd86d6150bcd5e3d6ac6eb6c4bd2e1531dde19448341c938dc88b0d0722fd3ed1a6d605c7112344
+  metadata.gz: dc0e68b644a532d23a8dfac125a48cbb2cf6c13e83e051e7757bf516a80a0d2fc721ea8d85f50d00461d0fa90aaf3e9fac4536f4c2818fbf061ad35110b64288
+  data.tar.gz: 7c8ea63a8b08532d8112ae85d0ea93d8c999f87a92ed43e5e6e8e97e0f168de7a69bdaa2d3f72fe0b42f756c158d4e3bcdbb0897312a6ac8be160f657c5a3fa3

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## [0.2.08] - 2019-06-02
+- New standard procedures implemented: `assq`, `assv`
+
+### Added
+- File `primitive_builder.rb`. New methods for implementing `assq`, `assv`
+
+### Changed
+- File `README.md` Added mentions to new procedures.
+
+### Removed
+- Superseded class `SkmList` removed.
+
+
 ## [0.2.07] - 2019-05-31
 - New standard procedures implemented: `list-copy`, `procedure?`, `apply` and `map`
 

data/README.md

@@ -252,6 +252,7 @@ This section lists the implemented standard procedures
 
 #### List procedures
 * `list?`, `null?`, `pair?`, `append`, `car`, `cdr`, `caar`, `cadr`, `cdar`, `cddr`,  `cons`,  `length`, `list`, `list-copy`, `list->vector`, `set-car!`, `set-cdr!`
+ , `assq`, `assv`
 
 #### String procedures
 * `string?`, `string=?`,  `string-append`, `string-length`, `string->symbol`

data/lib/skeem/datum_dsl.rb

@@ -104,7 +104,6 @@ module Skeem
     # Conversion from Ruby object value to Skeem datum
     def to_datum(aLiteral)
       return aLiteral if aLiteral.kind_of?(SkmSimpleDatum)
-      return list(aLiteral.members) if aLiteral.kind_of?(SkmList)
       return vector(aLiteral.members) if aLiteral.kind_of?(SkmVector)
       return aLiteral if aLiteral.kind_of?(Primitive::PrimitiveProcedure)
 

data/lib/skeem/grammar.rb

@@ -34,15 +34,15 @@ module Skeem
     rule('definition' => 'LPAREN DEFINE IDENTIFIER expression RPAREN').as 'definition'
     rule('definition' => 'LPAREN DEFINE LPAREN IDENTIFIER def_formals RPAREN body RPAREN').as 'alt_definition'
     rule('definition' => 'LPAREN BEGIN definition_star RPAREN').as 'definitions_within_begin'
-    rule('expression' =>  'IDENTIFIER').as 'variable_reference'
-    rule 'expression' =>  'literal'
-    rule 'expression' =>  'procedure_call'
-    rule 'expression' =>  'lambda_expression'
-    rule 'expression' =>  'conditional'
-    rule 'expression' =>  'assignment'
-    rule 'expression' =>  'derived_expression'
+    rule('expression' => 'IDENTIFIER').as 'variable_reference'
+    rule 'expression' => 'literal'
+    rule 'expression' => 'procedure_call'
+    rule 'expression' => 'lambda_expression'
+    rule 'expression' => 'conditional'
+    rule 'expression' => 'assignment'
+    rule 'expression' => 'derived_expression'
     rule 'literal' => 'quotation'
-    rule 'literal' => 'self-evaluating'
+    rule 'literal' => 'self-evaluating'   
     rule('quotation' => 'APOSTROPHE datum').as 'quotation_short'
     rule('quotation' => 'LPAREN QUOTE datum RPAREN').as 'quotation'
     rule 'self-evaluating' => 'BOOLEAN'

data/lib/skeem/primitive/primitive_builder.rb

@@ -61,6 +61,7 @@ module Skeem
 
       def add_comparison(aRuntime)
         create_eqv?(aRuntime)
+        create_eq?(aRuntime)
         create_equal?(aRuntime)
         create_equal(aRuntime)
         create_lt(aRuntime)
@@ -220,17 +221,36 @@ module Skeem
         define_primitive_proc(aRuntime, 'floor-remainder', binary, primitive)
       end
 
+      def core_eqv?(eval_arg1, eval_arg2)
+        raw_result = eval_arg1.eqv?(eval_arg2)
+        boolean(raw_result)
+      end
+
       def create_eqv?(aRuntime)
         primitive = ->(runtime, argument1, argument2) do
           operand_1 = argument1.evaluate(runtime)
           operand_2 = argument2.evaluate(runtime)
-          raw_result = operand_1.eqv?(operand_2)
-          boolean(raw_result)
+          core_eqv?(operand_1, operand_2)
         end
 
         define_primitive_proc(aRuntime, 'eqv?', binary, primitive)
       end
 
+      def core_eq?(eval_arg1, eval_arg2)
+        raw_result = eval_arg1.skm_eq?(eval_arg2)
+        boolean(raw_result)
+      end
+
+      def create_eq?(aRuntime)
+        primitive = ->(runtime, argument1, argument2) do
+          operand_1 = argument1.evaluate(runtime)
+          operand_2 = argument2.evaluate(runtime)
+          core_eq?(operand1, operand2)
+        end
+
+        define_primitive_proc(aRuntime, 'eq?', binary, primitive)
+      end
+
       def create_equal?(aRuntime)
         primitive = ->(runtime, argument1, argument2) do
           operand_1 = argument1.evaluate(runtime)
@@ -355,7 +375,7 @@ module Skeem
               argument = raw_arg.evaluate(aRuntime)
               last_result = argument
               raw_result &&= !(argument.boolean? && !argument.value)
-              break unless raw_result
+              break unless raw_result # stop here, a false was found...
             end
             raw_result = last_result if raw_result
             # $stderr.puts raw_result.inspect
@@ -379,7 +399,7 @@ module Skeem
               argument = raw_arg.evaluate(aRuntime)
               last_result = argument
               raw_result ||= (!argument.boolean? || argument.value)
-              break if raw_result
+              break if raw_result # stop here, a true was found...
             end
             raw_result = last_result if raw_result
             to_datum(raw_result)
@@ -596,36 +616,64 @@ module Skeem
         define_primitive_proc(aRuntime, 'set-cdr!', binary, primitive)
       end
 
-        # create_assv(aRuntime)
       def create_assq(aRuntime)
         primitive = ->(runtime, obj_arg, alist_arg) do
-          # assoc_list = alist_arg.evaluate(runtime)
-          # check_assoc_list(assoc_list, 'assq')
-          # result = boolean(false)
-          # pair = assoc_list
-          # while (pair.cdr && (pair.cdr.kind_of?(SkmPair)) do
-            # are_equal = @primitive_map['equal?'].call(runtime, pair.car, obj_arg)
-            # if are_equal
-              # result = pair
-              # break
-            # else
-              # pair = pair.cdr
-            # end
-          # end
-
-          # result
+          assoc_list = alist_arg.evaluate(runtime)
+          check_assoc_list(assoc_list, 'assq')
+          obj = obj_arg.evaluate(runtime)          
+          result = boolean(false)
+          unless assoc_list.empty?
+            pair = assoc_list
+            begin
+              are_equal = core_eq?(pair.car.car, obj)
+              if are_equal.value
+                result = pair.car
+                break
+              end
+              pair = pair.cdr
+            end while (pair && (pair.kind_of?(SkmPair)))
+          end
+
+          result
         end
         define_primitive_proc(aRuntime, 'assq', binary, primitive)
       end
+      
+      def create_assv(aRuntime)
+        primitive = ->(runtime, obj_arg, alist_arg) do
+          assoc_list = alist_arg.evaluate(runtime)
+          check_assoc_list(assoc_list, 'assq')
+          obj = obj_arg.evaluate(runtime)          
+          result = boolean(false)
+          unless assoc_list.empty?
+            pair = assoc_list
+            begin
+              are_equal = core_eqv?(pair.car.car, obj)
+              if are_equal.value
+                result = pair.car
+                break
+              end
+              pair = pair.cdr
+            end while (pair && (pair.kind_of?(SkmPair)))
+          end
+
+          result
+        end
+        define_primitive_proc(aRuntime, 'assv', binary, primitive)      
+      end      
 
       def check_assoc_list(alist, proc_name)
-        check_argtype(alist, SkmPair, 'association list', 'proc_name')
-      end
+        check_argtype(alist, [SkmPair, SkmEmptyList], 'association list', proc_name)
 
-      def create_assv(aRuntime)
+        unless alist.empty?
+          cell = SkmPair.new(integer(1), alist)
+          begin
+            cell = cell.cdr
+            check_argtype(cell, SkmPair, 'association list', proc_name)
+          end while cell.cdr.kind_of?(SkmPair)
+        end
       end
 
-
       def create_list_copy(aRuntime)
         primitive = ->(runtime, arg) do
           arg_evaluated = arg.evaluate(runtime)

data/lib/skeem/s_expr_builder.rb

@@ -86,7 +86,7 @@ module Skeem
     # rule('expression' =>  'IDENTIFIER').as 'variable_reference'
     def reduce_variable_reference(_production, aRange, _tokens, theChildren)
       SkmVariableReference.new(aRange, theChildren[0])
-    end
+    end    
 
     # rule('quotation' => 'APOSTROPHE datum').as 'quotation_short'
     def reduce_quotation_short(_production, _range, _tokens, theChildren)

data/lib/skeem/skm_compound_datum.rb

@@ -72,61 +72,6 @@ module Skeem
     end
   end # class
 
-  # @deprecated Use {#SkmPair} class instead.
-  class SkmList < SkmCompoundDatum
-    def tail()
-      SkmList.new(members.slice(1..-1))
-    end
-
-    def list?
-      true
-    end
-
-    def null?
-      empty?
-    end
-
-    def evaluate(aRuntime)
-      if empty?
-        self.class.new(nil)
-      else
-        first_evaluated = members.first.evaluate(aRuntime)
-
-        if first_evaluated.kind_of?(SkmIdentifier)
-          aRuntime.evaluate_form(self)
-        else
-          members_eval = members.map { |elem| elem.evaluate(aRuntime) }
-          self.class.new(members_eval)
-        end
-      end
-    end
-
-
-    # Factory method.
-    # Construct an Enumerator that will return iteratively the result
-    # of 'evaluate' method of each members of self.
-    def to_eval_enum(aRuntime)
-=begin
-      elements = self.members
-
-      new_enum = Enumerator.new do |result|
-        context = aRuntime
-        elements.each { |elem| result << elem.evaluate(context) }
-      end
-
-      new_enum
-=end
-      members.map { |elem| elem.evaluate(aRuntime) }
-    end
-
-    def done!()
-      # Do nothing
-    end
-
-    alias head first
-    alias rest tail
-  end # class
-
   class SkmVector < SkmCompoundDatum
     def vector?
       true

data/lib/skeem/skm_element.rb

@@ -61,6 +61,11 @@ module Skeem
       msg = "Missing implementation of method #{self.class.name}##{__method__}"
       raise NotImplementedError, msg
     end
+    
+    def skm_eq?(other)
+      # Default implementation, to override when necessary
+      self.eqv?(other)
+    end    
 
     # @return [TrueClass, FalseClass] true if quoted element is identical to itself
     def verbatim?

data/lib/skeem/version.rb

@@ -1,3 +1,3 @@
 module Skeem
-  VERSION = '0.2.07'.freeze
+  VERSION = '0.2.08'.freeze
 end

data/spec/skeem/primitive/primitive_builder_spec.rb

@@ -634,6 +634,29 @@ SKEEM
           expect(result.last.cdr).to eq(1)
         end
 
+        it 'should implement the assq procedure' do
+          subject.run("(define e '((a 1) (b 2) (c 3)))")
+          result = subject.run("(assq 'a e)")
+          expect(result.to_a).to eq(['a', 1])
+          result = subject.run("(assq 'b e)")
+          expect(result.to_a).to eq(['b', 2])
+          result = subject.run("(assq 'c e)")
+          expect(result.to_a).to eq(['c', 3])
+          result = subject.run("(assq 'd e)")
+          expect(result).to eq(false)
+          result = subject.run("(assq 'a '())")
+          expect(result).to eq(false)
+          result = subject.run("(assq 'a '())")
+          expect(result).to eq(false)
+          result = subject.run("(assq '(a) '(((a)) ((b)) ((c))))")
+          expect(result).to eq(false)
+        end
+
+        it 'should implement the assv procedure' do
+          result = subject.run("(assv 5 '((2 3) (5 7) (11 13)))")
+          expect(result.to_a).to eq([5, 7])
+        end
+
         it 'should implement the list-copy procedure' do
           checks = [
             ["(list-copy '())", []],
@@ -737,7 +760,7 @@ SKEEM
             ["(procedure? car)", true],
             ["(procedure? 'car)", false],
             ["(procedure? (lambda (x) (* x x)))", true],
-            # ["(procedure? '(lambda (x) (* x x)))", false] # Parse failure!
+            # ["(procedure? '(lambda (x) (* x x)))", false] # Parse fail: non-standard syntax
           ]
           checks.each do |(skeem_expr, expectation)|
             result = subject.run(skeem_expr)
@@ -754,7 +777,7 @@ SKEEM
             expect(result).to eq(expectation)
           end
         end
-        
+
         it 'should implement the map procedure' do
           checks = [
             ["(map car '((a b) (d e) (g h)))", ['a', 'd', 'g']],
@@ -764,7 +787,7 @@ SKEEM
             result = subject.run(skeem_expr)
             expect(result.to_a).to eq(expectation)
           end
-        end        
+        end
       end # context
 
       context 'IO procedures:' do

data/spec/skeem/skm_compound_datum_spec.rb

@@ -78,42 +78,6 @@ module Skeem
       end
     end # context
   end # describe
-
-  describe SkmList do
-    let(:sample_members) { [1, 2, 3] }
-    subject { SkmList.new(sample_members) }
-
-    context 'Initialization:' do
-      it 'should be initialized with its members' do
-        expect{ SkmList.new(sample_members) }.not_to raise_error
-      end
-      
-      it 'should react positively to list? predicate' do
-        expect(subject).to be_list
-      end
-
-      it 'should react correctly to null? predicate' do
-        expect(subject).not_to be_null
-        expect(SkmList.new([])).to be_null
-      end      
-    end # context
-
-    context 'Provided services:' do
-      it 'should retrieve its first member' do
-        expect(subject.first).to eq(1)
-        expect(subject.head).to eq(1)
-      end
-
-      it 'should retrieve its tail members' do
-        expect(subject.tail.inspect).to eq('<Skeem::SkmList: 2, 3>')
-        expect(subject.rest.inspect).to eq('<Skeem::SkmList: 2, 3>')
-      end
-
-      it 'should return its text representation' do
-        expect(subject.inspect).to eq('<Skeem::SkmList: 1, 2, 3>')
-      end
-    end # context
-  end # describe
   
   describe SkmVector do
     let(:sample_members) { [1, 2, 3] }

metadata

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