packcr 0.0.6 → 0.0.8

data/lib/packcr/templates/context/source.rb.erb

@@ -1,30 +1,35 @@
 # A packrat parser generated by PackCR <%= Packcr::VERSION %>
-<%- if !code(:source).empty? -%>
+<%- if !code(:esource).empty? -%>
 
-<%-   code(:source).each do |code| -%>
+<%-   code(:esource).each do |code| -%>
 <%=     stream.get_code_block(code, 0, @iname) -%>
 <%-   end -%>
 <%- end -%>
-
 class <%= class_name %>
+  <%- code(:location).each do |code| -%>
+  <%- %><%= stream.get_code_block(code, 2, @iname) -%>
+
+  <%- end -%>
+  <%- code(:source).each do |code| -%>
+  <%=   stream.get_code_block(code, 2, @iname) -%>
+
+  <%- end -%>
   def initialize(<% if @auxil_type %><%= auxil_type %>, <% end %>debug: false)
     <%- if @utf8 -%>
     @buffer = +""
     <%- else -%>
     @buffer = +"".b
     <%- end %>
-    @pos = 0
-    @cur = 0
+    @buffer_start_position = 0
+    @position_offset = 0
     @level = 0
-    @lrstack = []
     @thunk = ThunkNode.new([], nil, 0)
-    @heads = {}
     @memos = LrMemoTable.new
     @debug = debug
     @global_values = {}
     <%- if @location -%>
-    @pos_loc = Location.new
-    @cur_loc = Location.new
+    @buffer_start_position_loc = Location.new
+    @position_offset_loc = Location.new
     <%- end -%>
     <%- code(:init).each do |code| -%>
     <%- %><%= stream.get_code_block(code, 4, @iname) -%>
@@ -45,34 +50,33 @@ class <%= class_name %>
 
   def refill_buffer(num, mode = nil)
     len = @buffer.length
-    if len >= @cur + num
-      return len - @cur
+    if len >= @position_offset + num
+      return len - @position_offset
     end
-    while len < @cur + num
+    while len < @position_offset + num
       c = getc
       break if !c
       @buffer << c
       len = @buffer.length
     end
-    return len - @cur
+    return len - @position_offset
   end
 
   def commit_buffer
-    @buffer = @buffer[@cur, @buffer.length - @cur]
-    @pos += @cur
-    @heads.clear
+    @buffer = @buffer[@position_offset, @buffer.length - @position_offset]
+    @buffer_start_position += @position_offset
     @memos.clear
-    @cur = 0
+    @position_offset = 0
     <%- if @location -%>
-    @pos_loc = @pos_loc + @cur_loc
-    @cur_loc = Location.new
+    @buffer_start_position_loc = @buffer_start_position_loc + @position_offset_loc
+    @position_offset_loc = Location.new
     <%- end -%>
   end
 
   def parse
-    pos = @pos
+    pos = @buffer_start_position
     <%- if !@root.rules.empty? -%>
-    if apply_rule(:evaluate_rule_<%= @root.rules[0].name %>, @thunk.thunks, nil, 0)
+    if apply_rule(:evaluate_rule_<%= @root.rules[0].name %>, @thunk.thunks, nil, 0, @buffer_start_position<% if @location %>, @buffer_start_position_loc<% end %>)
       @thunk.do_action(self, nil, 0)
     else
       raise SyntaxError, "can't parse"
@@ -80,7 +84,7 @@ class <%= class_name %>
     commit_buffer
     <%- end -%>
     @thunk.clear
-    refill_buffer(1) >= 1 && pos != @pos
+    refill_buffer(1) >= 1 && pos != @buffer_start_position
   end
 
   def run
@@ -89,153 +93,128 @@ class <%= class_name %>
 
   <%- @root.rules.each do |rule| -%>
   <%-   rule.codes.each do |code| -%>
