skeem 0.2.15 → 0.2.16

data/lib/skeem/skm_binding.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 require_relative 'skm_element'
 
 module Skeem
-
   # An identifier that is not a syntactic keyword can be used as a variable.
   # A variable may give a name to value that is bound (i.e. associated)
   # to that variable.
@@ -56,26 +57,24 @@ module Skeem
 
       result
     end
-
   end # class
 
 
   class SkmUpdateBinding < SkmBinding
-
     protected
 
     def binding_action(aRuntime, anIdentifier, anExpression)
       aRuntime.update_binding(anIdentifier, anExpression)
     end
   end # class
-  
+
   class SkmDelayedUpdateBinding < SkmBinding
     attr_reader :new_val
-    
+
     def initialize(anIdentifier, aValue)
       super(anIdentifier, aValue)
     end
-    
+
     def do_it!(aRuntime)
       aRuntime.update_binding(variable, new_val)
     end
@@ -85,5 +84,5 @@ module Skeem
     def binding_action(_runtime, _identifier, anExpression)
       @new_val = anExpression
     end
-  end # class  
+  end # class
 end # module

data/lib/skeem/skm_compound_datum.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'forwardable'
 require_relative 'skm_element'
 
@@ -18,13 +20,15 @@ module Skeem
     end
 
     def ==(other)
-      return true if self.equal?(other)
+      return true if equal?(other)
+
       result = case other
         when SkmCompoundDatum
-          self.class == other.class && self.members == other.members
+          self.class == other.class && members == other.members
         when Array
           members == other
       end
+      result
     end
 
     alias eqv? equal?
@@ -65,7 +69,7 @@ module Skeem
     protected
 
     def inspect_specific
-      result = ''
+      result = +''
       members.each { |elem| result << elem.inspect + ', ' }
       result.sub!(/, $/, '')
       result
@@ -77,4 +81,4 @@ module Skeem
       true
     end
   end # class
-end # module
+end # module

data/lib/skeem/skm_element.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module Skeem
   # Abstract class. Generalization of any S-expr element.
   SkmElement = Struct.new(:position) do
     def initialize(aPosition)
       self.position = aPosition
     end
-    
+
     def callable?
       false
     end
@@ -12,15 +14,15 @@ module Skeem
     def number?
       false
     end
-    
+
     def complex?
       false
-    end    
+    end
 
     def real?
       false
     end
-    
+
     def rational?
       false
     end
@@ -32,7 +34,7 @@ module Skeem
     def boolean?
       false
     end
-    
+
     def char?
       false
     end
@@ -56,7 +58,7 @@ module Skeem
     def pair?
       false
     end
-    
+
     def procedure?
       false
     end
@@ -73,11 +75,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    
+      eqv?(other)
+    end
 
     # @return [TrueClass, FalseClass] true if quoted element is identical to itself
     def verbatim?
@@ -117,8 +119,8 @@ module Skeem
       # Do nothing
     end
 
-   def inspect
-      result = inspect_prefix
+    def inspect
+      result = inspect_prefix.dup
       result << inspect_specific
       result << inspect_suffix
 
@@ -139,4 +141,4 @@ module Skeem
       raise NotImplementedError, "Missing #{self.class.to_s + '#' + 'inspect_specific'}"
     end
   end # struct
-end # module
+end # module

data/lib/skeem/skm_empty_list.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'singleton'
 require_relative 'skm_element'
 
@@ -42,7 +44,7 @@ module Skeem
     def klone
       self
     end
-    
+
     def append_list(aList)
       aList
     end
@@ -64,14 +66,14 @@ module Skeem
     protected
 
     def inspect_specific
-      '()'
+      +'()'
     end
 
     private
 
-    def initialize()
+    def initialize
       super(0)
-      self.freeze
+      freeze
     end
   end # class
 end # module

data/lib/skeem/skm_exception.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Skeem
+  class SkmException < RuntimeError
+  end # class
+
+  class SkmError < SkmException
+  end # class
+end # module

data/lib/skeem/skm_expression.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 require_relative 'skm_element'
 
 module Skeem
   # Abstract class.
   class SkmExpression < SkmElement
   end # class
-end # module
+end # module

data/lib/skeem/skm_frame.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'skm_simple_datum'
 
 module Skeem
@@ -139,6 +141,5 @@ module Skeem
       # Notify the value that it is bound to a variable from this frame.
       anExpression.bound!(self)
     end
-
   end # class
-end # module
+end # module

data/lib/skeem/skm_pair.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'skm_empty_list'
 
 module Skeem
@@ -41,11 +43,12 @@ module Skeem
     def self.create_from_a(anArray)
       current = nil
       return SkmEmptyList.instance if anArray.empty?
+
       anArray.reverse_each do |elem|
         if current.nil?
-          current = self.new(elem, SkmEmptyList.instance)
+          current = new(elem, SkmEmptyList.instance)
         else
-          current = self.new(elem, current)
+          current = new(elem, current)
         end
       end
 
@@ -54,6 +57,7 @@ module Skeem
 
     def empty?
       return false if car
+
       if [SkmPair, SkmEmptyList].include? cdr.class
         cdr.empty?
       else
@@ -92,20 +96,20 @@ module Skeem
     end
 
     def last_pair
