Plexus-Mirror/toml4j
1
0
Fork 0
mirror of https://github.com/plexusorg/toml4j.git synced 2025-02-11 11:40:27 +00:00
Code Issues Projects Releases Wiki Activity

Literal strings no longer handled by Parboiled

Browse source
This commit is contained in:
moandji.ezana 2015-01-23 16:36:15 +02:00
parent bde639951a
commit 40cab5c499
2 changed files with 28 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/main/java/com/moandjiezana/toml/LiteralStringConverter.java
View file

@ -1,9 +1,7 @@
package com.moandjiezana.toml; package com.moandjiezana.toml;
import static com.moandjiezana.toml.ValueConverterUtils.parse; import static com.moandjiezana.toml.ValueConverterUtils.INVALID;
import static com.moandjiezana.toml.ValueConverterUtils.parser;
import java.util.List;
class LiteralStringConverter implements ValueConverter { class LiteralStringConverter implements ValueConverter {
@ -16,13 +14,36 @@ class LiteralStringConverter implements ValueConverter {
@Override @Override
public Object convert(String s) { public Object convert(String s) {
List<String> resultValue = parse(parser().LiteralString(), s); char[] chars = s.toCharArray();
boolean terminated = false;
StringBuilder sb = new StringBuilder(s.length());
if (resultValue == null) { for (int i = 1; i < chars.length; i++) {
return ValueConverterUtils.INVALID; char c = chars[i];
if (c == '\'') {
terminated = true;
continue;
} }
return resultValue.get(0); if (!terminated) {
sb.append(c);
}
if (terminated && c == '#') {
break;
}
if (terminated && !Character.isWhitespace(c)) {
return INVALID;
}
}
if (!terminated) {
return INVALID;
}
return sb.toString();
} }
private LiteralStringConverter() {} private LiteralStringConverter() {}

4
src/main/java/com/moandjiezana/toml/ValueParser.java
View file

@ -14,10 +14,6 @@ class ValueParser extends BaseParser<List<Object>> {
return FirstOf(EmptyArray(), Sequence('[', startList(), OneOrMore(FirstOf(NonEmptyArray(), ' ', ',')), ']', endList())); return FirstOf(EmptyArray(), Sequence('[', startList(), OneOrMore(FirstOf(NonEmptyArray(), ' ', ',')), ']', endList()));
} }
public Rule LiteralString() {
return FirstOf(EmptyLiteralString(), Sequence('\'', OneOrMore(TestNot("'"), ANY), startList(), pushToken(match()) , '\'', endList(), Comment()));
}
public Rule MultilineLiteralString() { public Rule MultilineLiteralString() {
return FirstOf(EmptyMultilineLiteralString(), Sequence("'''", startList(), Sequence(OneOrMore(TestNot("'''"), ANY), pushToken(match())), "'''", endList(), Comment())); return FirstOf(EmptyMultilineLiteralString(), Sequence("'''", startList(), Sequence(OneOrMore(TestNot("'''"), ANY), pushToken(match())), "'''", endList(), Comment()));
} }