packcr 0.0.7 → 0.0.8

data/lib/packcr/generated/node/charclass_node.rb

@@ -5,7 +5,7 @@ class Packcr
         case gen.lang
         when :c
           erbout = +""
-          erbout << "{\n    char c;\n    if (pcc_refill_buffer(ctx, 1) < 1) goto L#{format("%04d", onfail)};\n    c = ctx->buffer.buf[ctx->position_offset];\n".freeze
+          erbout << "{\n    char c;\n    if (packcr_refill_buffer(ctx, 1) < 1) goto L#{format("%04d", onfail)};\n    c = ctx->buffer.buf[ctx->position_offset];\n".freeze
           if !a && charclass =~ /\A[^\\]-.\z/
 
             if a
@@ -45,7 +45,7 @@ class Packcr
             end
           end
           if gen.location
-            erbout << "    pcc_location_forward(&ctx->position_offset_loc, ctx->buffer.buf + ctx->position_offset, 1);\n".freeze
+            erbout << "    packcr_location_forward(&ctx->position_offset_loc, ctx->buffer.buf + ctx->position_offset, 1);\n".freeze
           end
           erbout << "    ctx->position_offset++;\n}\n".freeze
 
@@ -99,10 +99,10 @@ class Packcr
         case gen.lang
         when :c
           erbout = +""
-          erbout << "if (pcc_refill_buffer(ctx, 1) < 1) goto L#{format("%04d", onfail)};\n".freeze
+          erbout << "if (packcr_refill_buffer(ctx, 1) < 1) goto L#{format("%04d", onfail)};\n".freeze
 
           if gen.location
-            erbout << "pcc_location_forward(&ctx->position_offset, ctx->buffer.buf + ctx->position_offset, 1);\n".freeze
+            erbout << "packcr_location_forward(&ctx->position_offset, ctx->buffer.buf + ctx->position_offset, 1);\n".freeze
           end
           erbout << "ctx->position_offset++;\n".freeze
 
@@ -140,14 +140,14 @@ class Packcr
         when :c
           erbout = +""
           if a
-            erbout << "if (\n    pcc_refill_buffer(ctx, 1) < 1 ||\n    ctx->buffer.buf[ctx->position_offset] == '#{Packcr.escape_character(charclass[i])}'\n) goto L#{format("%04d", onfail)};\n".freeze
+            erbout << "if (\n    packcr_refill_buffer(ctx, 1) < 1 ||\n    ctx->buffer.buf[ctx->position_offset] == '#{Packcr.escape_character(charclass[i])}'\n) goto L#{format("%04d", onfail)};\n".freeze
 
           else
-            erbout << "if (\n    pcc_refill_buffer(ctx, 1) < 1 ||\n    ctx->buffer.buf[ctx->position_offset] != '#{Packcr.escape_character(charclass[0])}'\n) goto L#{format("%04d", onfail)};\n".freeze
+            erbout << "if (\n    packcr_refill_buffer(ctx, 1) < 1 ||\n    ctx->buffer.buf[ctx->position_offset] != '#{Packcr.escape_character(charclass[0])}'\n) goto L#{format("%04d", onfail)};\n".freeze
 
           end
           if gen.location
-            erbout << "    pcc_location_forward(&ctx->position_offset_loc, ctx->buffer.buf + ctx->position_offset, 1);\n".freeze
+            erbout << "    packcr_location_forward(&ctx->position_offset_loc, ctx->buffer.buf + ctx->position_offset, 1);\n".freeze
           end
           erbout << "ctx->position_offset++;\n".freeze
           erbout
@@ -174,7 +174,7 @@ class Packcr
           erbout = +""
           a = charclass && charclass[0] == "^"
           i = a ? 1 : 0
-          erbout << "{\n    int u;\n    const size_t n = pcc_get_char_as_utf32(ctx, &u);\n    if (n == 0) goto L#{format("%04d", onfail)};\n".freeze
+          erbout << "{\n    int u;\n    const size_t n = packcr_get_char_as_utf32(ctx, &u);\n    if (n == 0) goto L#{format("%04d", onfail)};\n".freeze
 
           if charclass && !(a && n == 1) # not '.' or '[^]'
             u0 = 0
