preval 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e6a0c329c5ed18bfae8f21d08c13d96a2abb5c258d4233795c75c1e40019c3a
-  data.tar.gz: ea764b40b8983db9e8398a86df971c03d47be73bf3c31ec043293e3f8323cf93
+  metadata.gz: 31253267bb39c592ddd4ee513348088c751021d98064f26f17c1a723877eaa45
+  data.tar.gz: f3b1607bda33cfd394a4730c1f443b572a2c101e0db73c05c270db3ff148cb96
 SHA512:
-  metadata.gz: 14f7fd99735026b877061a53db6c13b795e4ea0a98e9ae3f0bfbd52ccabec28e712027323074c1b564f0c561c1f2af726e550e5415ad9014bfb5e9c42f63deb9
-  data.tar.gz: 1551ab23dfb06db810a3522727db2ae1915084f00c560072fafbb8033d921a113c78d51edaead97ad19eff82320ee883b81d43b0d870a5e4305949c269402050
+  metadata.gz: 86be3184bfbc1cae9aace4b5526c8e4ad6e47fd65c7a717df51b3a7e07c68acd7878474ebebc615c4525b5394dbe05b7039f3a4c6f6f25818ff60afeff12a762
+  data.tar.gz: 320346f7ecbd7c75326a2793c0f2751921cdcead050851fe32ca9a0c5b336e873c4e1d27dad121aea32663fb0673d23e377da1e538c3a3baed94d28131bbd33e

data/CHANGELOG.md

@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Added
+- Fold constant for exponentiation if exponent is 0 and value is an integer.
+- Replace `.reverse.each` usage with `.reverse_each`.
+- Replace `foo ... in` loops with `.each do` loops.
+- Replace `.gsub('...', '...')` with `.tr('...', '...')` if the arguments are strings and they are of length 1.
+- Replace `def foo; @foo; end` with `attr_reader :foo`.
+- Replace `.shuffle.first` with `.sample`.
+- Replace `.map { ... }.flatten(1)` with `.flat_map { ... }`.
 
 ## [0.2.0] - 2019-04-18
 ### Added

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    preval (0.2.0)
+    preval (0.3.0)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -28,11 +28,18 @@ If you're using the `bootsnap` gem, `preval` will automatically hook into its co
 
 Each optimization is generally named for the function it performs, and can be enabled through the `enable!` method on the visitor class. If you do not explicitly call `enable!` on any optimizations, nothing will change with your source.
 
-* `Preval::Visitors::Arithmetic`
-  * replaces constant expressions with their evaluation (e.g., `5 + 2` becomes `7`)
-  * replaces certain arithmetic identities with their evaluation (e.g., `a * 1` becomes `a`)
-* `Preval::Visitors::Loops`
-  * replaces `while true ... end` loops with `loop do ... end` loops
+* `Preval::Visitors::Arithmetic` replaces:
+  * constant expressions with their evaluation (e.g., `5 + 2` becomes `7`)
+  * arithmetic identities with their evaluation (e.g., `a * 1` becomes `a`)
+* `Preval::Visitors::Micro` replaces:
+  * `def foo; @foo; end` with `attr_reader :foo`
+  * `.gsub('...', '...')` with `.tr('...', '...')` if the arguments are strings and are both of length 1
+  * `.map { ... }.flatten(1)` with `.flat_map { ... }`
+  * `.reverse.each` with `.reverse_each` 
+  * `.shuffle.first` with `.sample`
+* `Preval::Visitors::Loops` replaces:
+  * `for ... in ... end` loops with `... each do ... end` loops
+  * `while true ... end` loops with `loop do ... end` loops
 
 ## Development
 

data/bin/console

@@ -5,6 +5,7 @@ require 'preval'
 
 Preval::Visitors::Arithmetic.enable!
 Preval::Visitors::Loops.enable!
+Preval::Visitors::Micro.enable!
 
 require 'irb'
 IRB.start(__FILE__)

data/bin/parse

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+require 'ripper'
+
+source = ARGV.first
+pp Ripper.sexp_raw(File.exist?(source) ? File.read(source) : source)

data/bin/print

@@ -5,6 +5,7 @@ require 'preval'
 
 Preval::Visitors::Arithmetic.enable!
 Preval::Visitors::Loops.enable!
+Preval::Visitors::Micro.enable!
 
 source = ARGV.first
 puts Preval.process(File.exist?(source) ? File.read(source) : source)

data/docs/index.html

@@ -23,6 +23,7 @@ textarea {
   background-color: black;
   box-sizing: border-box;
   color: white;
+  font-family: inherit;
   resize: none;
 }
 

data/docs/server.rb

@@ -4,6 +4,10 @@ require 'bundler/setup'
 require 'preval'
 require 'sinatra'
 
+Preval::Visitors::Arithmetic.enable!
+Preval::Visitors::Loops.enable!
+Preval::Visitors::Micro.enable!
+
 get '/' do
   send_file(File.expand_path('index.html', __dir__))
 end

data/lib/preval.rb

@@ -21,8 +21,10 @@ require 'preval/node'
 require 'preval/parser'
 require 'preval/version'
 require 'preval/visitor'
