packcr 0.0.6 → 0.0.7

data/lib/packcr/templates/node/rule.rb.erb

@@ -1,23 +1,30 @@
-debug { warn "#{ "  " * @level}EVAL    <%= name %> #{answer.pos} #{@buffer[answer.pos..-1].inspect}" }
-@level += 1
-answer.resize_captures(<%= capts.length %>)
-<%- if vars.length > 0 -%>
-answer.values = {}
-<%- end -%>
-<%- r = expr.reachability -%>
-<%- if r == Packcr::CODE_REACH__ALWAYS_SUCCEED -%>
-<%- -%><%= gen.generate_code(expr, 0, 0, false) -%>
-@level -= 1
-debug { warn "#{ "  " * @level}MATCH   <%= name %> #{answer.pos} #{@buffer[answer.pos...@cur].inspect}" }
-return answer
-<%- else -%>
-catch(0) do
+def evaluate_rule_<%= name %>(offset<% if gen.location %>, offset_loc<% end %>, limits: nil)
+  answer = ThunkChunk.new
+  answer.pos = @position_offset
+  <%-   if gen.location -%>
+  answer.pos_loc = @position_offset_loc
+  <%-   end -%>
+  debug { warn "#{ "  " * @level}EVAL    <%= name %> #{answer.pos} #{@buffer[answer.pos..-1].inspect}" }
+  @level += 1
+  answer.resize_captures(<%= capts.length %>)
+  <%- if vars.length > 0 -%>
+  answer.values = {}
+  <%- end -%>
+  <%- r = expr.reachability -%>
+  <%- if r == Packcr::CODE_REACH__ALWAYS_SUCCEED -%>
   <%- -%><%= gen.generate_code(expr, 0, 2, false) -%>
   @level -= 1
-  debug { warn "#{ "  " * @level}MATCH   <%= name %> #{answer.pos} #{@buffer[answer.pos...@cur].inspect}" }
+  debug { warn "#{ "  " * @level}MATCH   <%= name %> #{answer.pos} #{@buffer[answer.pos...@position_offset].inspect}" }
   return answer
+  <%- else -%>
+  catch(0) do
+    <%- -%><%= gen.generate_code(expr, 0, 4, false) -%>
+    @level -= 1
+    debug { warn "#{ "  " * @level}MATCH   <%= name %> #{answer.pos} #{@buffer[answer.pos...@position_offset].inspect}" }
+    return answer
+  end
+  @level -= 1
+  debug { warn "#{ "  " * @level}NOMATCH <%= name %> #{answer.pos} #{@buffer[answer.pos...@position_offset].inspect}" }
+  return nil
+  <%- end -%>
 end
-@level -= 1
-debug { warn "#{ "  " * @level}NOMATCH <%= name %> #{answer.pos} #{@buffer[answer.pos...@cur].inspect}" }
-return nil
-<%- end -%>

data/lib/packcr/templates/node/string_many.c.erb

@@ -1,11 +1,11 @@
 if (
     pcc_refill_buffer(ctx, <%= n %>) < <%= n %> ||
 <%- (n - 1).times do |i| -%>
-    (ctx->buffer.buf + ctx->cur)[<%= i %>] != '<%= Packcr.escape_character(value[i]) %>' ||
+    (ctx->buffer.buf + ctx->position_offset)[<%= i %>] != '<%= Packcr.escape_character(value[i]) %>' ||
 <%- end -%>
-    (ctx->buffer.buf + ctx->cur)[<%= n - 1 %>] != '<%= s = Packcr.escape_character(value[n - 1]) %>'
-) goto L<%= "%04d" % onfail %>;
+    (ctx->buffer.buf + ctx->position_offset)[<%= n - 1 %>] != '<%= Packcr.escape_character(value[n - 1]) %>'
+) goto L<%= format("%04d", onfail) %>;
 <%- if gen.location -%>
-pcc_location_forward(&ctx->cur_loc, ctx->buffer.buf + ctx->cur, n);
+pcc_location_forward(&ctx->position_offset_loc, ctx->buffer.buf + ctx->position_offset, n);
 <%- end -%>
-ctx->cur += <%= n %>;
+ctx->position_offset += <%= n %>;

data/lib/packcr/templates/node/string_many.rb.erb

