skeem 0.0.22 → 0.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b1748ebcacd81d8e56ece9deb9a8087d28ebb50
-  data.tar.gz: b4263783f841a2f3577c5cb885554f01f44c067e
+  metadata.gz: 46a43c0a96d793c7f042976ec034e9e261fe8198
+  data.tar.gz: 381a4e60b09bc4ffe797dce9ed62a40b53ec1225
 SHA512:
-  metadata.gz: fda3cea9741f1b2da1016b41b90b7ff627e54d37a3c3ac851b5afe6f85eaab943e2a245e1bbde96796179a464c1bcc6e8384fe03aaed3a4a40efe71110ff9483
-  data.tar.gz: 75fec756b836694aa1b2ac8874fbdb503017fb99328ce440ea9c8a45ea95f9a8232c5e16e8e5288aa4a3144c52d4de37ebfb22d1a913e1abd71886ea0c412cd7
+  metadata.gz: e7dc6aa941a1e5fc4940b4d35df274ac08cf3064990dd033af703d3e72afc59f7abfd19249c24574162fdac5e72fb74425e54303780df215764fb800d19b4cb6
+  data.tar.gz: a716f8595373f25da0796eb58c07f53d47bb83db183fe0d969226ff3216993198f5c9a47cb6bea7e3e578e539eb1760c9effbf8426483b59fcd34058be5c362a

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## [0.0.23] - 2018-10-24
+### Added
+- File `primitive_builder.rb` implementation of: standard `or`, `string->symbol`, `number->string`, `string-append` procedures.
+
+### Changed
+- File `README.md` udpated to reflect currently implemented features.
+
+### Fixed
+- Method `Convertible#to_skm` Now converts String argument into `SkmString` and raises an exception when unable to convert.
+
 ## [0.0.22] - 2018-10-23
 ### Added
 - Class `SkmBuilder`added support for list datum.
@@ -6,7 +16,6 @@
 ### Fixed
 - File `interpreter_spec.rb` Added test example of list quotation.
 
-
 ## [0.0.21] - 2018-10-22
 ### Added
 - Added support for alternative `define` syntax.

data/README.md

@@ -125,6 +125,8 @@ Here are a few other ones:
 - Vectors: `#(1 2 "three")`
 
 ### Scheme Expressions
+- Constant literals
+- Quotations
 - Variable references
 - Procedure calls
 - Lambda expressions
@@ -145,20 +147,25 @@ __Syntax:__
 * (if <test\> <consequent\> <alternate\>)  
 
 
-
 #### lambda  
 __Purpose:__ Definition of a procedure.  
 __Syntax:__   
 * (lambda <formals\> <body\>)
 
+#### quote  
+__Purpose:__ Quoting an expression (leave it unevaluated).  
+__Syntax:__   
+* (quote <datum\>)
+* '<datum\>
+
 ### Standard library
 This section lists the implemented standard procedures
 
 #### Boolean procedures
-* `boolean?`, `not`
+* `boolean?`, `and`, `or`,  `not`
 
 #### Numerical operations
-* Number-level: `number?`, `real?`, `integer?`, `zero?`, `+`, `-`, `*`, `/`, `=`, `square`
+* Number-level: `number?`, `real?`, `integer?`, `zero?`, `+`, `-`, `*`, `/`, `=`, `square`, `number->string`
 * Real-level: `positive?`, `negative?`, `<`, `>`, `<=`, `>=`, `abs`, `floor-remainder`
 * Integer-level: `even?`, `odd?`
 
@@ -166,7 +173,7 @@ This section lists the implemented standard procedures
 * `list?`, `null?`, `list`, `length`
 
 #### String procedures
-* `string?`
+* `string?`, `string-append`, `string->symbol`,
 
 #### Symbol procedures
 * `symbol?`

data/lib/skeem/convertible.rb

@@ -13,6 +13,10 @@ module Skeem
           SkmReal.create(native_obj)
         when Integer
           SkmInteger.create(native_obj)
+        when String
+          SkmString.create(native_obj)
+        else
+          raise StandardError, "No conversion of #{native_obj.class}"
       end
     end
   end # module

data/lib/skeem/primitive/primitive_builder.rb

@@ -8,7 +8,7 @@ module Skeem
       def add_primitives(aRuntime)
         add_arithmetic(aRuntime)
         add_comparison(aRuntime)
-        add_number_predicates(aRuntime)
+        add_number_procedures(aRuntime)
         add_boolean_procedures(aRuntime)
         add_string_procedures(aRuntime)
         add_symbol_procedures(aRuntime)
@@ -56,20 +56,24 @@ module Skeem
         create_gte(aRuntime)
       end
 
-      def add_number_predicates(aRuntime)
+      def add_number_procedures(aRuntime)
         create_object_predicate(aRuntime, 'number?')
         create_object_predicate(aRuntime, 'real?')
         create_object_predicate(aRuntime, 'integer?')
