packcr 0.1.0 → 0.1.1

data/lib/packcr/templates/node/alternate.rs.erb

@@ -1,39 +1,38 @@
-<%-   m = gen.next_label -%>
-'L<%= format("%04d", m) %>: {
+<%- m = gen.next_label -%>
+catch(<%= m %>, || {
     let p = self.input.position_offset;
     <%- if gen.location -%>
     TODO
     <%- end -%>
     <%- nodes.each_with_index do |expr, i| -%>
-    {
-        <%-   c = i + 1 < nodes.length -%>
-        <%-   if expr.reversible?(gen) -%>
-        <%-     %><%= gen.generate_code(expr, m, 8, false, reverse: true, oncut: onfail) -%>
-        <%-   else -%>
-        <%-     l = gen.next_label -%>
-        'L<%= format("%04d", l) %>: {
-            <%- r = expr.reachability -%>
-            <%- %><%= gen.generate_code(expr, l, 12, false, oncut: onfail) -%>
-            <%- if r == Packcr::CODE_REACH__ALWAYS_SUCCEED -%>
-            <%-   if c -%>
-            // unreachable codes omitted
-            <%-   end -%>
-        }
-        <%-       break -%>
-        <%-     else -%>
-            <%-   if r == Packcr::CODE_REACH__BOTH -%>
-            break 'L<%= format("%04d", m) %>;
-            <%-   end -%>
-            <%- end -%>
-        }
-        <%- end -%>
-    }
+    <%-   c = i + 1 < nodes.length -%>
+    <%-   if expr.reversible?(gen) -%>
+    <%-     %><%= gen.generate_code(expr, m, 4, false, reverse: true, oncut: onfail) -%>
+    <%-   else -%>
+    <%-     l = gen.next_label -%>
+    <%-     r = expr.reachability -%>
+    <%-     if r == Packcr::CODE_REACH__ALWAYS_SUCCEED -%>
+    catch(<%= l %>, || {
+        <%-   %><%= gen.generate_code(expr, l, 8, false, oncut: onfail) -%>
+        <%-   if c -%>
+        // unreachable codes omitted
+        <%-   end -%>
+        NOP
+    })?
+    <%-       break -%>
+    <%-     else -%>
+    catch(<%= l %>, || {
+        <%-   %><%= gen.generate_code(expr, l, 8, false, oncut: onfail) -%>
+        throw(<%= m %>)
+    })?;
+    <%-     end -%>
+    <%-   end -%>
     self.input.position_offset = p;
-    <%- if gen.location -%>
+    <%-   if gen.location -%>
     TODO
-    <%- end -%>
+    <%-   end -%>
     <%-   if !c -%>
-    break 'L<%= format("%04d", onfail) %>;
+    throw(<%= onfail %>)
     <%-   end -%>
     <%- end -%>
-} // 'L<%= format("%04d", m) %>
+})?;

data/lib/packcr/templates/node/charclass_utf8.rs.erb

@@ -1,9 +1,9 @@
 <%- a = charclass && charclass[0] == '^' -%>
 <%- i = a ? 1 : 0 -%>
 <%- any_code = !charclass || (a && n == 1) -%>
-let (<%= any_code ? "_" : "" %>u, n) = self.get_char_as_utf32();
+let (<%= any_code ? "_" : "" %>u, n) = self.input.get_char_as_utf32();
 if n == 0 {
-    break 'L<%= format("%04d", onfail) %>;
+    return throw(<%= onfail %>);
 }
 <%- unless any_code -%>
 if <% if !a -%>
@@ -35,7 +35,7 @@ if <% if !a -%>
     <%-   end -%>
     <%-   if !a -%>) <% end -%>
     <%- %>{
-    break 'L<%= format("%04d", onfail) %>;
+    return throw(<%= onfail %>);
 }
 <%- end -%>
 self.input.position_offset += n;

data/lib/packcr/templates/node/predicate_neg.rs.erb

@@ -4,18 +4,18 @@ let p = self.input.position_offset;
 <%- if gen.location -%>
 TODO
 <%- end -%>
-'L<%= format("%04d", l) %>: {
-    {
-        <%- %><%= gen.generate_code(expr, l, 4, false) -%>
-    }
+catch(<%= l %>, || {
+    <%- %><%= gen.generate_code(expr, l, 4, false) -%>
     <%- if r != Packcr::CODE_REACH__ALWAYS_FAIL -%>
     self.input.position_offset = p;
     <%-   if gen.location -%>
     TODO
     <%-   end -%>
-    break 'L<%= format("%04d", onfail) %>;
+    throw(<%= onfail %>)
+    <%- else -%>
+    NOP
     <%- end -%>
-}
+})?;
 <%- if r != Packcr::CODE_REACH__ALWAYS_SUCCEED -%>
 self.input.position_offset = p;
 <%-   if gen.location -%>

