skeem 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6261d01a57850b9accad9ba2136b59625c37ea58
-  data.tar.gz: 7918e865cadb393e285bfdea1e722970b918549b
+  metadata.gz: a55997a668dd1095c0228abea2090acdadedf98d
+  data.tar.gz: 33938d730ff4696cb52ad1f520fb0a1cc2e6df96
 SHA512:
-  metadata.gz: 1a4efb9e1b96a298448c908e11c1df6a03b810586f7008e10eab9c7336705d3df8e4648155f42737f4fd4453e62ad258af031efc3a884019e42f81babc63b722
-  data.tar.gz: abd048ab5117289e788090947e142805183283b49f05bdd5f16ac491888c8a5f1c6857bc631d51b6db7dc5c9229ccd5b6f65962e7950cdd24bb30c2f761ebb98
+  metadata.gz: 293117e7f86f050aaf6617d2e8d5ccdc838c8b37a5d6a57a3e455e2236640b6063e3cb18215e059d5de76976e1d9f2a2c915c19cceccffce02a8eded1aa04663
+  data.tar.gz: d71c34ed8c32fc148d161f35c236f38320d629770094dff17b32f6428f5b0d03019644b6adec00f2d8d08699a080fe1745bc74a9e279216a1484a70f1dad5d49

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## [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?'
+
+### Changed
+- Class hierarchy `SExprElement`. Prefix `SExpr` in class names changed into 'Skm'
+
+### Fixed
+- Method `PrimitiveBuilder#create_minus` When '-' has only one argument then it means sign change.
+
 ## [0.0.9] - 2018-09-15
 Added primitive procedures: 'number?', 'real?', 'integer?'.
 

data/lib/skeem/primitive/primitive_builder.rb

@@ -6,23 +6,39 @@ module Skeem
       def add_primitives(aRuntime)
         add_arithmetic(aRuntime)
         add_number_predicates(aRuntime)
+        add_boolean_procedures(aRuntime)
+        add_string_procedures(aRuntime)
+        add_symbol_procedures(aRuntime)
       end
-      
+
       private
-      
+
       def add_arithmetic(aRuntime)
         def_procedure(aRuntime, create_plus)
         def_procedure(aRuntime, create_minus)
         def_procedure(aRuntime, create_multiply)
         def_procedure(aRuntime, create_divide)
       end
-      
+
       def add_number_predicates(aRuntime)
         def_procedure(aRuntime, create_number?)
         def_procedure(aRuntime, create_real?)
         def_procedure(aRuntime, create_integer?)
       end
-      
+
+      def add_boolean_procedures(aRuntime)
+        def_procedure(aRuntime, create_not)
+        def_procedure(aRuntime, create_boolean?)
+      end
+
+      def add_string_procedures(aRuntime)
+        def_procedure(aRuntime, create_string?)
+      end
+
+      def add_symbol_procedures(aRuntime)
+        def_procedure(aRuntime, create_symbol?)
+      end
+
       def create_plus()
         plus_code = ->(runtime, arglist) do
           first_one = arglist.head.evaluate(runtime)
@@ -34,13 +50,17 @@ module Skeem
 
         ['+', plus_code]
       end
-      
+
       def create_minus()
         minus_code = ->(runtime, arglist) do
           first_one = arglist.head.evaluate(runtime)
-          operands = arglist.tail.to_eval_enum(runtime)
           raw_result = first_one.value
-          operands.each { |elem| raw_result -= elem.value } 
+          if arglist.length > 1
+            operands = arglist.tail.to_eval_enum(runtime)
+            operands.each { |elem| raw_result -= elem.value }
+          else
+            raw_result = -raw_result
+          end
           to_skm(raw_result)
         end
 
@@ -52,7 +72,7 @@ module Skeem
           first_one = arglist.head.evaluate(runtime)
           operands = arglist.tail.to_eval_enum(runtime)
           raw_result = first_one.value
-          operands.each { |elem| raw_result *= elem.value }          
+          operands.each { |elem| raw_result *= elem.value }
           to_skm(raw_result)
         end
 
@@ -96,8 +116,47 @@ module Skeem
         end
 
         ['integer?', pred_code]