-  def action_<%= rule.name %>_<%= code.index %>(__pcc_in, __pcc_vars, __pcc_index)
-    ____ = (__pcc_vars[__pcc_index] ||= Value.new).value if __pcc_vars
+  def action_<%= rule.name %>_<%= code.index %>(__packcr_in, __packcr_vars, __packcr_index)
+    ____ = (__packcr_vars[__packcr_index] ||= Value.new).value if __packcr_vars
     <%-   code.vars.each do |ref| -%>
-    <%= ref.var %> = (__pcc_in.value_refs[<%= ref.index %>]  ||= Value.new).value
+    <%= ref.var %> = (__packcr_in.value_refs[<%= ref.index %>]  ||= Value.new).value
     <%-   end -%>
-    __0 = __pcc_in.capt0.capture_string(@buffer)
-    __0s = @pos + __pcc_in.capt0.range_start
-    __0e = @pos + __pcc_in.capt0.range_end
+    __0 = __packcr_in.capt0.capture_string(@buffer)
+    __0s = @buffer_start_position + __packcr_in.capt0.range_start
+    __0e = @buffer_start_position + __packcr_in.capt0.range_end
     <%-   if @location -%>
-    __0sl = @pos_loc + __pcc_in.capt0.start_loc
-    __0el = @pos_loc + __pcc_in.capt0.end_loc
+    __0sl = @buffer_start_position_loc + __packcr_in.capt0.start_loc
+    __0el = @buffer_start_position_loc + __packcr_in.capt0.end_loc
     <%-   end -%>
     <%-   if @capture_in_code -%>
-    __0c = __pcc_in.capt0
+    __0c = __packcr_in.capt0
     <%-   end -%>
     <%-   code.capts.each do |capture| -%>
-    __<%= capture.index + 1 %> = __pcc_in.capts[<%= capture.index %>].capture_string(@buffer)
-    __<%= capture.index + 1 %>s = @pos + __pcc_in.capts[<%= capture.index %>].range_start
-    __<%= capture.index + 1 %>e = @pos + __pcc_in.capts[<%= capture.index %>].range_end
+    __<%= capture.index + 1 %> = __packcr_in.capts[<%= capture.index %>].capture_string(@buffer)
+    __<%= capture.index + 1 %>s = @buffer_start_position + __packcr_in.capts[<%= capture.index %>].range_start
+    __<%= capture.index + 1 %>e = @buffer_start_position + __packcr_in.capts[<%= capture.index %>].range_end
     <%-     if @location -%>
-    __<%= capture.index + 1 %>sl = @pos_loc + __pcc_in.capts[<%= capture.index %>].start_loc
-    __<%= capture.index + 1 %>el = @pos_loc + __pcc_in.capts[<%= capture.index %>].end_loc
+    __<%= capture.index + 1 %>sl = @buffer_start_position_loc + __packcr_in.capts[<%= capture.index %>].start_loc
+    __<%= capture.index + 1 %>el = @buffer_start_position_loc + __packcr_in.capts[<%= capture.index %>].end_loc
     <%-     end -%>
     <%-     if @capture_in_code -%>
-    __<%= capture.index + 1 %>c = __pcc_in.capts[<%= capture.index %>]
+    __<%= capture.index + 1 %>c = __packcr_in.capts[<%= capture.index %>]
     <%-     end -%>
     <%-   end -%>
     <%- %><%=   stream.get_code_block(code.code, 4, @iname) -%>
 
-    __pcc_vars[__pcc_index].value = ____ if __pcc_vars
+    __packcr_vars[__packcr_index].value = ____ if __packcr_vars
   end
 
   <%-   end -%>
   <%- end -%>
   <%- @root.rules.each do |rule| -%>
-  def evaluate_rule_<%= rule.name %>
-    answer = ThunkChunk.new
-    answer.pos = @cur
-    <%-   if @location -%>
-    answer.pos_loc = @cur_loc
-    <%-   end -%>
-    <%-   gen = ::Packcr::Generator.new(rule, @ascii, @location, :rb) -%>
-    <%-   -%><%= gen.generate_code(rule, 0, 4, false) -%>
-  end
+  <%-   gen = ::Packcr::Generator.new(rule, @ascii, @location, :rb) -%>
+  <%-   -%><%= gen.generate_code(rule, 0, 2, false) -%>
 
   <%- end -%>
