packcr 0.0.4 → 0.0.6

data/lib/packcr/node/predicate_node.rb

@@ -15,42 +15,33 @@ 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)
         if neg
-          l = gen.next_label
-          r, code = gen.generate_code_str(expr, l, 4, false)
           gen.write Packcr.template("node/predicate_neg.#{gen.lang}.erb", binding, indent: indent, unwrap: bare)
-          case r
-          when Packcr::CODE_REACH__ALWAYS_SUCCEED
-            r = Packcr::CODE_REACH__ALWAYS_FAIL
-          when Packcr::CODE_REACH__ALWAYS_FAIL
-            r = Packcr::CODE_REACH__ALWAYS_SUCCEED
-          end
         else
-          l = gen.next_label
-          m = gen.next_label
-          r, code = gen.generate_code_str(expr, l, 4, false)
           gen.write Packcr.template("node/predicate.#{gen.lang}.erb", binding, indent: indent, unwrap: bare)
         end
-        return r
       end
 
-      def verify_variables(vars)
-        expr.verify_variables(vars)
-      end
-
-      def verify_captures(ctx, capts)
-        expr.verify_captures(ctx, capts)
-      end
-
-      def link_references(ctx)
-        expr.link_references(ctx)
+      def reachability
+        if neg
+          -expr.reachability
+        else
+          expr.reachability
+        end
       end
 
       def nodes
         [expr]
       end
+
+      def to_h
+        {
+          type: :predicate,
+          expr: expr&.to_h,
+          neg: neg,
+        }
+      end
     end
   end
 end

data/lib/packcr/node/quantity_node.rb

@@ -16,45 +16,50 @@ class Packcr
         $stdout.print "#{" " * indent}}\n"
       end
 
-      def generate_code(gen, onfail, indent, bare)
+      def generate_code(gen, onfail, indent, bare, oncut: nil)
         if max > 1 || max < 0
-          r = nil
           gen.write Packcr.template("node/quantify_many.#{gen.lang}.erb", binding, indent: indent, unwrap: bare)
+        elsif max == 1
+          if min > 0
+            gen.write gen.generate_code(expr, onfail, indent, bare)
+          else
+            gen.write Packcr.template("node/quantify_one.#{gen.lang}.erb", binding, indent: indent, unwrap: bare)
+          end
+        end
+      end
+
+      def reachability
+        if max > 1 || max < 0
           if min <= 0
             return Packcr::CODE_REACH__ALWAYS_SUCCEED
           end
-          if r == Packcr::CODE_REACH__ALWAYS_FAIL
+          if expr.reachability == Packcr::CODE_REACH__ALWAYS_FAIL
             return Packcr::CODE_REACH__ALWAYS_FAIL
           end
           return Packcr::CODE_REACH__BOTH
         elsif max == 1
           if min > 0
-            return gen.generate_code(expr, onfail, indent, bare)
+            return expr.reachability
           else
-            gen.write Packcr.template("node/quantify_one.#{gen.lang}.erb", binding, indent: indent, unwrap: bare)
             return Packcr::CODE_REACH__ALWAYS_SUCCEED
           end
         else
-          # no code to generate
           return Packcr::CODE_REACH__ALWAYS_SUCCEED
         end
       end
 
-      def verify_variables(vars)
-        expr.verify_variables(vars)
-      end
-
-      def verify_captures(ctx, capts)
-        expr.verify_captures(ctx, capts)
-      end
-
-      def link_references(ctx)
-        expr.link_references(ctx)
-      end
-
       def nodes
         [expr]
       end
+
+      def to_h
+        {
+          type: :predicate,
+          expr: expr&.to_h,
+          min: min,
+          max: max,
+        }
+      end
     end
   end
 end

data/lib/packcr/node/reference_node.rb

@@ -16,8 +16,19 @@ class Packcr
         $stdout.print ", name:'#{name}', rule:'#{rule&.name || "(null)"}')\n"
       end
 
-      def generate_code(gen, onfail, indent, bare)
+      def reversible?(gen)
+        gen.lang == :rb
+      end
+
+      def generate_code(gen, onfail, indent, bare, oncut: nil)
         gen.write Packcr.template("node/reference.#{gen.lang}.erb", binding, indent: indent)
+      end
+
+      def generate_reverse_code(gen, onsuccess, indent, bare, oncut: nil)
+        gen.write Packcr.template("node/reference_reverse.#{gen.lang}.erb", binding, indent: indent)
+      end
+
+      def reachability
         Packcr::CODE_REACH__BOTH
       end
 
@@ -48,11 +59,8 @@ class Packcr
         vars.push(self) if !found
       end
 