@@ -227,7 +227,7 @@ class Packcr
             end
           end
           if gen.location
-            erbout << "    pcc_location_forward(&ctx->position_offset_loc, ctx->buffer.buf + ctx->position_offset, n);\n".freeze
+            erbout << "    packcr_location_forward(&ctx->position_offset_loc, ctx->buffer.buf + ctx->position_offset, n);\n".freeze
           end
           erbout << "    ctx->position_offset += n;\n}\n".freeze
 

data/lib/packcr/generated/node/eof_node.rb

@@ -5,7 +5,7 @@ class Packcr
         case gen.lang
         when :c
           erbout = +""
-          erbout << "if (pcc_refill_buffer(ctx, 1) >= 1) goto L#{format("%04d", onfail)};\n".freeze
+          erbout << "if (packcr_refill_buffer(ctx, 1) >= 1) goto L#{format("%04d", onfail)};\n".freeze
 
           erbout
         when :rb

data/lib/packcr/generated/node/error_node.rb

@@ -10,7 +10,7 @@ class Packcr
           l = gen.next_label
           m = gen.next_label
 
-          erbout << "#{gen.generate_code(expr, l, 4, true)}    goto L#{format("%04d", m)};\nL#{format("%04d", l)}:;\n    {\n        pcc_value_t null;\n        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});\n".freeze
+          erbout << "#{gen.generate_code(expr, l, 4, true)}    goto L#{format("%04d", m)};\nL#{format("%04d", l)}:;\n    {\n        packcr_value_t null;\n        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});\n".freeze
 
           vars.each do |var|
             erbout << "        thunk->data.leaf.values.buf[#{var.index}] = &(chunk->values.buf[#{var.index}]);\n".freeze
@@ -23,7 +23,7 @@ class Packcr
           if gen.location
             erbout << "        thunk->data.leaf.capt0.range.start_loc = chunk->pos_loc;\n        thunk->data.leaf.capt0.range.end_loc = ctx->position_offset_loc;\n".freeze
           end
-          erbout << "        memset(&null, 0, sizeof(pcc_value_t)); /* in case */\n        thunk->data.leaf.action(ctx, thunk, &null);\n        pcc_thunk__destroy(ctx->auxil, thunk);\n    }\n    goto L#{format("%04d", onfail)};\nL#{format("%04d", m)}:;\n}\n".freeze
+          erbout << "        memset(&null, 0, sizeof(packcr_value_t)); /* in case */\n        thunk->data.leaf.action(ctx, thunk, &null);\n        packcr_thunk__destroy(ctx->auxil, thunk);\n    }\n    goto L#{format("%04d", onfail)};\nL#{format("%04d", m)}:;\n}\n".freeze
 
           erbout
         when :rb

data/lib/packcr/generated/node/expand_node.rb

@@ -5,10 +5,10 @@ class Packcr
         case gen.lang
         when :c
           erbout = +""
-          erbout << "{\n    const size_t n = chunk->capts.buf[#{index}].range.end - chunk->capts.buf[#{index}].range.start;\n    if (pcc_refill_buffer(ctx, n) < n) goto L#{format("%04d", onfail)};\n    if (n > 0) {\n        const char *const p = ctx->buffer.buf + ctx->position_offset;\n        const char *const q = ctx->buffer.buf + chunk->capts.buf[#{index}].range.start;\n        size_t i;\n        for (i = 0; i < n; i++) {\n            if (p[i] != q[i]) goto L#{format("%04d", onfail)};\n        }\n".freeze
+          erbout << "{\n    const size_t n = chunk->capts.buf[#{index}].range.end - chunk->capts.buf[#{index}].range.start;\n    if (packcr_refill_buffer(ctx, n) < n) goto L#{format("%04d", onfail)};\n    if (n > 0) {\n        const char *const p = ctx->buffer.buf + ctx->position_offset;\n        const char *const q = ctx->buffer.buf + chunk->capts.buf[#{index}].range.start;\n        size_t i;\n        for (i = 0; i < n; i++) {\n            if (p[i] != q[i]) goto L#{format("%04d", onfail)};\n        }\n".freeze
 
           if gen.location