-  def setup_lr(rule, lr)
-    lr.head ||= LrHead.new(rule)
-    @lrstack.reverse_each do |lrentry|
-      if lrentry.head == lr.head
-        break
-      end
-      lrentry.head = lr.head
-      lr.head.involved_set[lrentry.rule] = true
-    end
-  end
-
-  def grow_lr(rule, memo, head, pos<% if @location %>, p_loc<% end %>)
-    @heads[pos] = head
+  def grow_lr(rule, offset<% if @location %>, offset_loc<% end %>)
     while true
-      @cur = pos - @pos
+      old_offset = @position_offset
+      @position_offset = offset
       <%- if @location -%>
-      @cur_loc = p_loc - @pos_loc
+      @position_offset_loc = offset_loc
       <%- end -%>
-      head.involved_set_to_eval_set
-      answer = public_send(rule)
-      if !answer || @pos + @cur <= memo.pos
+      answer = public_send(rule, offset<% if @location %>, offset_loc<% end %>, limits: {rule => true})
+      if !answer || @position_offset <= old_offset
         break
       end
+      memo = @memos[offset, rule]
       memo.answer = answer
-      memo.pos = @pos + @cur
+      memo.offset = @position_offset
       <%- if @location -%>
-      memo.pos_loc = @pos_loc + @cur_loc
+      memo.offset_loc = @position_offset_loc
       <%- end -%>
     end
-    @heads[pos] = nil
-    @cur = memo.pos - @pos
-    <%- if @location -%>
-    @cur_loc = memo.pos_loc - @pos_loc
-    <%- end -%>
-    memo.answer
-  end
-
-  def lr_answer(rule, memo, pos<% if @location %>, p_loc<% end %>)
-    head = memo.lr.head
-    if head.rule_name != rule
-      return memo.lr.seed
-    end
-
-    memo.answer = memo.lr.seed
-    if !memo.answer
-      return nil
-    end
-    grow_lr(rule, memo, head, pos<% if @location %>, p_loc<% end %>)
   end
 
   def rule_answer(rule)
-    pos = @pos + @cur
+    offset = @position_offset
     <%- if @location -%>
-    p_loc = @pos_loc + @cur_loc
+    offset_loc = @position_offset_loc
     <%- end -%>
-    memo = @memos[pos, rule]
-    head = @heads[pos]
+    memo = @memos[offset, rule]
 
-    if head
-      if !memo && rule != head.rule_name && !head.involved_set[rule]
-        return nil
-      end
-      if head.eval_set.delete(rule)
-        return public_send(rule)
-      end
-    end
-
-    if memo
-      @cur = memo.pos - @pos
+    if !memo
+      memo = LrMemo.new(offset<% if @location %>, offset_loc<% end %>)
+      @memos[offset, rule] = memo
+      answer = public_send(rule, offset<% if @location %>, offset_loc<% end %>)
+      memo.answer = answer
+      memo.offset = @position_offset
       <%- if @location -%>
-      @cur_loc = memo.pos_loc - @pos_loc
+      memo.offset_loc = @position_offset_loc
       <%- end -%>
-      if !memo.lr
-        return memo.answer
+      if memo.grow
+        grow_lr(rule, offset<% if @location %>, offset_loc<% end %>)
+        memo.grow = false
+        answer = memo.answer
+        @position_offset = memo.offset
+        <%- if @location -%>
+        @position_offset_loc = memo.offset_loc
+        <%- end -%>
       end
-      setup_lr(rule, memo.lr)
-      return memo.lr.seed
-    end
-
-    lr = LrEntry.new
-    lr.rule = rule
-    @lrstack.push(lr)
-    memo = LrMemo.new(lr, pos<% if @location %>, p_loc<% end %>)
-    @memos[pos, rule] = memo
-    answer = public_send(rule)
-    @lrstack.pop
-    memo.pos = @pos + @cur
-    <%- if @location -%>
-    memo.pos_loc = @pos_loc + @cur_loc
-    <%- end -%>
-    if !lr.head
-      memo.answer = answer
       return answer
