ruby2ruby 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5b53ed4dcaf3f49d555eaac182c0db834ef853b6
-  data.tar.gz: e9beb44116c010a09b853fdca582565b380db3a0
+SHA256:
+  metadata.gz: 7086dd5ae0a401311ba0191c9558965765a208862def995221c1d5e065b7579b
+  data.tar.gz: e9a369ff76c740f0eafa6389a3e1ab5e03eebe435d16c0542853bdfcd0981eaa
 SHA512:
-  metadata.gz: a253a034894e65cfdaa8b5d96ab884db76c828b6b5ef2bec0f5c93a2beea9bba808919d0553342d1ba63e16bb52341f3159818cc2457951524289e32ea55743c
-  data.tar.gz: 4a0fdf340723d063e6f421654ad2cb8d458c47f6bf9a340acf6a13794a196dac556986c31b4512daf5f0a0864a438759c17fe918bfec226496333fd200c28bc9
+  metadata.gz: b4195418b8035e9c5d01e2af6ba64ad3b4375706fc473f5b297867b5838ad17482e7ad91e30a70c08c78934695ac3893ca8bdee977ad109ae7e24e9f54e5ea93
+  data.tar.gz: 6c9e14a882ed557a6384b80e1bcb7aa546ee1745edfd11a548334c0d953abed4c7b90f18432ce156dd511b35edc5ac7196c1a966cbefbcf6f562a4d6303f574f

data/History.rdoc

@@ -1,3 +1,10 @@
+=== 2.4.1 / 2018-02-15
+
+* 2 minor enhancements:
+
+  * Added bitwise ops to BINARY. (david942j)
+  * Added rewrite_call|if|until|while to normalize `not` in conditions.
+
 === 2.4.0 / 2017-07-17
 
 * 1 major enhancement:

data/lib/ruby2ruby.rb

@@ -31,13 +31,13 @@ end
 # Generate ruby code from a sexp.
 
 class Ruby2Ruby < SexpProcessor
-  VERSION = "2.4.0" # :nodoc:
+  VERSION = "2.4.1" # :nodoc:
 
   # cutoff for one-liners
   LINE_LENGTH = 78
 
   # binary operation messages
-  BINARY = [:<=>, :==, :<, :>, :<=, :>=, :-, :+, :*, :/, :%, :<<, :>>, :**, :'!=']
+  BINARY = [:<=>, :==, :<, :>, :<=, :>=, :-, :+, :*, :/, :%, :<<, :>>, :**, :'!=', :^, :|, :&]
 
   ##
   # Nodes that represent assignment and probably need () around them.
@@ -1073,11 +1073,30 @@ class Ruby2Ruby < SexpProcessor
     exp
   end
 
+  def rewrite_call exp # :nodoc:
+    _, recv, msg, *args = exp
+
+    exp = s(:not, recv) if msg == :! && args.empty?
+
+    exp
+  end
+
   def rewrite_ensure exp # :nodoc:
     exp = s(:begin, exp) unless context.first == :begin
     exp
   end
 
+  def rewrite_if exp # :nodoc:
+    _, c, t, f = exp
+
+    if c.sexp_type == :not then
+      _, nc = c
+      exp = s(:if, nc, f, t)
+    end
+
+    exp
+  end
+
   def rewrite_resbody exp # :nodoc:
     _, args, *_rest = exp
     raise "no exception list in #{exp.inspect}" unless exp.size > 2 && args
@@ -1114,6 +1133,28 @@ class Ruby2Ruby < SexpProcessor
     end
   end
 
+  def rewrite_until exp # :nodoc:
+    _, c, *body = exp
+
+    if c.sexp_type == :not then
+      _, nc = c
+      exp = s(:while, nc, *body)
+    end
+
+    exp
+  end
+
+  def rewrite_while exp # :nodoc:
+    _, c, *body = exp
+
+    if c.sexp_type == :not then
+      _, nc = c
+      exp = s(:until, nc, *body)
+    end
+
+    exp
+  end
+
   ############################################################
   # Utility Methods:
 

data/test/test_ruby2ruby.rb

@@ -19,8 +19,6 @@ class R2RTestCase < ParseTreeTestCase
   def self.generate_test klass, node, data, input_name, output_name
     output_name = data.has_key?('Ruby2Ruby') ? 'Ruby2Ruby' : 'Ruby'
 
