From 3be83c7fa2a9232fad3b1ea738a001df15a6d5b5 Mon Sep 17 00:00:00 2001
From: "Sven M. Hallberg" <pesco@khjk.org>
Date: Tue, 4 Jun 2013 21:59:39 +0200
Subject: [PATCH] set index and offset of result tokens in llk driver
---
src/backends/llk.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/backends/llk.c b/src/backends/llk.c
index 79ab8f45..4f73c469 100644
--- a/src/backends/llk.c
+++ b/src/backends/llk.c
@@ -339,10 +339,12 @@ HParseResult *h_llk_parse(HAllocator* mm__, const HParser* parser, HInputStream*
// the top of stack is such that there will be a result...
HParsedToken *tok; // will hold result token
+ tok = h_arena_malloc(arena, sizeof(HParsedToken));
+ tok->index = stream->index;
+ tok->bit_offset = stream->bit_offset;
if(x == mark) {
// hit stack frame boundary...
// wrap the accumulated parse result, this sequence is finished
- tok = h_arena_malloc(arena, sizeof(HParsedToken));
tok->token_type = TT_SEQUENCE;
tok->seq = seq;
@@ -361,13 +363,13 @@ HParseResult *h_llk_parse(HAllocator* mm__, const HParser* parser, HInputStream*
case HCF_END:
if(!stream->overrun)
goto no_parse;
+ h_arena_free(arena, tok);
tok = NULL;
break;
case HCF_CHAR:
if(input != x->chr)
goto no_parse;
- tok = h_arena_malloc(arena, sizeof(HParsedToken));
tok->token_type = TT_UINT;
tok->uint = x->chr;
break;
@@ -377,7 +379,6 @@ HParseResult *h_llk_parse(HAllocator* mm__, const HParser* parser, HInputStream*
goto no_parse;
if(!charset_isset(x->charset, input))
goto no_parse;
- tok = h_arena_malloc(arena, sizeof(HParsedToken));
tok->token_type = TT_UINT;
tok->uint = input;
break;
@@ -390,8 +391,6 @@ HParseResult *h_llk_parse(HAllocator* mm__, const HParser* parser, HInputStream*
// 'tok' has been parsed; process it
- // XXX set tok->index and tok->bit_offset (don't take directly from stream, cuz peek!)
-
// perform token reshape if indicated
if(x->reshape)
tok = (HParsedToken *)x->reshape(make_result(arena, tok));
--
GitLab