+    elsif memo.fail
+      memo.answer = nil
+      memo.grow = true
+      return nil
+    else
+      @position_offset = memo.offset
+      <%- if @location -%>
+      @position_offset_loc = memo.offset_loc
+      <%- end -%>
+      return memo.answer
     end
-
-    lr.seed = answer
-    lr_answer(rule, memo, pos<% if @location %>, p_loc<% end %>)
   end
 
-  def apply_rule(rule, thunks, values, index)
-    answer = rule_answer(rule)
+  def apply_rule(rule, thunks, values, index, offset<% if @location %>, offset_loc<% end %>, limits: nil)
+    if limits
+      limits = limits.merge(rule => true)
+      answer = public_send(rule, offset<% if @location %>, offset_loc<% end %>, limits: limits)
+      memo = @memos[offset, rule]
+      if !answer || @position_offset <= memo.offset
+        if memo
+          answer = memo.answer
+          @position_offset = memo.offset
+          <%- if @location -%>
+          @position_offset_loc = memo.offset_loc
+          <%- end -%>
+        end
+      else
+        memo.answer = answer
+        memo.offset = @position_offset
+        <%- if @location -%>
+        memo.offset_loc = @position_offset_loc
+        <%- end -%>
+      end
+    else
+      answer = rule_answer(rule)
+    end
+
     if !answer
       return false
     end
@@ -250,10 +229,6 @@ class <%= class_name %>
     end
   end
 
-  <%-   code(:location).each do |code| -%>
-  <%- %><%= stream.get_code_block(code, 2, @iname) -%>
-
-  <%-   end -%>
   class LrMemoTable
     def initialize
       @memos = {}
@@ -273,20 +248,24 @@ class <%= class_name %>
     end
   end
 
-  class LrHead
-    attr_accessor :rule_name, :involved_set, :eval_set
+  class LrMemo
+    attr_accessor :grow, :answer, :offset, :fail
+    <%- if @location -%>
+    attr_accessor :offset_loc
+    <%- end -%>
 
-    def initialize(rule_name)
-      @rule_name = rule_name
-      @involved_set = {}
-      @eval_set = {}
+    def initialize(offset<% if @location %>, offset_loc<% end %>)
+      @offset = offset
+      <%- if @location -%>
+      @offset_loc = offset_loc
+      <%- end -%>
+      @fail = true
+      @grow = false
     end
 
-    def involved_set_to_eval_set
-      @eval_set.clear
-      @involved_set.each do |k, v|
-        @eval_set[k] = true
-      end
+    def answer=(answer)
+      @fail = nil
+      @answer = answer
     end
   end
 
@@ -311,10 +290,7 @@ class <%= class_name %>
     end
   end
 
-  class Thunk
-  end
-
-  class ThunkLeaf < Thunk
+  class ThunkLeaf
     attr_accessor :capt0, :capts, :value_refs, :action
 
     def initialize(action, capt0 = Capture.new, value_refs = {}, capts = {})
@@ -329,7 +305,7 @@ class <%= class_name %>
     end
   end
 
-  class ThunkNode < Thunk
+  class ThunkNode
     attr_accessor :thunks, :values, :index
 
     def initialize(thunks, values, index)
@@ -350,10 +326,6 @@ class <%= class_name %>
     end
   end
 
-  class LrEntry
-    attr_accessor :rule, :head, :seed
-  end
-
   class Capture
     attr_accessor :range_start, :range_end
     <%- if @location -%>
@@ -370,27 +342,7 @@ class <%= class_name %>
     end
 
     def capture_string(buffer)
-      @string ||= buffer[@range_start, @range_end - @range_start]
-    end
-  end
-
-  class LrMemo
-    attr_accessor :lr, :answer, :pos
-    <%- if @location -%>
-    attr_accessor :pos_loc
-    <%- end -%>
-
-    def initialize(lr, pos<% if @location %>, pos_loc<% end %>)
-      @pos = pos
-      <%- if @location -%>
-      @pos_loc = pos_loc
-      <%- end -%>
-      @lr = lr
-    end
-
-    def answer=(answer)
-      @lr = nil
-      @answer = answer
+      @capture_string ||= buffer[@range_start, @range_end - @range_start]
     end
   end
 

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