-            erbout << "        pcc_location_forward(&ctx->position_offset_loc, ctx->buffer.buf + ctx->position_offset, n);\n".freeze
+            erbout << "        packcr_location_forward(&ctx->position_offset_loc, ctx->buffer.buf + ctx->position_offset, n);\n".freeze
           end
           erbout << "        ctx->position_offset += n;\n    }\n}\n".freeze
 

data/lib/packcr/generated/node/predicate_node.rb

@@ -11,7 +11,7 @@ class Packcr
           erbout << "{\n    const size_t p = ctx->position_offset;\n".freeze
 
           if gen.location
-            erbout << "    const pcc_location_t p_loc = ctx->position_offset_loc;\n".freeze
+            erbout << "    const packcr_location_t p_loc = ctx->position_offset_loc;\n".freeze
           end
           erbout << "#{gen.generate_code(expr, l, 4, false)}".freeze
           if r != Packcr::CODE_REACH__ALWAYS_FAIL
@@ -84,7 +84,7 @@ class Packcr
           erbout << "{\n    const size_t p = ctx->position_offset;\n".freeze
 
           if gen.location
-            erbout << "    const pcc_location_t p_loc = ctx->position_offset_loc;\n".freeze
+            erbout << "    const packcr_location_t p_loc = ctx->position_offset_loc;\n".freeze
           end
           erbout << "#{gen.generate_code(expr, l, 4, false)}".freeze
           if r != Packcr::CODE_REACH__ALWAYS_FAIL

data/lib/packcr/generated/node/quantity_node.rb

@@ -7,11 +7,12 @@ class Packcr
           erbout = +""
           erbout << "{\n".freeze
 
+          r = expr.reachability
           if min > 0
             erbout << "    const size_t p0 = ctx->position_offset;\n".freeze
 
             if gen.location
-              erbout << "    const pcc_location_t p0_loc = ctx->position_offset_loc;\n".freeze
+              erbout << "    const packcr_location_t p0_loc = ctx->position_offset_loc;\n".freeze
             end
             erbout << "    const size_t n0 = chunk->thunks.len;\n".freeze
           end
@@ -25,13 +26,13 @@ class Packcr
           end
           erbout << "        const size_t p = ctx->position_offset;\n".freeze
 
-          if gen.location
-            erbout << "        const pcc_location_t p_loc = ctx->position_offset_loc;\n".freeze
+          if r != Packcr::CODE_REACH__ALWAYS_SUCCEED
+            if gen.location
+              erbout << "        const packcr_location_t p_loc = ctx->position_offset_loc;\n".freeze
+            end
+            erbout << "        const size_t n = chunk->thunks.len;\n".freeze
           end
-          erbout << "        const size_t n = chunk->thunks.len;\n".freeze
-
           l = gen.next_label
-          r = expr.reachability
           erbout << "#{gen.generate_code(expr, l, 8, false)}        if (ctx->position_offset == p) break;\n".freeze
 
           if r != Packcr::CODE_REACH__ALWAYS_SUCCEED
@@ -40,7 +41,7 @@ class Packcr
             if gen.location
               erbout << "        ctx->position_offset_loc = p_loc;\n".freeze
             end
-            erbout << "        pcc_thunk_array__revert(ctx->auxil, &chunk->thunks, n);\n        break;\n".freeze
+            erbout << "        packcr_thunk_array__revert(ctx->auxil, &chunk->thunks, n);\n        break;\n".freeze
           end
           erbout << "    }\n".freeze
 
@@ -50,7 +51,7 @@ class Packcr
             if gen.location
               erbout << "        ctx->position_offset_loc = p0_loc;\n".freeze
             end