-      end       
-      
+      end
+
+      def create_not()
+        logical = ->(runtime, arg) do
+          arg_evaluated = arg.evaluate(runtime)
+          if arg_evaluated.boolean? && arg_evaluated.value == false
+            to_skm(true)
+          else
+            to_skm(false)
+          end
+        end
+        ['not', logical]
+      end
+
+      def create_boolean?()
+        pred_code = ->(runtime, arg) do
+          arg_evaluated = arg.evaluate(runtime)
+          to_skm(arg_evaluated.boolean?)
+        end
+
+        ['boolean?', pred_code]
+      end
+
+      def create_string?()
+        pred_code = ->(runtime, arg) do
+          arg_evaluated = arg.evaluate(runtime)
+          to_skm(arg_evaluated.string?)
+        end
+
+        ['string?', pred_code]
+      end
+
+      def create_symbol?
+        pred_code = ->(runtime, arg) do
+          arg_evaluated = arg.evaluate(runtime)
+          to_skm(arg_evaluated.symbol?)
+        end
+
+        ['symbol?', pred_code]
+      end
+
       def def_procedure(aRuntime, aPair)
         func = PrimitiveProcedure.new(aPair.first, aPair.last)
         define(aRuntime, func.identifier, func)
@@ -106,16 +165,16 @@ module Skeem
       def define(aRuntime, aKey, anEntry)
         aRuntime.define(aKey, anEntry)
       end
-      
+
       # Convert Ruby object into its Skeem counterpart
       def to_skm(native_obj)
         case native_obj
           when TrueClass, FalseClass
             SkmBoolean.create(native_obj)
-          when Float 
+          when Float
             SkmReal.create(native_obj)
           when Integer
-            SkmInteger.create(native_obj)     
+            SkmInteger.create(native_obj)
         end
       end
     end # module

data/lib/skeem/s_expr_nodes.rb

@@ -29,6 +29,18 @@ module Skeem
     def integer?
       false
     end
+    
+    def boolean?
+      false
+    end
+
+    def string?
+      false
+    end    
+
+    def symbol?
+      false
+    end    
 
     # Abstract method.
     # Part of the 'visitee' role in Visitor design pattern.
@@ -81,6 +93,9 @@ module Skeem
   end # class
 
   class SkmBoolean < SkmTerminal
+    def boolean?
+      true
+    end  
   end # class
 
   class SkmNumber < SkmTerminal
@@ -106,6 +121,10 @@ module Skeem
     def init_value(aValue)
       super(aValue.dup)
     end
+    
+    def string?
+      true
+    end     
   end # class
 
   class SkmIdentifier < SkmTerminal
@@ -113,6 +132,10 @@ module Skeem
     def init_value(aValue)
       super(aValue.dup)
     end
+    
+    def symbol?
+      true
+    end     
   end # class
 
   class SkmReserved < SkmIdentifier
@@ -123,7 +146,7 @@ module Skeem
     attr_accessor(:members)
     extend Forwardable
 
-    def_delegator :@members, :first, :empty?
+    def_delegators :@members, :first, :length, :empty?
 
     def initialize(theMembers)
       super(nil)

data/lib/skeem/version.rb

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

data/spec/skeem/interpreter_spec.rb

@@ -102,6 +102,22 @@ 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)
+        expect(result.value).to eq(-3)
+      end
+
+      it 'should implement the substraction of integers' do
+        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       
 
       it 'should implement the product of numbers' do
         result = subject.run('(* 2 3 4)')
@@ -159,7 +175,53 @@ module Skeem
           result = subject.run(skeem_expr)
           expect(result.value).to eq(expectation)
         end
-      end       
+      end
+
+      it 'should implement the not procedure' do
+        checks = [
+          ['(not #t)', false],
+          ['(not 3)', false],
+          ['(not #f)', true]
+        ]
+        checks.each do |(skeem_expr, expectation)|
+          result = subject.run(skeem_expr)
+          expect(result.value).to eq(expectation)
+        end
+      end
+
+      it 'should implement the boolean? procedure' do
+        checks = [
+          ['(boolean? #f)', true],
+          ['(boolean? 0)', false]
+        ]
+        checks.each do |(skeem_expr, expectation)|
+          result = subject.run(skeem_expr)
+          expect(result.value).to eq(expectation)
+        end
+      end
+
+      it 'should implement the string? procedure' do
+        checks = [
+          ['(string? #f)', false],
+          ['(string? 3)', false],
+          ['(string? "hi")', true]
+        ]
+        checks.each do |(skeem_expr, expectation)|
+          result = subject.run(skeem_expr)
+          expect(result.value).to eq(expectation)
+        end
+      end
+
+      it 'should implement the symbol? procedure' do
+        checks = [
+          ['(symbol? #f)', false],
+          ['(symbol? "bar")', false]
+        ]
+        checks.each do |(skeem_expr, expectation)|
+          result = subject.run(skeem_expr)
+          expect(result.value).to eq(expectation)
+        end
+      end      
     end # context
   end # describe
 end # module

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: skeem
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Dimitri Geshef