skeem 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a55997a668dd1095c0228abea2090acdadedf98d
-  data.tar.gz: 33938d730ff4696cb52ad1f520fb0a1cc2e6df96
+  metadata.gz: a42694aa5f20550be636b493bcf451db3b5d70f8
+  data.tar.gz: a3f65ef0a724758a257fbaaf5570edf8c341ea08
 SHA512:
-  metadata.gz: 293117e7f86f050aaf6617d2e8d5ccdc838c8b37a5d6a57a3e455e2236640b6063e3cb18215e059d5de76976e1d9f2a2c915c19cceccffce02a8eded1aa04663
-  data.tar.gz: d71c34ed8c32fc148d161f35c236f38320d629770094dff17b32f6428f5b0d03019644b6adec00f2d8d08699a080fe1745bc74a9e279216a1484a70f1dad5d49
+  metadata.gz: afa3959e8f8e9873b08cc242954350dbf61ab0cb2296ce46175f68e70070498cc10446031b32011536e39b8f7cb9a2f7bd1977e949c98a7b541b61aae2310674
+  data.tar.gz: 6c07561060a42c776a14534fa117734850c3878d83c915bda6c997eab1e29cf88417d35bdaa9fa0e0071ad7c3ac5aef38759ee7e0855aeaf2e774cd6fa810959

data/CHANGELOG.md

@@ -1,9 +1,16 @@
+## [0.0.11] - 2018-09-16
+Added primitive procedures: `=`, `<`, `>`, `>=`, `<=`
+
+### Added
+- Class `PrimitiveBuilder`. Added methods to implement the comparison operators `=`, `<`, `>`, `>=`, `<=`
+- File `interpreter_spec.rb` added tests for `<`, `>`, `>=`, `<=`
+
 ## [0.0.10] - 2018-09-15
 Added primitive procedures: 'boolean?', 'string?', 'symbol?', and 'not' 
 
 ### Added
 - Class `PrimitiveBuilder`. Added methods to implement the predicates 'boolean?', 'string?', 'symbol?', and 'not'
-- File `interpreter_spec.rb` methods to implement the predicates 'boolean?', 'string?', 'symbol?'
+- File `interpreter_spec.rb` added tests for 'boolean?', 'string?', 'symbol?'
 
 ### Changed
 - Class hierarchy `SExprElement`. Prefix `SExpr` in class names changed into 'Skm'

data/lib/skeem/primitive/primitive_builder.rb

@@ -5,6 +5,7 @@ module Skeem
     module PrimitiveBuilder
       def add_primitives(aRuntime)
         add_arithmetic(aRuntime)
+        add_comparison(aRuntime)
         add_number_predicates(aRuntime)
         add_boolean_procedures(aRuntime)
         add_string_procedures(aRuntime)
@@ -20,6 +21,14 @@ module Skeem
         def_procedure(aRuntime, create_divide)
       end
 
+      def add_comparison(aRuntime)
+        def_procedure(aRuntime, create_equal)
+        def_procedure(aRuntime, create_lt)
+        def_procedure(aRuntime, create_gt)
+        def_procedure(aRuntime, create_lte)
+        def_procedure(aRuntime, create_gte)
+      end
+
       def add_number_predicates(aRuntime)
         def_procedure(aRuntime, create_number?)
         def_procedure(aRuntime, create_real?)
@@ -91,6 +100,70 @@ module Skeem
         ['/', divide_code]
       end
 
+      def create_equal
+        equal_code = ->(runtime, arglist) do
+          first_one = arglist.head.evaluate(runtime)
+          operands = arglist.tail.to_eval_enum(runtime)
+          first_value = first_one.value
+          all_equal = operands.all? { |elem| first_value == elem.value }
+          to_skm(all_equal)
+        end
+
+        ['=', equal_code]
+      end
+
+      def create_lt
+        lt_code = ->(runtime, arglist) do
+          operands = arglist.to_eval_enum(runtime)
+          result = true
+          operands.each_cons(2) do |(elem1, elem2)|
+            result &&= elem1.value < elem2.value
+          end
+          to_skm(result)
+        end
+
+        ['<', lt_code]
+      end
+
+      def create_gt
+        gt_code = ->(runtime, arglist) do
+          operands = arglist.to_eval_enum(runtime)
+          result = true
+          operands.each_cons(2) do |(elem1, elem2)|
+            result &&= elem1.value > elem2.value
+          end
+          to_skm(result)
+        end
+
+        ['>', gt_code]
+      end
+
+      def create_lte
+        lte_code = ->(runtime, arglist) do
+          operands = arglist.to_eval_enum(runtime)
+          result = true
+          operands.each_cons(2) do |(elem1, elem2)|
+            result &&= elem1.value <= elem2.value
+          end
+          to_skm(result)
+        end
+
+        ['<=', lte_code]
+      end
+
+      def create_gte
+        gte_code = ->(runtime, arglist) do
+          operands = arglist.to_eval_enum(runtime)
+          result = true
+          operands.each_cons(2) do |(elem1, elem2)|
+            result &&= elem1.value >= elem2.value
+          end
+          to_skm(result)
+        end
+
+        ['>=', gte_code]
+      end
+
       def create_number?()
         pred_code = ->(runtime, arg) do
           arg_evaluated = arg.evaluate(runtime)

