Merge pull request #1346 from jediwhale/master

!define crashes when missing opening delimiter

Author: jediwhale

src/fitnesse/wikitext/parser/Comment.java

@@ -4,7 +4,7 @@ public class Comment extends SymbolType implements Rule, Translation {
     public static final Comment symbolType = new Comment();
 
     public Comment() {
-        super("Comment", Newline);
+        super("Comment");
         wikiMatcher(new Matcher().startLine().string("#"));
         wikiRule(this);
         htmlTranslation(this);

src/fitnesse/wikitext/parser/Define.java

@@ -39,9 +39,16 @@ private Maybe<String> copyVariableValue(Parser parser, Symbol next) {
   }
 
   private Maybe<String> parseVariableValue(Parser parser, Symbol next) {
-    SymbolType close = next.getType().closeType();
-    if (close == SymbolType.Empty) return Maybe.noString;
-    return parser.parseToAsString(close);
+    SymbolType nextType = next.getType();
+
+    // for backward compatibility: !define x<eof> is valid
+    if (nextType == SymbolType.Empty) return new Maybe<>("");
+
+    if (nextType == SymbolType.OpenBrace) return parser.parseToAsString(SymbolType.CloseBrace);
+    if (nextType == SymbolType.OpenBracket) return parser.parseToAsString(SymbolType.CloseBracket);
+    if (nextType == SymbolType.OpenParenthesis) return parser.parseToAsString(SymbolType.CloseParenthesis);
+    
+    return Maybe.noString;
   }
 
   @Override

src/fitnesse/wikitext/parser/Literal.java

@@ -4,15 +4,15 @@ public class Literal extends SymbolType implements Rule {
     public static final Literal symbolType = new Literal();
 
     public Literal() {
-        super("Literal", CloseLiteral);
+        super("Literal");
         wikiMatcher(new Matcher().string("!-"));
         wikiRule(this);
     }
 
     @Override
     public Maybe<Symbol> parse(Symbol current, Parser parser) {
         SymbolType type = current.getType();
-        String literal = parser.parseLiteral(closeType());
+        String literal = parser.parseLiteral(CloseLiteral);
         if (parser.atEnd())  return Symbol.nothing;
         return new Maybe<>(new Symbol(type, literal));
     }

src/fitnesse/wikitext/parser/SymbolType.java

@@ -73,12 +73,12 @@ public class SymbolType implements Matchable {
             .wikiMatcher(new Matcher().startLineOrCell().string("!note"))
             .wikiRule(new LineRule())
             .htmlTranslation(Translate.with(ToHtml::note).child(0));
-    public static final SymbolType OpenBrace = new SymbolType("OpenBrace", CloseBrace)
+    public static final SymbolType OpenBrace = new SymbolType("OpenBrace")
             .wikiMatcher(new Matcher().string("{"));
 
-    public static final SymbolType OpenBracket = new SymbolType("OpenBracket", CloseBracket)
+    public static final SymbolType OpenBracket = new SymbolType("OpenBracket")
             .wikiMatcher(new Matcher().string("["));
-    public static final SymbolType OpenParenthesis = new SymbolType("OpenParenthesis", CloseParenthesis)
+    public static final SymbolType OpenParenthesis = new SymbolType("OpenParenthesis")
             .wikiMatcher(new Matcher().string("("));
     public static final SymbolType OrderedList = new SymbolType("OrderedList")
             .wikiMatcher(new Matcher().startLine().whitespace().listDigit().string(" "))
@@ -106,14 +106,10 @@ public class SymbolType implements Matchable {
     private final List<Matcher> wikiMatchers = new ArrayList<>(1);
     private Rule wikiRule = defaultRule;
     private Translation htmlTranslation = null;
-    private final SymbolType                        closeType;
     private final List<ParsedSymbolDecorator> decorators = new LinkedList<>();
 
-    public SymbolType(String name) { this(name, Empty); }
-
-    public SymbolType(String name, SymbolType closeType) {
+    public SymbolType(String name) {
       this.name = name;
-      this.closeType = closeType;
     }
 
   public List<Matcher> getWikiMatchers() { return wikiMatchers; }
@@ -151,10 +147,6 @@ public SymbolMatch makeMatch(ScanString input, SymbolStream symbols) {
         return SymbolMatch.noMatch;
     }
 
-    public SymbolType closeType() {
-      return closeType;
-    }
-
     public void addDecorator(ParsedSymbolDecorator symbolDecorator) {
       decorators.add(symbolDecorator);
     }

test/fitnesse/wikitext/parser/DefineTest.java

@@ -21,7 +21,10 @@ public void parsesDefine() {
     assertParses("!define x {y}", "SymbolList[Define[Text, Text]]");
     assertParses("!define x {y" /* eof */, "SymbolList[Define[Text, Text]]");
     assertParses("!define x" /* eof */, "SymbolList[Define[Text, Text]]");
+  }
 
+  @Test public void parsesMissingBraces() {
+    assertParses("!define x +1 stuff", "SymbolList[Text, Whitespace, Text, Whitespace, Delta, Whitespace, Text]");
   }
 
   @Test