data/lib/packcr/templates/node/quantity_many.rs.erb

@@ -9,42 +9,69 @@ TODO
 let mut i = -1;
 <%- end -%>
 <%- m = gen.next_label -%>
-'L<%= format("%04d", m) %>: loop {
-    <%- if use_count -%>
-    i += 1;
-    <%- end -%>
-    <%- if max >= 0 -%>
-    if i >= <%= max %> { break; }
-    <%- end -%>
-    let p = self.input.position_offset;
-    <%- if r != Packcr::CODE_REACH__ALWAYS_SUCCEED -%>
-    <%-   if gen.location -%>
-    TODO
-    <%-   end -%>
-    <%- end -%>
-    <%- l = gen.next_label -%>
-    <%- r = expr.reachability -%>
-    'L<%= format("%04d", l) %>: {
-        <%- %><%= gen.generate_code(expr, l, 8, false) -%>
-        if self.input.position_offset == p {
-            break 'L<%= format("%04d", m) %>;
+catch(<%= m %>, || {
+    loop {
+        <%- if use_count -%>
+        i += 1;
+        <%- end -%>
+        <%- if max >= 0 -%>
+        if i >= <%= max %> {
+            return NOP;
         }
+        <%- end -%>
+        let p = self.input.position_offset;
         <%- if r != Packcr::CODE_REACH__ALWAYS_SUCCEED -%>
-        continue 'L<%= format("%04d", m) %>;
+        <%-   if gen.location -%>
+        TODO
+        <%-   end -%>
+        <%- end -%>
+        <%- l = gen.next_label -%>
+        <%- r = expr.reachability -%>
+        <%- if r == Packcr::CODE_REACH__ALWAYS_SUCCEED -%>
+        TODO
+        match (|| {
+            <%- %><%= gen.generate_code(expr, l, 12, false) -%>
+            if self.input.position_offset == p {
+                return throw(<%= m %>);
+            }
+        })() {
+            NOP => continue,
+            Err(label) if label != <%= l %> => return throw(label),
+            _ => {
+                self.input.position_offset = p;
+                <%-   if gen.location -%>
+                TODO
+                <%-   end -%>
+                return throw(<%= m %>);
+            }
+        }
+        <%- else -%>
+        match (|| {
+            <%- %><%= gen.generate_code(expr, l, 12, false) -%>
+            if self.input.position_offset == p {
+                return throw(<%= m %>);
+            }
+            NOP
+        })() {
+            NOP => continue,
+            Err(label) if label != <%= l %> => return throw(label),
+            _ => {
+                self.input.position_offset = p;
+                <%-   if gen.location -%>
+                TODO
+                <%-   end -%>
+                return throw(<%= m %>);
+            }
+        }
+        <%- end -%>
     }
-    self.input.position_offset = p;
-    <%-   if gen.location -%>
-    TODO
-    <%-   end -%>
-    break 'L<%= format("%04d", m) %>;
-    <%- end -%>
-}
+})?;
 <%- if min > 0 -%>
 if i < <%= min %> {
     self.input.position_offset = p0;
     <%-   if gen.location -%>
     TODO
     <%-   end -%>
-    break 'L<%= format("%04d", onfail) %>;
+    return throw(<%= onfail %>);
 }
 <%- end -%>

data/lib/packcr/templates/node/reference.rs.erb

