Plexus-Mirror/toml4j
1
0
Fork 0
mirror of https://github.com/plexusorg/toml4j.git synced 2024-05-16 09:31:36 +00:00
Code Issues Projects Releases Wiki Activity

Minor refactoring

Browse source
This commit is contained in:
moandji.ezana 2014-04-06 21:12:34 +02:00
parent 494049124f
commit 2c3152e770
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/main/java/com/moandjiezana/toml/TomlParser.java
View file

@ -30,10 +30,6 @@ class TomlParser extends BaseParser<Object> {
return Sequence(Sequence(KeyGroupDelimiter(), KeyGroupName(), addKeyGroup((String) pop()), KeyGroupDelimiter(), Spacing()), checkKeyGroup(match()));
}
Rule IllegalCharacters() {
return ZeroOrMore(TestNot(NewLine()), ANY);
}
boolean checkKeyGroup(String definition) {
String afterBracket = definition.substring(definition.indexOf(']') + 1);
for (char character : afterBracket.toCharArray()) {
@ -128,7 +124,17 @@ class TomlParser extends BaseParser<Object> {
@SuppressNode
Rule Spacing() {
return ZeroOrMore(FirstOf(Comment(), AnyOf(" \t\r\n\f")));
return ZeroOrMore(FirstOf(Comment(), Whitespace(), NewLine(), AnyOf("\f")));
}
Rule IllegalCharacters() {
return Sequence(ZeroOrMore(Whitespace()), OneOrMore(TestNot('#', NewLine()), ANY));
//return Sequence(ZeroOrMore(Whitespace()), TestNot('#', NewLine()), OneOrMore(ANY));
}
@SuppressNode
Rule Whitespace() {
return AnyOf(" \t");
}
@SuppressNode
@ -143,7 +149,7 @@ class TomlParser extends BaseParser<Object> {
@SuppressNode
Rule Comment() {
return Sequence('#', ZeroOrMore(TestNot(AnyOf("\r\n")), ANY), FirstOf("\r\n", '\r', '\n', EOI));
return Sequence('#', ZeroOrMore(TestNot(NewLine()), ANY), FirstOf(NewLine(), EOI));
}
@SuppressWarnings("unchecked")