-    return if node.to_s =~ /(str_question|not|bang).*_(19|20|21|22|23|24)$/
-
     klass.class_eval <<-EOM
       def test_#{node}
         pt = #{data[input_name].inspect}
@@ -766,12 +764,15 @@ class TestRuby2Ruby < R2RTestCase
 
     assert_parse Ruby18Parser.new.parse(rb1), rb1
     assert_parse Ruby19Parser.new.parse(rb1), rb1
+    assert_parse Ruby25Parser.new.parse(rb1), rb1
 
     assert_parse Ruby18Parser.new.parse(rb2), rb1
-    assert_parse Ruby19Parser.new.parse(rb2), rb2
+    assert_parse Ruby19Parser.new.parse(rb2), rb1
+    assert_parse Ruby25Parser.new.parse(rb2), rb1
 
     assert_parse Ruby18Parser.new.parse(rb3), rb1
-    assert_parse Ruby19Parser.new.parse(rb3), rb2
+    assert_parse Ruby19Parser.new.parse(rb3), rb1
+    assert_parse Ruby25Parser.new.parse(rb3), rb1
   end
 
   def assert_parse sexp, expected_ruby, expected_eval = nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby2ruby
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Ryan Davis
@@ -10,9 +10,9 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDijCCAnKgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDPjCCAiagAwIBAgIBAjANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTE2MDkyNjAxNTczNVoXDTE3MDkyNjAxNTczNVowRTETMBEGA1UE
+  GRYDY29tMB4XDTE3MTEyMTIxMTExMFoXDTE4MTEyMTIxMTExMFowRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -20,17 +20,16 @@ cert_chain:
   oOvjtt5P8+GSK9zLzxQP0gVLS/D0FmoE44XuDr3iQkVS2ujU5zZL84mMNqNB1znh
   GiadM9GHRaDiaxuX0cIUBj19T01mVE2iymf9I6bEsiayK/n6QujtyCbTWsAS9Rqt
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
-  gBEfoTEGr7Zii72cx+sCAwEAAaOBhDCBgTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE
-  sDAdBgNVHQ4EFgQUR8V72Z3+v+2P9abCnL4wjx32T+EwIwYDVR0RBBwwGoEYcnlh
-  bmQtcnVieUB6ZW5zcGlkZXIuY29tMCMGA1UdEgQcMBqBGHJ5YW5kLXJ1YnlAemVu
-  c3BpZGVyLmNvbTANBgkqhkiG9w0BAQUFAAOCAQEAIGzgp0aZ2W9+v96ujmBcQHoC
-  buy0iU68MVj2VlxMyfr1KPZIh1OyhU4UO4zrkREcH8ML70v9cYHNvOd9oynRHnvC
-  l2tj/fD3YJ0AEkJxGrYwRWQmvMfC4bJ02bC1+rVOUIXXKp3+cUmiN4sTniof8VFo
-  bo/YYP4c7erpERa+9hrqygg6WQbJlk2YRlH3JXPFjmu869i2dcbR5ZLOAeEy+axH
-  E4oJcnPkJAr0rw504JGtlZtONZQblwmRJOIdXzolaE3NRGUzGVOUSptZppAKiavY
-  fO6tdKQc/5RfA8oQEkg8hrxA5PQSz4TOFJGLpFvIapEk6tMruQ0bHgkhr9auXg==
+  gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
+  HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBBQUAA4IB
+  AQAfAXSQpsW7YSxd1csRtA/M4Zt0AMXFMd76GJ8Lgtg8G0+VFbdChRyDuDb0kPlW
+  h9QQX/YABfCW8vxmssbMGrP+VGBAn7BbdTcfTlgCWrvMX1uL5aRL74nA4urKXqdW
+  a0nP70K4958P3GffBdtE3KGkU5xstFnXGajxuBRnL66E15KU0BNehVxdG258bdPu
+  EKN6MqBPftFiev3tuwqDV11r2GquDpniYcT+Mi8/PgeAgVT/afBeVgbB3KaZeTRR
+  AhXhF6Wi2GTMezlj5jlI5XV7WsJUSwTp/YiVvcmT74ZaCRvexm6EnNhkrvJJ1Xeu
+  V+HB+LYYhXWitInO/eXxDrFB
   -----END CERTIFICATE-----
-date: 2017-07-17 00:00:00.000000000 Z
+date: 2018-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexp_processor
@@ -132,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: ruby2ruby provides a means of generating pure ruby code easily from RubyParser