unparser 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e22ce4a6c59125542cef4caa360ad6701a72c82c4ca03738956d02ed19b538f
-  data.tar.gz: 4dd7843a5c08b5e9bae671d9a3d24ceea9946ded9f99cfbf2bd5b522674cfe23
+  metadata.gz: 89eae693b0b2b09ebd3fcb9ade1e24b126c68afaa05ac5d2fa635c33c8b25229
+  data.tar.gz: 1c04a551559a58cebb43475e3a43cb8100ae68d5f6ff0a8fea78e7a7e92d55e2
 SHA512:
-  metadata.gz: 984057493441e3fb74c6b8f6f0bd0f04947462f4ed3fab30204900b5930cfa5b209ebcff0eb403ab2049e2268bff9642b0ed0cafd262a9e45309d5c256fac4b8
-  data.tar.gz: 0dd44d20b3e7affcbf195d143c94c2aebf7fabc908387caec37dc42b82155e025393a71e65d58df80602f0d6f6bab9913e422265723ec1425bc71d952da5e2bd
+  metadata.gz: 6236052606af0a610cd6819ad2b19bf47877428057dc53d7c16cc1c7bef91cbb9d169ad62f402c2113bb211275588041443242c179c9fa5233b1938fce4ffd84
+  data.tar.gz: e7b4b900464471d40e2f0f385d992c20cf3fec04b6ba7f560b3c784c6d677d652ac9364c62fca6a70990f0e88c113f107bac05adec02c073f480cc371b3fff1b

data/Changelog.md

@@ -1,3 +1,8 @@
+# v0.2.7 2018-07-18
+
+* Add emitters for `__FILE__` and `__LINE__`
+  https://github.com/mbj/unparser/pull/70
+
 # v0.2.7 2018-02-09
 
 * Allow ruby_parser 2.5

data/lib/unparser.rb

@@ -50,6 +50,7 @@ require 'unparser/emitter/literal/hash'
 require 'unparser/emitter/literal/range'
 require 'unparser/emitter/literal/dynamic_body'
 require 'unparser/emitter/literal/execute_string'
+require 'unparser/emitter/meta'
 require 'unparser/emitter/send'
 require 'unparser/emitter/send/unary'
 require 'unparser/emitter/send/binary'

data/lib/unparser/emitter/meta.rb

@@ -0,0 +1,14 @@
+module Unparser
+  class Emitter
+    # Namespace class for meta emitters
+    class Meta < self
+      include Terminated
+
+      handle(:__FILE__, :__LINE__)
+
+      def dispatch
+        write(node.type.to_s) # (e.g. literally write '__FILE__' or '__LINE__')
+      end
+    end # Meta
+  end # Emitter
+end # Unparser

data/spec/support/parser_class_generator.rb

@@ -0,0 +1,21 @@
+module ParserClassGenerator
+  def self.generate_with_options(base_parser_class, builder_options)
+    # This builds a dynamic subclass of the base_parser_class (e.g. Parser::Ruby23)
+    # and overrides the default_parser method to return a parser whose builder
+    # has various options set.
+    #
+    # Currently the only builder option is :emit_file_line_as_literals
+
+    Class.new(base_parser_class) do
+      define_singleton_method(:default_parser) do |*args|
+        super(*args).tap do |parser|
+          parser.builder.emit_file_line_as_literals = builder_options[:emit_file_line_as_literals]
+        end
+      end
+
+      define_singleton_method(:inspect) do
+        "#{base_parser_class.inspect} with builder options: #{builder_options.inspect}"
+      end
+    end
+  end
+end

data/spec/unit/unparser_spec.rb

@@ -1,26 +1,76 @@
 require 'spec_helper'
 require 'parser/all'
+require 'support/parser_class_generator'
 
 describe Unparser, mutant_expression: 'Unparser::Emitter*' do
   describe '.unparse' do
 