data/lib/skeem/version.rb

@@ -1,3 +1,3 @@
 module Skeem
-  VERSION = '0.0.10'.freeze
+  VERSION = '0.0.11'.freeze
 end

data/spec/skeem/interpreter_spec.rb

@@ -102,7 +102,7 @@ module Skeem
         expect(result).to be_kind_of(SkmReal)
         expect(result.value).to eq(4.34)
       end
-      
+
       it 'should implement the negation of integer' do
         result = subject.run('(- 3)')
         expect(result).to be_kind_of(SkmInteger)
@@ -113,11 +113,11 @@ module Skeem
         result = subject.run('(- 3 4)')
         expect(result).to be_kind_of(SkmInteger)
         expect(result.value).to eq(-1)
-        
+
         result = subject.run('(- 3 4 5)')
         expect(result).to be_kind_of(SkmInteger)
-        expect(result.value).to eq(-6)        
-      end       
+        expect(result.value).to eq(-6)
+      end
 
       it 'should implement the product of numbers' do
         result = subject.run('(* 2 3 4)')
@@ -136,7 +136,79 @@ module Skeem
         expect(result).to be_kind_of(SkmInteger)
         expect(result.value).to eq(210)
       end
+
+      it 'should implement the equality operator' do
+        checks = [
+          ['(= 3 3)', true],
+          ['(= 3 (+ 1 2) (- 4 1))', true],
+          ['(= "foo" "foo")', true],
+          ['(= 3 4)', false],
+          ['(= "foo" "bar")', false]
+        ]
+        checks.each do |(skeem_expr, expectation)|
+          result = subject.run(skeem_expr)
+          expect(result.value).to eq(expectation)
+        end
+      end
+
+      it 'should implement the less than operator' do
+        checks = [
+          ['(< 3 4)', true],
+          ['(< 3 (+ 2 2) (+ 4 1))', true],
+          ['(< 3 3)', false],
+          ['(< 3 2)', false],
+          ['(< 3 4 5 4)', false]
+        ]
+        checks.each do |(skeem_expr, expectation)|
+          result = subject.run(skeem_expr)
+          expect(result.value).to eq(expectation)
+        end
+      end
+
+      it 'should implement the greater than operator' do
+        checks = [
+          ['(> 3 2)', true],
+          ['(> 3 (- 4 2) (- 2 1))', true],
+          ['(> 3 3)', false],
+          ['(> 3 4)', false],
+          ['(> 3 2 1 2)', false]
+        ]
+        checks.each do |(skeem_expr, expectation)|
+          result = subject.run(skeem_expr)
+          expect(result.value).to eq(expectation)
+        end
+      end
+
+      it 'should implement the less or equal than operator' do
+        checks = [
+          ['(<= 3 4)', true],
+          ['(<= 3 (+ 2 2) (+ 4 1))', true],
+          ['(<= 3 3)', true],
+          ['(<= 3 2)', false],
+          ['(<= 3 4 5 4)', false],
+          ['(<= 3 4 5 5)', true]
+        ]
+        checks.each do |(skeem_expr, expectation)|
+          result = subject.run(skeem_expr)
+          expect(result.value).to eq(expectation)
+        end
+      end
       
+      it 'should implement the greater or equal than operator' do
+        checks = [
+          ['(>= 3 2)', true],
+          ['(>= 3 (- 4 2) (- 2 1))', true],
+          ['(>= 3 3)', true],
+          ['(>= 3 4)', false],
+          ['(>= 3 2 1 2)', false],
+          ['(>= 3 2 1 1)', true]
+        ]
+        checks.each do |(skeem_expr, expectation)|
+          result = subject.run(skeem_expr)
+          expect(result.value).to eq(expectation)
+        end
+      end      
+
       it 'should implement the number? predicate' do
         checks = [
           ['(number? 3.1)', true],
@@ -149,7 +221,7 @@ module Skeem
           expect(result.value).to eq(expectation)
         end
       end
-      
+
       it 'should implement the real? predicate' do
         checks = [
           ['(real? 3.1)', true],
@@ -221,7 +293,7 @@ module Skeem
           result = subject.run(skeem_expr)
           expect(result.value).to eq(expectation)
         end
-      end      
+      end
     end # context
   end # describe
 end # module

metadata

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