packcr 0.0.8 → 0.1.0

data/lib/packcr/stream.rb

@@ -21,7 +21,7 @@ class Packcr
     end
 
     def write_text(s)
-      write s.gsub(/\r\n/, "\n")
+      write s.gsub("\r\n", "\n")
     end
 
     def write_line_directive(fname, lineno)

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

@@ -1,9 +1,9 @@
 /* A packrat parser generated by PackCR <%= Packcr::VERSION %> */
 
-<%- code(:esource).each do |code| -%>
-<%=   stream.get_code_block(code, 0, @iname) -%>
-<%- end -%>
 <%- if !code(:esource).empty? -%>
+<%-   code(:esource).each do |code| -%>
+<%=     stream.get_code_block(code, 0, @iname) -%>
+<%-   end -%>
 
 <%- end -%>
 #ifdef _MSC_VER
@@ -994,6 +994,33 @@ static void packcr_do_action(packcr_context_t *ctx, const packcr_thunk_array_t *
     }
 }
 
+<%= prefix %>_context_t *<%= prefix %>_create(<%= auxil_def %>auxil) {
+    return packcr_context__create(auxil);
+}
+
+void <%= prefix %>_destroy(<%= prefix %>_context_t *ctx) {
+    packcr_context__destroy(ctx);
+}
+<%- if !@root.rules.empty? -%>
+
+<%-   @root.rules.each do |rule| -%>
+static packcr_thunk_chunk_t *packcr_evaluate_rule_<%= rule.name %>(packcr_context_t *ctx, size_t offset<% if @location %>, packcr_location_t offset_loc<% end %>, packcr_rule_set_t *limits);
+<%-   end -%>
+<%- end -%>
+
+int <%= prefix %>_parse(<%= prefix %>_context_t *ctx, <%= value_def %>*ret) {
+    size_t pos = ctx->buffer_start_position;
+<%- if !@root.rules.empty? -%>
+    if (packcr_apply_rule(ctx, packcr_evaluate_rule_<%= @root.rules[0].name %>, &ctx->thunks, ret, ctx->position_offset<% if @location %>, ctx->position_offset_loc<% end %>, NULL))
+        packcr_do_action(ctx, &ctx->thunks, ret);
+    else
+        PACKCR_ERROR(ctx->auxil);
+    packcr_commit_buffer(ctx);
+<%- end -%>
+    packcr_thunk_array__revert(ctx->auxil, &ctx->thunks, 0);
+    return pos != ctx->buffer_start_position && packcr_refill_buffer(ctx, 1) >= 1;
+}
+
 <%- @root.rules.each do |rule| -%>
 <%-   rule.codes.each do |code| -%>
 static void packcr_action_<%= rule.name %>_<%= code.index %>(<%= prefix %>_context_t *__packcr_ctx, packcr_thunk_t *__packcr_in, packcr_value_t *__packcr_out) {
@@ -1046,35 +1073,12 @@ static void packcr_action_<%= rule.name %>_<%= code.index %>(<%= prefix %>_conte
 
 <%-   end -%>
 <%- end -%>
-<%- @root.rules.each do |rule| -%>
-static packcr_thunk_chunk_t *packcr_evaluate_rule_<%= rule.name %>(packcr_context_t *ctx, size_t offset<% if @location %>, packcr_location_t offset_loc<% end %>, packcr_rule_set_t *limits);
-<%- end -%>
 
 <%- @root.rules.each do |rule| -%>
 <%-   gen = ::Packcr::Generator.new(rule, @ascii, @location) -%>
 <%=   gen.generate_code(rule, 0, 0, false) -%>
 
 <%- end -%>
-<%= prefix %>_context_t *<%= prefix %>_create(<%= auxil_def %>auxil) {
-    return packcr_context__create(auxil);
-}
-
-int <%= prefix %>_parse(<%= prefix %>_context_t *ctx, <%= value_def %>*ret) {
-    size_t pos = ctx->buffer_start_position;
-<%- if !@root.rules.empty? -%>
-    if (packcr_apply_rule(ctx, packcr_evaluate_rule_<%= @root.rules[0].name %>, &ctx->thunks, ret, ctx->position_offset<% if @location %>, ctx->position_offset_loc<% end %>, NULL))
-        packcr_do_action(ctx, &ctx->thunks, ret);
-    else
-        PACKCR_ERROR(ctx->auxil);
-    packcr_commit_buffer(ctx);
-<%- end -%>
-    packcr_thunk_array__revert(ctx->auxil, &ctx->thunks, 0);
-    return pos != ctx->buffer_start_position && packcr_refill_buffer(ctx, 1) >= 1;
-}
-
-void <%= prefix %>_destroy(<%= prefix %>_context_t *ctx) {
-    packcr_context__destroy(ctx);
-}
 <%- if !code(:lsource).empty? -%>
 
 <%-   code(:lsource).each do |code| -%>

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

@@ -1,9 +1,10 @@
 # A packrat parser generated by PackCR <%= Packcr::VERSION %>
-<%- if !code(:esource).empty? -%>
 
+<%- if !code(:esource).empty? -%>
 <%-   code(:esource).each do |code| -%>
 <%=     stream.get_code_block(code, 0, @iname) -%>
 <%-   end -%>
+
 <%- end -%>
 class <%= class_name %>
   <%- code(:location).each do |code| -%>
@@ -14,6 +15,127 @@ class <%= class_name %>
   <%=   stream.get_code_block(code, 2, @iname) -%>
 
   <%- end -%>
+  class LrMemoTable
+    def initialize
+      @memos = {}
+    end
+
+    def clear
+      @memos.clear
+    end
+
+    def []=(index, rule_name, memo)
+      entry = @memos[index] ||= {}
+      entry[rule_name] = memo
+    end
+
+    def [](index, rule_name)
+      @memos.dig(index, rule_name)
+    end
+  end
+
+  class LrMemo
+    attr_accessor :grow, :answer, :offset, :fail
+    <%- if @location -%>
+    attr_accessor :offset_loc
+    <%- end -%>
+
+    def initialize(offset<% if @location %>, offset_loc<% end %>)
+      @offset = offset
+      <%- if @location -%>
+      @offset_loc = offset_loc
+      <%- end -%>
+      @fail = true
+      @grow = false
+    end
+
+    def answer=(answer)
+      @fail = nil
+      @answer = answer
+    end
+  end
+
+  class ThunkChunk
+    attr_accessor :thunks, :capts, :pos, :values
+    <%- if @location -%>
+    attr_accessor :pos_loc
+    <%- end -%>
+
+    def initialize
+      super
+      @thunks = []
+      @capts = {}
+      @pos = 0
+      @values = {}
+    end
+
+    def resize_captures(len)
+      len.times do |i|
+        @capts[i] = Capture.new
+      end
+    end
+  end
+
+  class ThunkLeaf
+    attr_accessor :capt0, :capts, :value_refs, :action
+
+    def initialize(action, capt0 = Capture.new, value_refs = {}, capts = {})
+      @value_refs = value_refs
+      @capts = capts
+      @capt0 = capt0
+      @action = action
+    end
+
+    def do_action(ctx, values, index)
+      ctx.public_send(action, self, values, index)
+    end
+  end
+
+  class ThunkNode
+    attr_accessor :thunks, :values, :index
+
+    def initialize(thunks, values, index)
+      @thunks = thunks
+      @values = values
+      @index = index
+      values[index] ||= Value.new if values
+    end
+
+    def do_action(ctx, _values, _index)
+      @thunks.each do |thunk|
+        thunk.do_action(ctx, @values, @index)
+      end
+    end
+
+    def clear
+      @thunks.clear
+    end
+  end
+
+  class Capture
+    attr_accessor :range_start, :range_end
+    <%- if @location -%>
+    attr_accessor :start_loc, :end_loc
+    <%- end -%>
+
+    def initialize(range_start = 0, range_end = 0<% if @location %>, start_loc = nil, end_loc = nil<% end%>)
+      @range_start = range_start
+      @range_end = range_end
+      <%- if @location -%>
+      @start_loc = start_loc || Location.new
+      @end_loc = end_loc || Location.new
+      <%- end -%>
+    end
+
+    def capture_string(buffer)
+      @capture_string ||= buffer[@range_start, @range_end - @range_start]
+    end
+  end
+
+  class Value
+    attr_accessor :value
+  end
+
   def initialize(<% if @auxil_type %><%= auxil_type %>, <% end %>debug: false)
     <%- if @utf8 -%>
     @buffer = +""
@@ -91,47 +213,6 @@ class <%= class_name %>
     nil while parse
   end
 
-  <%- @root.rules.each do |rule| -%>
-  <%-   rule.codes.each do |code| -%>
-  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 %> = (__packcr_in.value_refs[<%= ref.index %>]  ||= Value.new).value
-    <%-   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 = @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 = __packcr_in.capt0
-    <%-   end -%>
-    <%-   code.capts.each do |capture| -%>
-    __<%= 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 = @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 = __packcr_in.capts[<%= capture.index %>]
-    <%-     end -%>
-    <%-   end -%>
-    <%- %><%=   stream.get_code_block(code.code, 4, @iname) -%>
-
-    __packcr_vars[__packcr_index].value = ____ if __packcr_vars
-  end
-
-  <%-   end -%>
-  <%- end -%>
-  <%- @root.rules.each do |rule| -%>
-  <%-   gen = ::Packcr::Generator.new(rule, @ascii, @location, :rb) -%>
-  <%-   -%><%= gen.generate_code(rule, 0, 2, false) -%>
-
-  <%- end -%>
   def grow_lr(rule, offset<% if @location %>, offset_loc<% end %>)
     while true
       old_offset = @position_offset
@@ -228,127 +309,47 @@ class <%= class_name %>
       thunk.do_action(self, values, index)
     end
   end
+  <%- @root.rules.each do |rule| -%>
+  <%-   rule.codes.each do |code| -%>
 
-  class LrMemoTable
-    def initialize
-      @memos = {}
-    end
-
-    def clear
-      @memos.clear
-    end
-
-    def []=(index, rule_name, memo)
-      entry = @memos[index] ||= {}
-      entry[rule_name] = memo
-    end
-
-    def [](index, rule_name)
-      @memos.dig(index, rule_name)
-    end
-  end
-
-  class LrMemo
-    attr_accessor :grow, :answer, :offset, :fail
-    <%- if @location -%>
-    attr_accessor :offset_loc
-    <%- end -%>
-
-    def initialize(offset<% if @location %>, offset_loc<% end %>)
-      @offset = offset
-      <%- if @location -%>
-      @offset_loc = offset_loc
-      <%- end -%>
-      @fail = true
-      @grow = false
-    end
-
-    def answer=(answer)
-      @fail = nil
-      @answer = answer
-    end
-  end
-
-  class ThunkChunk
-    attr_accessor :thunks, :capts, :pos, :values
-    <%- if @location -%>
-    attr_accessor :pos_loc
-    <%- end -%>
-
-    def initialize
-      super
-      @thunks = []
-      @capts = {}
-      @pos = 0
-      @values = {}
-    end
-
-    def resize_captures(len)
-      len.times do |i|
-        @capts[i] = Capture.new
-      end
-    end
-  end
-
-  class ThunkLeaf
-    attr_accessor :capt0, :capts, :value_refs, :action
-
-    def initialize(action, capt0 = Capture.new, value_refs = {}, capts = {})
-      @value_refs = value_refs
-      @capts = capts
-      @capt0 = capt0
-      @action = action
-    end
-
-    def do_action(ctx, values, index)
-      ctx.public_send(action, self, values, index)
-    end
-  end
-
-  class ThunkNode
-    attr_accessor :thunks, :values, :index
-
-    def initialize(thunks, values, index)
-      @thunks = thunks
-      @values = values
-      @index = index
-      values[index] ||= Value.new if values
-    end
-
-    def do_action(ctx, _values, _index)
-      @thunks.each do |thunk|
-        thunk.do_action(ctx, @values, @index)
-      end
-    end
-
-    def clear
-      @thunks.clear
-    end
-  end
-
-  class Capture
-    attr_accessor :range_start, :range_end
-    <%- if @location -%>
-    attr_accessor :start_loc, :end_loc
-    <%- end -%>
-
-    def initialize(range_start = 0, range_end = 0<% if @location %>, start_loc = nil, end_loc = nil<% end%>)
-      @range_start = range_start
-      @range_end = range_end
-      <%- if @location -%>
-      @start_loc = start_loc || Location.new
-      @end_loc = end_loc || Location.new
-      <%- end -%>
-    end
+  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 %> = (__packcr_in.value_refs[<%= ref.index %>]  ||= Value.new).value
+    <%-   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 = @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 = __packcr_in.capt0
+    <%-   end -%>
+    <%-   code.capts.each do |capture| -%>
+    __<%= 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 = @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 = __packcr_in.capts[<%= capture.index %>]
+    <%-     end -%>
+    <%-   end -%>
+    <%- %><%=   stream.get_code_block(code.code, 4, @iname) -%>
 
-    def capture_string(buffer)
-      @capture_string ||= buffer[@range_start, @range_end - @range_start]
-    end
+    __packcr_vars[__packcr_index].value = ____ if __packcr_vars
   end
+  <%-   end -%>
+  <%- end -%>
+  <%- @root.rules.each do |rule| -%>
 
-  class Value
-    attr_accessor :value
-  end
+  <%-   gen = ::Packcr::Generator.new(rule, @ascii, @location, :rb) -%>
+  <%-   -%><%= gen.generate_code(rule, 0, 2, false) -%>
+  <%- end -%>
 end
 <%- if !code(:lsource).empty? -%>