-      def verify_captures(ctx, capts)
-      end
-
       def link_references(ctx)
-        rule = ctx.rule(name)
+        rule = ctx.root.rule(name)
         if !rule
           ctx.error line + 1, col + 1, "No definition of rule '#{name}'"
         else
@@ -63,6 +71,14 @@ class Packcr
           self.rule = rule
         end
       end
+
+      def to_h
+        {
+          type: :reference,
+          name: name,
+          var: var,
+        }
+      end
     end
   end
 end

data/lib/packcr/node/root_node.rb

@@ -0,0 +1,60 @@
+class Packcr
+  class Node
+    class RootNode < Packcr::Node
+      attr_accessor :rules
+      attr_reader :rulehash
+
+      def initialize
+        @rules = []
+        @rulehash = {}
+        @implicit_rules = []
+      end
+
+      def debug_dump
+        @rules.each(&:debug_dump)
+      end
+
+      def make_rulehash(ctx)
+        @rules.each do |rule|
+          if @rulehash[rule.name]
+            ctx.error rule.line + 1, rule.col + 1, "Multiple definition of rule '#{rule.name}'"
+          else
+            @rulehash[rule.name] = rule
+          end
+        end
+      end
+
+      def setup(ctx)
+        make_rulehash(ctx)
+        @rules.first&.top = true
+        @rules.each do |rule|
+          rule.setup(ctx)
+        end
+        @rules.each do |rule|
+          rule.verify(ctx)
+        end
+      end
+
+      def rule(name)
+        rule = @rulehash[name]
+        return rule if rule
+        case name
+        when "EOF"
+          expr = Packcr::Node::EofNode.new
+        else
+          return nil
+        end
+        rule = Packcr::Node::RuleNode.new(expr, name)
+        @rules << rule
+        @rulehash[name] = rule
+      end
+
+      def to_h
+        {
+          type: :root,
+          rules: rules.map(&:to_h),
+        }
+      end
+    end
+  end
+end

data/lib/packcr/node/rule_node.rb

@@ -1,7 +1,7 @@
 class Packcr
   class Node
     class RuleNode < Packcr::Node
-      attr_accessor :codes, :name, :expr, :ref, :vars, :capts, :line, :col
+      attr_accessor :codes, :name, :expr, :ref, :vars, :capts, :line, :col, :top
 
       def initialize(expr = nil, name = nil, line = nil, col = nil)
         super()
@@ -21,22 +21,45 @@ class Packcr
         $stdout.print "#{" " * indent}}\n"
       end
 
+      def generate_code(gen, onfail, indent, bare, oncut: nil)
+        gen.write Packcr.template("node/rule.#{gen.lang}.erb", binding, indent: indent, unwrap: bare)
+      end
+
+      def reachability
+        expr.reachability
+      end
+
       def verify(ctx)
         expr.verify_variables([])
         expr.verify_captures(ctx, [])
+        verify_rule_reference(ctx)
+      end
+
+      def verify_rule_reference(ctx)
+        return if top
+        if ref == 0
+          ctx.error line + 1, col + 1, "Never used rule '#{name}'"
+        end
       end
 
       def add_ref
         @ref += 1
       end
 
-      def setup
-        setup_rule(self)
+      def setup(ctx)
+        super(ctx, self)
       end
 
       def nodes
         [expr]
       end
+
+      def to_h
+        {
+          type: :rule,
+          expr: expr&.to_h,
+        }
+      end
     end
   end
 end

data/lib/packcr/node/sequence_node.rb

@@ -3,18 +3,44 @@ class Packcr
     class SequenceNode < Packcr::Node
       attr_accessor :nodes
 
-      def initialize(*nodes)
+      def initialize(*nodes, cut: false)
         super()
         self.nodes = nodes
+        @cut = cut
       end
 
-      def seq(node)
-        @nodes << node
+      def sequence?
+        true
+      end
+
+      def seq(node, cut: false)
+        if node&.sequence?
+          node.nodes.each do |child|
+            seq(child, cut: cut)
+            cut = false
+          end
+          return self
+        end
+
+        if cut
+          if node
+            node = Packcr::Node::SequenceNode.new(node, cut: true)
+          else
+            node = Packcr::Node::SequenceNode.new(cut: true)
+          end
+        end
+        if node
+          if @nodes.last.sequence?
+            @nodes.last.seq(node)
+          else
+            @nodes << node
+          end
+        end
         self
       end
 
       def debug_dump(indent = 0)
-        $stdout.print "#{" " * indent}Sequence(max:#{max}, len:#{nodes.length}) {\n"
+        $stdout.print "#{" " * indent}Sequence(max:#{max}, len:#{nodes.length}#{@cut ? ", cut: true" : ""}) {\n"
         nodes.each do |child_node|
           child_node.debug_dump(indent + 2)
         end
@@ -27,39 +53,28 @@ class Packcr
         m
       end
 
-      def generate_code(gen, onfail, indent, bare)
-        b = false
-        nodes.each_with_index do |expr, i|
-          case gen.generate_code(expr, onfail, indent, false)
+      def generate_code(gen, onfail, indent, bare, oncut: nil)
+        gen.write Packcr.template("node/sequence.#{gen.lang}.erb", binding, indent: indent)
+      end
+
+      def reachability
+        r = Packcr::CODE_REACH__ALWAYS_SUCCEED
+        nodes.each do |expr|
+          case expr.reachability
           when Packcr::CODE_REACH__ALWAYS_FAIL
-            if i + 1 < nodes.length
-              gen.write Packcr.template("node/sequence_unreachable.#{gen.lang}.erb", binding, indent: indent)
-            end
             return Packcr::CODE_REACH__ALWAYS_FAIL
-          when Packcr::CODE_REACH__ALWAYS_SUCCEED
-          else
-            b = true
+          when Packcr::CODE_REACH__BOTH
+            r = Packcr::CODE_REACH__BOTH
           end
         end
-        return b ? Packcr::CODE_REACH__BOTH : Packcr::CODE_REACH__ALWAYS_SUCCEED
-      end
-
-      def verify_variables(vars)
-        nodes.each do |node|
-          node.verify_variables(vars)
-        end
+        r
       end
 
-      def verify_captures(ctx, capts)
-        nodes.each do |node|
-          node.verify_captures(ctx, capts)
-        end
-      end
-
-      def link_references(ctx)
-        nodes.each do |node|
-          node.link_references(ctx)
-        end
+      def to_h
+        {
+          type: :sequence,
+          nodes: nodes.map(&:to_h),
+        }
       end
     end
   end

data/lib/packcr/node/string_node.rb

@@ -17,30 +17,30 @@ class Packcr
         $stdout.print "')\n"
       end
 
-      def generate_code(gen, onfail, indent, bare)
+      def generate_code(gen, onfail, indent, bare, oncut: nil)
         n = value&.length || 0
         if n > 0
           if n > 1
             gen.write Packcr.template("node/string_many.#{gen.lang}.erb", binding, indent: indent)
-            return Packcr::CODE_REACH__BOTH
           else
             gen.write Packcr.template("node/string_one.#{gen.lang}.erb", binding, indent: indent)
-            return Packcr::CODE_REACH__BOTH
           end
-        else
-          # no code to generate
-          return Packcr::CODE_REACH__ALWAYS_SUCCEED
         end
-        Packcr::CODE_REACH__BOTH
-      end
-
-      def verify_variables(vars)
       end
 
-      def verify_captures(ctx, capts)
+      def reachability
+        n = value&.length || 0
+        if n <= 0
+          return Packcr::CODE_REACH__ALWAYS_SUCCEED
+        end
+        Packcr::CODE_REACH__BOTH
       end
 
-      def link_references(ctx)
+      def to_h
+        {
+          type: :string,
+          value: value,
+        }
       end
     end
   end

data/lib/packcr/node.rb

@@ -1,25 +1,55 @@
 class Packcr
   class Node
-    def seq(expr)
-      SequenceNode.new(self, expr)
+    def seq(expr, cut: false)
+      SequenceNode.new(self).seq(expr, cut: cut)
     end
 
     def alt(expr)
-      AlternateNode.new(self, expr)
+      AlternateNode.new(self).alt(expr)
+    end
+
+    def verify_variables(vars)
+      nodes.each do |node|
+        node.verify_variables(vars)
+      end
+    end
+
+    def verify_captures(ctx, capts)
+      nodes.each do |node|
+        node.verify_captures(ctx, capts)
+      end
+    end
+
+    def link_references(ctx)
     end
 
     def setup_rule(rule)
+    end
+
+    def setup(ctx, rule)
+      setup_rule(rule)
+      link_references(ctx)
+
       nodes.each do |node|
-        node.setup_rule(rule)
+        node.setup(ctx, rule)
       end
     end
 
     def nodes
       []
     end
+
+    def reversible?(gen)
+      false
+    end
+
+    def sequence?
+      false
+    end
   end
 end
 
+require "packcr/node/root_node"
 require "packcr/node/rule_node"
 require "packcr/node/reference_node"
 require "packcr/node/string_node"
@@ -32,3 +62,4 @@ require "packcr/node/capture_node"
 require "packcr/node/expand_node"
 require "packcr/node/action_node"
 require "packcr/node/error_node"
+require "packcr/node/eof_node"