+
 require 'preval/visitors/arithmetic'
 require 'preval/visitors/loops'
+require 'preval/visitors/micro'
 
 if defined?(Bootsnap)
   load_iseq = RubyVM::InstructionSequence.method(:load_iseq)

data/lib/preval/format.rb

@@ -10,23 +10,23 @@ module Preval
     to(:aref) { body[1] ? "#{source(0)}[#{source(1)}]" : "#{source(0)}[]" }
     to(:aref_field) { "#{source(0)}[#{source(1)}]" }
     to(:arg_paren) { body[0].nil? ? '' : "(#{source(0)})" }
-    to(:args_add) { starts_with?(:args_new) ? source(1) : join(',') }
+    to(:args_add) { starts_with?(:args_new) ? source(1) : join(', ') }
     to(:args_add_block) do
       args, block = body
 
       parts = args.is?(:args_new) ? [] : [args.to_source]
-      parts << "#{parts.any? ? ',' : ''}&#{block.to_source}" if block
+      parts << "#{parts.any? ? ', ' : ''}&#{block.to_source}" if block
 
       parts.join
     end
-    to(:args_add_star) { starts_with?(:args_new) ? "*#{source(1)}" : "#{source(0)},*#{source(1)}" }
+    to(:args_add_star) { starts_with?(:args_new) ? "*#{source(1)}" : "#{source(0)}, *#{source(1)}" }
     to(:args_new) { '' }
     to(:assign) { "#{source(0)} = #{source(1)}" }
     to(:array) { body[0].nil? ? '[]' : "#{starts_with?(:args_add) ? '[' : ''}#{source(0)}]" }
     to(:assoc_new) { starts_with?(:@label) ? join(' ') : join(' => ') }
     to(:assoc_splat) { "**#{source(0)}" }
-    to(:assoclist_from_args) { body[0].map(&:to_source).join(',') }
-    to(:bare_assoc_hash) { body[0].map(&:to_source).join(',') }
+    to(:assoclist_from_args) { body[0].map(&:to_source).join(', ') }
+    to(:bare_assoc_hash) { body[0].map(&:to_source).join(', ') }
     to(:begin) { "begin\n#{join("\n")}\nend" }
     to(:BEGIN) { "BEGIN {\n#{source(0)}\n}"}
     to(:binary) { "#{source(0)} #{body[1]} #{source(2)}" }
@@ -67,7 +67,7 @@ module Preval
     to(:ensure) { "ensure\n#{source(0)}" }
     to(:fcall) { join }
     to(:field) { join }
