commit fc9bb98914de1b11149303cb87d6ef7fad7e621f
author Gavin Howard <yzena.tech@gmail.com> Wed Feb 21 19:03:13 2018 -0700
committer Gavin Howard <yzena.tech@gmail.com> Tue Aug 28 17:10:29 2018 -0600
tree 892bc4b292582cc90af2386723f772adb7d24ca6
parent f9edc41189b00fe55db924f06c90f349e089d612

Fix bugs in lexer that mishandled comments

src/bc/lex.c

diff --git a/src/bc/lex.c b/src/bc/lex.c
index f7e800a..765a9ac 100644
--- a/src/bc/lex.c
+++ b/src/bc/lex.c
@@ -635,6 +635,10 @@
 static BcStatus bc_lex_comment(BcLex* lex, BcLexToken* token) {
 
   uint32_t newlines;
+  bool end;
+  size_t i;
+  const char* buffer;
+  char c;
 
   newlines = 0;
 
@@ -642,19 +646,19 @@
 
   ++lex->idx;
 
-  size_t i = lex->idx;
-  const char* buffer = lex->buffer;
-  char c = buffer[i];
+  i = lex->idx;
+  buffer = lex->buffer;
 
-  if (c == '\n') ++newlines;
-
-  int end = 0;
+  end = false;
 
   while (!end) {
 
-    while (c != '*' && c != '\0') c = buffer[++i];
+    c = buffer[i];
 
-    if (c == '\n') ++newlines;
+    while (c != '*' && c != '\0') {
+      if (c == '\n') ++newlines;
+      c = buffer[++i];
+    }
 
     if (c == '\0' || buffer[i + 1] == '\0') {
       lex->idx = i;