fix variable/property/prompt

Author: cwisniew

src/main/antlr/net/rptools/maptool/advanceddice/parser/GenesysDiceLexer.g4

@@ -68,9 +68,9 @@ FUNCTION                         : '#' IDENTIFIER;
 
 
 // Variables
-VARIABLE                         : '${' (~[}])+ '}';
-PROPERTY                         : '${@' (~[}])+ '}';
-PROMPT                           : '${?' (~[}])+ '}';
+PROPERTY                         : LBRACE '@' (~[}])+ RBRACE;
+PROMPT                           : LBRACE '?' (~[}])+ RBRACE;
+VARIABLE                         : LBRACE (~[?@]) (~[}])+ RBRACE;
 
 
 // Dice Types
@@ -94,6 +94,8 @@ fragment WHITE_DICE_NAMES         : 'w' | 'white';
 
 
 
+fragment LBRACE                   : '{';
+fragment RBRACE                   : '}';
 
 
 

src/main/antlr/net/rptools/maptool/advanceddice/parser/GenesysDiceParser.g4

@@ -56,6 +56,7 @@ genesysNumberDice             : INTEGER_LITERAL
                               | PROMPT
                               ;
 
+
 genesysFunction               : func=FUNCTION LPAREN genesysFunctionParams RPAREN
                               ;
 

src/main/java/net/rptools/maptool/advanceddice/Main.java

@@ -20,7 +20,7 @@ public class Main {
 
   public static void main(String[] args) {
     try {
-      var res = new GenesysDiceRoller().roll("3yhs", null, null, null);
+      var res = new GenesysDiceRoller().roll("3y{@prop}y{var}y{?prompt}s", n -> 1, n -> 2, n -> 3);
       System.out.println(res);
     } catch (Exception e) {
       e.printStackTrace();

src/main/java/net/rptools/maptool/advanceddice/genesys/GenesysDiceRollVisitor.java

@@ -288,13 +288,16 @@ private int getNumber(GenesysNumberDiceContext num) {
     if (num.INTEGER_LITERAL() != null) {
       return Integer.parseInt(num.INTEGER_LITERAL().getText());
     } else if (num.VARIABLE() != null) {
-      return variableResolver.applyAsInt(num.VARIABLE().getText());
+      var name = num.VARIABLE().getText().replaceAll("^\\{", "").replaceAll("}$", "");
+      return variableResolver.applyAsInt(name);
     } else if (num.PROPERTY() != null) {
-      return propertyResolver.applyAsInt(num.PROPERTY().getText());
+      var name = num.PROPERTY().getText().replaceAll("^\\{@", "").replaceAll("}$", "");
+      return propertyResolver.applyAsInt(name);
     } else if (num.PROMPT() != null) {
-      return promptResolver.applyAsInt(num.PROMPT().getText());
+      var name = num.PROMPT().getText().replaceAll("^\\{\\?", "").replaceAll("}$", "");
+      return promptResolver.applyAsInt(name);
     } else {
-      return 1; // TODO: CDW
+      throw new IllegalArgumentException("Unknown number type"); // Shouldn't happen
     }
   }