Fix Scala {Number}, and use in tokenizer

Also, link identifiers of length=1 per Lubos.

Author: idodeclare

Diff for: LICENSE-scala.txt

@@ -0,0 +1,41 @@
+Scala Language Specification
+============================
+Authors and Contributors
+Martin Odersky, Philippe Altherr, Vincent Cremet, Gilles Dubochet, Burak
+Emir, Philipp Haller, Stéphane Micheloud, Nikolay Mihaylov, Adriaan Moors,
+Lukas Rytz, Michel Schinz, Erik Stenman, Matthias Zenger
+
+Markdown Conversion by Iain McGinniss.
+
+Scala License
+=============
+Copyright (c) 2002-  EPFL
+Copyright (c) 2011-  Lightbend, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+
+Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+Neither the name of the EPFL nor the names of its contributors may be used
+to endorse or promote products derived from this software without specific
+prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS”
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.

Diff for: src/org/opensolaris/opengrok/analysis/scala/Consts.java

@@ -31,7 +31,6 @@
 public class Consts{
     public static final Set<String> kwd = new HashSet<String>() ;
     static {
-        //Note that keywords with 1 letter will be ignored since we need at least 2 chars per identifier
         kwd.add("abstract");
         kwd.add("case");
         kwd.add("catch");
@@ -70,6 +69,7 @@ public class Consts{
         kwd.add("while");
         kwd.add("with");
         kwd.add("yield");
-    }
 
+        kwd.add("_");	// "Lexical syntax ... reserved words"
+    }
 }

Diff for: src/org/opensolaris/opengrok/analysis/scala/Scala.lexh

@@ -0,0 +1,60 @@
+/*
+ * 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) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Portions Copyright (c) 2017, Chris Fraire <[email protected]>.
+ */
+
+Identifier = [a-zA-Z_] [a-zA-Z0-9_]*
+
+Number = [\-]? ({integerLiteral} | {floatingPointLiteral})
+/*
+ * Numeric Literal ::= [‘-’] integerLiteral
+ *                  |  [‘-’] floatingPointLiteral
+ *
+ * integerLiteral  ::=  (decimalNumeral | hexNumeral) [‘L’ | ‘l’]
+ * decimalNumeral  ::=  ‘0’ | nonZeroDigit {digit}
+ * hexNumeral      ::=  ‘0’ (‘x’ | ‘X’) hexDigit {hexDigit}
+ * digit           ::=  ‘0’ | nonZeroDigit
+ * nonZeroDigit    ::=  ‘1’ | … | ‘9’
+ * hexDigit        ::= ‘0’ | … | ‘9’ | ‘A’ | … | ‘F’ | ‘a’ | … | ‘f’
+ */
+integerLiteral = ({decimalNumeral} | {hexNumeral}) [Ll]?
+decimalNumeral = ([0] | {nonZeroDigit} {digit}*)
+hexNumeral = [0][xX] {hexDigit}+
+digit = [0-9]
+nonZeroDigit = [1-9]
+hexDigit = [0-9A-Fa-f]
+
+/*
+ * floatingPointLiteral  ::=
+ *     digit {digit} ‘.’ digit {digit} [exponentPart] [floatType]
+ *     |  ‘.’ digit {digit} [exponentPart] [floatType]
+ *     |  digit {digit} exponentPart [floatType]
+ *     |  digit {digit} [exponentPart] floatType
+ * exponentPart          ::=  (‘E’ | ‘e’) [‘+’ | ‘-’] digit {digit}
+ * floatType             ::=  ‘F’ | ‘f’ | ‘D’ | ‘d’
+ */
+floatingPointLiteral = ({digit}+ "." {digit}+ {exponentPart}? {floatType}? |
+    "." {digit}+ {exponentPart}? {floatType}? |
+    {digit}+ {exponentPart} {floatType}? |
+    {digit}+ {exponentPart}? {floatType})
+exponentPart = [Ee] [\+\-]? {digit}+
+floatType = [FfDd]

Diff for: src/org/opensolaris/opengrok/analysis/scala/ScalaSymbolTokenizer.lex

@@ -23,7 +23,7 @@
  */
 
 /*
- * Gets Java symbols - ignores comments, strings, keywords
+ * Gets Scala symbols - ignores comments, strings, keywords
  */
 
 package org.opensolaris.opengrok.analysis.scala;
@@ -41,10 +41,10 @@ super(in);
 %include CommonTokenizer.lexh
 %char
 
-Identifier = [a-zA-Z_] [a-zA-Z0-9_]*
-
 %state STRING COMMENT SCOMMENT QSTRING
 
+%include Common.lexh
+%include Scala.lexh
 %%
 
 <YYINITIAL> {
@@ -53,6 +53,7 @@ Identifier = [a-zA-Z_] [a-zA-Z0-9_]*
                         setAttribs(id, yychar, yychar + yylength());
                         return yystate(); }
               }
+ {Number}    {}
  \"     { yybegin(STRING); }
  \'     { yybegin(QSTRING); }
  "/*"   { yybegin(COMMENT); }
@@ -73,9 +74,10 @@ Identifier = [a-zA-Z_] [a-zA-Z0-9_]*
 }
 
 <SCOMMENT> {
-\n      { yybegin(YYINITIAL);}
+{EOL}      { yybegin(YYINITIAL);}
 }
 
 <YYINITIAL, STRING, COMMENT, SCOMMENT, QSTRING> {
+{WhiteSpace} |
 [^]    {}
 }

Diff for: src/org/opensolaris/opengrok/analysis/scala/ScalaXref.lex

@@ -52,12 +52,8 @@ import org.opensolaris.opengrok.web.Util;
   protected void setLineNumber(int x) { yyline = x; }
 %}
 
-Identifier = [a-zA-Z_] [a-zA-Z0-9_]+
-
 File = [a-zA-Z]{FNameChar}* "." ("scala"|"properties"|"props"|"xml"|"conf"|"txt"|"htm"|"html"|"ini"|"jnlp"|"jad"|"diff"|"patch")
 
-Number = (0[xX][0-9a-fA-F]+|[0-9]+\.[0-9]+|[0-9]+)(([eE][+-]?[0-9]+)?[ufdlUFDL]*)?
-
 JavadocWithClassArg = "@throws" | "@exception"
 JavadocWithParamNameArg = "@param"
 
@@ -69,6 +65,7 @@ ParamName = {Identifier} | "<" {Identifier} ">"
 %include Common.lexh
 %include CommonURI.lexh
 %include CommonPath.lexh
+%include Scala.lexh
 %%
 <YYINITIAL>{