@@ -1,5 +1,5 @@
 {
-    pcc_thunk_t *const thunk = pcc_thunk__create_leaf(ctx->auxil, pcc_action_<%= gen.rule.name %>_<%= index %>, <%= gen.rule.vars.length %>, <%= gen.rule.capts.length %>);
+    packcr_thunk_t *const thunk = packcr_thunk__create_leaf(ctx->auxil, packcr_action_<%= gen.rule.name %>_<%= index %>, <%= gen.rule.vars.length %>, <%= gen.rule.capts.length %>);
 <%- vars.each do |var| -%>
     thunk->data.leaf.values.buf[<%= var.index %>] = &(chunk->values.buf[<%= var.index %>]);
 <%- end -%>
@@ -7,10 +7,10 @@
     thunk->data.leaf.capts.buf[<%= capt.index %>] = &(chunk->capts.buf[<%= capt.index %>]);
 <%- end -%>
     thunk->data.leaf.capt0.range.start = chunk->pos;
-    thunk->data.leaf.capt0.range.end = ctx->cur;
+    thunk->data.leaf.capt0.range.end = ctx->position_offset;
 <%- if gen.location -%>
-    thunk->data.leaf.capt0.range.start_loc_ptr = &chunk->pos_loc;
-    thunk->data.leaf.capt0.range.end_loc_ptr = &ctx->cur_loc;
+    thunk->data.leaf.capt0.range.start_loc = chunk->pos_loc;
+    thunk->data.leaf.capt0.range.end_loc = ctx->position_offset_loc;
 <%- end -%>
-    pcc_thunk_array__add(ctx->auxil, &chunk->thunks, thunk);
+    packcr_thunk_array__add(ctx->auxil, &chunk->thunks, thunk);
 }

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

