Allow nested block comments, fixes #774

overturetool · Feb 5, 2021 · 100d48d · 100d48d
1 parent 7bced1c
commit 100d48d
Showing 1 changed file with 24 additions and 2 deletions.
diff --git a/core/parser/src/main/java/org/overture/parser/lex/LexTokenReader.java b/core/parser/src/main/java/org/overture/parser/lex/LexTokenReader.java
@@ -929,10 +929,11 @@ else if (ch == '>')
 					StringBuilder sb = new StringBuilder();
 					rdCh();
 					ILexLocation here = location(linecount, charpos, tokline, tokpos);
+					int nestedCount = 0;
 
 					while (ch != EOF)
 					{
-					    while (ch != '*' && ch != EOF)
+					    while (ch != '*' && ch != '/' && ch != EOF)
 					    {
 					    	sb.append(ch);
 					    	rdCh();
@@ -942,11 +943,32 @@ else if (ch == '>')
 					    {
 					    	throwMessage(1011, tokline, tokpos, "Unterminated block comment");
 					    }
+					    else if (ch == '/')
+					    {
+					    	sb.append('/');
+
+					    	if (rdCh() == '*')
+						    {
+						    	nestedCount++;
+						    	sb.append('*');
+						    	rdCh();
+						    }
+					    }
 					    else
 					    {
 						    if (rdCh() == '/')
 						    {
-						    	break;
+						    	if (nestedCount == 0)
+						    	{
+						    		break;
+						    	}
+						    	else
+						    	{
+						    		nestedCount--;
+						    		sb.append('*');
+						    		sb.append('/');
+						    		rdCh();
+						    	}
 						    }
 						    else
 						    {