-      if cdr.nil? || (cdr == SkmEmptyList.instance) || (!cdr.kind_of?(SkmPair))
+      if cdr.nil? || (cdr == SkmEmptyList.instance) || !cdr.kind_of?(SkmPair)
         self
       else
         cdr.last_pair
       end
     end
-    
+
     def proper?
-      last_node = self.last_pair
+      last_node = last_pair
       last_node.cdr.nil? || (last_node.cdr == SkmEmptyList.instance)
     end
 
     def last
-      self.to_a.last
+      to_a.last
     end
 
     def eqv?(_other)
@@ -138,7 +142,7 @@ module Skeem
     end
 
     def append(anElement)
-      last_one = self.last_pair
+      last_one = last_pair
       if last_one.cdr.nil? || last_one.cdr.kind_of?(SkmEmptyList)
         last_one.cdr = SkmPair.new(anElement, SkmEmptyList.instance)
       else
@@ -147,7 +151,7 @@ module Skeem
     end
 
     def append_list(aList)
-      last_one = self.last_pair
+      last_one = last_pair
       if last_one.cdr.nil? || last_one.cdr.kind_of?(SkmEmptyList)
         last_one.cdr = aList
       else
@@ -157,22 +161,23 @@ module Skeem
 
     def evaluate(aRuntime)
       return SkmEmptyList.instance if empty?
+
       if car.kind_of?(SkmIdentifier) && car.is_var_name
         result = aRuntime.evaluate_form(self)
       else
         begin
           result = clone_evaluate(aRuntime)
-        rescue NoMethodError => exc
-          $stderr.puts 'SkmPair#evaluate:   ' + self.inspect
-          $stderr.puts 'SkmPair as Array:   ' + self.to_a.inspect
-          raise exc
+        rescue NoMethodError => e
+          $stderr.puts 'SkmPair#evaluate:   ' + inspect
+          $stderr.puts 'SkmPair as Array:   ' + to_a.inspect
+          raise e
         end
       end
       result
     end
 
     def quasiquote(aRuntime)
-      members_eval = self.to_a.map { |elem| elem.quasiquote(aRuntime) }
+      members_eval = to_a.map { |elem| elem.quasiquote(aRuntime) }
       self.class.create_from_a(members_eval)
     end
 
@@ -184,16 +189,17 @@ module Skeem
 
     def quoted!
       car.quoted!
-      cdr.quoted! if cdr
+      cdr&.quoted!
     end
 
     def unquoted!
       car.unquoted!
-      cdr.unquoted! if cdr
+      cdr&.unquoted!
     end
 
-    def verbatim?()
+    def verbatim?
       return false unless car.verbatim?
+
       if cdr.nil?
         true
       else
@@ -211,6 +217,5 @@ module Skeem
 
       result
     end
-
   end # class
-end # module
+end # module

data/lib/skeem/skm_procedure_exec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'runtime'
 
 module Skeem
@@ -27,18 +29,18 @@ module Skeem
       result = definition.evaluate_sequence(runtime)
       runtime.pop
       # $stderr.puts "Lambda result: #{result.object_id.to_s(16)}" if result.kind_of?(SkmLambda)
-      
+
       result
     end
-    
+
     private
-    
+
     def evaluate_defs(aRuntime)
       definition.definitions.each do |bndng|
-        val = bndng.value.evaluate(aRuntime)      
+        val = bndng.value.evaluate(aRuntime)
         var = bndng.variable.evaluate(aRuntime)
         frame.add_binding(var, val)
-      end    
+      end
     end
   end # class
-end # module
+end # module

data/lib/skeem/skm_simple_datum.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'skm_element'
 
 module Skeem
@@ -14,7 +16,7 @@ module Skeem
     end
 
     def self.create(aValue)
-      lightweight = self.allocate
+      lightweight = allocate
       lightweight.init_value(aValue)
       return lightweight
     end
@@ -33,12 +35,12 @@ module Skeem
     # @param other [SkmSimpleDatum, Object] object to compare with.
     # @return [TrueClass, FalseClass]
     def ==(other)
-      return true if self.equal?(other)
+      return true if equal?(other)
 
       result = if other.kind_of?(SkmSimpleDatum)
-          self.value == other.value
+          value == other.value
         else
-          self.value == other
+          value == other
         end
 
       result
@@ -51,7 +53,7 @@ module Skeem
       true
     end
 
-    def done!()
+    def done!
       # Do nothing
     end
 
@@ -103,16 +105,16 @@ module Skeem
     end
 
     def eqv?(other)
-      return true if self.equal?(other)
+      return true if equal?(other)
 
       result = if other.kind_of?(SkmNumber)
-        if self.exact? != other.exact?
+        if exact? != other.exact?
           false
         else
-          self.value == other.value
+          value == other.value
         end
       else
-        self.value == other
+        value == other
       end
 
       result
@@ -159,7 +161,6 @@ module Skeem
       char_value = int_value < 0xff ? int_value.chr : [int_value].pack('U')
       create(char_value)
     end
-
   end # class
 
   class SkmString < SkmSimpleDatum
@@ -199,7 +200,7 @@ module Skeem
     end
 
     def verbatim?
-      not is_var_name
+      !is_var_name
     end
 
     def quoted!
@@ -213,4 +214,4 @@ module Skeem
 
   class SkmReserved < SkmIdentifier
   end # class
-end # module
+end # module