Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
475 changes: 377 additions & 98 deletions core/src/main/java/com/github/simy4/coregex/core/Coregex.java

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -184,11 +184,11 @@ private Coregex elementaryRE(Context ctx) {
break;
case '^':
ctx.match('^');
elementaryRE = new Coregex.Group(Coregex.Group.Type.LOOKBEHIND, Coregex.empty());
elementaryRE = Coregex.lineStart();
break;
case '$':
ctx.match('$');
elementaryRE = new Coregex.Group(Coregex.Group.Type.LOOKAHEAD, Coregex.empty());
elementaryRE = Coregex.lineEnd();
break;
case '\\':
switch (ctx.peek(2)) {
Expand All @@ -198,7 +198,7 @@ private Coregex elementaryRE(Context ctx) {
case 'A':
ctx.match('\\');
ctx.match('A');
elementaryRE = new Coregex.Group(Coregex.Group.Type.LOOKBEHIND, Coregex.empty());
elementaryRE = Coregex.inputStart();
break;
case 'b':
ctx.match('\\');
Expand All @@ -223,15 +223,12 @@ private Coregex elementaryRE(Context ctx) {
case 'z':
ctx.match('\\');
ctx.match('z');
elementaryRE = new Coregex.Group(Coregex.Group.Type.LOOKAHEAD, Coregex.empty());
elementaryRE = Coregex.inputEnd();
break;
case 'Z':
ctx.match('\\');
ctx.match('Z');
elementaryRE =
new Coregex.Group(
Coregex.Group.Type.LOOKAHEAD,
new Coregex.Union(Coregex.empty(), Set.single('\n')));
elementaryRE = Coregex.inputEndBeforeTerminator();
break;
case 'G':
throw ctx.unsupported("metacharacter \\G");
Expand Down Expand Up @@ -519,6 +516,8 @@ private Set metachar(Context ctx) {
ctx.match('\\');
char ch = ctx.peek();
Set.Builder metachar = Set.builder(ctx.flags);
// char classes that are ASCII-only here, but Unicode with UNICODE_CHARACTER_CLASS
boolean asciiOnly = 0 <= "dDwWsS".indexOf(ch);
switch (ch) {
case 't':
ctx.match('t');
Expand Down Expand Up @@ -600,6 +599,7 @@ private Set metachar(Context ctx) {
ctx.match('p');
ctx.match('{');
String posix = ctx.span('}');
asciiOnly = !"all".equals(posix) && !"ASCII".equals(posix) && !posix.startsWith("java");
switch (posix) {
case "all":
metachar.matching(any -> true, "\\p{all}");
Expand Down Expand Up @@ -665,6 +665,9 @@ private Set metachar(Context ctx) {
metachar.single(ch);
break;
}
if (asciiOnly && 0 != (ctx.flags & Pattern.UNICODE_CHARACTER_CLASS)) {
metachar.approximated();
}
return metachar.build();
}

Expand Down
Loading
Loading