From 520884739ce70efc05abf669a67f0aae50005229 Mon Sep 17 00:00:00 2001
From: "Sven M. Hallberg" <pesco@khjk.org>
Date: Thu, 24 Sep 2015 16:33:13 +0200
Subject: [PATCH] cosmetic changes
---
src/backends/lr.c | 2 +-
src/backends/lr0.c | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/backends/lr.c b/src/backends/lr.c
index d9aaee72..fb256c0b 100644
--- a/src/backends/lr.c
+++ b/src/backends/lr.c
@@ -163,7 +163,7 @@ HLRAction *h_reduce_action(HArena *arena, const HLRItem *item)
}
// adds 'new' to the branches of 'action'
-// returns a 'action' if it is already of type HLR_CONFLICT
+// returns 'action' if it is already of type HLR_CONFLICT
// allocates a new HLRAction otherwise
HLRAction *h_lr_conflict(HArena *arena, HLRAction *action, HLRAction *new)
{
diff --git a/src/backends/lr0.c b/src/backends/lr0.c
index 1c86484e..a02df9e1 100644
--- a/src/backends/lr0.c
+++ b/src/backends/lr0.c
@@ -30,9 +30,9 @@ static void expand_to_closure(HCFGrammar *g, HHashSet *items)
HCFChoice *sym = item->rhs[item->mark]; // symbol after mark
// if there is a non-terminal after the mark, follow it
+ // and add items corresponding to the productions of sym
// NB: unlike LLk, we do consider HCF_CHARSET a non-terminal here
- if(sym != NULL && (sym->type==HCF_CHOICE || sym->type==HCF_CHARSET)) {
- // add items corresponding to the productions of sym
+ if(sym != NULL) {
if(sym->type == HCF_CHOICE) {
for(HCFSequence **p=sym->seq; *p; p++) {
HLRItem *it = h_lritem_new(arena, sym, (*p)->items, 0);
@@ -41,7 +41,7 @@ static void expand_to_closure(HCFGrammar *g, HHashSet *items)
h_slist_push(work, it);
}
}
- } else { // HCF_CHARSET
+ } else if(sym->type == HCF_CHARSET) {
for(unsigned int i=0; i<256; i++) {
if(charset_isset(sym->charset, i)) {
// XXX allocate these single-character symbols statically somewhere
@@ -93,8 +93,8 @@ HLRDFA *h_lr0_dfa(HCFGrammar *g)
// compute closure
// if destination is a new state:
// add it to state set
- // add transition to it
// add it to the work list
+ // add transition to it
while(!h_slist_empty(work)) {
size_t state_idx = (uintptr_t)h_slist_pop(work);
--
GitLab