sexpistol 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c36941d9da82ca386be18aaba9fcea89d742b28a6a6ff9617967187bf99f88ed
-  data.tar.gz: a2c621597fa0fff8217e7f1a5f85d5b87c2888b8ccb4a8b54bc0f48618785872
+  metadata.gz: a23e0ce0544e9283ef642b526913ab4cc8e02b2d5cb99639b39093e2fdbad776
+  data.tar.gz: 79ff60a0e79eb517f9ace663c86a29eb0923721516316161ac8a85e212164857
 SHA512:
-  metadata.gz: 0eba95203d5f768aa0cbf5be24fa4d23a86adad03eb00e2bc7191dc08bf049788fdd306fde8c97bd13f47136bc3deb91670a37d5e48421ac9e2b94a7fe644ed8
-  data.tar.gz: 61938f7c6826683bd3514a51941a45d01ca514ea2bd153329185da7604213e7ce12b3585bee666ea48196e3c8d0150c53b7536e1a5093e30e67f700e73564c9d
+  metadata.gz: 12df1844e76a6c3f054e10ce2b27a6438c5774cb8b099296263e2ecb05e5d56d269d5cf1f7cf6bafe3f3e6331cf53243b470cd61d311ec6f86b23d00e133ca56
+  data.tar.gz: d572e231a3aef14615db2587d4889a14b69d6912c56ca592bdb8f503316e55be559e491fd76219ecf46368232722104e25c0ca0ceb1db02c3d7ee8deb4b95f45

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sexpistol (0.1.0)
+    sexpistol (0.1.1)
 
 GEM
   remote: https://rubygems.org/

data/lib/sexpistol/parser.rb

@@ -10,10 +10,12 @@ class Sexpistol
     INTEGER =     /([\-+]?[0-9]+)(?=[\s()])/.freeze
     SYMBOL =      /[^0-9()\s]+[^()\s]*/.freeze
 
-    def initialize(string)
+    def initialize(string, parse_ruby_keyword_literals = false)
       raise 'String given is not an s-expression' if string.strip[0] != '('
       raise 'Invalid s-expression' if string.count('(') != string.count(')')
 
+      @parse_ruby_keyword_literals = parse_ruby_keyword_literals
+
       super(string.strip)
     end
 
@@ -22,7 +24,7 @@ class Sexpistol
         case token = fetch_token
         when ')' then break
         when '(' then exp << parse(level + 1)
-        when String, Integer, Float, Symbol then exp << token
+        when String, Integer, Float, Symbol then exp << convert_ruby_keyword_literals(token)
         end
       end
 
@@ -45,5 +47,16 @@ class Sexpistol
 
       raise "Invalid token at position #{pos} near '#{scan(/.{0,20}/)}'."
     end
+
+    def convert_ruby_keyword_literals(token)
+      return token unless @parse_ruby_keyword_literals && token.is_a?(Symbol)
+
+      case token
+      when :nil then nil
+      when :true then true
+      when :false then false
+      else token
+      end
+    end
   end
 end

data/lib/sexpistol/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Sexpistol
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/lib/sexpistol.rb

@@ -5,49 +5,33 @@ require 'sexpistol/version'
 require 'sexpistol/s_expression_array'
 
 class Sexpistol
-  def self.parse(string, parse_ruby_keyword_literals: false)
-    tree = Sexpistol::Parser.new(string).parse
-    return convert_ruby_keyword_literals(tree) if parse_ruby_keyword_literals
-
-    tree
-  end
-
-  def self.to_sexp(data, scheme_compatability: false)
-    data = convert_scheme_literals(data) if scheme_compatability
+  class << self
+    def parse(string, parse_ruby_keyword_literals: false)
+      Sexpistol::Parser.new(string, parse_ruby_keyword_literals).parse
+    end
 
-    return "\"#{data}\"" if data.is_a?(String)
-    return data.to_s unless data.is_a?(Array)
+    def to_sexp(data, scheme_compatability: false)
+      data = convert_scheme_literals(data) if scheme_compatability
 
-    if data.is_a?(SExpressionArray)
-      data.map { |x| to_sexp(x, scheme_compatability: scheme_compatability) }.join(' ')
-    else
-      "(#{data.map { |x| to_sexp(x, scheme_compatability: scheme_compatability) }.join(' ')})"
-    end
-  end
+      return "\"#{data}\"" if data.is_a?(String)
+      return data.to_s unless data.is_a?(Array)
 
-  def self.convert_ruby_keyword_literals(expression)
-    recursive_map(expression) do |x|
-      case x
-      when :nil then nil
-      when :true then true
-      when :false then false
-      else x
+      if data.is_a?(SExpressionArray)
+        data.map { |x| to_sexp(x, scheme_compatability: scheme_compatability) }.join(' ')
+      else
+        "(#{data.map { |x| to_sexp(x, scheme_compatability: scheme_compatability) }.join(' ')})"
       end
     end
-  end
-
-  def self.convert_scheme_literals(data)
-    case data
-    when nil then []
-    when true then :'#t'
-    when false then :'#f'
-    else data
-    end
-  end
 
-  def self.recursive_map(data, &block)
-    return data.map { |x| recursive_map(x, &block) } if data.is_a?(Array)
+    private 
 
-    block.call(data)
+    def convert_scheme_literals(data)
+      case data
+      when nil then []
+      when true then :'#t'
+      when false then :'#f'
+      else data
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sexpistol
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Aaron Gough