From e07ba59f6250f37632d27de1a8940dddab9fab2c Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Fri, 8 May 2020 21:49:50 +0200
Subject: [PATCH] [jOOQ/jOOQ#10181] Avoid unnecessary PeekIgnoreComment
 allocation

---
 .../main/java/org/jooq/impl/ParserImpl.java   | 42 ++++++++-----------
 1 file changed, 17 insertions(+), 25 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
index 8acafb6879..54f77172a3 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
@@ -11643,7 +11643,10 @@ final class ParserImpl implements Parser {
         // [#8074] The SQL standard and some implementations (e.g. PostgreSQL,
         //         SQL Server) support nesting block comments
         int blockCommentNestLevel = 0;
-        PeekIgnoreComment ignoreComment = new PeekIgnoreComment(ctx);
+        boolean ignoreComment = false;
+        final String ignoreCommentStart = ctx.settings().getParseIgnoreCommentStart();
+        final String ignoreCommentStop = ctx.settings().getParseIgnoreCommentStop();
+        final boolean checkIgnoreComment = !FALSE.equals(ctx.settings().isParseIgnoreComments());
 
         loop:
         for (int i = position; i < ctx.sql.length; i++) {
@@ -11667,7 +11670,7 @@ final class ParserImpl implements Parser {
                         blockCommentNestLevel++;
 
                         while (i < ctx.sql.length) {
-                            if (!peekIgnoreComment(ctx, ignoreComment, i).ignoreComment) {
+                            if (!(ignoreComment = peekIgnoreComment(ctx, ignoreComment, ignoreCommentStart, ignoreCommentStop, checkIgnoreComment, i))) {
                                 switch (ctx.sql[i]) {
                                     case '/':
                                         if (i + 1 < ctx.sql.length && ctx.sql[i + 1] == '*') {
@@ -11706,7 +11709,7 @@ final class ParserImpl implements Parser {
                         i = i + 2;
 
                         while (i < ctx.sql.length) {
-                            if (!peekIgnoreComment(ctx, ignoreComment, i).ignoreComment) {
+                            if (!(ignoreComment = peekIgnoreComment(ctx, ignoreComment, ignoreCommentStart, ignoreCommentStop, checkIgnoreComment, i))) {
                                 switch (ctx.sql[i]) {
                                     case '\r':
                                     case '\n':
@@ -11728,7 +11731,7 @@ final class ParserImpl implements Parser {
                         i = i + 2;
 
                         while (i < ctx.sql.length) {
-                            if (!peekIgnoreComment(ctx, ignoreComment, i).ignoreComment) {
+                            if (!(ignoreComment = peekIgnoreComment(ctx, ignoreComment, ignoreCommentStart, ignoreCommentStop, checkIgnoreComment, i))) {
                                 switch (ctx.sql[i]) {
                                     case '\r':
                                     case '\n':
@@ -11760,33 +11763,22 @@ final class ParserImpl implements Parser {
         return position;
     }
 
-    private static final class PeekIgnoreComment {
-        boolean ignoreComment;
-        final String ignoreCommentStart;
-        final String ignoreCommentStop;
-        final boolean checkIgnoreComment;
-
-        PeekIgnoreComment(ParserContext ctx) {
-            this.ignoreComment = false;
-            this.ignoreCommentStart = ctx.settings().getParseIgnoreCommentStart();
-            this.ignoreCommentStop = ctx.settings().getParseIgnoreCommentStop();
-            this.checkIgnoreComment = !FALSE.equals(ctx.settings().isParseIgnoreComments());
-        }
-    }
-
-    private static final PeekIgnoreComment peekIgnoreComment(
+    private static final boolean peekIgnoreComment(
         ParserContext ctx,
-        PeekIgnoreComment param,
+        boolean ignoreComment,
+        String ignoreCommentStart,
+        String ignoreCommentStop,
+        boolean checkIgnoreComment,
         int i
     ) {
 
-        if (param.checkIgnoreComment)
-            if (!param.ignoreComment)
-                param.ignoreComment = peek(ctx, param.ignoreCommentStart, i);
+        if (checkIgnoreComment)
+            if (!ignoreComment)
+                ignoreComment = peek(ctx, ignoreCommentStart, i);
             else
-                param.ignoreComment = !peek(ctx, param.ignoreCommentStop, i);
+                ignoreComment = !peek(ctx, ignoreCommentStop, i);
 
-        return param;
+        return ignoreComment;
     }
 
     private static final char upper(char c) {