Skip to content

Commit 2e64786

Browse files
committed
Update preprocessor: skip directives in comment blocks.
1 parent 21ef6c6 commit 2e64786

4 files changed

Lines changed: 361 additions & 324 deletions

File tree

docs/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ RookScript (C) Black Rook Software
33
by Matt Tropiano et al. (see AUTHORS.txt)
44

55

6+
Changed in 1.18.0
7+
-----------------
8+
9+
- `Fixed` Preprocessor directives in comment blocks now will not get processed.
10+
11+
612
Changed in 1.17.3
713
-----------------
814

src/main/java/com/blackrook/rookscript/compiler/ScriptKernel.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,8 @@ public ScriptKernel()
9797
addStringDelimiter('"', '"');
9898
addRawStringDelimiter('`', '`');
9999

100-
addCommentStartDelimiter("/*", TYPE_COMMENT);
101-
addCommentLineDelimiter("//", TYPE_COMMENT);
102-
addCommentEndDelimiter("*/", TYPE_COMMENT);
100+
addCommentDelimiter("/*", "*/");
101+
addCommentLineDelimiter("//");
103102

104103
addDelimiter("(", TYPE_LPAREN);
105104
addDelimiter(")", TYPE_RPAREN);

0 commit comments

Comments
 (0)