From 8b1d615a77ba30dc22e3e798d49c8f9f5fc4a33a Mon Sep 17 00:00:00 2001
From: nickysn <nickysn@gmail.com>
Date: Mon, 3 Aug 2020 12:59:45 +0000
Subject: [PATCH] [PATCH 056/188] fix comments scanning

From 4933bad2fb89f856c5cfc5d60378e619c92a5413 Mon Sep 17 00:00:00 2001
From: Dmitry Boyarintsev <skalogryz.lists@gmail.com>
Date: Sun, 24 Nov 2019 20:18:09 -0500

git-svn-id: branches/wasm@46052 -
---
 utils/wasmbin/parseutils.pas |  3 ++-
 utils/wasmbin/watscanner.pas | 11 ++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/utils/wasmbin/parseutils.pas b/utils/wasmbin/parseutils.pas
index 308be8175a..cd59d9b8a1 100644
--- a/utils/wasmbin/parseutils.pas
+++ b/utils/wasmbin/parseutils.pas
@@ -222,7 +222,8 @@ begin
     if isSubStrMatch(s, index, substr) then begin
       inc(index, length(substr));
       Break;
-    end;
+    end else
+      inc(index);
   end;
   Result:=Copy(s, i, index-i);
 end;
diff --git a/utils/wasmbin/watscanner.pas b/utils/wasmbin/watscanner.pas
index 4da2567932..c634bf29d4 100644
--- a/utils/wasmbin/watscanner.pas
+++ b/utils/wasmbin/watscanner.pas
@@ -192,13 +192,12 @@ begin
     Result := idx<=length(buf);
     if not Result then Exit;
     ofs:=idx;
-    has2chars := idx<length(buf);
-    if has2chars then begin
-      if (buf[idx]=';') and (buf[idx+1]=';') then begin
+    if (idx<length(buf)) and (buf[idx] in [';','(']) and (buf[idx+1]=';') then begin
+      if (buf[idx]=';') then begin
         // comment until the end of the line
         cmt := ScanTo(buf, idx, EoLnChars);
         ScanWhile(buf, idx, EoLnChars);
-      end else if (buf[idx]='(') and (buf[idx+1]=';') then
+      end else
         // comment until the ;)
         cmt := ScanToSubstr(buf, idx, ';)');
 
@@ -207,9 +206,7 @@ begin
         done:=true;
       end else
         DoComment(cmt);
-    end;
-
-    if not done then begin
+    end else begin
       done:=true;
       if buf[idx] = '(' then begin
         token:=weOpenBrace;