-            erbout << "        pcc_thunk_array__revert(ctx->auxil, &chunk->thunks, n0);\n        goto L#{format("%04d", onfail)};\n    }\n".freeze
+            erbout << "        packcr_thunk_array__revert(ctx->auxil, &chunk->thunks, n0);\n        goto L#{format("%04d", onfail)};\n    }\n".freeze
           end
           erbout << "}\n".freeze
 
@@ -112,45 +113,43 @@ class Packcr
         case gen.lang
         when :c
           erbout = +""
-          erbout << "{\n".freeze
-
-          l = gen.next_label
-          erbout << "    const size_t p = ctx->position_offset;\n".freeze
+          r = expr.reachability
+          if r == Packcr::CODE_REACH__ALWAYS_SUCCEED
+            erbout << "#{gen.generate_code(expr, nil, 0, true)}".freeze
+          else
+            erbout << "{\n".freeze
 
-          if gen.location
-            erbout << "    const pcc_location_t p_loc = ctx->position_offset_loc;\n".freeze
-          end
-          erbout << "    const size_t n = chunk->thunks.len;\n".freeze
+            l = gen.next_label
+            erbout << "    const size_t p = ctx->position_offset;\n".freeze
 
-          r = expr.reachability
-          erbout << "#{gen.generate_code(expr, l, 4, false)}".freeze
-          if r != Packcr::CODE_REACH__ALWAYS_SUCCEED
+            if gen.location
+              erbout << "    const packcr_location_t p_loc = ctx->position_offset_loc;\n".freeze
+            end
+            erbout << "    const size_t n = chunk->thunks.len;\n#{gen.generate_code(expr, l, 4, false)}".freeze
             m = gen.next_label
             erbout << "    goto L#{format("%04d", m)};\nL#{format("%04d", l)}:;\n".freeze
 
             if gen.location
               erbout << "    ctx->position_offset_loc = p_loc;\n".freeze
             end
-            erbout << "    ctx->position_offset = p;\n    pcc_thunk_array__revert(ctx->auxil, &chunk->thunks, n);\nL#{format("%04d", m)}:;\n".freeze
+            erbout << "    ctx->position_offset = p;\n    packcr_thunk_array__revert(ctx->auxil, &chunk->thunks, n);\nL#{format("%04d", m)}:;\n}\n".freeze
           end
-          erbout << "}\n".freeze
-
           erbout
         when :rb
           erbout = +""
-          l = gen.next_label
-          erbout << "pos#{gen.level} = @position_offset\n".freeze
-
-          if gen.location
-            erbout << "p_loc#{gen.level} = @position_offset_loc\n".freeze
-          end
-          erbout << "n#{gen.level} = answer.thunks.length\n".freeze
-
           r = expr.reachability
           if r == Packcr::CODE_REACH__ALWAYS_SUCCEED
 
-            erbout << "#{gen.generate_code(expr, l, 0, false)}".freeze
+            erbout << "#{gen.generate_code(expr, nil, 0, true)}".freeze
           else
+            l = gen.next_label
+            erbout << "pos#{gen.level} = @position_offset\n".freeze
+
+            if gen.location
+              erbout << "p_loc#{gen.level} = @position_offset_loc\n".freeze
+            end
+            erbout << "n#{gen.level} = answer.thunks.length\n".freeze
+
             m = gen.next_label
             erbout << "catch(#{m}) do\n  catch(#{l}) do\n#{gen.generate_code(expr, l, 4, false)}    throw(#{m})\n  end\n".freeze
 

data/lib/packcr/generated/node/reference_node.rb

@@ -6,9 +6,9 @@ class Packcr
         when :c
           erbout = +""
           if index.nil?
