From 0e24940b78c1cb01c7231f49e8bf53622c7d0b62 Mon Sep 17 00:00:00 2001 From: gnembon Date: Mon, 27 Jul 2020 20:33:45 -0300 Subject: [PATCH] patched error messages with new style map and list constructors --- src/main/java/carpet/script/Tokenizer.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/carpet/script/Tokenizer.java b/src/main/java/carpet/script/Tokenizer.java index 61668abc..30fac871 100644 --- a/src/main/java/carpet/script/Tokenizer.java +++ b/src/main/java/carpet/script/Tokenizer.java @@ -370,12 +370,14 @@ public class Tokenizer implements Iterator token.type == Token.TokenType.HEX_LITERAL || token.type == Token.TokenType.VARIABLE || token.type == Token.TokenType.STRINGPARAM || + ( token.type == Token.TokenType.MARKER && ( previousToken.surface.equalsIgnoreCase("{") || previousToken.surface.equalsIgnoreCase("["))) || token.type == Token.TokenType.FUNCTION ) &&( previousToken.type == Token.TokenType.VARIABLE || previousToken.type == Token.TokenType.FUNCTION || previousToken.type == Token.TokenType.LITERAL || previousToken.type == Token.TokenType.CLOSE_PAREN || + ( previousToken.type == Token.TokenType.MARKER && ( previousToken.surface.equalsIgnoreCase("}") || previousToken.surface.equalsIgnoreCase("]"))) || previousToken.type == Token.TokenType.HEX_LITERAL || previousToken.type == Token.TokenType.STRINGPARAM )