java.util.Pattern flavor for TRegex #4815

danieljaburek · 2022-08-12T10:18:35Z

Adding support for Java Regex in TRegex (as part of Bachelor thesis)

…ttests

oracle-contributor-agreement · 2022-08-12T10:18:40Z

Thank you for your pull request and welcome to our community! To contribute, please sign the Oracle Contributor Agreement (OCA).
The following contributors of this PR have not signed the OCA:

PR author: @danieljaburek
k11915134@students.jku.at (@danieljaburek)

To sign the OCA, please create an Oracle account and sign the OCA in Oracle's Contributor Agreement Application.

When singing the OCA, please provide your GitHub username. After signing the OCA and getting an OCA approval from Oracle, this PR will be automatically updated.

oubidar-Abderrahim · 2022-08-16T09:54:59Z

Thank you for contributing to GraalVM, we will review your PR shortly

oubidar-Abderrahim · 2022-08-16T09:55:23Z

@djoooooe could you please assign someone to review this PR? let me know if you need me to mirror it to bitbucket. Thank you

djoooooe · 2022-08-12T11:15:21Z

regex/src/com.oracle.truffle.regex.test/src/com/oracle/truffle/regex/dsj/JavaTruffleRegex.java

+import org.graalvm.polyglot.Context;
+import org.graalvm.polyglot.Value;
+
+public class JavaTruffleRegex {


djoooooe · 2022-08-12T11:16:08Z

...x/src/com.oracle.truffle.regex.test/src/com/oracle/truffle/regex/dsj/JavaRegexBenchmark.java

+//        String input = "hello World!";
+//        String input = "def=def";
+        String input = "abcabcabc";
+


please remove commented code and TODO comments

djoooooe · 2022-08-12T11:16:31Z

regex/src/com.oracle.truffle.regex.test/src/com/oracle/truffle/regex/jmh/DFAGenBenchmark.java

            context = Context.newBuilder().build();
            context.enter();
-            tregexPattern = context.eval(TRegexTestDummyLanguage.ID, '/' + reURL + '/');
+            tregexPattern = context.eval(TRegexTestDummyLanguage.ID, /*"Flavor=JavaUtilPattern" + */'/' + reURL + '/');


djoooooe · 2022-08-12T11:16:36Z

regex/src/com.oracle.truffle.regex.test/src/com/oracle/truffle/regex/jmh/DFAGenBenchmark.java

+//    @Benchmark
+//    public boolean javaPattern(BenchState state) {
+//        return state.javaPattern.matcher(state.input).find();
+//    }


djoooooe · 2022-08-12T11:19:12Z

...oracle.truffle.regex.test/src/com/oracle/truffle/regex/tregex/test/JavaUtilPatternTests.java

+    public void quantifiers() {
+        test("abc?", 0, "ab");
+        test("abc??", 0, "ab");
+//        test("abc?+c", 0, "abcc");  // not supported yet --> bailout (possive quantifiers)


transform to a test that expects the bailout

djoooooe · 2022-08-16T08:55:07Z

...oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/parser/flavors/RubyRegexParser.java

                parens();
                break;
-            case '^':
+            case '^': // TODO


djoooooe · 2022-08-16T08:55:32Z

regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/parser/BaseLexer.java

@@ -0,0 +1,294 @@
+package com.oracle.truffle.regex.tregex.parser;


missing copyright header

djoooooe · 2022-08-16T08:56:21Z

....oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/parser/flavors/java/JavaFlags.java

+    private final int value;
+
+    private static final String FLAGS = "idmsuxU";
+    //    private static final String BIT_FLAGS = "mixy";


remove commented code

djoooooe · 2022-08-16T08:58:44Z

...e.truffle.regex/src/com/oracle/truffle/regex/tregex/parser/flavors/java/JavaRegexParser.java

+    private void addQuantifier(Token.Quantifier quantifier) {
+        astBuilder.addQuantifier(quantifier);
+    }
+


remove commented code

djoooooe · 2022-08-16T09:00:28Z

...e.truffle.regex/src/com/oracle/truffle/regex/tregex/parser/flavors/java/JavaRegexParser.java

+            addDollar();    // $
+            nextSequence(); // |
+            pushLookAheadAssertion(false);  // (?=
+            pushGroup();    // (?:


pushLookAheadAssertion automatically pushes a group, no need to do that here

djoooooe · 2022-08-16T10:34:17Z

@djoooooe could you please assign someone to review this PR? let me know if you need me to mirror it to bitbucket. Thank you

Yes, please mirror this PR to bitbucket

djoooooe · 2022-08-18T12:00:59Z

...e.truffle.regex/src/com/oracle/truffle/regex/tregex/parser/flavors/java/JavaRegexParser.java

-            pushGroup();    // (?:
            addCharClass(CodePointSet.create('\r'));
            addCharClass(CodePointSet.create('\n'));
            nextSequence();


also remove the corresponding popGroup(), and add a test that hits this path

danieljaburek added 21 commits March 3, 2022 14:42

Added basic methods for character classes to test helloWorld

77a0508

Adjusted to ASTBuilder

2808c6b

First draft of Character Classes

0cc758e

Adjusted so that normal "characters" work as "classes"

f568b67

Backup before switching to Tokens

c707d90

Added Tokens and updated system to use them + added UnitTests

19713a7

Added unittests and starting to fix code to support them

ec390c1

Added few tokens to support more Java-Regex-Syntax and working on Uni…

52a36c0

…ttests

Cleaned up "useless" or duplicate escape-functions

3611045

Added Unicode Character Class Support and working on Unittests

233f0fb

Working on Unittests

f786b82

Added flags-support + all unit tests are working

1a7bd02

Code cleanup

d412675

Further clean up + comment

2fc80ed

minor changes

38ac686

First attempt of splitting code up to JavaLexer

19a82a0

Bugfixes of JavaLexer & JavaRegexParser to work together

911a7b7

JavaLexer and JavaRegexParser completing all unit tests

2682713

Added BaseClass of Lexers + clean up of code

5d8bebb

changed placeholder to comment

0721d55

added character class testcases + minor bugfixes

2e9a5bd

oracle-contributor-agreement bot added the OCA Required At least one contributor does not have an approved Oracle Contributor Agreement. label Aug 12, 2022

oracle-contributor-agreement bot added OCA Verified All contributors have signed the Oracle Contributor Agreement. and removed OCA Required At least one contributor does not have an approved Oracle Contributor Agreement. labels Aug 15, 2022

changed add to open in Token + adjusted minor things

78f5069

djoooooe changed the title ~~Access TRegex from Java~~ java.util.Pattern flavor for TRegex Aug 16, 2022

oubidar-Abderrahim requested a review from djoooooe August 16, 2022 09:53

oubidar-Abderrahim assigned oubidar-Abderrahim and djoooooe Aug 16, 2022

djoooooe requested changes Aug 16, 2022

View reviewed changes

Changing minor things + cleaning up comments

47d7f87

djoooooe reviewed Aug 18, 2022

View reviewed changes

bug fix in dollar()

1228478

		@@ -0,0 +1,294 @@
		package com.oracle.truffle.regex.tregex.parser;

java.util.Pattern flavor for TRegex #4815

Are you sure you want to change the base?

java.util.Pattern flavor for TRegex #4815

Uh oh!

Conversation

danieljaburek commented Aug 12, 2022

Uh oh!

oracle-contributor-agreement bot commented Aug 12, 2022

Uh oh!

oubidar-Abderrahim commented Aug 16, 2022

Uh oh!

oubidar-Abderrahim commented Aug 16, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

djoooooe commented Aug 16, 2022

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

oubidar-Abderrahim commented Aug 16, 2022 •

edited

Loading