packcr 0.0.4 → 0.0.7

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

@@ -0,0 +1,11 @@
+if (
+    pcc_refill_buffer(ctx, <%= n %>) < <%= n %> ||
+<%- (n - 1).times do |i| -%>
+    (ctx->buffer.buf + ctx->position_offset)[<%= i %>] != '<%= Packcr.escape_character(value[i]) %>' ||
+<%- end -%>
+    (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->position_offset_loc, ctx->buffer.buf + ctx->position_offset, n);
+<%- end -%>
+ctx->position_offset += <%= n %>;

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

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

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

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

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

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

data/lib/packcr/util.rb

@@ -2,17 +2,13 @@ require "erb"
 
 class Packcr
   module Util
-    def is_identifier_string(str)
-      str.match?(/\A(?!\d)\w+\z/)
-    end
-
     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"
@@ -23,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
@@ -35,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,16 +59,12 @@ class Packcr
       $stdout.print escape_string(str)
     end
 
-    def find_trailing_blanks(str)
-      str =~ /[ \v\f\t\n\r]*\z/
-    end
-
     def unify_indent_spaces(spaces)
       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
@@ -83,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.4"
+  VERSION = "0.0.7".freeze
 end

data/lib/packcr.rb

@@ -1,15 +1,3 @@
-class Packcr
-end
-
-require "packcr/util"
-require "packcr/code_block"
-require "packcr/stream"
-require "packcr/generator"
-require "packcr/buffer"
-require "packcr/node"
-require "packcr/context"
-require "packcr/version"
-
 class Packcr
   CODE_REACH__BOTH = 0
   CODE_REACH__ALWAYS_SUCCEED = 1
@@ -22,7 +10,7 @@ class Packcr
 
   def run
     Context.new(@path.to_s, **@opt) do |ctx|
-      if !ctx.parse
+      if !ctx.parse_all
         raise "PackCR error: can't parse"
       end
       if !ctx.generate
@@ -31,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,61 +1,168 @@
 --- !ruby/object:Gem::Specification
 name: packcr
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.7
 platform: ruby
 authors:
 - wanabe
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2023-01-06 00:00:00.000000000 Z
+date: 2023-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.12'
+- !ruby/object:Gem::Dependency
+  name: rspec-parameterized
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !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: []
+executables:
+- packcr
 extensions: []
 extra_rdoc_files: []
 files:
+- exe/packcr
 - lib/packcr.rb
-- lib/packcr/buffer.rb
+- lib/packcr/broadcast.rb
+- 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
 - lib/packcr/node/alternate_node.rb
 - lib/packcr/node/capture_node.rb
 - lib/packcr/node/charclass_node.rb
+- lib/packcr/node/eof_node.rb
 - lib/packcr/node/error_node.rb
 - lib/packcr/node/expand_node.rb
 - lib/packcr/node/predicate_node.rb
 - lib/packcr/node/quantity_node.rb
 - lib/packcr/node/reference_node.rb
+- lib/packcr/node/root_node.rb
 - lib/packcr/node/rule_node.rb
 - lib/packcr/node/sequence_node.rb
 - lib/packcr/node/string_node.rb
 - lib/packcr/parser.rb
 - lib/packcr/stream.rb
+- lib/packcr/templates/context/header.c.erb
+- lib/packcr/templates/context/source.c.erb
+- lib/packcr/templates/context/source.rb.erb
+- lib/packcr/templates/node/action.c.erb
+- lib/packcr/templates/node/action.rb.erb
+- lib/packcr/templates/node/alternate.c.erb
+- lib/packcr/templates/node/alternate.rb.erb
+- lib/packcr/templates/node/capture.c.erb
+- lib/packcr/templates/node/capture.rb.erb
+- lib/packcr/templates/node/charclass.c.erb
+- lib/packcr/templates/node/charclass.rb.erb
+- lib/packcr/templates/node/charclass_any.c.erb
+- lib/packcr/templates/node/charclass_any.rb.erb
+- lib/packcr/templates/node/charclass_fail.c.erb
+- lib/packcr/templates/node/charclass_fail.rb.erb
+- lib/packcr/templates/node/charclass_one.c.erb
+- lib/packcr/templates/node/charclass_one.rb.erb
+- lib/packcr/templates/node/charclass_utf8.c.erb
+- lib/packcr/templates/node/charclass_utf8.rb.erb
+- lib/packcr/templates/node/charclass_utf8_reverse.rb.erb
+- lib/packcr/templates/node/eof.c.erb
+- lib/packcr/templates/node/eof.rb.erb
+- lib/packcr/templates/node/error.c.erb
+- lib/packcr/templates/node/error.rb.erb
+- lib/packcr/templates/node/expand.c.erb
+- lib/packcr/templates/node/expand.rb.erb
+- lib/packcr/templates/node/predicate.c.erb
+- 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/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
+- lib/packcr/templates/node/rule.c.erb
+- lib/packcr/templates/node/rule.rb.erb
+- lib/packcr/templates/node/sequence.c.erb
+- lib/packcr/templates/node/sequence.rb.erb
+- lib/packcr/templates/node/string_many.c.erb
+- 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/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:
@@ -64,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:
   - - ">="

data/lib/packcr/buffer.rb

@@ -1,47 +0,0 @@
-
-class Packcr
-  class Buffer
-    def initialize
-      @buf = +"".b
-    end
-
-    def len
-      @buf.length
-    end
-
-    def [](index)
-      @buf[index].ord
-    end
-
-    def count_characters(s, e)
-      # UTF-8 multibyte character support but without checking UTF-8 validity
-      n = 0
-      i = s
-      while i < e
-        c = self[i]
-        if c == 0
-          break
-        end
-        n += 1
-        i += (c < 0x80) ? 1 : ((c & 0xe0) == 0xc0) ? 2 : ((c & 0xf0) == 0xe0) ? 3 : ((c & 0xf8) == 0xf0) ? 4 : 1
-      end
-      return n
-    end
-
-    def add(ch)
-      @buf.concat(ch)
-    end
-
-    def to_s
-      @buf
-    end
-
-    def []=(pos, ch)
-      @buf[pos] = ch
-    end
-
-    def add_pos(offset)
-      @buf[0, offset] = ""
-    end
-  end
-end