packcr 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b00f2dcd94c63af9d03206e51dbb951778f35cf44a8e4644025f8fb5f59043e2
-  data.tar.gz: d03d48555f0dfb6086acb7198050defe1e0eea025fca279ef9fc85491803f83b
+  metadata.gz: 53243fb5032a86ddf13dcd3c4b99075d4e8ebfae75a0f239ec4e4564ee56c8dc
+  data.tar.gz: 17c31d7663eb1207a3426add4c226dde9bdbf4540a11b4570c4b26f5ddb5f0be
 SHA512:
-  metadata.gz: a06709977ca0f8a12529668b2ae879f5a713798a35daaf27a76038560cf949817d128f47f019b2ef59ce347f61021415806343646f4835dd239e9965e4dd1814
-  data.tar.gz: f4de00a9453f68af3eeefb2b07792ff1cfd3748dd21aaa96fb859ec57a13bd4fd7c63931c7695ee8e2c13256f6d8a17ff694de8e48df809d7e33582f0861d8c7
+  metadata.gz: 5fd7efc77c5b5e49c540652d0072aa3b749b8d99c39bad10984ad02f12c4f0fef3df2783ff11a012f4eac5cf62e0d8c3640b381909ee9c08e00dc990e67a3acb
+  data.tar.gz: cb94b6e3bc70fbad68a50471321f66d76425d6729775a1d542f44e45900fef286a592947fbabcf398cca67c142be58cc64b89a7249eba5baa5775ae19f7af4f3

data/exe/packcr

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require "packcr/cli"
+Packcr::Cli.run(ARGV)

data/lib/packcr/broadcast.rb

@@ -0,0 +1,17 @@
+class Packcr
+  class BroadCast
+    def initialize(*arrays)
+      @arrays = arrays
+    end
+
+    def <<(obj)
+      @arrays.each do |array|
+        array << obj
+      end
+    end
+
+    def to_ary
+      @arrays
+    end
+  end
+end

data/lib/packcr/cli.rb

@@ -0,0 +1,25 @@
+require "packcr"
+require "optparse"
+
+class Packcr::Cli
+  class << self
+    def run(argv)
+      new.run(argv)
+    end
+  end
+
+  def run(argv)
+    lang = nil
+    debug = false
+    ascii = false
+    opt = OptionParser.new
+    opt.on("-l", "--lang=VAL") {|v| lang = v.to_sym }
+    opt.on("-d", "--debug") {|v| debug = true }
+    opt.on("-a", "--ascii") {|v| ascii = true }
+
+    opt.parse!(argv)
+    argv.each do |ifile|
+      Packcr.new(ifile, lang: lang, debug: debug, ascii: ascii).run
+    end
+  end
+end

data/lib/packcr/code_block.rb

@@ -1,11 +1,10 @@
 
 class Packcr
   class CodeBlock
-    attr_reader :text, :len, :line
+    attr_reader :text, :line
 
-    def initialize(text = nil, len = 0, line = nil, col = nil)
+    def initialize(text = nil, line = nil, col = nil)
       @text = text
-      @len = len
       @line = line
       @col = col
     end

data/lib/packcr/context.rb

@@ -1,15 +1,20 @@
+require "tempfile"
 require "packcr/parser"
+require "packcr/broadcast"
 
 class Packcr
-  class Context < Packcr::Parser
+  class Context
+    attr_reader :lang, :root
+    attr_accessor :prefix, :auxil_type, :value_type, :errnum, :capture_in_code
+
     def initialize(path, lines: false, debug: false, ascii: false, lang: nil)
-      super(debug: debug)
       if !path
         raise ArgumentError, "bad path: #{path}";
       end
 
       @iname = path
-      @ifile = File.open(path, "rb")
+      @debug = debug
+
       dirname = File.dirname(path)
       basename = File.basename(path, ".*")
       if !lang