+        create_number2string(aRuntime)
       end
 
       def add_boolean_procedures(aRuntime)
         create_not(aRuntime)
         create_and(aRuntime)
+        create_or(aRuntime)
         create_object_predicate(aRuntime, 'boolean?')
       end
 
       def add_string_procedures(aRuntime)
         create_object_predicate(aRuntime, 'string?')
+        create_string_append(aRuntime)
+        create_string2symbol(aRuntime)
       end
 
       def add_symbol_procedures(aRuntime)
@@ -267,6 +271,17 @@ module Skeem
         define_primitive_proc(aRuntime, '>=', one_or_more, primitive)
       end
 
+      def create_number2string(aRuntime)
+        # TODO: add support for radix argument
+        primitive = ->(runtime, arg) do
+          arg_evaluated = arg.evaluate(runtime)
+          check_argtype(arg_evaluated, SkmNumber, 'number', 'number->string')
+          to_skm(arg_evaluated.value.to_s)
+        end
+
+        define_primitive_proc(aRuntime, 'number->string', unary, primitive)
+      end
+
       def create_not(aRuntime)
         primitive = ->(runtime, arg) do
           arg_evaluated = arg.evaluate(runtime)
@@ -279,7 +294,7 @@ module Skeem
 
         define_primitive_proc(aRuntime, 'not', unary, primitive)
       end
-      
+
       def create_and(aRuntime)
         # arglist should be a Ruby Array
         primitive = ->(runtime, arglist) do
@@ -298,7 +313,53 @@ module Skeem
             to_skm(raw_result)
           end
         end
-        define_primitive_proc(aRuntime, 'and', zero_or_more, primitive)      
+        define_primitive_proc(aRuntime, 'and', zero_or_more, primitive)
+      end
+
+      def create_or(aRuntime)
+        # arglist should be a Ruby Array
+        primitive = ->(runtime, arglist) do
+          if arglist.empty?
+            to_skm(false) # in conformance with 4.2.1
+          else
+            raw_result = false
+            last_result = nil
+            arglist.each do |raw_arg|
+              argument = raw_arg.evaluate(aRuntime)
+              last_result = argument
+              raw_result ||= (!argument.boolean? || argument.value)
+              break if raw_result
+            end
+            raw_result = last_result if raw_result
+            to_skm(raw_result)
+          end
+        end
+        define_primitive_proc(aRuntime, 'or', zero_or_more, primitive)
+      end
+      
+      def create_string_append(aRuntime)
+        primitive = ->(runtime, arglist) do
+          if arglist.empty?
+            value = ''
+          else
+            parts = evaluate_array(arglist, aRuntime)
+            value = parts.reduce('') { |interim, substr| interim << substr.value }
+          end
+
+          SkmString.create(value)
+        end
+
+        define_primitive_proc(aRuntime, 'string-append', zero_or_more, primitive)      
+      end
+
+      def create_string2symbol(aRuntime)
+        primitive = ->(runtime, arg) do
+          arg_evaluated = arg.evaluate(runtime)
+          check_argtype(arg_evaluated, SkmString, 'string', 'string->symbol')
+          SkmIdentifier.create(arg_evaluated.value)
+        end
+
+        define_primitive_proc(aRuntime, 'string->symbol', unary, primitive)
       end
 
       def create_length(aRuntime)

data/lib/skeem/version.rb

@@ -1,3 +1,3 @@
 module Skeem
-  VERSION = '0.0.22'.freeze
+  VERSION = '0.0.23'.freeze
 end

data/spec/skeem/primitive/primitive_builder_spec.rb

@@ -148,7 +148,7 @@ module Skeem
         end
       end # context
 
