Merge pull request #1920 from idodeclare/feature/lua_tests

Feature/lua tests

Author: tarzanek

opengrok-indexer/pom.xml

@@ -130,6 +130,13 @@ Portions Copyright (c) 2017, Chris Fraire <[email protected]>.
                     <exclude>*.java</exclude>
                 </excludes>
             </testResource>
+            <testResource>
+                <targetPath>org/opensolaris/opengrok/analysis/lua/</targetPath>
+                <directory>../test/org/opensolaris/opengrok/analysis/lua/</directory>
+                <excludes>
+                    <exclude>*.java</exclude>
+                </excludes>
+            </testResource>
             <testResource>
                 <targetPath>org/opensolaris/opengrok/analysis/perl/</targetPath>
                 <directory>../test/org/opensolaris/opengrok/analysis/perl/</directory>

src/org/opensolaris/opengrok/analysis/lua/Lua.lexh

@@ -0,0 +1,54 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * See LICENSE.txt included in this distribution for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at LICENSE.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Portions Copyright (c) 2017, Chris Fraire <[email protected]>.
+ */
+
+/*
+ * Copyright © 1994–2017 Lua.org, PUC-Rio.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * "Names (also called identifiers) in Lua can be any string of letters,
+ * digits, and underscores, not beginning with a digit...."
+ */
+Identifier = [\p{Letter}_] [\p{Letter}\p{Number}_]*
+
+Number = ([0][xX][0-9a-fA-F]+ | [0-9]+\.[0-9]+ |
+    [0-9][0-9_]*) ([eE][+-]?[0-9]+)?

src/org/opensolaris/opengrok/analysis/lua/LuaSymbolTokenizer.lex

@@ -27,12 +27,13 @@
  */
 
 package org.opensolaris.opengrok.analysis.lua;
+
+import java.io.IOException;
 import org.opensolaris.opengrok.analysis.JFlexTokenizer;
 
 /**
  * @author Evan Kinney
  */
-
 %%
 %public
 %class LuaSymbolTokenizer
@@ -44,11 +45,20 @@ super(in);
 %int
 %include CommonTokenizer.lexh
 %char
+%{
+    int bracketLevel;
 
-Identifier = [a-zA-Z_] [a-zA-Z0-9_']*
+    @Override
+    public void reset() throws IOException {
+        super.reset();
+        bracketLevel = 0;
+    }
+%}
 
 %state STRING LSTRING COMMENT SCOMMENT QSTRING
 
+%include Common.lexh
+%include Lua.lexh
 %%
 
 <YYINITIAL> {
@@ -59,34 +69,47 @@ Identifier = [a-zA-Z_] [a-zA-Z0-9_']*
             return yystate();
         }
     }
+    {Number}    {}
     \"     { yybegin(STRING);   }
-    "[["   { yybegin(LSTRING);  }
+    "[" [=]* "["    {
+        String capture = yytext();
+        bracketLevel = LuaUtils.countOpeningLongBracket(capture);
+        yybegin(LSTRING);
+    }
     \'     { yybegin(QSTRING);  }
-    "--[[" { yybegin(COMMENT);  }
+    "--[" [=]* "["    {
+        String capture = yytext();
+        String bracket = capture.substring(2);
+        bracketLevel = LuaUtils.countOpeningLongBracket(bracket);
+        yybegin(COMMENT);
+    }
     "--"   { yybegin(SCOMMENT); }
 }
 
 <STRING> {
+    \\[\"\\]    {}
     \"   { yybegin(YYINITIAL); }
-    \\\\ | \\\" {}
-}
-
-<LSTRING> {
-    "]]" { yybegin(YYINITIAL); }
 }
 
 <QSTRING> {
+    \\[\'\\]    {}
     \' { yybegin(YYINITIAL); }
 }
 
-<COMMENT> {
-    "]]" { yybegin(YYINITIAL); }
+<LSTRING, COMMENT> {
+    "]" [=]* "]"    {
+        String capture = yytext();
+        if (LuaUtils.isClosingLongBracket(capture, bracketLevel)) {
+            yybegin(YYINITIAL);
+        }
+    }
 }
 
 <SCOMMENT> {
-    \n { yybegin(YYINITIAL); }
+    {WhspChar}*{EOL} { yybegin(YYINITIAL); }
 }
 
 <YYINITIAL, STRING, LSTRING, COMMENT, SCOMMENT, QSTRING> {
+{WhiteSpace}    {}
 [^] {}
 }

src/org/opensolaris/opengrok/analysis/lua/LuaUtils.java

@@ -0,0 +1,84 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * See LICENSE.txt included in this distribution for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at LICENSE.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright (c) 2017, Chris Fraire <[email protected]>.
+ */
+
+package org.opensolaris.opengrok.analysis.lua;
+
+/**
+ * Represents a container for Lua-related utility methods.
+*/
+public class LuaUtils {
+
+    /**
+     * private to enforce singleton
+     */
+    private  LuaUtils() {
+    }
+    
+    /**
+     * Counts the level of a Lua opening long bracket specified in
+     * {@code capture}.
+     * @param capture the opening long bracket
+     * @return the bracket level
+     */
+    public static int countOpeningLongBracket(String capture) {
+        if (!capture.startsWith("[") || !capture.endsWith("[")) {
+            throw new IllegalArgumentException(
+                "Invalid opening long bracket: " + capture);
+        }
+
+        int n = 0;
+        for (int i = 1; i + 1 < capture.length(); ++i) {
+            if (capture.charAt(i) != '=') {
+                throw new IllegalArgumentException(
+                    "Invalid opening long bracket: " + capture);
+            }
+            ++n;
+        }
+        return n;
+    }
+
+    /**
+     * Determines if the specified {@code capture} is a closing long bracket of
+     * the specified {@code level}.
+     * @param capture the possible Lua closing long bracket
+     * @param level the required level of closing long bracket
+     * @return true if the {@code capture} is determined to be the required
+     * closing long bracket or false otherwise.
+     */
+    public static boolean isClosingLongBracket(String capture, int level) {
+        if (!capture.startsWith("]") || !capture.endsWith("]")) {
+            throw new IllegalArgumentException(
+                "Invalid opening long bracket: " + capture);
+        }
+
+        int n = 0;
+        for (int i = 1; i + 1 < capture.length(); ++i) {
+            if (capture.charAt(i) != '=') {
+                throw new IllegalArgumentException(
+                    "Invalid opening long bracket: " + capture);
+            }
+            ++n;
+        }
+        return n == level;
+    }
+}