@@ -29,40 +34,38 @@ class Packcr
       @lang = lang.to_sym
       case @lang
       when :c
-        @sname = path + ".c"
         @hname = path + ".h"
+        @patterns = {
+          source: path + ".c",
+          header: @hname
+        }
         @hid = File.basename(@hname).upcase.gsub(/[^A-Z0-9]/, "_")
       when :rb
-        @sname = path + ".rb"
-        @hname = nil
+        @patterns = {
+          source: path + ".rb"
+        }
       else
         raise "unexpected lang: #{@lang}"
       end
 
       @lines = !!lines
       @ascii = !!ascii
+      @utf8 = !ascii
 
       @errnum = 0
-      @linenum = 0
-      @charnum = 0
-      @linepos = 0
-      @bufpos = 0
-      @bufcur = 0
-
-      @esource = []
-      @eheader = []
-      @source = []
-      @header = []
-      @lheader = []
-      @lsource = []
-      @location = []
-      @init = []
+
+      @codes = {}
+      @root = Node::RootNode.new
 
       if block_given?
         yield(self)
       end
     end
 
+    def code(name)
+      @codes[name] ||= []
+    end
+
     def inspect
       "#<#{self.class}:0x%016x>" % object_id
     end
@@ -84,6 +87,15 @@ class Packcr
       @prefix || "pcc"
     end
 
+    def pass_value_code(var)
+      case @lang
+      when :c
+        "__ = #{var};"
+      when :rb
+        "____ = #{var}"
+      end
+    end
+
     def class_name
       prefix.gsub(/(?:_|^|(\W))([a-z])/) { "#{$1}#{$2}".upcase }
     end
@@ -106,33 +118,20 @@ class Packcr
       EOS
     end
 
-    def parse
-      $stdin = @ifile
-      nil while super
-
-      if @location.empty?
-        @location = nil
+    def parse_all
+      File.open(@iname, "rb") do |r|
+        parser = Packcr::Parser.new(self, r, debug: @debug)
+        nil while parser.parse
       end
 
-      make_rulehash
-      @rules.each do |rule|
-        rule.setup
-        rule.expr.link_references(self)
-      end
-      @rules[1..-1]&.each do |rule|
-        if rule.ref == 0
-          error rule.line + 1, rule.col + 1, "Never used rule '#{rule.name}'"
-        elsif rule.ref < 0 # impossible?
-          error rule.line + 1, rule.col + 1, "Multiple definition of rule '#{rule.name}'"
-        end
+      if !code(:location).empty?
+        @location = true
       end
 
-      @rules.each do |rule|
-        rule.verify(self)
-      end
+      @root.setup(self)
 
       if @debug
-        @rules.each(&:debug_dump)
+        @root.debug_dump
         dump_options
       end
 
@@ -140,24 +139,28 @@ class Packcr
     end
 
     def generate
-      if @hname
-        File.open(@hname, "wt") do |hio|
-          hstream = ::Packcr::Stream.new(hio, @hname, @lines ? 0 : nil)
-
-          hstream.write Packcr.template("context/header.#{@lang}.erb", binding), rewrite_line_directive: true
+      results = []
+
+      @patterns.each do |template, ofile|
+        result = Tempfile.new
+        result.unlink
+        results << [ofile, result]
+        stream = Packcr::Stream.new(result, ofile, @lines ? 0 : nil)
+        stream.write Packcr.template("context/#{template}.#{@lang}.erb", binding), rewrite_line_directive: true
+
+        if !@errnum.zero?
+          results.each do |_, result|
+            result.close
+          end
+          return false
         end
       end
 
-      File.open(@sname, "wt") do |sio|
-        sstream = ::Packcr::Stream.new(sio, @sname, @lines ? 0 : nil)
-
-        sstream.write Packcr.template("context/source.#{@lang}.erb", binding), rewrite_line_directive: true
-      end
-
-      if !@errnum.zero?
-        File.unlink(@hname) if @name
-        File.unlink(@sname)
-        return false
+      results.each do |(name, result)|
+        result.rewind
+        open(name, "wt") do |f|
+          IO.copy_stream(result, f)
+        end
       end
       true
     end

