From 1b2e8e9e8b5aaa938ef78a5d29e31ad4b514746a Mon Sep 17 00:00:00 2001
From: Daniel <dmoody256@gmail.com>
Date: Mon, 10 Aug 2020 10:37:31 -0500
Subject: fix issue where java parses class incorrectly from lambdas after new

---
 CHANGES.txt                   |  3 +++
 SCons/Tool/JavaCommon.py      |  3 ++-
 SCons/Tool/JavaCommonTests.py | 41 +++++++++++++++++++++++++++++++++++++++--
 3 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index b9835c9..fe45dc9 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -24,6 +24,9 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
       like zip(["test.zip"], ["zip_scons.py"]) and ignore ZIPCOMSTR if ZIPCOM and ZIPCOMSTR
       weren't set after the Environment/Tool is initialized. (Explained in PR #3659)
 
+  From Daniel Moody:
+    - Fix issue where java parsed a class incorrectly from lambdas used after a new.
+
   From Mats Wichmann:
     - Complete tests for Dictionary, env.keys() and env.values() for
       OverrideEnvironment. Enable env.setdefault() method, add tests.
diff --git a/SCons/Tool/JavaCommon.py b/SCons/Tool/JavaCommon.py
index bb05977..d869b38 100644
--- a/SCons/Tool/JavaCommon.py
+++ b/SCons/Tool/JavaCommon.py
@@ -87,9 +87,10 @@ if java_parsing:
     #     any alphanumeric token surrounded by angle brackets (generics);
     #     the multi-line comment begin and end tokens /* and */;
     #     array declarations "[]".
+    #     Lambda function symbols: ->
     _reToken = re.compile(r'(\n|\\\\|//|\\[\'"]|[\'"{\};.()]|' +
                           r'\d*\.\d*|[A-Za-z_][\w$.]*|<[A-Za-z_]\w+>|' +
-                          r'/\*|\*/|\[\])')
+                          r'/\*|\*/|\[\]|->)')
 
 
     class OuterState:
diff --git a/SCons/Tool/JavaCommonTests.py b/SCons/Tool/JavaCommonTests.py
index b0a788e..83354b8 100644
--- a/SCons/Tool/JavaCommonTests.py
+++ b/SCons/Tool/JavaCommonTests.py
@@ -97,7 +97,7 @@ public class Foo
         """Test class names with $ in them"""
 
         input = """\
-public class BadDep { 
+public class BadDep {
   public void new$rand () {}
 }
 """
@@ -484,6 +484,43 @@ public class NestedExample
         expect = [ 'NestedExample$1', 'NestedExample$1$1', 'NestedExample' ]
         assert expect == classes, (expect, classes)
 
+    def test_lambda_after_new(self):
+        """Test lamdas after new"""
+
+        input = """\
+// import java.util.*;
+
+public class LamdaExample
+{
+
+    public void testFunc (int arg1, String arg2, Runnable lambda){
+    }
+    public LamdaExample()
+    {
+        testFunc(
+            5,
+            new String("test"),
+            // Lambda symbol is after new, and used curly braces so
+            // we should not parse this as a new class.
+            () -> {}
+        );
+    }
+
+
+    public static void main(String argv[])
+    {
+            LamdaExample e = new LamdaExample();
+    }
+}
+"""
+        pkg_dir, classes = SCons.Tool.JavaCommon.parse_java(input, '1.4')
+        expect = [ 'LamdaExample' ]
+        assert expect == classes, (expect, classes)
+
+        pkg_dir, classes = SCons.Tool.JavaCommon.parse_java(input, '1.8')
+        expect = [ 'LamdaExample' ]
+        assert expect == classes, (expect, classes)
+
     def test_private_inner_class_instantiation(self):
         """Test anonymous inner class generated by private instantiation"""
 
@@ -532,7 +569,7 @@ class Broken
    * Detected.
    */
   class InnerOK { InnerOK () { } }
-  
+
   {
     System.out.println("a number: " + 1000.0 + "");
   }
-- 
cgit v0.12