opendev/gerrit
Code Issues Proposed changes

Merge "Replace vanilla parboiled with grappa library"

Browse Source
This commit is contained in:
Shawn Pearce
2015-06-12 23:56:24 +00:00
committed by Gerrit Code Review
parent b3f83e2ec6 0db7612e09
commit 5b85e238f8
3 changed files with 24 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gerrit-server/src/test/java/com/google/gerrit/server/util/ParboiledTest.java
View File

@@ -35,8 +35,8 @@ public class ParboiledTest {
" [Number] '42'\n" +
" [0..9] '4'\n" +
" [0..9] '2'\n" +
" [ZeroOrMore]\n" +
" [ZeroOrMore]\n";
" [zeroOrMore]\n" +
" [zeroOrMore]\n";
private CalculatorParser parser;
@@ -49,7 +49,7 @@ public class ParboiledTest {
public void test() {
ParsingResult<String> result =
new ReportingParseRunner<String>(parser.Expression()).run("42");
assertThat(result.hasErrors()).isFalse();
assertThat(result.isSuccess()).isTrue();
// next test is optional; we could stop here.
assertThat(ParseTreeUtils.printNodeTree(result)).isEqualTo(EXPECTED);
}
@@ -57,19 +57,19 @@ public class ParboiledTest {
@BuildParseTree
static class CalculatorParser extends BaseParser<Object> {
Rule Expression() {
return Sequence(Term(), ZeroOrMore(AnyOf("+-"), Term()));
return sequence(Term(), zeroOrMore(anyOf("+-"), Term()));
}
Rule Term() {
return Sequence(Factor(), ZeroOrMore(AnyOf("*/"), Factor()));
return sequence(Factor(), zeroOrMore(anyOf("*/"), Factor()));
}
Rule Factor() {
return FirstOf(Number(), Sequence('(', Expression(), ')'));
return firstOf(Number(), sequence('(', Expression(), ')'));
}
Rule Number() {
return OneOrMore(CharRange('0', '9'));
return oneOrMore(charRange('0', '9'));
}
}
}