data/lib/packcr/generator.rb

@@ -1,8 +1,6 @@
-require "stringio"
-
 class Packcr
   class Generator
-    attr_reader :ascii, :rule, :location, :lang
+    attr_reader :ascii, :rule, :location, :lang, :level
 
     def initialize(rule, ascii, location, lang = :c)
       @rule = rule
@@ -10,27 +8,31 @@ class Packcr
       @ascii = !!ascii
       @location = !!location
       @lang = lang
+      @level = 0
     end
 
     def next_label
       @label += 1
     end
 
-    def generate_code(node, onfail, indent, bare)
-      node.generate_code(self, onfail, indent, bare)
-    end
-
-    def generate_code_str(node, onfail, indent, bare)
-      @stream, stream = StringIO.new, @stream
+    def generate_code(node, onescape, indent, bare, reverse: false, oncut: nil)
+      @stream, stream = +"", @stream
+      @level += 1
       begin
-        return generate_code(node, onfail, indent, bare), @stream.string
+        if reverse
+          node.generate_reverse_code(self, onescape, indent, bare, oncut: oncut)
+        else
+          node.generate_code(self, onescape, indent, bare, oncut: oncut)
+        end
+        @stream
       ensure
+        @level -= 1
         @stream = stream
       end
     end
 
     def write(str)
-      @stream.write(str)
+      @stream << str
     end
   end
 end

data/lib/packcr/node/action_node.rb

@@ -33,9 +33,12 @@ class Packcr
         end
       end
 
-      def generate_code(gen, onfail, indent, bare)
+      def generate_code(gen, onfail, indent, bare, oncut: nil)
         gen.write Packcr.template("node/action.#{gen.lang}.erb", binding, indent: indent, unwrap: bare)
-        return Packcr::CODE_REACH__ALWAYS_SUCCEED
+      end
+
+      def reachability
+        Packcr::CODE_REACH__ALWAYS_SUCCEED
       end
 
       def verify_variables(vars)
@@ -46,13 +49,19 @@ class Packcr
         @capts = capts
       end
 
-      def link_references(ctx)
-      end
-
       def setup_rule(rule)
         @index = rule.codes.length
         rule.codes.push(self)
       end
+
+      def to_h
+        {
+          type: :action,
+          code: code&.text,
+          vars: vars&.map(&:to_h),
+          capts: capts&.map(&:to_h),
+        }
+      end
     end
   end
 end

data/lib/packcr/node/alternate_node.rb

@@ -9,7 +9,7 @@ class Packcr
       end
 
       def alt(node)
-        @nodes << node
+        @nodes << node if node
         self
       end
 
@@ -27,14 +27,21 @@ class Packcr
         m
       end
 
-      def generate_code(gen, onfail, indent, bare)
-        b = false
-        m = gen.next_label
-
-        reach = nil
-        gen.write Packcr.template("node/alternate.#{gen.lang}.erb", binding, indent: indent - 4, unwrap: bare)
+      def generate_code(gen, onfail, indent, bare, oncut: nil)
+        gen.write Packcr.template("node/alternate.#{gen.lang}.erb", binding, indent: indent, unwrap: bare)
+      end
 
-        reach || Packcr::CODE_REACH__ALWAYS_FAIL
+      def reachability
+        r = Packcr::CODE_REACH__ALWAYS_FAIL
+        nodes.each do |expr|
+          case expr.reachability
+          when Packcr::CODE_REACH__ALWAYS_SUCCEED
+            return Packcr::CODE_REACH__ALWAYS_SUCCEED
+          when Packcr::CODE_REACH__BOTH
+            r = Packcr::CODE_REACH__BOTH
+          end
+        end
+        r
       end
 
       def verify_variables(vars)
