Johannes/java-commons
Johannes/java-commons
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

muScript: support comments

Browse Source
This commit is contained in:
Johannes Frohnmeyer 2023-03-11 13:52:59 +01:00
parent 6f180900b6
commit a5fa86a6c7
Signed by: Johannes
GPG Key ID: E76429612C2929F4
2 changed files with 56 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
muscript/src/main/java/io/gitlab/jfronny/muscript/compiler/Lexer.java
View File

@ -32,7 +32,7 @@ public class Lexer {
}
// Scan expression
skipWhitespace();
skipWhitespaceAndComments();
if (isAtEnd()) {
createToken(Token.EOF);
return;
@ -132,13 +132,32 @@ public class Lexer {
}
}
private void skipWhitespace() {
private void skipWhitespaceAndComments() {
while (true) {
if (isAtEnd()) return;
char c = peek();
switch (c) {
switch (peek()) {
case ' ', '\r', '\t', '\n' -> advance();
case '/' -> {
switch (peekNext()) {
case '/' -> {
while (!isAtEnd() && peek() != '\r' && peek() != '\n') advance();
}
case '*' -> {
advance();
advance();
while (!isAtEnd() && (peek() != '*' || peekNext() != '/')) advance();
if (!isAtEnd()) {
advance();
advance();
}
}
default -> {
start = current;
return;
}
}
}
default -> {
start = current;
return;

33
muscript/src/test/java/io/gitlab/jfronny/muscript/test/CommentTest.java Normal file
View File

@ -0,0 +1,33 @@
package io.gitlab.jfronny.muscript.test;
import io.gitlab.jfronny.muscript.compiler.Parser;
import org.junit.jupiter.api.Test;
import static io.gitlab.jfronny.muscript.test.util.MuTestUtil.makeArgs;
import static org.junit.jupiter.api.Assertions.assertEquals;
class CommentTest {
@Test
void singleLine() {
assertEquals(2, Parser.parseScript("""
n = 5
n = 2
// n = 3
n
""").run(makeArgs()).asNumber().getValue());
}
@Test
void multiLine() {
assertEquals(2, Parser.parseScript("""
n = 2
/* n = 3 */
/*
n = 3
n = 4
n = 5
*/
n
""").run(makeArgs()).asNumber().getValue());
}
}