oedipus_lex 2.5.3 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 294308d6ea6c939c11f453d7f64236d9aa16030bab382949409fad9e9ea48068
-  data.tar.gz: 176340a2625364bd9fa473c6ac165d4839e7774d09585e2debf5f8a75104f56f
+  metadata.gz: 9a4715d1253bc4e949f28fe08756befae60945975dea73942e4821293e910a21
+  data.tar.gz: c54b53dd59c1ebd5f81b0d4e3cfcd81b06520813934f91827a03d1185d4a7971
 SHA512:
-  metadata.gz: e973dec5da6a7848ed1934fdb0fe47e24bf5dbdbbbce252565441d085cb7146af2cf6e72d5327c9cea7267d15f8dcef5bf7473149f523e68af5e4e2d5829ed74
-  data.tar.gz: bd024dcd741969fc4119989bfbbc8f570142cc32b59ec8e66097af24f6531760a61571db228b0f751259d556d95b6fe9ddb5cb872049addb3a41c5bd089af71f
+  metadata.gz: 1d611cdec7771203561d7f6c4edaf5afa7a4839eff5efa0b82c22a88a7f68b87a8f6b7bd13891a2dbcdccfed1017ea8d32dc4424a5427be7cf6a9b4444626d1d
+  data.tar.gz: 259a6b53e966df95e6138f7a6fd3c80948d151ffca0d50a9c03badb737b30b949800e9bf761cacbbaaf55c20c72469733dbd1e0aff7dca8b819005efcb1aac6f

data/History.rdoc

@@ -1,3 +1,14 @@
+=== 2.6.0 / 2021-10-27
+
+* 2 minor enhancements:
+
+  * Add frozen_string_literal comment to generated lexers.
+  * Allow empty regex. (marcandre)
+
+* 1 bug fix:
+
+  * Switched from peek(1) == "\n" to check(/\n/) to save a ton of strings.
+
 === 2.5.3 / 2021-05-29
 
 * 1 bug fix:

data/lib/oedipus_lex.rb

@@ -30,7 +30,7 @@ require "oedipus_lex.rex"
 # books.
 
 class OedipusLex
-  VERSION = "2.5.3" # :nodoc:
+  VERSION = "2.6.0" # :nodoc:
 
   ##
   # The class name to generate.
@@ -394,6 +394,7 @@ class OedipusLex
   # :stopdoc:
 
   TEMPLATE = <<-'REX'.gsub(/^ {6}/, '')
+      # frozen_string_literal: true
       <%= encoding %>
       #--
       # This file is automatically generated. Do not modify it.
@@ -564,7 +565,7 @@ class OedipusLex
 
           until ss.eos? or token do
 % if option[:lineno] then
-            if ss.peek(1) == "\n"
+            if ss.check(/\n/) then
               self.lineno += 1
 % if option[:column] then
               # line starts 1 position after the newline

data/lib/oedipus_lex.rex

@@ -8,7 +8,7 @@ option
 
 macro
   ST    /(?:(:\S+|\w+\??))/
-  RE    /(\/(?:\\.|[^\/])+\/[ion]?)/
+  RE    /(\/(?:\\.|[^\/])*\/[ion]?)/
   ACT   /(\{.*|:?\w+)/
 
 rule

data/lib/oedipus_lex.rex.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
 # encoding: UTF-8
 #--
 # This file is automatically generated. Do not modify it.
-# Generated by: oedipus_lex version 2.5.2.
+# Generated by: oedipus_lex version 2.6.0.
 # Source: lib/oedipus_lex.rex
 #++
 
@@ -14,7 +15,7 @@ class OedipusLex
 
   # :stopdoc:
   ST  = /(?:(:\S+|\w+\??))/
-  RE  = /(\/(?:\\.|[^\/])+\/[ion]?)/
+  RE  = /(\/(?:\\.|[^\/])*\/[ion]?)/
   ACT = /(\{.*|:?\w+)/
   # :startdoc:
   # :stopdoc:
@@ -137,7 +138,7 @@ class OedipusLex
     token = nil
 
     until ss.eos? or token do
-      if ss.peek(1) == "\n"
+      if ss.check(/\n/) then
         self.lineno += 1
         # line starts 1 position after the newline
         self.start_of_current_line_pos = ss.pos + 1

data/test/test_oedipus_lex.rb

@@ -635,7 +635,8 @@ class TestOedipusLex < Minitest::Test
 
     ruby = generate_lexer src
 
-    exp = ["# encoding: UTF-8",
+    exp = ["# frozen_string_literal: true",
+           "# encoding: UTF-8",
            "#--",
            "# This file is automatically generated. Do not modify it.",
            "# Generated by: oedipus_lex version #{OedipusLex::VERSION}.",
@@ -644,7 +645,7 @@ class TestOedipusLex < Minitest::Test
            "module X",
            "module Y"]
 
-    assert_equal exp, ruby.lines.map(&:chomp).first(8)
+    assert_equal exp, ruby.lines.map(&:chomp).first(9)
   end
 
   def test_header_encoding_is_on_top
@@ -665,7 +666,8 @@ class TestOedipusLex < Minitest::Test
 
     ruby = generate_lexer src
 
-    exp = ["# encoding: UTF-8",
+    exp = ["# frozen_string_literal: true",
+           "# encoding: UTF-8",
            "#--",
            "# This file is automatically generated. Do not modify it.",
            "# Generated by: oedipus_lex version #{OedipusLex::VERSION}.",
@@ -674,7 +676,7 @@ class TestOedipusLex < Minitest::Test
            "",
            "module X"]
 
-    assert_equal exp, ruby.lines.map(&:chomp).first(8)
+    assert_equal exp, ruby.lines.map(&:chomp).first(9)
   end
 
   def test_read_non_existent_file
@@ -765,6 +767,19 @@ class TestOedipusLex < Minitest::Test
     assert_match 'ss.scan(/#{X}/)', source
   end
 
+  def test_parses_empty_regexp
+    source = generate_lexer %q{
+      class Foo
+      rule
+              /\w+/ { @state = :ARG; emit :tFUNCTION_CALL }
+        :ARG  /\(/  { @state = nil; emit :tARG_LIST_BEGIN }
+        :ARG  //    { @state = nil }
+      end
+    }
+
+    assert_match 'ss.skip(//)', source
+  end
+
   def test_changing_state_during_lexing
     src = <<-'REX'
       class Calculator

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oedipus_lex
 version: !ruby/object:Gem::Version
-  version: 2.5.3
+  version: 2.6.0
 platform: ruby
 authors:
 - Ryan Davis
@@ -29,7 +29,7 @@ cert_chain:
   d/AHw/kcnU6iuMUoJEcGiJd4gVCTn1l3cDcIvxakGslCA88Jubw0Sqatan0TnC9g
   KToW560QIey7SPfHWduzFJnV
   -----END CERTIFICATE-----
-date: 2021-05-30 00:00:00.000000000 Z
+date: 2021-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc

metadata.gz.sig

@@ -1,2 +1 @@
-
-#��Ir!A��xW�����ȇL[n`�|���j�D�g�-�}���'[H�У@_\H��
+��-�V���F���k���r�Xp�G0�_3�t�6pu�+H_r�t�O�|F=yg��'0�rZ�{�3
��U�#͍KJ����T�7�(/��z����?Tp�&4�E�����s��Sb��z����M5������F�k�,=F