From 605e552a251a5a05224195608b75e668d6bbd190 Mon Sep 17 00:00:00 2001
From: Jean Pierre Cimalando <jp-dev@inbox.ru>
Date: Mon, 20 Apr 2020 22:54:04 +0200
Subject: [PATCH] Change the comment type into an enum

---
 src/sfizz/parser/Parser.cpp | 22 +++++++++++++---------
 src/sfizz/parser/Parser.h   |  8 +++++++-
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/sfizz/parser/Parser.cpp b/src/sfizz/parser/Parser.cpp
index 800d0379..ffa660aa 100644
--- a/src/sfizz/parser/Parser.cpp
+++ b/src/sfizz/parser/Parser.cpp
@@ -7,6 +7,7 @@
 #include "Parser.h"
 #include "ParserPrivate.h"
 #include "absl/memory/memory.h"
+#include <cassert>
 
 namespace sfz {
 
@@ -348,21 +349,21 @@ void Parser::flushCurrentHeader()
     _currentOpcodes.clear();
 }
 
-int Parser::hasComment(Reader& reader)
+Parser::CommentType Parser::getCommentType(Reader& reader)
 {
     if (reader.peekChar() != '/')
-        return false;
+        return CommentType::None;
 
     reader.getChar();
 
-    int ret = 0;
+    CommentType ret = CommentType::None;
 
     switch (reader.peekChar()) {
     case '/':
-        ret = 1;
+        ret = CommentType::Line;
         break;
     case '*':
-        ret = 2;
+        ret = CommentType::Block;
         break;
     }
 
@@ -374,8 +375,8 @@ size_t Parser::skipComment()
 {
     Reader& reader = *_included.back();
 
-    int commentType = hasComment(reader);
-    if (!commentType)
+    const CommentType commentType = getCommentType(reader);
+    if (commentType == CommentType::None)
         return 0;
 
     SourceLocation start = reader.location();
@@ -387,7 +388,7 @@ size_t Parser::skipComment()
     bool terminated = false;
 
     switch (commentType) {
-    case 1: // line comment
+    case CommentType::Line:
         {
             int c;
             while ((c = reader.getChar()) != Reader::kEof && c != '\r' && c != '\n')
@@ -395,7 +396,7 @@ size_t Parser::skipComment()
             terminated = true;
         }
         break;
-    case 2: // block comment
+    case CommentType::Block:
         {
             int c1 = 0;
             int c2 = reader.getChar();
@@ -406,6 +407,9 @@ size_t Parser::skipComment()
             }
         }
         break;
+    default:
+        assert(false);
+        break;
     }
 
     if (!terminated) {
diff --git a/src/sfizz/parser/Parser.h b/src/sfizz/parser/Parser.h
index 88424d1d..057143ad 100644
--- a/src/sfizz/parser/Parser.h
+++ b/src/sfizz/parser/Parser.h
@@ -84,7 +84,13 @@ private:
     void flushCurrentHeader();
 
     // helpers
-    static int hasComment(Reader& reader); // 0=None 1=Line 2=Block
+    enum class CommentType {
+        None,
+        Line,
+        Block,
+    };
+
+    static CommentType getCommentType(Reader& reader);
     size_t skipComment();
     static void trimRight(std::string& text);
     static size_t extractToEol(Reader& reader, std::string* dst); // ignores comment