fix for variables length of 1 character

RPTools · Sep 29, 2023 · b781041 · b781041
1 parent 9987d66
commit b781041
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,8 @@
 .gradle
 build/
 !gradle/wrapper/gradle-wrapper.jar
-!**/src/main/**/build/
-!**/src/test/**/build/
+**/src/main/**/build/
+**/src/test/**/build/
 
 ### IntelliJ IDEA ###
 .idea
@@ -42,4 +42,4 @@ bin/
 ### Antlr files that IDE tools may generate
 src/main/antlr/net/rptools/maptool/advanceddice/gen
 src/main/antlr/net/rptools/maptool/advanceddice/build
-src/main/gen
+src/main/gen
diff --git a/src/main/antlr/net/rptools/maptool/advanceddice/parser/GenesysDiceLexer.g4 b/src/main/antlr/net/rptools/maptool/advanceddice/parser/GenesysDiceLexer.g4
@@ -70,7 +70,7 @@ FUNCTION                         : '#' IDENTIFIER;
 // Variables
 PROPERTY                         : LBRACE '@' (~[}])+ RBRACE;
 PROMPT                           : LBRACE '?' (~[}])+ RBRACE;
-VARIABLE                         : LBRACE (~[?@]) (~[}])+ RBRACE;
+VARIABLE                         : LBRACE (~[?@]) (~[}])* RBRACE;
 
 
 // Dice Types

diff --git a/src/main/antlr/net/rptools/maptool/advanceddice/parser/GenesysDiceParser.g4 b/src/main/antlr/net/rptools/maptool/advanceddice/parser/GenesysDiceParser.g4
@@ -56,7 +56,6 @@ genesysNumberDice             : INTEGER_LITERAL
                               | PROMPT
                               ;
 
-
 genesysFunction               : func=FUNCTION LPAREN genesysFunctionParams RPAREN
                               ;
-Original file line number
+Diff line change
@@ Expand Up / @@ -56,7 +56,6 @@ genesysNumberDice : INTEGER_LITERAL @@
                                   | PROMPT
                                   ;
     genesysFunction               : func=FUNCTION LPAREN genesysFunctionParams RPAREN
                                   ;
@@ Expand Down @@