-    to(:for) { "#{source(1)}.each do |#{source(0)}|\n#{source(2)}\nend" }
+    to(:for) { "for #{source(0)} in #{source(1)} do\n#{source(2)}\nend" }
     to(:hash) { body[0].nil? ? '{}' : "{ #{join} }" }
     to(:if) { "if #{source(0)}\n#{source(1)}\n#{body[2] ? "#{source(2)}\n" : ''}end" }
     to(:if_mod) { "#{source(1)} if #{source(0)}" }
@@ -78,11 +78,11 @@ module Preval
     to(:method_add_arg) { body[1].is?(:args_new) ? source(0) : join }
     to(:method_add_block) { join }
     to(:methref) { join('.:') }
-    to(:mlhs_add) { starts_with?(:mlhs_new) ? source(1) : join(',') }
-    to(:mlhs_add_post) { join(',') }
-    to(:mlhs_add_star) { "#{starts_with?(:mlhs_new) ? '' : "#{source(0)},"}#{body[1] ? "*#{source(1)}" : '*'}" }
+    to(:mlhs_add) { starts_with?(:mlhs_new) ? source(1) : join(', ') }
+    to(:mlhs_add_post) { join(', ') }
+    to(:mlhs_add_star) { "#{starts_with?(:mlhs_new) ? '' : "#{source(0)}, "}#{body[1] ? "*#{source(1)}" : '*'}" }
     to(:mlhs_paren) { "(#{source(0)})" }
-    to(:mrhs_add) { join(',') }
+    to(:mrhs_add) { join(', ') }
     to(:mrhs_add_star) { "*#{join}" }
     to(:mrhs_new) { '' }
     to(:mrhs_new_from_args) { source(0) }
@@ -102,7 +102,7 @@ module Preval
       parts << kwarg_rest.to_source if kwarg_rest
       parts << block.to_source if block
 
-      parts.join(',')
+      parts.join(', ')
     end
     to(:program) { "#{join("\n")}\n" }
     to(:qsymbols_add) { join(starts_with?(:qsymbols_new) ? '' : ' ') }

data/lib/preval/node.rb

@@ -2,6 +2,25 @@
 
 module Preval
   class Node
+    class TypeMatch
+      attr_reader :types
+
+      def initialize(types)
+        @types = types
+      end
+
+      def match?(node)
+        node.body.size == types.size &&
+          node.body.zip(types).all? do |(left, right)|
+            left.is_a?(Node) && Array(right).include?(left.type)
+          end
+      end
+
+      def self.match?(types, node)
+        new(types).match?(node)
+      end
+    end
+
     include Format
 
     attr_reader :type, :body, :literal
@@ -12,6 +31,13 @@ module Preval
       @literal = literal
     end
 
+    def dig(index, *args)
+      node = body[index]
+      return nil unless node
+
+      args.any? ? node.dig(*args) : node
+    end
+
     def join(delim = '')
       body.map(&:to_source).join(delim)
     end
@@ -44,6 +70,10 @@ module Preval
       end
     end
 
+    def type_match?(*types)
+      TypeMatch.new(types).match?(self)
+    end
+
     def update(type, body)
       @type = type
       @body = body

data/lib/preval/version.rb

@@ -1,3 +1,3 @@
 module Preval
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/lib/preval/visitors/arithmetic.rb

@@ -38,7 +38,9 @@ module Preval
             node.replace(right)
           end
         elsif operation == :**
-          if right.int?(1)
+          if left.is?(:@int) && right.int?(0)
+            node.update(:@int, left.to_int < 0 ? -1 : 1)
+          elsif right.int?(1)
             node.replace(left)
           elsif left.int?(1)
             node.replace(left)

data/lib/preval/visitors/loops.rb

@@ -13,11 +13,25 @@ module Preval
 
       using TrueNode
 
+      def on_for(node)
+        sexp = Parser.parse(<<~CODE)
+          #{node.source(1)}.each do |#{node.source(0)}|
+            #{node.source(2)}
+          end
+        CODE
+
+        node.update(:stmts_add, sexp.body[0].body)
+      end
+
       def on_while(node)
-        predicate, statements = node.body
-        return unless predicate.true?
+        return unless node.body[0].true?
+
+        sexp = Parser.parse(<<~CODE)
+          loop do
+            #{node.source(1)}
+          end
+        CODE
 
-        sexp = Parser.parse("loop do\n#{statements.to_source}\nend")
         node.update(:stmts_add, sexp.body[0].body)
       end
     end

data/lib/preval/visitors/micro.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+module Preval
+  class Visitors
+    class Micro < Visitor
+      def on_call(node)
+        left, _period, right = node.body
+
+        if node.type_match?(:call, :@period, :@ident) && left.type_match?(%i[array vcall], :@period, :@ident)
+          callleft, callperiod, callright = left.body
+
+          if callright.body == 'reverse' && right.body == 'each'
+            callright.update(:@ident, 'reverse_each')
+            node.update(:call, [callleft, callperiod, callright])
+          elsif callright.body == 'shuffle' && right.body == 'first'
+            callright.update(:@ident, 'sample')
+            node.update(:call, [callleft, callperiod, callright])
+          end
+        end
+      end
+
+      def on_def(node)
+        if node.type_match?(:@ident, :params, :bodystmt) &&
+           node.body[1].body.none? &&
+           node.dig(2, 0, 0).is?(:stmts_new) &&
+
+          var_ref = node.dig(2, 0, 1)
+
+          if var_ref.is?(:var_ref) &&
+             var_ref.type_match?(:@ivar) &&
+             node.body[0].body == var_ref.body[0].body[1..-1]
+
+            sexp = Parser.parse("attr_reader :#{node.body[0].body}")
+            node.update(:stmts_add, sexp.body[0].body)
+          end
+        end
+      end
+
+      def on_method_add_arg(node)
+        if node.type_match?(:call, :arg_paren)
+          if node.body[0].type_match?(:vcall, :@period, :@ident) &&
+             node.dig(0, 2).body == 'gsub'
+
+            left = node.dig(1, 0, 0, 0, 1)
+            right = node.dig(1, 0, 0, 1)
+
+            if left.is?(:string_literal) &&
+               right.is?(:string_literal) &&
+               [left, right].all? do |node|
+                 node.dig(0, 1).is?(:@tstring_content) &&
+                 node.dig(0, 1).body.length == 1
+               end
+
+              node.dig(0, 2).update(:@ident, 'tr')
+            end
+          elsif node.dig(0).type_match?(:method_add_block, :@period, :@ident) &&
+                node.dig(0, 0, 0).type_match?(%i[array vcall], :@period, :@ident) &&
+                node.dig(0, 0, 0, 2).body == 'map' &&
+                node.dig(0, 2).body == 'flatten' &&
+                node.dig(1).is?(:arg_paren) &&
+                node.dig(1, 0, 0, 0).is?(:args_new) &&
+                node.dig(1, 0, 0, 1).is?(:@int) &&
+                node.dig(1, 0, 0, 1).body == '1'
+
+            node.dig(0, 0, 0, 2).update(:@ident, 'flat_map')
+            node.update(:method_add_block, node.dig(0, 0).body)
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: preval
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Kevin Deisz
@@ -68,6 +68,7 @@ files:
 - README.md
 - Rakefile
 - bin/console
+- bin/parse
 - bin/print
 - bin/setup
 - docs/index.html
@@ -80,6 +81,7 @@ files:
 - lib/preval/visitor.rb
 - lib/preval/visitors/arithmetic.rb
 - lib/preval/visitors/loops.rb
+- lib/preval/visitors/micro.rb
 - preval.gemspec
 homepage: https://github.com/kddeisz/preval
 licenses: