packcr 0.0.6 → 0.0.7

data/lib/packcr/node/charclass_node.rb

@@ -18,59 +18,53 @@ class Packcr
       end
 
       def generate_code(gen, onfail, indent, bare, oncut: nil)
-        if gen.ascii
-          return generate_ascii_code(gen, onfail, indent, bare)
-        else
-          return generate_utf8_charclass_code(gen, onfail, indent, bare)
-        end
+        return generate_ascii_code(gen, onfail, indent, bare) if gen.ascii
+
+        generate_utf8_charclass_code(gen, onfail, indent, bare)
       end
 
       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
+        raise "unexpected" if gen.ascii
+
+        generate_utf8_charclass_reverse_code(gen, onsuccess, indent, bare)
       end
 
       def reachability
-        charclass = self.value
+        charclass = value
         n = charclass&.length || 0
-        if charclass.nil? || n > 0
-          return Packcr::CODE_REACH__BOTH
-        else
-          return Packcr::CODE_REACH__ALWAYS_FAIL
-        end
+        return Packcr::CODE_REACH__BOTH if charclass.nil? || n > 0
+
+        Packcr::CODE_REACH__ALWAYS_FAIL
       end
 
       private
 
       def generate_utf8_charclass_code(gen, onfail, indent, bare)
-        charclass = self.value
+        charclass = 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.#{gen.lang}.erb", binding, indent: indent, unwrap: bare)
+          gen.write Packcr.format_code(get_utf8_code(gen, onfail, indent, bare, charclass, n), indent: indent, unwrap: bare)
         else
-          gen.write Packcr.template("node/charclass_fail.#{gen.lang}.erb", binding, indent: indent)
+          gen.write Packcr.format_code(get_fail_code(gen, onfail, indent, bare), indent: indent)
         end
       end
 
       def generate_utf8_charclass_reverse_code(gen, onsuccess, indent, bare)
-        charclass = self.value
+        charclass = 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
+        return unless charclass.nil? || n > 0
+
+        gen.write Packcr.format_code(get_utf8_reverse_code(gen, onsuccess, indent, bare, charclass, n), indent: indent, unwrap: bare)
       end
 
       def generate_ascii_code(gen, onfail, indent, bare)
-        charclass = self.value
+        charclass = value
         if charclass
           n = charclass.length
           a = charclass[0] == "^"
@@ -80,15 +74,15 @@ class Packcr
           end
           if n > 0
             if n > 1
-              gen.write Packcr.template("node/charclass.#{gen.lang}.erb", binding, indent: indent, unwrap: bare)
+              gen.write Packcr.format_code(get_code(gen, onfail, indent, bare, charclass, n, a), indent: indent, unwrap: bare)
             else
-              gen.write Packcr.template("node/charclass_one.#{gen.lang}.erb", binding, indent: indent)
+              gen.write Packcr.format_code(get_one_code(gen, onfail, indent, bare, charclass, n, a), indent: indent)
             end
           else
-            gen.write Packcr.template("node/charclass_fail.#{gen.lang}.erb", binding, indent: indent)
+            gen.write Packcr.format_code(get_fail_code(gen, onfail, indent, bare), indent: indent)
           end
         else
-          gen.write Packcr.template("node/charclass_any.#{gen.lang}.erb", binding, indent: indent)
+          gen.write Packcr.format_code(get_any_code(gen, onfail, indent, bare, charclass), indent: indent)
         end
       end
 
@@ -101,3 +95,5 @@ class Packcr
     end
   end
 end
+
+require "packcr/generated/node/charclass_node"

data/lib/packcr/node/eof_node.rb

@@ -6,11 +6,11 @@ class Packcr
       end
 
       def generate_code(gen, onfail, indent, bare, oncut: nil)
-        gen.write Packcr.template("node/eof.#{gen.lang}.erb", binding, indent: indent, unwrap: bare)
+        gen.write Packcr.format_code(get_code(gen, onfail, indent, bare, oncut), indent: indent, unwrap: bare)
       end
 
       def reachability
-        return Packcr::CODE_REACH__BOTH
+        Packcr::CODE_REACH__BOTH
       end
 
       def to_h
@@ -21,3 +21,5 @@ class Packcr
     end
   end
 end
+
+require "packcr/generated/node/eof_node"

data/lib/packcr/node/error_node.rb

@@ -30,7 +30,7 @@ class Packcr
       end
 
       def generate_code(gen, onfail, indent, bare, oncut: nil)
-        gen.write Packcr.template("node/error.#{gen.lang}.erb", binding, indent: indent, unwrap: bare)
+        gen.write Packcr.format_code(get_code(gen, onfail, indent, bare, oncut), indent: indent, unwrap: bare)
       end
 
       def reachability
