DeCarabas/lrparsers
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Lots of logging tweaks

Browse source
This commit is contained in:
John Doty 2024-06-09 07:12:35 -07:00
parent 38837f5c4d
commit 0c3e6b211c
1 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

31
harness.py
View file

@ -112,19 +112,19 @@ class RepairStack(typing.NamedTuple):
match action: match action:
case parser.Shift(): case parser.Shift():
rl.info(f"{stack.state}: SHIFT -> {action.state}") rl.debug(f"{stack.state}: SHIFT -> {action.state}")
return stack.push(action.state), False return stack.push(action.state), False
case parser.Accept(): case parser.Accept():
rl.info(f"{stack.state}: ACCEPT") rl.debug(f"{stack.state}: ACCEPT")
return stack, True # ? return stack, True # ?
case parser.Reduce(): case parser.Reduce():
rl.info(f"{stack.state}: REDUCE {action.name} {action.count} ") rl.debug(f"{stack.state}: REDUCE {action.name} {action.count} ")
new_stack = stack.pop(action.count) new_stack = stack.pop(action.count)
rl.info(f" -> {new_stack.state}") rl.debug(f" -> {new_stack.state}")
new_state = table.gotos[new_stack.state][action.name] new_state = table.gotos[new_stack.state][action.name]
rl.info(f" goto {new_state}") rl.debug(f" goto {new_state}")
stack = new_stack.push(new_state) stack = new_stack.push(new_state)
case parser.Error(): case parser.Error():
@ -159,6 +159,10 @@ class Repair:
if self.advance >= 3: if self.advance >= 3:
self.success = True self.success = True
def __repr__(self):
valstr = f"({self.value})" if self.value is not None else ""
return f"<Repair {self.repair.value}{valstr} cost:{self.cost} advance:{self.advance}>"
def neighbors( def neighbors(
self, self,
table: parser.ParseTable, table: parser.ParseTable,
@ -173,8 +177,8 @@ class Repair:
if rl.isEnabledFor(logging.INFO): if rl.isEnabledFor(logging.INFO):
valstr = f"({self.value})" if self.value is not None else "" valstr = f"({self.value})" if self.value is not None else ""
rl.info(f"{self.repair.value}{valstr} @ {self.cost} input:{input_index}") rl.debug(f"{self.repair.value}{valstr} @ {self.cost} input:{input_index}")
rl.info(f" {','.join(str(s) for s in self.stack.flatten())}") rl.debug(f" {','.join(str(s) for s in self.stack.flatten())}")
state = self.stack.state state = self.stack.state
@ -188,7 +192,7 @@ class Repair:
# necessary, producing a new version of the stack. Count up the # necessary, producing a new version of the stack. Count up the
# number of successful shifts. # number of successful shifts.
for token in table.actions[state].keys(): for token in table.actions[state].keys():
rl.info(f" token: {token}") rl.debug(f" token: {token}")
new_stack, success = self.stack.handle_token(table, token) new_stack, success = self.stack.handle_token(table, token)
if new_stack is None: if new_stack is None:
# Not clear why this is necessary, but I think state merging # Not clear why this is necessary, but I think state merging
@ -197,7 +201,7 @@ class Repair:
continue continue
if token == input[input_index].kind: if token == input[input_index].kind:
rl.info(f" generate shift {token}") rl.debug(f" generate shift {token}")
yield Repair( yield Repair(
repair=RepairAction.Shift, repair=RepairAction.Shift,
parent=self, parent=self,
@ -206,7 +210,7 @@ class Repair:
advance=1, # Move forward by one. advance=1, # Move forward by one.
) )
rl.info(f" generate insert {token}") rl.debug(f" generate insert {token}")
yield Repair( yield Repair(
repair=RepairAction.Insert, repair=RepairAction.Insert,
value=token, value=token,
@ -223,7 +227,7 @@ class Repair:
# delete-insert pairs, not insert-delete, because they are # delete-insert pairs, not insert-delete, because they are
# symmetrical and therefore a waste of time and memory.) # symmetrical and therefore a waste of time and memory.)
if self.repair != RepairAction.Insert: if self.repair != RepairAction.Insert:
rl.info(f" generate delete") rl.debug(f" generate delete")
yield Repair( yield Repair(
repair=RepairAction.Delete, repair=RepairAction.Delete,
parent=self, parent=self,
@ -234,6 +238,7 @@ class Repair:
def recover(table: parser.ParseTable, input: list[TokenValue], start: int, stack: ParseStack): def recover(table: parser.ParseTable, input: list[TokenValue], start: int, stack: ParseStack):
rl = recover_log
initial = Repair( initial = Repair(
repair=RepairAction.Base, repair=RepairAction.Base,
cost=0, cost=0,
@ -259,6 +264,10 @@ def recover(table: parser.ParseTable, input: list[TokenValue], start: int, stack
repairs.append(repair) repairs.append(repair)
repair = repair.parent repair = repair.parent
repairs.reverse() repairs.reverse()
if rl.isEnabledFor(logging.INFO):
rl.info("Recovered with actions:")
for repair in repairs:
rl.info(" " + repr(repair))
return repairs return repairs
for neighbor in repair.neighbors(table, input, start): for neighbor in repair.neighbors(table, input, start):