oedipus_lex 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61adb0e46462bf1c5bc415fdc1654e216ab490b4
-  data.tar.gz: 04be5ee4d10e6b8829af5af8ddb01f8fd2592bcd
+  metadata.gz: ab5673d633e7abae710deb96e4b764b2518bed0e
+  data.tar.gz: 9e16b31d4ffeaad609fe27812e69f8dfa3b0b8ff
 SHA512:
-  metadata.gz: 6a622ea8f3751c1408c5775c47dea719e43da6a5d296cd65ce39ef6b4a0fbf80135de1a290d862eb9d689c93748bb84fb8fc42b5881a67bbf0f065734282e173
-  data.tar.gz: e81ff0a38cb4fbf6e3cac5d6babb3d8652bdc2be385e7995cb2426670aa6f65a52aa5cfb900757045d77c476ce7012cfe01e2f20f247cdb700a557cb30536ee6
+  metadata.gz: c3948a898e603ccb19494bdcb753f1ae5f799d21660c42a8ba80611884e18a94f615ef1511c79d1ac5f592e6ea7288ab673b6729988e8f8a07d37c881e9f6c6f
+  data.tar.gz: 7876d02faa16c81ef199ceec5b342cf9bd69e9e0d6c4970328e8e92c49abc3904dd06e1b1a40734fe5cc80314030e2b5cc21d7a2ec60afb60ff66f532a93572c

data/History.rdoc

@@ -1,3 +1,9 @@
+=== 2.4.1 / 2016-01-21
+
+* 1 minor enhancement:
+
+  * Use `skip` and `match?` instead of `scan` and `check`. Better on GC. (presidentbeef)
+
 === 2.4.0 / 2014-08-29
 
 * 1 minor enhancement:

data/README.rdoc

@@ -19,7 +19,7 @@ At the very least, you need to add slashes to all your regexps.
 
 Oedipus, like rexical, is based primarily on generating code much like
 you would a hand-written lexer. It is _not_ a table or hash driven
-lexer. It use StrScanner within a multi-level case statement. As such,
+lexer. It uses StrScanner within a multi-level case statement. As such,
 Oedipus matches on the _first_ match, not the longest (like lex and
 its ilk).
 

data/Rakefile

@@ -3,8 +3,6 @@
 require "rubygems"
 require "hoe"
 
-Hoe.plugin :debugging
-Hoe.plugin :git
 Hoe.plugin :isolate
 Hoe.plugin :seattlerb
 
@@ -16,6 +14,10 @@ Hoe.spec "oedipus_lex" do
   self.history_file     = "History.rdoc"
 end
 
+Hoe.bad_plugins.each do |bad|
+  warn "BAD: Hoe.plugin :#{bad}"
+end
+
 task :bootstrap do
   ruby "-Ilib lib/oedipus_lex.rb lib/oedipus_lex.rex > lib/oedipus_lex.rex.rb.new"
   system "diff -uw lib/oedipus_lex.rex.rb lib/oedipus_lex.rex.rb.new"
@@ -78,4 +80,9 @@ task :debug do
   puts rex.generate
 end
 
+task :wtf => :isolate do
+  puts `~/.rbenv/versions/2.2.0/bin/ruby -S gem env`
+  puts `~/.rbenv/versions/2.2.0/bin/ruby -S gem list`
+end
+
 # vim: syntax=ruby

data/lib/oedipus_lex.rb

@@ -4,7 +4,7 @@ require "erb"
 require "oedipus_lex.rex"
 
 class OedipusLex
-  VERSION = "2.4.0"
+  VERSION = "2.4.1"
 
   attr_accessor :class_name
   attr_accessor :header
@@ -44,28 +44,33 @@ class OedipusLex
         start_state == state or
         (state.nil? and predicates.include? start_state)
 