@@ -68,3 +68,5 @@ class Packcr
     end
   end
 end
+
+require "packcr/generated/node/error_node"

data/lib/packcr/node/expand_node.rb

@@ -16,11 +16,11 @@ class Packcr
       end
 
       def generate_code(gen, onfail, indent, bare, oncut: nil)
-        gen.write Packcr.template("node/expand.#{gen.lang}.erb", binding, indent: indent, unwrap: bare)
+        gen.write Packcr.format_code(get_code(gen, onfail, indent, bare, oncut), indent: indent, unwrap: bare)
       end
 
       def reachability
-        return Packcr::CODE_REACH__BOTH
+        Packcr::CODE_REACH__BOTH
       end
 
       def verify_captures(ctx, capts)
@@ -28,11 +28,12 @@ class Packcr
           unless capt.is_a?(Packcr::Node::CaptureNode)
             raise "unexpected capture: #{capt.class}"
           end
+
           index == capt.index
         end
-        if !found && index != nil
-          ctx.error line + 1, col + 1, "Capture #{index + 1} not available at this position"
-        end
+        return if found || index.nil?
+
+        ctx.error line + 1, col + 1, "Capture #{index + 1} not available at this position"
       end
 
       def to_h
@@ -44,3 +45,5 @@ class Packcr
     end
   end
 end
+
+require "packcr/generated/node/expand_node"

data/lib/packcr/node/predicate_node.rb

@@ -17,9 +17,9 @@ class Packcr
 
       def generate_code(gen, onfail, indent, bare, oncut: nil)
         if neg
-          gen.write Packcr.template("node/predicate_neg.#{gen.lang}.erb", binding, indent: indent, unwrap: bare)
+          gen.write Packcr.format_code(get_neg_code(gen, onfail, indent, bare, oncut), indent: indent, unwrap: bare)
         else
-          gen.write Packcr.template("node/predicate.#{gen.lang}.erb", binding, indent: indent, unwrap: bare)
+          gen.write Packcr.format_code(get_code(gen, onfail, indent, bare, oncut), indent: indent, unwrap: bare)
         end
       end
 
@@ -45,3 +45,5 @@ class Packcr
     end
   end
 end
+
+require "packcr/generated/node/predicate_node"

data/lib/packcr/node/quantity_node.rb

@@ -18,12 +18,12 @@ class Packcr
 
       def generate_code(gen, onfail, indent, bare, oncut: nil)
         if max > 1 || max < 0
-          gen.write Packcr.template("node/quantify_many.#{gen.lang}.erb", binding, indent: indent, unwrap: bare)
+          gen.write Packcr.format_code(get_many_code(gen, onfail, indent, bare, oncut), indent: indent, unwrap: bare)
         elsif max == 1
           if min > 0
-            gen.write gen.generate_code(expr, onfail, indent, bare)
+            gen.write gen.generate_code(expr, onfail, indent, bare, oncut: oncut)
           else
-            gen.write Packcr.template("node/quantify_one.#{gen.lang}.erb", binding, indent: indent, unwrap: bare)
+            gen.write Packcr.format_code(get_one_code(gen, onfail, indent, bare, oncut), indent: indent, unwrap: bare)
           end
         end
       end
@@ -36,15 +36,15 @@ class Packcr
           if expr.reachability == Packcr::CODE_REACH__ALWAYS_FAIL
             return Packcr::CODE_REACH__ALWAYS_FAIL
           end
-          return Packcr::CODE_REACH__BOTH
+
+          Packcr::CODE_REACH__BOTH
         elsif max == 1
-          if min > 0
-            return expr.reachability
-          else
-            return Packcr::CODE_REACH__ALWAYS_SUCCEED
-          end
+          return expr.reachability if min > 0
+
+          Packcr::CODE_REACH__ALWAYS_SUCCEED
+
         else
-          return Packcr::CODE_REACH__ALWAYS_SUCCEED
+          Packcr::CODE_REACH__ALWAYS_SUCCEED
         end
       end
 
@@ -63,3 +63,5 @@ class Packcr
     end
   end
 end
+
+require "packcr/generated/node/quantity_node"

data/lib/packcr/node/reference_node.rb

@@ -21,11 +21,11 @@ class Packcr
       end
 
       def generate_code(gen, onfail, indent, bare, oncut: nil)
-        gen.write Packcr.template("node/reference.#{gen.lang}.erb", binding, indent: indent)
+        gen.write Packcr.format_code(get_code(gen, onfail, indent, bare, oncut), indent: indent, unwrap: bare)
       end
 
       def generate_reverse_code(gen, onsuccess, indent, bare, oncut: nil)