@@ -66,10 +73,11 @@ class Packcr
         end
       end
 
-      def link_references(ctx)
-        nodes.each do |node|
-          node.link_references(ctx)
-        end
+      def to_h
+        {
+          type: :alternate,
+          nodes: nodes&.map(&:to_h),
+        }
       end
     end
   end

data/lib/packcr/node/capture_node.rb

@@ -15,25 +15,19 @@ class Packcr
         $stdout.print "#{" " * indent}}\n"
       end
 
-      def generate_code(gen, onfail, indent, bare)
-        r = nil
+      def generate_code(gen, onfail, indent, bare, oncut: nil)
         gen.write Packcr.template("node/capture.#{gen.lang}.erb", binding, indent: indent)
-        return r
       end
 
-      def verify_variables(vars)
-        expr.verify_variables(vars)
+      def reachability
+        expr.reachability
       end
 
       def verify_captures(ctx, capts)
-        expr.verify_captures(ctx, capts)
+        super
         capts.push(self)
       end
 
-      def link_references(ctx)
-        expr.link_references(ctx)
-      end
-
       def nodes
         [expr]
       end
@@ -41,7 +35,13 @@ class Packcr
       def setup_rule(rule)
         @index = rule.capts.length
         rule.capts << self
-        super
+      end
+
+      def to_h
+        {
+          type: :capture,
+          expr: expr&.to_h,
+        }
       end
     end
   end

data/lib/packcr/node/charclass_node.rb

@@ -13,7 +13,11 @@ class Packcr
         $stdout.print "')\n"
       end
 
-      def generate_code(gen, onfail, indent, bare)
+      def reversible?(gen)
+        gen.lang == :rb && !gen.ascii
+      end
+
+      def generate_code(gen, onfail, indent, bare, oncut: nil)
         if gen.ascii
           return generate_ascii_code(gen, onfail, indent, bare)
         else
@@ -21,13 +25,22 @@ class Packcr
         end
       end
 
-      def verify_variables(vars)
-      end
-
-      def verify_captures(ctx, capts)
+      def generate_reverse_code(gen, onsuccess, indent, bare, oncut: nil)
+        if gen.ascii
+          raise "unexpected"
+        else
+          return generate_utf8_charclass_reverse_code(gen, onsuccess, indent, bare)
+        end
       end
 
-      def link_references(ctx)
+      def reachability
+        charclass = self.value
+        n = charclass&.length || 0
+        if charclass.nil? || n > 0
+          return Packcr::CODE_REACH__BOTH
+        else
+          return Packcr::CODE_REACH__ALWAYS_FAIL
+        end
       end
 
       private
@@ -39,13 +52,20 @@ class Packcr
         end
         n = charclass&.length || 0
         if charclass.nil? || n > 0
-          a = charclass && charclass[0] == '^'
-          i = a ? 1 : 0
           gen.write Packcr.template("node/charclass_utf8.#{gen.lang}.erb", binding, indent: indent, unwrap: bare)
-          return Packcr::CODE_REACH__BOTH
         else
           gen.write Packcr.template("node/charclass_fail.#{gen.lang}.erb", binding, indent: indent)
-          return Packcr::CODE_REACH__ALWAYS_FAIL
+        end
+      end
+
+      def generate_utf8_charclass_reverse_code(gen, onsuccess, indent, bare)
+        charclass = self.value
+        if charclass && charclass.encoding != Encoding::UTF_8
+          charclass = charclass.dup.force_encoding(Encoding::UTF_8)
+        end
+        n = charclass&.length || 0
+        if charclass.nil? || n > 0
+          gen.write Packcr.template("node/charclass_utf8_reverse.#{gen.lang}.erb", binding, indent: indent, unwrap: bare)
         end
       end
 