-      cond =
-        if exclusive or not start_state then
-          "when text = ss.scan(#{regexp}) then"
-        elsif start_state =~ /^:/ then
-          "when (state == #{start_state}) && (text = ss.scan(#{regexp})) then"
-        else
-          "when #{start_state} && (text = ss.scan(#{regexp})) then"
-        end
+      uses_text = false
 
       body =
         case action
         when nil, false then
           "  # do nothing"
         when /^\{/ then
+          uses_text = action =~ /\btext\b/
           "  action #{action}"
         when /^:/, "nil" then
           "  [:state, #{action}]"
-        else
+        else # plain method name
+          uses_text = true
           "  #{action} text"
         end
 
-      [cond, body]
+      check = uses_text ? "text = ss.scan(#{regexp})" : "ss.skip(#{regexp})"
+
+      cond = if exclusive or not start_state then
+               check
+             elsif start_state =~ /^:/ then
+               "(state == #{start_state}) && (#{check})"
+             else # predicate method
+               "#{start_state} && (#{check})"
+             end
+
+      ["when #{cond} then", body]
     end
 
     def pretty_print pp
@@ -100,7 +105,7 @@ class OedipusLex
 
     def to_ruby state, predicates, exclusive
       [
-       "when ss.check(#{regex}) then",
+       "when ss.match?(#{regex}) then",
        "  case",
        rules.map { |subrule|
          s = subrule.to_ruby(state, predicates, exclusive)

data/test/test_oedipus_lex.rb

@@ -1,4 +1,3 @@
-gem "minitest"
 require "minitest/autorun"
 require "oedipus_lex"
 require "stringio"
@@ -458,7 +457,7 @@ class TestOedipusLex < Minitest::Test
 
     ruby = generate_lexer src
 
-    assert_match "when ss.check(/\\d/) then", ruby
+    assert_match "when ss.match?(/\\d/) then", ruby
     assert_match "when text = ss.scan(/\\d+\\.\\d+/) then", ruby
     assert_match "when text = ss.scan(/\\d+/) then", ruby
     assert_match "end # group /\\d/", ruby
@@ -481,12 +480,12 @@ class TestOedipusLex < Minitest::Test
 
     ruby = generate_lexer src
 
-    assert_match "when ss.check(/\\d/) then", ruby
+    assert_match "when ss.match?(/\\d/) then", ruby
     assert_match "when text = ss.scan(/\\d+\\.\\d+/) then", ruby
     assert_match "when text = ss.scan(/\\d+/) then", ruby
     assert_match "end # group /\\d/", ruby
 
-    assert_match "when ss.check(/\\+/) then", ruby
+    assert_match "when ss.match?(/\\+/) then", ruby
     assert_match "when xx? && (text = ss.scan(/\\+whatever/)) then", ruby
     assert_match "when (state == :x) && (text = ss.scan(/\\+\\d+/)) then", ruby
     assert_match "end # group /\\d/", ruby

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oedipus_lex
 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-----
-  MIIDPjCCAiagAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDPjCCAiagAwIBAgIBAzANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTEzMDkxNjIzMDQxMloXDTE0MDkxNjIzMDQxMlowRTETMBEGA1UE
+  GRYDY29tMB4XDTE1MDkxOTIwNTEyMloXDTE2MDkxODIwNTEyMlowRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -22,14 +22,14 @@ cert_chain:
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
   gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
   HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBBQUAA4IB
-  AQCFZ7JTzoy1gcG4d8A6dmOJy7ygtO5MFpRIz8HuKCF5566nOvpy7aHhDDzFmQuu
-  FX3zDU6ghx5cQIueDhf2SGOncyBmmJRRYawm3wI0o1MeN6LZJ/3cRaOTjSFy6+S6
-  zqDmHBp8fVA2TGJtO0BLNkbGVrBJjh0UPmSoGzWlRhEVnYC33TpDAbNA+u39UrQI
-  ynwhNN7YbnmSR7+JU2cUjBFv2iPBO+TGuWC+9L2zn3NHjuc6tnmSYipA9y8Hv+As
-  Y4evBVezr3SjXz08vPqRO5YRdO3zfeMT8gBjRqZjWJGMZ2lD4XNfrs7eky74CyZw
-  xx3n58i0lQkBE1EpKE0lFu/y
+  AQB+Hx8xUgrpZa4P8H8gR8zme5kISwQrG80MbpqJV6/G3/ZicRFhN5sjwu0uHGue
+  bd9Cymf6oIRwHVarJux2M32T6bL07Hmi07w2QaPc3MnMKB/D46SRZ2JSSGPFRBTc
+  SilobMRoGs/7B15uGFUEnNrCB/ltMqhwwSx1r++UQPfeySHEV9uqu03E5Vb7J37O
+  2Er6PLXHRiYsIycD1LkMi6YnixdITRHmrqJYE2rsjaIfpIehiusVAPHkNf7qbpHq
+  qx3h45R1CAsObX0SQDIT+rRbQrtKz1GHIZTOFYvEJjUY1XmRTZupD3CJ8Q7sDqSy
+  NLq5jm1fq6Y9Uolu3RJbmycf
   -----END CERTIFICATE-----
-date: 2014-08-30 00:00:00.000000000 Z
+date: 2016-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -37,14 +37,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '5.4'
+        version: '5.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '5.4'
+        version: '5.8'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -65,14 +65,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3.14'
 description: |-
   Oedipus Lex is a lexer generator in the same family as Rexical and
   Rex. Oedipus Lex is my independent lexer fork of Rexical. Rexical was
@@ -88,7 +88,7 @@ description: |-
 
   Oedipus, like rexical, is based primarily on generating code much like
   you would a hand-written lexer. It is _not_ a table or hash driven
-  lexer. It use StrScanner within a multi-level case statement. As such,
+  lexer. It uses StrScanner within a multi-level case statement. As such,
   Oedipus matches on the _first_ match, not the longest (like lex and
   its ilk).
 
@@ -107,7 +107,6 @@ extra_rdoc_files:
 - sample/error1.txt
 files:
 - .autotest
-- .gemtest
 - History.rdoc
 - Manifest.txt
 - README.rdoc
@@ -156,9 +155,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Oedipus Lex is a lexer generator in the same family as Rexical and Rex
-test_files:
-- test/test_oedipus_lex.rb
+test_files: []