-        gen.write Packcr.template("node/reference_reverse.#{gen.lang}.erb", binding, indent: indent)
+        gen.write Packcr.format_code(get_reverse_code(gen, onsuccess, indent, bare, oncut), indent: indent)
       end
 
       def reachability
@@ -34,10 +34,12 @@ class Packcr
 
       def setup_rule(rule)
         return unless var
+
         i = rule.vars.index do |ref|
           unless ref.is_a?(Packcr::Node::ReferenceNode)
             raise "Unexpected node type: #{ref.class}"
           end
+
           var == ref.var
         end
         if !i
@@ -54,6 +56,7 @@ class Packcr
           unless var.is_a?(Packcr::Node::ReferenceNode)
             raise "unexpected var: #{var.class}"
           end
+
           index == var.index
         end
         vars.push(self) if !found
@@ -61,14 +64,15 @@ class Packcr
 
       def link_references(ctx)
         rule = ctx.root.rule(name)
-        if !rule
-          ctx.error line + 1, col + 1, "No definition of rule '#{name}'"
-        else
+        if rule
           unless rule.is_a?(Packcr::Node::RuleNode)
             raise "unexpected node type #{rule.class}"
           end
+
           rule.add_ref
           self.rule = rule
+        else
+          ctx.error line + 1, col + 1, "No definition of rule '#{name}'"
         end
       end
 
@@ -82,3 +86,5 @@ class Packcr
     end
   end
 end
+
+require "packcr/generated/node/reference_node"

data/lib/packcr/node/root_node.rb

@@ -38,6 +38,7 @@ class Packcr
       def rule(name)
         rule = @rulehash[name]
         return rule if rule
+
         case name
         when "EOF"
           expr = Packcr::Node::EofNode.new

data/lib/packcr/node/rule_node.rb

@@ -22,7 +22,7 @@ class Packcr
       end
 
       def generate_code(gen, onfail, indent, bare, oncut: nil)
-        gen.write Packcr.template("node/rule.#{gen.lang}.erb", binding, indent: indent, unwrap: bare)
+        gen.write Packcr.format_code(get_code(gen, onfail, indent, bare, oncut), indent: indent, unwrap: bare)
       end
 
       def reachability
@@ -37,9 +37,10 @@ class Packcr
 
       def verify_rule_reference(ctx)
         return if top
-        if ref == 0
-          ctx.error line + 1, col + 1, "Never used rule '#{name}'"
-        end
+
+        return unless ref == 0
+
+        ctx.error line + 1, col + 1, "Never used rule '#{name}'"
       end
 
       def add_ref
@@ -63,3 +64,5 @@ class Packcr
     end
   end
 end
+
+require "packcr/generated/node/rule_node"

data/lib/packcr/node/sequence_node.rb

@@ -54,7 +54,7 @@ class Packcr
       end
 
       def generate_code(gen, onfail, indent, bare, oncut: nil)
-        gen.write Packcr.template("node/sequence.#{gen.lang}.erb", binding, indent: indent)
+        gen.write Packcr.format_code(get_code(gen, onfail, indent, bare, oncut), indent: indent)
       end
 
       def reachability
@@ -79,3 +79,5 @@ class Packcr
     end
   end
 end
+
+require "packcr/generated/node/sequence_node"

data/lib/packcr/node/string_node.rb

@@ -19,12 +19,12 @@ class Packcr
 
       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)
-          else
-            gen.write Packcr.template("node/string_one.#{gen.lang}.erb", binding, indent: indent)
-          end
+        return unless n > 0
+
+        if n > 1
+          gen.write Packcr.format_code(get_many_code(gen, onfail, indent, bare, oncut, n), indent: indent)
+        else
+          gen.write Packcr.format_code(get_one_code(gen, onfail, indent, bare, oncut, n), indent: indent)
         end
       end
 
@@ -33,6 +33,7 @@ class Packcr
         if n <= 0
           return Packcr::CODE_REACH__ALWAYS_SUCCEED
         end
+
         Packcr::CODE_REACH__BOTH
       end
 
@@ -45,3 +46,5 @@ class Packcr
     end
   end
 end
+
+require "packcr/generated/node/string_node"

data/lib/packcr/node.rb

@@ -20,11 +20,9 @@ class Packcr
       end
     end
 
-    def link_references(ctx)
-    end
+    def link_references(ctx); end
 
-    def setup_rule(rule)
-    end
+    def setup_rule(rule); end
 
     def setup(ctx, rule)
       setup_rule(rule)
@@ -39,7 +37,7 @@ class Packcr
       []
     end
 
-    def reversible?(gen)
+    def reversible?(_gen)
       false
     end