-      context 'Number predicates:' do
+      context 'Number procedures:' do
         it 'should implement the number? predicate' do
           checks = [
             ['(number? 3.1)', true],
@@ -161,7 +161,7 @@ module Skeem
             expect(result.value).to eq(expectation)
           end
         end
-        
+
         it 'should implement the real? predicate' do
           checks = [
             ['(real? 3.1)', true],
@@ -188,8 +188,21 @@ module Skeem
             expect(result.value).to eq(expectation)
           end
         end
+
+        it 'should implement the number->string procedure' do
+          checks = [
+            ['(number->string 3.4)', '3.4'],
+            ['(number->string 1e2)', '100.0'],
+            ['(number->string 1e-23)', '1.0e-23'],
+            ['(number->string -7)', '-7']
+          ]
+          checks.each do |(skeem_expr, expectation)|
+            result = subject.run(skeem_expr)
+            expect(result.value).to eq(expectation)
+          end
+        end
       end # context
-      
+
       context 'Boolean procedures:' do
         it 'should implement the not procedure' do
           checks = [
@@ -202,7 +215,7 @@ module Skeem
             expect(result.value).to eq(expectation)
           end
         end
-        
+
         it 'should implement the and procedure' do
           checks = [
             ['(and (= 2 2) (> 2 1))', true],
@@ -213,14 +226,39 @@ module Skeem
             result = subject.run(skeem_expr)
             expect(result.value).to eq(expectation)
           end
-          
+
           # If all the expressions evaluate to true values,
           # the values of the last expression are returned.
           source = "(and 1 2 'c '(f g))"
           result = subject.run(source)
-          p result
-        end        
-        
+          expect(result).to be_kind_of(SkmList)
+          expect(result.head.value).to eq('f')
+          expect(result.last.value).to eq('g')
+        end
+
+        it 'should implement the or procedure' do
+          checks = [
+            ['(or (= 2 2) (> 2 1))', true],
+            ['(or (= 2 2) (< 2 1))', true],
+            ['(or)', false],
+            ['(or #f)', false],
+            ['(or #f #t)', true],
+            ['(or #f #f #f)', false],
+
+          ]
+          checks.each do |(skeem_expr, expectation)|
+            result = subject.run(skeem_expr)
+            expect(result.value).to eq(expectation)
+          end
+
+          # When an expression evaluates to true value,
+          # the values of the this expression is returned.
+          source = "(or #f 'a #f)"
+          result = subject.run(source)
+          expect(result).to be_kind_of(SkmIdentifier)
+          expect(result.value).to eq('a')
+        end
+
         it 'should implement the boolean? procedure' do
           checks = [
             ['(boolean? #f)', true],
@@ -230,9 +268,9 @@ module Skeem
             result = subject.run(skeem_expr)
             expect(result.value).to eq(expectation)
           end
-        end          
+        end
       end # context
-      
+
       context 'String procedures:' do
         it 'should implement the string? procedure' do
           checks = [
@@ -244,10 +282,32 @@ module Skeem
             result = subject.run(skeem_expr)
             expect(result.value).to eq(expectation)
           end
-        end      
+        end
+
+        it 'should implement the string->symbol procedure' do
+          checks = [
+            ['(string->symbol "mISSISSIppi")', 'mISSISSIppi']
+          ]
+          checks.each do |(skeem_expr, expectation)|
+            result = subject.run(skeem_expr)
+            expect(result.value).to eq(expectation)
+          end
+        end
+        
+        it 'should implement the string-append procedure' do
+          checks = [
+            ['(string-append)', ''],
+            ['(string-append "abc" "def")', 'abcdef'],
+            ['(string-append "Hey " "you " "there!")', 'Hey you there!']
+          ]
+          checks.each do |(skeem_expr, expectation)|
+            result = subject.run(skeem_expr)
+            expect(result.value).to eq(expectation)
+          end
+        end
       end # context
-      
-      context 'Symbol procedures:' do      
+
+      context 'Symbol procedures:' do
         it 'should implement the symbol? procedure' do
           checks = [
             ['(symbol? #f)', false],
@@ -259,8 +319,8 @@ module Skeem
           end
         end
       end # context
-      
-      context 'List procedures:' do      
+
+      context 'List procedures:' do
         it 'should implement the list? procedure' do
           checks = [
             ['(list? #f)', false],
@@ -274,7 +334,7 @@ module Skeem
             expect(result.value).to eq(expectation)
           end
         end
-        
+
           it 'should implement the null? procedure' do
           checks = [
             ['(null? #f)', false],
@@ -289,7 +349,7 @@ module Skeem
             result = subject.run(skeem_expr)
             expect(result.value).to eq(expectation)
           end
-        end 
+        end
 
         it 'should implement the length procedure' do
           checks = [
@@ -302,10 +362,10 @@ module Skeem
             result = subject.run(skeem_expr)
             expect(result.value).to eq(expectation)
           end
-        end         
-      end # context  
+        end
+      end # context
 
-      context 'Vector procedures:' do          
+      context 'Vector procedures:' do
         it 'should implement the vector? procedure' do
           checks = [
             ['(vector? #f)', false],
@@ -319,13 +379,13 @@ module Skeem
             expect(result.value).to eq(expectation)
           end
         end
-        
+
         it 'should implement the vector procedure' do
           source = '(vector)'
           result = subject.run(source)
           expect(result).to be_kind_of(SkmVector)
           expect(result).to be_empty
-          
+
           source = '(vector 1 2 3)'
           result = subject.run(source)
           expect(result).to be_kind_of(SkmVector)
@@ -346,17 +406,17 @@ module Skeem
             result = subject.run(skeem_expr)
             expect(result.value).to eq(expectation)
           end
-        end 
+        end
 
         it 'should implement the vector-ref procedure' do
           source = "(vector-ref '#(1 1 2 3 5 8 13 21) 5)"
           result = subject.run(source)
           expect(result).to be_kind_of(SkmInteger)
-          expect(result.value).to eq(8)         
-        end         
-      end # context      
-      
-      context 'IO procedures:' do          
+          expect(result.value).to eq(8)
+        end
+      end # context
+
+      context 'IO procedures:' do
         it 'should implement the newline procedure' do
           default_stdout = $stdout
           $stdout = StringIO.new()

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skeem
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.23
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-23 00:00:00.000000000 Z
+date: 2018-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rley