From 33c5c780c123c900e35e3b29a3a03fba3b618a92 Mon Sep 17 00:00:00 2001
From: David Schmenk <dschmenk@gmail.com>
Date: Sat, 5 Jul 2014 12:37:31 -0700
Subject: [PATCH] Clean up 'when/of/otherwise' code constructs
---
src/toolsrc/parse.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/toolsrc/parse.c b/src/toolsrc/parse.c
index 9ba2384..93d56da 100755
--- a/src/toolsrc/parse.c
+++ b/src/toolsrc/parse.c
@@ -639,11 +639,10 @@ int parse_stmnt(void)
char *idptr;
/*
- * Optimization for last function LEAVE
+ * Optimization for last function LEAVE and OF clause.
*/
- if (scantoken != END_TOKEN && scantoken != DONE_TOKEN)
+ if (scantoken != END_TOKEN && scantoken != DONE_TOKEN && scantoken != OF_TOKEN && scantoken != DEFAULT_TOKEN)
prevstmnt = scantoken;
-
switch (scantoken)
{
case IF_TOKEN:
@@ -822,17 +821,17 @@ int parse_stmnt(void)
emit_brne(tag_choice);
emit_codetag(tag_of);
while (parse_stmnt()) next_line();
- //emit_brnch(break_tag);
tag_of = tag_new(BRANCH_TYPE);
- emit_brnch(tag_of);
+ if (prevstmnt != BREAK_TOKEN) // Fall through to next OF if no break
+ emit_brnch(tag_of);
emit_codetag(tag_choice);
tag_choice = tag_new(BRANCH_TYPE);
}
else if (scantoken == DEFAULT_TOKEN)
{
- scan();
emit_codetag(tag_of);
tag_of = 0;
+ scan();
while (parse_stmnt()) next_line();
if (scantoken != ENDCASE_TOKEN)
{