@@ -64,16 +84,20 @@ class Packcr
             else
               gen.write Packcr.template("node/charclass_one.#{gen.lang}.erb", binding, indent: indent)
             end
-            return Packcr::CODE_REACH__BOTH
           else
             gen.write Packcr.template("node/charclass_fail.#{gen.lang}.erb", binding, indent: indent)
-            return Packcr::CODE_REACH__ALWAYS_FAIL
           end
         else
           gen.write Packcr.template("node/charclass_any.#{gen.lang}.erb", binding, indent: indent)
-          return Packcr::CODE_REACH__BOTH
         end
       end
+
+      def to_h
+        {
+          type: :charclass,
+          value: value,
+        }
+      end
     end
   end
 end

data/lib/packcr/node/eof_node.rb

@@ -0,0 +1,23 @@
+class Packcr
+  class Node
+    class EofNode < Packcr::Node
+      def debug_dump(indent = 0)
+        $stdout.print "#{" " * indent}Eof()\n"
+      end
+
+      def generate_code(gen, onfail, indent, bare, oncut: nil)
+        gen.write Packcr.template("node/eof.#{gen.lang}.erb", binding, indent: indent, unwrap: bare)
+      end
+
+      def reachability
+        return Packcr::CODE_REACH__BOTH
+      end
+
+      def to_h
+        {
+          type: :eof,
+        }
+      end
+    end
+  end
+end

data/lib/packcr/node/error_node.rb

@@ -29,26 +29,22 @@ class Packcr
         $stdout.print "#{" " * indent}}\n"
       end
 
-      def generate_code(gen, onfail, indent, bare)
-        l = gen.next_label
-        m = gen.next_label
-        r, code = gen.generate_code_str(expr, l, 4, true)
+      def generate_code(gen, onfail, indent, bare, oncut: nil)
         gen.write Packcr.template("node/error.#{gen.lang}.erb", binding, indent: indent, unwrap: bare)
-        return r
+      end
+
+      def reachability
+        expr.reachability
       end
 
       def verify_variables(vars)
         @vars = vars
-        expr.verify_variables(vars)
+        super
       end
 
       def verify_captures(ctx, capts)
         @capts = capts
-        expr.verify_captures(ctx, capts)
-      end
-
-      def link_references(ctx)
-        expr.link_references(ctx)
+        super
       end
 
       def nodes
@@ -58,7 +54,16 @@ class Packcr
       def setup_rule(rule)
         @index = rule.codes.length
         rule.codes.push(self)
-        super
+      end
+
+      def to_h
+        {
+          type: :error,
+          code: code&.text,
+          vars: vars&.map(&:to_h),
+          capts: capts&.map(&:to_h),
+          index: @index,
+        }
       end
     end
   end

data/lib/packcr/node/expand_node.rb

@@ -3,8 +3,10 @@ class Packcr
     class ExpandNode < Packcr::Node
       attr_accessor :index, :line, :col
 
-      def initialize(index = nil)
+      def initialize(index = nil, line = nil, col = nil)
         @index = index
+        @line = line
+        @col = col
       end
 
       def debug_dump(indent = 0)
@@ -13,12 +15,12 @@ class Packcr
         $stdout.print ")\n"
       end
 
-      def generate_code(gen, onfail, indent, bare)
+      def generate_code(gen, onfail, indent, bare, oncut: nil)
         gen.write Packcr.template("node/expand.#{gen.lang}.erb", binding, indent: indent, unwrap: bare)
-        return Packcr::CODE_REACH__BOTH
       end
 
-      def verify_variables(vars)
+      def reachability
+        return Packcr::CODE_REACH__BOTH
       end
 
       def verify_captures(ctx, capts)
@@ -33,7 +35,11 @@ class Packcr
         end
       end
 
-      def link_references(ctx)
+      def to_h
+        {
+          type: :expand,
+          index: index,
+        }
       end
     end
   end