@@ -2,9 +2,9 @@ answer.thunks.push(
   ThunkLeaf.new(
     :action_<%= gen.rule.name %>_<%= index %>,
     Capture.new(
-      answer.pos, @cur,
+      answer.pos, @position_offset,
       <%- if gen.location -%>
-      answer.pos_loc, @cur_loc,
+      answer.pos_loc, @position_offset_loc,
       <%- end -%>
     ),
     <%- if vars.empty? -%>

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

@@ -1,8 +1,8 @@
 <%-   m = gen.next_label -%>
 {
-    const size_t p = ctx->cur;
+    const size_t p = ctx->position_offset;
 <%- if gen.location -%>
-    const pcc_location_t p_loc = ctx->cur_loc;
+    const packcr_location_t p_loc = ctx->position_offset_loc;
 <%- end -%>
     const size_t n = chunk->thunks.len;
 <%- nodes.each_with_index do |expr, i| -%>
@@ -17,18 +17,18 @@
 <%-     break -%>
 <%-   else -%>
 <%-     if r == Packcr::CODE_REACH__BOTH -%>
-    goto L<%= "%04d" % m %>;
+    goto L<%= format("%04d", m) %>;
 <%-     end -%>
 <%-   end -%>
-L<%= "%04d" % l %>:;
-    ctx->cur = p;
+L<%= format("%04d", l) %>:;
+    ctx->position_offset = p;
 <%- if gen.location -%>
-    ctx->cur_loc = p_loc;
+    ctx->position_offset_loc = p_loc;
 <%- end -%>
-    pcc_thunk_array__revert(ctx->auxil, &chunk->thunks, n);
+    packcr_thunk_array__revert(ctx->auxil, &chunk->thunks, n);
 <%-   if !c -%>
-    goto L<%= "%04d" % onfail %>;
+    goto L<%= format("%04d", onfail) %>;
 <%-   end -%>
 <%- end -%>
-L<%= "%04d" % m %>:;
+L<%= format("%04d", m) %>:;
 }

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

@@ -1,14 +1,13 @@
 <%-   m = gen.next_label -%>
 catch(<%= m %>) do
-  pos<%= gen.level %> = @cur
+  pos<%= gen.level %> = @position_offset
   <%- if gen.location -%>
-  p_loc<%= gen.level %> = @cur_loc
+  p_loc<%= gen.level %> = @position_offset_loc
   <%- end -%>
   n<%= gen.level %> = answer.thunks.length
   <%- nodes.each_with_index do |expr, i| -%>
   <%-   c = i + 1 < nodes.length -%>
   <%- if expr.reversible?(gen) -%>
-  <%-   r = expr.reachability -%>
   <%-   %><%= gen.generate_code(expr, m, 2, false, reverse: true, oncut: onfail) -%>
   <%- else -%>
   <%-   l = gen.next_label -%>
@@ -28,9 +27,9 @@ catch(<%= m %>) do
     <%-   end -%>
   end
   <%- end -%>
-  @cur = pos<%= gen.level %>
+  @position_offset = pos<%= gen.level %>
   <%- if gen.location -%>
-  @cur_loc = p_loc<%= gen.level %>
+  @position_offset_loc = p_loc<%= gen.level %>
   <%- end -%>
   answer.thunks[n<%= gen.level %>..-1] = []
   <%-   if !c -%>

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

@@ -1,17 +1,17 @@
 {
-    const size_t p = ctx->cur;
+    const size_t p = ctx->position_offset;
     size_t q;
 <%- if gen.location -%>
-    pcc_location_t p_loc = ctx->cur_loc;
-    pcc_location_t q_loc;
+    packcr_location_t p_loc = ctx->position_offset_loc;
+    packcr_location_t q_loc;
 <%- end -%>
 <%= gen.generate_code(expr, onfail, 4, false) -%>
-    q = ctx->cur;
+    q = ctx->position_offset;
     chunk->capts.buf[<%= index %>].range.start = p;
     chunk->capts.buf[<%= index %>].range.end = q;
 <%- if gen.location -%>
-    q_loc = ctx->cur_loc;
-    *chunk->capts.buf[<%= index %>].range.start_loc_ptr = p_loc;
-    *chunk->capts.buf[<%= index %>].range.end_loc_ptr = q_loc;
+    q_loc = ctx->position_offset_loc;
+    chunk->capts.buf[<%= index %>].range.start_loc = p_loc;
+    chunk->capts.buf[<%= index %>].range.end_loc = q_loc;
 <%- end -%>
 }

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

@@ -1,14 +1,14 @@
-pos<%= gen.level %> = @cur
+pos<%= gen.level %> = @position_offset
 <%- if gen.location -%>
-p_loc<%= gen.level %> = @cur_loc
+p_loc<%= gen.level %> = @position_offset_loc
 <%- end -%>
 <%- %><%= gen.generate_code(expr, onfail, 0, false) -%>
-q<%= gen.level %> = @cur
+q<%= gen.level %> = @position_offset
 capt<%= gen.level %> = answer.capts[<%= index %>]
 capt<%= gen.level %>.range_start = pos<%= gen.level %>
 capt<%= gen.level %>.range_end = q<%= gen.level %>
 <%- if gen.location -%>
-q_loc<%= gen.level %> = @cur_loc
+q_loc<%= gen.level %> = @position_offset_loc
 capt<%= gen.level %>.start_loc = p_loc<%= gen.level %>
 capt<%= gen.level %>.end_loc = q_loc<%= gen.level %>
 <%- end -%>

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

@@ -1,21 +1,21 @@
 {
 <%- if !a && charclass =~ /\A[^\\]-.\z/ -%>
     char c;
-    if (pcc_refill_buffer(ctx, 1) < 1) goto L<%= "%04d" % onfail %>;
-    c = ctx->buffer.buf[ctx->cur];
+    if (packcr_refill_buffer(ctx, 1) < 1) goto L<%= format("%04d", onfail) %>;
+    c = ctx->buffer.buf[ctx->position_offset];
 <%- if a -%>
-    if (c >= '<%= Packcr.escape_character(charclass[0]) %>' && c <= '<%= Packcr.escape_character(charclass[2]) %>') goto L<%= "%04d" % onfail %>;
+    if (c >= '<%= Packcr.escape_character(charclass[0]) %>' && c <= '<%= Packcr.escape_character(charclass[2]) %>') goto L<%= format("%04d", onfail) %>;
 <%- else -%>
-    if (!(c >= '<%= Packcr.escape_character(charclass[0]) %>' && c <= '<%= Packcr.escape_character(charclass[2]) %>')) goto L<%= "%04d" % onfail %>;
+    if (!(c >= '<%= Packcr.escape_character(charclass[0]) %>' && c <= '<%= Packcr.escape_character(charclass[2]) %>')) goto L<%= format("%04d", onfail) %>;
 <%- end -%>
 <%- if gen.location -%>
-    pcc_location_forward(&ctx->cur_loc, ctx->buffer.buf + ctx->cur, 1);
+    packcr_location_forward(&ctx->position_offset_loc, ctx->buffer.buf + ctx->position_offset, 1);
 <%- end -%>
-    ctx->cur++;
+    ctx->position_offset++;
 <%- else -%>
     char c;
-    if (pcc_refill_buffer(ctx, 1) < 1) goto L<%= "%04d" % onfail %>;
-    c = ctx->buffer.buf[ctx->cur];
+    if (packcr_refill_buffer(ctx, 1) < 1) goto L<%= format("%04d", onfail) %>;
+    c = ctx->buffer.buf[ctx->position_offset];
 <%- if a -%>
     if (
 <%- else -%>
@@ -35,13 +35,13 @@
 <%-   i += 1 -%>
 <%- end -%>
 <%- if a -%>
-    ) goto L<%= "%04d" % onfail %>;
+    ) goto L<%= format("%04d", onfail) %>;
 <%- else -%>
-    )) goto L<%= "%04d" % onfail %>;
+    )) goto L<%= format("%04d", onfail) %>;
 <%- end -%>
 <%- if gen.location -%>