-            erbout << "{\n    pcc_rule_set_t *l = NULL;\n    if (limits && ctx->position_offset == offset && pcc_rule_set__index(ctx->auxil, limits, pcc_evaluate_rule_#{name}) == PCC_VOID_VALUE) {\n        l = limits;\n    }\n    if (!pcc_apply_rule(ctx, pcc_evaluate_rule_#{name}, &chunk->thunks, NULL, offset".freeze
+            erbout << "{\n    packcr_rule_set_t *l = NULL;\n    if (limits && ctx->position_offset == offset && packcr_rule_set__index(ctx->auxil, limits, packcr_evaluate_rule_#{name}) == PACKCR_VOID_VALUE) {\n        l = limits;\n    }\n    if (!packcr_apply_rule(ctx, packcr_evaluate_rule_#{name}, &chunk->thunks, NULL, offset".freeze
           else
-            erbout << "{\n    pcc_rule_set_t *l = NULL;\n    if (limits && ctx->position_offset == offset && pcc_rule_set__index(ctx->auxil, limits, pcc_evaluate_rule_#{name}) == PCC_VOID_VALUE) {\n        l = limits;\n    }\n    if (!pcc_apply_rule(ctx, pcc_evaluate_rule_#{name}, &chunk->thunks, &(chunk->values.buf[#{index}]), offset".freeze
+            erbout << "{\n    packcr_rule_set_t *l = NULL;\n    if (limits && ctx->position_offset == offset && packcr_rule_set__index(ctx->auxil, limits, packcr_evaluate_rule_#{name}) == PACKCR_VOID_VALUE) {\n        l = limits;\n    }\n    if (!packcr_apply_rule(ctx, packcr_evaluate_rule_#{name}, &chunk->thunks, &(chunk->values.buf[#{index}]), offset".freeze
 
           end
           if gen.location

data/lib/packcr/generated/node/rule_node.rb

@@ -5,26 +5,26 @@ class Packcr
         case gen.lang
         when :c
           erbout = +""
-          erbout << "static pcc_thunk_chunk_t *pcc_evaluate_rule_#{name}(pcc_context_t *ctx, size_t offset".freeze
+          erbout << "static packcr_thunk_chunk_t *packcr_evaluate_rule_#{name}(packcr_context_t *ctx, size_t offset".freeze
           if gen.location
-            erbout << ", pcc_location_t offset_loc".freeze
+            erbout << ", packcr_location_t offset_loc".freeze
           end
-          erbout << ", pcc_rule_set_t *limits) {\n    pcc_thunk_chunk_t *const chunk = pcc_thunk_chunk__create(ctx);\n    chunk->pos = ctx->position_offset;\n".freeze
+          erbout << ", packcr_rule_set_t *limits) {\n    packcr_thunk_chunk_t *const chunk = packcr_thunk_chunk__create(ctx);\n    chunk->pos = ctx->position_offset;\n".freeze
 
           if gen.location
             erbout << "    chunk->pos_loc = ctx->position_offset_loc;\n".freeze
           end
-          erbout << "    PCC_DEBUG(ctx->auxil, PCC_DBG_EVALUATE, \"#{name}\", ctx->level, chunk->pos, (ctx->buffer.buf + chunk->pos), (ctx->buffer.len - chunk->pos));\n    ctx->level++;\n    pcc_value_table__resize(ctx->auxil, &chunk->values, #{vars.length});\n    pcc_capture_table__resize(ctx->auxil, &chunk->capts, #{capts.length});\n".freeze
+          erbout << "    PACKCR_DEBUG(ctx->auxil, PACKCR_DBG_EVALUATE, \"#{name}\", ctx->level, chunk->pos, (ctx->buffer.buf + chunk->pos), (ctx->buffer.len - chunk->pos));\n    ctx->level++;\n    packcr_value_table__resize(ctx->auxil, &chunk->values, #{vars.length});\n    packcr_capture_table__resize(ctx->auxil, &chunk->capts, #{capts.length});\n".freeze
 
           if !vars.empty?
-            erbout << "    pcc_value_table__clear(ctx->auxil, &chunk->values);\n".freeze
+            erbout << "    packcr_value_table__clear(ctx->auxil, &chunk->values);\n".freeze
           end
           r = expr.reachability
 