@@ -1,10 +1,10 @@
 if (
   refill_buffer(<%= n %>) < <%= n %> ||
-  @buffer[@cur, <%= n %>] != <%= value[0, n].dump %>
+  @buffer[@position_offset, <%= n %>] != <%= value[0, n].dump %>
 )
   throw(<%= onfail %>)
 end
 <%- if gen.location -%>
-@cur_loc = @cur_loc.forward(@buffer, @cur, <%= n %>)
+@position_offset_loc = @position_offset_loc.forward(@buffer, @position_offset, <%= n %>)
 <%- end -%>
-@cur += <%= n %>
+@position_offset += <%= n %>

data/lib/packcr/templates/node/string_one.c.erb

@@ -1,8 +1,8 @@
 if (
     pcc_refill_buffer(ctx, 1) < 1 ||
-    ctx->buffer.buf[ctx->cur] != '<%= Packcr.escape_character(value[0]) %>'
-) goto L<%= "%04d" % onfail %>;
+    ctx->buffer.buf[ctx->position_offset] != '<%= Packcr.escape_character(value[0]) %>'
+) goto L<%= format("%04d", onfail) %>;
 <%- if gen.location -%>
-    pcc_location_forward(&ctx->cur_loc, ctx->buffer.buf + ctx->cur, 1);
+    pcc_location_forward(&ctx->position_offset_loc, ctx->buffer.buf + ctx->position_offset, 1);
 <%- end -%>
-ctx->cur++;
+ctx->position_offset++;

data/lib/packcr/templates/node/string_one.rb.erb

@@ -1,10 +1,10 @@
 if (
   refill_buffer(1) < 1 ||
-  @buffer[@cur] != "<%= Packcr.escape_character(value[0]) %>"
+  @buffer[@position_offset] != "<%= Packcr.escape_character(value[0]) %>"
 )
   throw(<%= onfail %>)
 end
 <%- if gen.location -%>
-@cur_loc = @cur_loc.forward(@buffer, @cur, 1)
+@position_offset_loc = @position_offset_loc.forward(@buffer, @position_offset, 1)
 <%- end -%>
-@cur += 1
+@position_offset += 1

data/lib/packcr/util.rb

@@ -5,10 +5,10 @@ class Packcr
     def unescape_string(str, is_charclass)
       if is_charclass
         str.gsub!("\\" * 2) { "\\" * 4 }
-        str.gsub!("\"" ) { "\\\"" }
+        str.gsub!("\"") { "\\\"" }
       end
       str.gsub!(/\\(.)/) do
-        c = $1
+        c = ::Regexp.last_match(1)
         case c
         when "0"
           "\\x00"
@@ -19,7 +19,7 @@ class Packcr
         end
       end
       str.gsub!(/[^\x00-\x7f]/) do
-        "\\x%02x" % $&.ord
+        format("\\x%02x", ::Regexp.last_match(0).ord)
       end
       str.replace "\"#{str}\"".undump
     end
