aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/org/yaml/snakeyaml/resolver/Resolver.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/org/yaml/snakeyaml/resolver/Resolver.java')
-rw-r--r--src/main/java/org/yaml/snakeyaml/resolver/Resolver.java14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/main/java/org/yaml/snakeyaml/resolver/Resolver.java b/src/main/java/org/yaml/snakeyaml/resolver/Resolver.java
index 0ff170d5..9c0d32fb 100644
--- a/src/main/java/org/yaml/snakeyaml/resolver/Resolver.java
+++ b/src/main/java/org/yaml/snakeyaml/resolver/Resolver.java
@@ -69,16 +69,14 @@ public class Resolver {
* matches INT (see issue 130)
* http://code.google.com/p/snakeyaml/issues/detail?id=130
*/
- addImplicitResolver(Tag.INT, INT, "-+0123456789", 100);
- addImplicitResolver(Tag.FLOAT, FLOAT, "-+0123456789.", 100);
- addImplicitResolver(Tag.MERGE, MERGE, "<", 100);
+ addImplicitResolver(Tag.INT, INT, "-+0123456789");
+ addImplicitResolver(Tag.FLOAT, FLOAT, "-+0123456789.");
+ addImplicitResolver(Tag.MERGE, MERGE, "<", 10);
addImplicitResolver(Tag.NULL, NULL, "~nN\0", 10);
addImplicitResolver(Tag.NULL, EMPTY, null, 10);
addImplicitResolver(Tag.TIMESTAMP, TIMESTAMP, "0123456789", 50);
- // The following implicit resolver is only for documentation
- // purposes.
- // It cannot work
- // because plain scalars cannot start with '!', '&', or '*'.
+ // The following implicit resolver is only for documentation purposes.
+ // It cannot work because plain scalars cannot start with '!', '&', or '*'.
addImplicitResolver(Tag.YAML, YAML, "!&*", 10);
}
@@ -127,7 +125,7 @@ public class Resolver {
for (ResolverTuple v : resolvers) {
Tag tag = v.getTag();
Pattern regexp = v.getRegexp();
- if (value.length() < v.getLimit() && regexp.matcher(value).matches()) {
+ if (value.length() <= v.getLimit() && regexp.matcher(value).matches()) {
return tag;
}
}