-    pcc_location_forward(&ctx->cur_loc, ctx->buffer.buf + ctx->cur, 1);
+    packcr_location_forward(&ctx->position_offset_loc, ctx->buffer.buf + ctx->position_offset, 1);
 <%- end -%>
-    ctx->cur++;
+    ctx->position_offset++;
 <%- end -%>
 }

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

@@ -2,7 +2,7 @@
 if refill_buffer(1) < 1
   throw(<%= onfail %>)
 end
-c<%= gen.level %> = @buffer[@cur]
+c<%= gen.level %> = @buffer[@position_offset]
 <%-   if a -%>
 if c<%= gen.level %> >= "<%= Packcr.escape_character(charclass[0]) %>" && c<%= gen.level %> <= "<%= Packcr.escape_character(charclass[2]) %>"
   throw(<%= onfail %>)
@@ -13,14 +13,14 @@ unless c<%= gen.level %> >= "<%= Packcr.escape_character(charclass[0]) %>" && c<
 end
 <%-   end -%>
 <%-   if gen.location -%>
-@cur_loc = @cur_loc.forward(@buffer, @cur, 1)
+@position_offset_loc = @position_offset_loc.forward(@buffer, @position_offset, 1)
 <%-   end -%>
-@cur += 1
+@position_offset += 1
 <%- else -%>
 if refill_buffer(1) < 1
   throw(<%= onfail %>)
 end
-c<%= gen.level %> = @buffer[@cur]
+c<%= gen.level %> = @buffer[@position_offset]
 <%-   if a -%>
 if (
 <%-   else -%>
@@ -43,7 +43,7 @@ unless (
   throw(<%= onfail %>)
 end
 <%-   if gen.location -%>
-@cur_loc = @cur_loc.forward(@buffer, @cur, 1)
+@position_offset_loc = @position_offset_loc.forward(@buffer, @position_offset, 1)
 <%-   end -%>
-@cur += 1
+@position_offset += 1
 <%- end -%>