@@ -31,19 +31,20 @@ class Packcr
     def escape_string(str)
       str = str.b
       str.gsub(/(\0+)|(\e+)|("+)|('+)|(\\+)|((?:(?![\0\e"'\\])[ -~])+)|([\x01-\x1a\x1c-\x1f\x7f-\xff]+)/n) do
-        n = $&.size
-        next "\\0"   * n if $1
-        next "\\x1b" * n if $2
-        next "\\\""  * n if $3
-        next "\\\'"  * n if $4
-        next "\\\\"  * n if $5
-        next $6 if $6
-        $7.dump[1..-2].downcase
+        n = ::Regexp.last_match(0).size
+        next "\\0"   * n if ::Regexp.last_match(1)
+        next "\\x1b" * n if ::Regexp.last_match(2)
+        next "\\\""  * n if ::Regexp.last_match(3)
+        next "\\'" * n if ::Regexp.last_match(4)
+        next "\\\\" * n if ::Regexp.last_match(5)
+        next ::Regexp.last_match(6) if ::Regexp.last_match(6)
+
+        ::Regexp.last_match(7).dump[1..-2].downcase
       end
     end
 
     def dump_integer_value(value)
-      if value == nil
+      if value.nil?
         $stdout.print "void"
       else
         $stdout.print value
@@ -62,8 +63,8 @@ class Packcr
       offset = 0
       spaces.tr!("\v\f", " ")
       spaces.gsub!(/\t+/) do
-        chars = $`.length
-        o = 8 * $&.length - (offset + chars) % 8
+        chars = ::Regexp.last_match.pre_match.length
+        o = (8 * ::Regexp.last_match(0).length) - ((offset + chars) % 8)
         offset = (7 - chars) % 8
         " " * o
       end
@@ -75,15 +76,19 @@ class Packcr
       erb = ERB.new(File.read(template_path), trim_mode: "%-")
       erb.filename = template_path
       result = erb.result(b)
+      format_code(result, indent: indent, unwrap: unwrap)
+    end
+
+    def format_code(result, indent: 0, unwrap: false)
       if unwrap
         result.gsub!(/\A\{|\}\z/, "")
         indent -= 4
       end
       result.gsub!(/^(?!$)/, " " * indent)
-      result.gsub!(/^( *?) {0,4}<<<</) { $1 }
+      result.gsub!(/^( *?) {0,4}<<<</) { ::Regexp.last_match(1) }
       result
     end
   end
 
   extend Util
-end
+end

data/lib/packcr/version.rb

@@ -1,3 +1,3 @@
 class Packcr
-  VERSION = "0.0.6"
+  VERSION = "0.0.7".freeze
 end

data/lib/packcr.rb

@@ -1,14 +1,3 @@
-class Packcr
-end
-
-require "packcr/util"
-require "packcr/code_block"
-require "packcr/stream"
-require "packcr/generator"
-require "packcr/node"
-require "packcr/context"
-require "packcr/version"
-
 class Packcr
   CODE_REACH__BOTH = 0
   CODE_REACH__ALWAYS_SUCCEED = 1
@@ -30,3 +19,11 @@ class Packcr
     end
   end
 end
+
+require "packcr/util"
+require "packcr/code_block"
+require "packcr/stream"
+require "packcr/generator"
+require "packcr/node"
+require "packcr/context"
+require "packcr/version"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packcr
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - wanabe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-01-19 00:00:00.000000000 Z
+date: 2023-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.43.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.43.0
 description: 
 email: 
 executables:
@@ -65,6 +79,20 @@ files:
 - lib/packcr/cli.rb
 - lib/packcr/code_block.rb
 - lib/packcr/context.rb
+- lib/packcr/generated/context.rb
+- lib/packcr/generated/node/action_node.rb
+- lib/packcr/generated/node/alternate_node.rb
+- lib/packcr/generated/node/capture_node.rb
+- lib/packcr/generated/node/charclass_node.rb
+- lib/packcr/generated/node/eof_node.rb
+- lib/packcr/generated/node/error_node.rb
+- lib/packcr/generated/node/expand_node.rb
+- lib/packcr/generated/node/predicate_node.rb
+- lib/packcr/generated/node/quantity_node.rb
+- lib/packcr/generated/node/reference_node.rb
+- lib/packcr/generated/node/rule_node.rb
+- lib/packcr/generated/node/sequence_node.rb
+- lib/packcr/generated/node/string_node.rb
 - lib/packcr/generator.rb
 - lib/packcr/node.rb
 - lib/packcr/node/action_node.rb
@@ -113,10 +141,10 @@ files:
 - lib/packcr/templates/node/predicate.rb.erb
 - lib/packcr/templates/node/predicate_neg.c.erb
 - lib/packcr/templates/node/predicate_neg.rb.erb
-- lib/packcr/templates/node/quantify_many.c.erb
-- lib/packcr/templates/node/quantify_many.rb.erb
-- lib/packcr/templates/node/quantify_one.c.erb
-- lib/packcr/templates/node/quantify_one.rb.erb
+- lib/packcr/templates/node/quantity_many.c.erb
+- lib/packcr/templates/node/quantity_many.rb.erb
+- lib/packcr/templates/node/quantity_one.c.erb
+- lib/packcr/templates/node/quantity_one.rb.erb
 - lib/packcr/templates/node/reference.c.erb
 - lib/packcr/templates/node/reference.rb.erb
 - lib/packcr/templates/node/reference_reverse.rb.erb
@@ -128,13 +156,13 @@ files:
 - lib/packcr/templates/node/string_many.rb.erb
 - lib/packcr/templates/node/string_one.c.erb
 - lib/packcr/templates/node/string_one.rb.erb
-- lib/packcr/tokenizer.rb
 - lib/packcr/util.rb
 - lib/packcr/version.rb
 homepage: https://github.com/wanabe/packcr
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -143,7 +171,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="