summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/util/plaparse.cpp
diff options
context:
space:
mode:
author AJR <ajrhacker@users.noreply.github.com>2021-09-16 14:26:49 -0400
committer AJR <ajrhacker@users.noreply.github.com>2021-09-16 14:26:49 -0400
commita656497a6207da8a92f57e87bf7016a5fd1b25d0 (patch)
tree981676dee1a640ccdcec91ee9f9cda7ae15a75a6 /src/lib/util/plaparse.cpp
parent6b96a5d24b0848d1cca5009d9f5aa0c6b1039e6c (diff)
plaparse: Fix regression caused by parser eating '#' comment characters
Diffstat (limited to 'src/lib/util/plaparse.cpp')
-rw-r--r--src/lib/util/plaparse.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/lib/util/plaparse.cpp b/src/lib/util/plaparse.cpp
index 798abf41c23..dfcf3dc8e80 100644
--- a/src/lib/util/plaparse.cpp
+++ b/src/lib/util/plaparse.cpp
@@ -99,7 +99,7 @@ static uint32_t suck_number(util::random_read &src)
process_terms - process input/output matrix
-------------------------------------------------*/
-static bool process_terms(jed_data *data, util::random_read &src, uint8_t &ch, parse_info *pinfo)
+static bool process_terms(jed_data *data, util::random_read &src, uint8_t ch, parse_info *pinfo)
{
uint32_t curinput = 0;
uint32_t curoutput = 0;
@@ -197,12 +197,10 @@ static bool process_terms(jed_data *data, util::random_read &src, uint8_t &ch, p
if (src.read(&ch, 1, actual))
return false;
if (actual != 1)
- {
- ch = 0;
- break;
- }
+ return true;
}
+ src.seek(-1, SEEK_CUR);
return true;
}
@@ -353,7 +351,7 @@ int pla_parse(util::random_read &src, jed_data *result)
case '0': case '1': case '-': case '~':
if (!process_terms(result, src, ch, &pinfo))
return JEDERR_INVALID_DATA;
- continue;
+ break;
default:
break;