optimization by extracting logic to compute firstForUnaryExpressionNo…

…tPlusMinus
jhipster · Sep 27, 2019 · 4a70840 · 4a70840
1 parent 5a620d9
commit 4a70840
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 14 deletions.
diff --git a/packages/java-parser/src/parser.js b/packages/java-parser/src/parser.js
@@ -68,7 +68,11 @@ class JavaParser extends Parser {
     blocksStatements.defineRules.call(this, $, t);
     expressions.defineRules.call(this, $, t);
 
+    this.firstForUnaryExpressionNotPlusMinus = [];
     this.performSelfAnalysis();
+    this.firstForUnaryExpressionNotPlusMinus = expressions.computeFirstForUnaryExpressionNotPlusMinus.call(
+      this
+    );
   }
 
   // hack to turn off CST building side effects during backtracking

diff --git a/packages/java-parser/src/productions/expressions.js b/packages/java-parser/src/productions/expressions.js
@@ -612,18 +612,6 @@ function defineRules($, t) {
   });
 
   $.RULE("isReferenceTypeCastExpression", () => {
-    const firstUnaryExpressionNotPlusMinus = this.computeContentAssist(
-      "unaryExpressionNotPlusMinus",
-      []
-    );
-    const nextTokTypes = firstUnaryExpressionNotPlusMinus.map(
-      x => x.nextTokenType
-    );
-    // uniq
-    const firstForUnaryExpressionNotPlusMinus = nextTokTypes.filter(
-      (v, i, a) => a.indexOf(v) === i
-    );
-
     $.CONSUME(t.LBrace);
     $.SUBRULE($.referenceType);
     $.MANY(() => {
@@ -633,7 +621,7 @@ function defineRules($, t) {
     const firstTokTypeAfterRBrace = this.LA(1).tokenType;
 
     return (
-      firstForUnaryExpressionNotPlusMinus.find(tokType =>
+      this.firstForUnaryExpressionNotPlusMinus.find(tokType =>
         tokenMatcher(firstTokTypeAfterRBrace, tokType)
       ) !== undefined
     );
@@ -673,6 +661,19 @@ function defineRules($, t) {
   });
 }
 
+function computeFirstForUnaryExpressionNotPlusMinus() {
+  const firstUnaryExpressionNotPlusMinus = this.computeContentAssist(
+    "unaryExpressionNotPlusMinus",
+    []
+  );
+  const nextTokTypes = firstUnaryExpressionNotPlusMinus.map(
+    x => x.nextTokenType
+  );
+  // uniq
+  return nextTokTypes.filter((v, i, a) => a.indexOf(v) === i);
+}
+
 module.exports = {
-  defineRules
+  defineRules,
+  computeFirstForUnaryExpressionNotPlusMinus
 };