-    PARSERS = IceNine.deep_freeze(
+    RUBY_VERSION_PARSERS = IceNine.deep_freeze(
       '2.1' => Parser::Ruby21,
       '2.2' => Parser::Ruby22,
       '2.3' => Parser::Ruby23
     )
 
-    RUBIES = PARSERS.keys.freeze
+    RUBY_VERSIONS = RUBY_VERSION_PARSERS.keys.freeze
 
-    def self.parser_for_ruby_version(version)
-      PARSERS.fetch(version) do
-        raise "Unrecognized Ruby version #{version}"
+    def self.builder_options
+      @builder_options ||= {}
+    end
+
+    def self.builder_options=(options)
+      @builder_options = options
+    end
+
+    def self.ruby_versions
+      @ruby_versions ||= RUBY_VERSIONS
+    end
+
+    def self.ruby_versions=(versions)
+      @ruby_versions = versions
+    end
+
+    def self.with_ruby_versions(beginning_at: nil, ending_at: nil, only: nil)
+      original_ruby_versions = ruby_versions
+      if only
+        self.ruby_versions = only & ruby_versions # intersection
+      else
+        if ending_at
+          idx = ruby_versions.index(ending_at) || fail('Invalid Ruby specified')
+          self.ruby_versions = ruby_versions[0..idx]
+        end
+        if beginning_at
+          idx = ruby_versions.index(beginning_at) || fail('Invalid Ruby specified')
+          self.ruby_versions = ruby_versions[idx..-1]
+        end
       end
+
+      yield
+
+      self.ruby_versions = original_ruby_versions
     end
 
-    def self.with_versions(versions)
-      versions.each do |version|
-        yield parser_for_ruby_version(version)
+    def self.current_parsers
+      ruby_versions.map do |ruby_version|
+        if builder_options != {}
+          ParserClassGenerator.generate_with_options(parser_for_ruby_version(ruby_version), builder_options)
+        else
+          parser_for_ruby_version(ruby_version)
+        end
+      end
+    end
+
+    def self.with_builder_options(options)
+      original_options = builder_options
+      self.builder_options = builder_options.merge(options)
+
+      yield
+
+      self.builder_options = original_options
+    end
+
+    def self.parser_for_ruby_version(version)
+      RUBY_VERSION_PARSERS.fetch(version) do
+        raise "Unrecognized Ruby version #{version}"
       end
     end
 
@@ -50,14 +100,14 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
       assert_source("(#{expression}).foo")
     end
 
-    def self.assert_terminated(expression, rubies = RUBIES)
-      assert_source(expression, rubies)
-      assert_source("foo(#{expression})", rubies)
-      assert_source("#{expression}.foo", rubies)
+    def self.assert_terminated(expression)
+      assert_source(expression)
+      assert_source("foo(#{expression})")
+      assert_source("#{expression}.foo")
     end
 
-    def self.assert_generates(ast_or_string, expected, versions = RUBIES)
-      with_versions(versions) do |parser|
+    def self.assert_generates(ast_or_string, expected)
+      current_parsers.each do |parser|
         it "should generate #{ast_or_string} as #{expected} under #{parser.inspect}" do
           if ast_or_string.is_a?(String)
             expected = strip(expected)
@@ -69,16 +119,16 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
       end
     end
 
-    def self.assert_round_trip(input, versions = RUBIES)
-      with_versions(versions) do |parser|
+    def self.assert_round_trip(input)
+      current_parsers.each do |parser|
         it "should round trip #{input} under #{parser.inspect}" do
           assert_round_trip(input, parser)
         end
       end
     end
 
-    def self.assert_source(input, versions = RUBIES)
-      assert_round_trip(strip(input), versions)
+    def self.assert_source(input)
+      assert_round_trip(strip(input))
     end
 
     context 'kwargs' do
@@ -273,8 +323,18 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
 
     context 'magic keywords' do
       assert_generates '__ENCODING__', 'Encoding::UTF_8'
-      assert_generates '__FILE__', '"(string)"'
-      assert_generates '__LINE__', '1'
+
+      # These two assertions don't actually need to be wrapped in this block since `true` is the default,
+      # but it is helpful to contrast with the assertions farther down.
+      with_builder_options(emit_file_line_as_literals: true) do
+        assert_generates '__FILE__', '"(string)"'
+        assert_generates '__LINE__', '1'
+      end
+
+      with_builder_options(emit_file_line_as_literals: false) do
+        assert_source '__FILE__'
+        assert_source '__LINE__'
+      end
     end
 
     context 'assignment' do
@@ -408,8 +468,10 @@ describe Unparser, mutant_expression: 'Unparser::Emitter*' do
     end
 
     context 'conditional send (csend)' do
-      assert_terminated 'a&.b',    %w(2.3)
-      assert_terminated 'a&.b(c)', %w(2.3)
+      with_ruby_versions(beginning_at: '2.3') do
+        assert_terminated 'a&.b'
+        assert_terminated 'a&.b(c)'
+      end
     end
 
     context 'send' do

data/unparser.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name        = 'unparser'
-  gem.version     = '0.2.7'
+  gem.version     = '0.2.8'
 
   gem.authors     = ['Markus Schirp']
   gem.email       = 'mbj@schirp-dso.com'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unparser
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Markus Schirp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-09 00:00:00.000000000 Z
+date: 2018-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: abstract_type
@@ -223,6 +223,7 @@ files:
 - lib/unparser/emitter/literal/regexp.rb
 - lib/unparser/emitter/literal/singleton.rb
 - lib/unparser/emitter/match.rb
+- lib/unparser/emitter/meta.rb
 - lib/unparser/emitter/module.rb
 - lib/unparser/emitter/op_assign.rb
 - lib/unparser/emitter/redo.rb
@@ -250,6 +251,7 @@ files:
 - spec/integration/unparser/corpus_spec.rb
 - spec/integrations.yml
 - spec/spec_helper.rb
+- spec/support/parser_class_generator.rb
 - spec/unit/unparser/buffer/append_spec.rb
 - spec/unit/unparser/buffer/append_without_prefix_spec.rb
 - spec/unit/unparser/buffer/capture_content_spec.rb
@@ -285,7 +287,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Generate equivalent source for parser gem AST nodes
@@ -293,6 +295,7 @@ test_files:
 - spec/integration/unparser/corpus_spec.rb
 - spec/integrations.yml
 - spec/spec_helper.rb
+- spec/support/parser_class_generator.rb
 - spec/unit/unparser/buffer/append_spec.rb
 - spec/unit/unparser/buffer/append_without_prefix_spec.rb
 - spec/unit/unparser/buffer/capture_content_spec.rb