@@ -1,3 +1,3 @@
-if !self.apply_rule(Rule::<%= Packcr.camelize(name) %>, &mut answer, <%= index || 0 %>, offset, limits.clone()) {
-    break 'L<%= format("%04d", onfail) %>;
+if !self.apply_rule(Rule::<%= Packcr.camelize(name) %>, &mut answer, <%= index || 0 %>, offset, &limits) {
+    return throw(<%= onfail %>);
 }

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

@@ -1,12 +1,12 @@
 <%- for_ref = has_ref ? "" : "_" -%>
 #[allow(non_snake_case)]
-fn evaluate_rule_<%= name %>(
-    &mut self,
-    <%= for_ref %>offset: usize,
+fn evaluate_rule_<%= name %>(<% -%>
+    <%- %>&mut self, <% -%>
+    <%- %><%= for_ref %>offset: usize, <% -%>
     <%- if gen.location -%>
     TODO
     <%- end -%>
-    <%= for_ref %>limits: Option<RuleSet>,
+    <%- %><%= for_ref %>limits: RuleLimit<% -%>
 ) -> Option<ThunkChunk> {
     let mut answer = ThunkChunk::new(self.input.position_offset);
     <%-   if gen.location -%>
@@ -19,16 +19,25 @@ fn evaluate_rule_<%= name %>(
     <%- end -%>
     <%- r = expr.reachability -%>
     <%- if r == Packcr::CODE_REACH__ALWAYS_SUCCEED -%>
-    <%- -%><%= gen.generate_code(expr, 0, 4, false) -%>
+    let _ = (|| {
+        <%- -%><%= gen.generate_code(expr, 0, 8, false) -%>
+        NOP
+    })();
     self.level -= 1;
-    return Some(answer);
+    Some(answer)
     <%- else -%>
-    'L0000: {
+    match (|| {
         <%- -%><%= gen.generate_code(expr, 0, 8, false) -%>
-        self.level -= 1;
-        return Some(answer);
+        NOP
+    })() {
+        NOP => {
+            self.level -= 1;
+            Some(answer)
+        }
+        _ => {
+            self.level -= 1;
+            None
+        }
     }
-    self.level -= 1;
-    return None;
     <%- end -%>
 }

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

@@ -1,8 +1,8 @@
-if self.refill_buffer(<%= n %>) < <%= n %>
-  || self.input.buffer.as_bytes()[self.input.position_offset..(self.input.position_offset + <%= n %>)] != <% -%>
-  <%- %>[<%= value[0, n].each_char.map { |c| "b'#{Packcr.escape_character(c)}'" }.join(", ") %>]
+if self.input.refill_buffer(<%= n %>) < <%= n %>
+    || !self.input.buffer[self.input.position_offset..] <% -%>
+    <%- %>.starts_with("<%= value[0, n].each_char.map { |c| "#{Packcr.escape_character(c)}" }.join %>")
 {
-    break 'L<%= format("%04d", onfail) %>;
+    return throw(<%= onfail %>);
 }
 <%- if gen.location -%>
 TODO

data/lib/packcr/templates/node/string_many_reverse.rs.erb

@@ -0,0 +1,7 @@
+if self.input.refill_buffer(<%= n %>) >= <%= n %>
+    && self.input.buffer[self.input.position_offset..]<% -%>
+    <%- %>.starts_with("<%= value[0, n].each_char.map { |c| "#{Packcr.escape_character(c)}" }.join %>")
+{
+    self.input.position_offset += <%= n %>;
+    return throw(<%= onsuccess %>);
+}

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

@@ -1,7 +1,7 @@
-if self.refill_buffer(1) < 1
-    || self.input.buffer.as_bytes()[self.input.position_offset] != b'<%= Packcr.escape_character(value[0]) %>'
+if self.input.refill_buffer(1) < 1
+    || !self.input.buffer[self.input.position_offset..].starts_with("<%= Packcr.escape_character(value[0]) %>")
 {
-    break 'L<%= format("%04d", onfail) %>;
+    return throw(<%= onfail %>);
 }
 <%- if gen.location -%>
 TODO

data/lib/packcr/templates/node/string_one_reverse.rs.erb

@@ -0,0 +1,6 @@
+if self.input.refill_buffer(1) >= 1
+    && self.input.buffer[self.input.position_offset..].starts_with("<%= Packcr.escape_character(value[0]) %>")
+{
+    self.input.position_offset += 1;
+    return throw(<%= onsuccess %>);
+}

data/lib/packcr/version.rb

@@ -1,3 +1,3 @@
 class Packcr
-  VERSION = "0.1.0".freeze
+  VERSION = "0.1.1".freeze
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: packcr
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - wanabe
 bindir: exe
 cert_chain: []
-date: 2025-05-26 00:00:00.000000000 Z
+date: 2025-06-03 00:00:00.000000000 Z
 dependencies: []
 executables:
 - packcr
@@ -108,9 +108,11 @@ files:
 - lib/packcr/templates/node/string_many.c.erb
 - lib/packcr/templates/node/string_many.rb.erb
 - lib/packcr/templates/node/string_many.rs.erb
+- lib/packcr/templates/node/string_many_reverse.rs.erb
 - lib/packcr/templates/node/string_one.c.erb
 - lib/packcr/templates/node/string_one.rb.erb
 - lib/packcr/templates/node/string_one.rs.erb
+- lib/packcr/templates/node/string_one_reverse.rs.erb
 - lib/packcr/util.rb
 - lib/packcr/version.rb
 homepage: https://github.com/wanabe/packcr
@@ -125,7 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -134,5 +136,5 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubygems_version: 3.6.5
 specification_version: 4
-summary: Parser generator for C or Ruby
+summary: Parser generator for C, Ruby, and Rust
 test_files: []