-          erbout << "#{gen.generate_code(expr, 0, 4, false)}    ctx->level--;\n    PCC_DEBUG(ctx->auxil, PCC_DBG_MATCH, \"#{name}\", ctx->level, chunk->pos, (ctx->buffer.buf + chunk->pos), (ctx->position_offset - chunk->pos));\n    return chunk;\n".freeze
+          erbout << "#{gen.generate_code(expr, 0, 4, false)}    ctx->level--;\n    PACKCR_DEBUG(ctx->auxil, PACKCR_DBG_MATCH, \"#{name}\", ctx->level, chunk->pos, (ctx->buffer.buf + chunk->pos), (ctx->position_offset - chunk->pos));\n    return chunk;\n".freeze
 
           if r != Packcr::CODE_REACH__ALWAYS_SUCCEED
-            erbout << "L0000:;\n    ctx->level--;\n    PCC_DEBUG(ctx->auxil, PCC_DBG_NOMATCH, \"#{name}\", ctx->level, chunk->pos, (ctx->buffer.buf + chunk->pos), (ctx->position_offset - chunk->pos));\n    pcc_thunk_chunk__destroy(ctx, chunk);\n    return NULL;\n".freeze
+            erbout << "L0000:;\n    ctx->level--;\n    PACKCR_DEBUG(ctx->auxil, PACKCR_DBG_NOMATCH, \"#{name}\", ctx->level, chunk->pos, (ctx->buffer.buf + chunk->pos), (ctx->position_offset - chunk->pos));\n    packcr_thunk_chunk__destroy(ctx, chunk);\n    return NULL;\n".freeze
           end
           erbout << "}\n".freeze
 

data/lib/packcr/generated/node/string_node.rb

@@ -5,7 +5,7 @@ class Packcr
         case gen.lang
         when :c
           erbout = +""
-          erbout << "if (\n    pcc_refill_buffer(ctx, #{n}) < #{n} ||\n".freeze
+          erbout << "if (\n    packcr_refill_buffer(ctx, #{n}) < #{n} ||\n".freeze
 
           (n - 1).times do |i|
             erbout << "    (ctx->buffer.buf + ctx->position_offset)[#{i}] != '#{Packcr.escape_character(value[i])}' ||\n".freeze
@@ -13,7 +13,7 @@ class Packcr
           erbout << "    (ctx->buffer.buf + ctx->position_offset)[#{n - 1}] != '#{Packcr.escape_character(value[n - 1])}'\n) goto L#{format("%04d", onfail)};\n".freeze
 
           if gen.location
-            erbout << "pcc_location_forward(&ctx->position_offset_loc, ctx->buffer.buf + ctx->position_offset, n);\n".freeze
+            erbout << "packcr_location_forward(&ctx->position_offset_loc, ctx->buffer.buf + ctx->position_offset, #{n});\n".freeze
           end
           erbout << "ctx->position_offset += #{n};\n".freeze
 
@@ -35,10 +35,10 @@ class Packcr
         case gen.lang
         when :c
           erbout = +""
-          erbout << "if (\n    pcc_refill_buffer(ctx, 1) < 1 ||\n    ctx->buffer.buf[ctx->position_offset] != '#{Packcr.escape_character(value[0])}'\n) goto L#{format("%04d", onfail)};\n".freeze
+          erbout << "if (\n    packcr_refill_buffer(ctx, 1) < 1 ||\n    ctx->buffer.buf[ctx->position_offset] != '#{Packcr.escape_character(value[0])}'\n) goto L#{format("%04d", onfail)};\n".freeze
 
           if gen.location
-            erbout << "    pcc_location_forward(&ctx->position_offset_loc, ctx->buffer.buf + ctx->position_offset, 1);\n".freeze
+            erbout << "    packcr_location_forward(&ctx->position_offset_loc, ctx->buffer.buf + ctx->position_offset, 1);\n".freeze
           end
           erbout << "ctx->position_offset++;\n".freeze