From a765ee41d756836854f98412f7b2832e1f935ff7 Mon Sep 17 00:00:00 2001
From: Mikhail Zarechenskiy <mikhail.zarechenskiy@jetbrains.com>
Date: Tue, 26 Jun 2018 15:38:24 +0300
Subject: [PATCH] Introduce `uL`/`UL` suffix to represent numbers of unsigned
 long type

 #KT-24663 Fixed
---
 .../evaluate/ConstantExpressionEvaluator.kt   |  67 ++-
 .../org/jetbrains/kotlin/lexer/Kotlin.flex    |   6 +-
 .../org/jetbrains/kotlin/lexer/_JetLexer.java | 551 +++++++++---------
 .../explicitUnsignedLongTypeCheck.kt          |  18 +
 .../explicitUnsignedLongTypeCheck.txt         |   9 +
 .../unsignedLiteralsInsideConstVals.kt        |   5 +
 .../unsignedLiteralsInsideConstVals.txt       |   4 +
 .../unsignedLiteralsOverflowSignedBorder.kt   |   2 +
 .../unsignedLiteralsOverflowSignedBorder.txt  |   1 +
 .../wrongLongSuffixForULong.kt                |   4 +
 .../wrongLongSuffixForULong.txt               |   6 +
 compiler/testData/psi/UnsignedLiteral.kt      |   3 +-
 compiler/testData/psi/UnsignedLiteral.txt     |  23 +-
 .../ConstraintSystemTestData.kt               |   2 +-
 ...DiagnosticsWithUnsignedTypesGenerated.java |  10 +
 .../resolve/constants/CompileTimeConstant.kt  |   2 +
 16 files changed, 406 insertions(+), 307 deletions(-)
 create mode 100644 compiler/testData/diagnostics/testsWithUnsignedTypes/explicitUnsignedLongTypeCheck.kt
 create mode 100644 compiler/testData/diagnostics/testsWithUnsignedTypes/explicitUnsignedLongTypeCheck.txt
 create mode 100644 compiler/testData/diagnostics/testsWithUnsignedTypes/wrongLongSuffixForULong.kt
 create mode 100644 compiler/testData/diagnostics/testsWithUnsignedTypes/wrongLongSuffixForULong.txt

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt
index 78d1416cd91..9b77085ff28 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt
@@ -387,15 +387,19 @@ private class ConstantExpressionEvaluatorVisitor(
             }
         }
 
-        val isUnsigned = hasUnsignedSuffix(text)
-        val typedConstant = nodeElementType == KtNodeTypes.INTEGER_CONSTANT && (hasLongSuffix(text) || isUnsigned)
+        val isIntegerConstant = nodeElementType == KtNodeTypes.INTEGER_CONSTANT
+        val isUnsignedLong = isIntegerConstant && hasUnsignedLongSuffix(text)
+        val isUnsigned = isUnsignedLong || hasUnsignedSuffix(text)
+        val isTyped = isUnsigned || hasLongSuffix(text)
+
         return createConstant(
             result,
             expectedType,
             CompileTimeConstant.Parameters(
                 canBeUsedInAnnotation = true,
-                isPure = !typedConstant,
+                isPure = !isTyped,
                 isUnsignedNumberLiteral = isUnsigned,
+                isUnsignedLongNumberLiteral = isUnsignedLong,
                 usesVariableAsConstant = false,
                 usesNonConstValAsConstant = false
             )
@@ -443,6 +447,7 @@ private class ConstantExpressionEvaluatorVisitor(
                 CompileTimeConstant.Parameters(
                     isPure = false,
                     isUnsignedNumberLiteral = false,
+                    isUnsignedLongNumberLiteral = false,
                     canBeUsedInAnnotation = canBeUsedInAnnotation,
                     usesVariableAsConstant = usesVariableAsConstant,
                     usesNonConstValAsConstant = usesNonConstantVariableAsConstant
@@ -506,6 +511,7 @@ private class ConstantExpressionEvaluatorVisitor(
                     canBeUsedInAnnotation = true,
                     isPure = false,
                     isUnsignedNumberLiteral = false,
+                    isUnsignedLongNumberLiteral = false,
                     usesVariableAsConstant = leftConstant.usesVariableAsConstant || rightConstant.usesVariableAsConstant,
                     usesNonConstValAsConstant = leftConstant.usesNonConstValAsConstant || rightConstant.usesNonConstValAsConstant
                 )
@@ -553,7 +559,7 @@ private class ConstantExpressionEvaluatorVisitor(
                 CompileTimeConstant.Parameters(
                     canBeUsedInAnnotation,
                     !isNumberConversionMethod && isArgumentPure,
-                    false,
+                    false, false,
                     usesVariableAsConstant, usesNonConstValAsConstant
                 )
             )
@@ -586,7 +592,7 @@ private class ConstantExpressionEvaluatorVisitor(
             val usesNonConstValAsConstant =
                 usesNonConstValAsConstant(argumentForReceiver.expression) || usesNonConstValAsConstant(argumentForParameter.expression)
             val parameters = CompileTimeConstant.Parameters(
-                canBeUsedInAnnotation, areArgumentsPure, false, usesVariableAsConstant, usesNonConstValAsConstant
+                canBeUsedInAnnotation, areArgumentsPure, false, false, usesVariableAsConstant, usesNonConstValAsConstant
             )
             return when (resultingDescriptorName) {
                 OperatorNameConventions.COMPARE_TO -> createCompileTimeConstantForCompareTo(result, callExpression)?.wrap(parameters)
@@ -708,6 +714,7 @@ private class ConstantExpressionEvaluatorVisitor(
                         canBeUsedInAnnotation = isPropertyCompileTimeConstant(callableDescriptor),
                         isPure = false,
                         isUnsignedNumberLiteral = false,
+                        isUnsignedLongNumberLiteral = false,
                         usesVariableAsConstant = true,
                         usesNonConstValAsConstant = !callableDescriptor.isConst
                     )
@@ -934,10 +941,16 @@ private class ConstantExpressionEvaluatorVisitor(
         parameters: CompileTimeConstant.Parameters,
         expectedType: KotlinType
     ): CompileTimeConstant<*>? {
+        if (parameters.isUnsignedLongNumberLiteral) {
+            return ULongValue(value).wrap(parameters)
+        }
+
         if (TypeUtils.noExpectedType(expectedType) || expectedType.isError) {
             return createIntegerValueTypeConstant(value, constantExpressionEvaluator.module, parameters)
         }
-        val integerValue = ConstantValueFactory.createIntegerConstantValue(value, expectedType, parameters.isUnsignedNumberLiteral)
+        val integerValue = ConstantValueFactory.createIntegerConstantValue(
+            value, expectedType, parameters.isUnsignedNumberLiteral
+        )
         if (integerValue != null) {
             return integerValue.wrap(parameters)
         }
@@ -962,14 +975,22 @@ private class ConstantExpressionEvaluatorVisitor(
         canBeUsedInAnnotation: Boolean = this !is NullValue,
         isPure: Boolean = false,
         isUnsigned: Boolean = false,
+        isUnsignedLong: Boolean = false,
         usesVariableAsConstant: Boolean = false,
         usesNonConstValAsConstant: Boolean = false
     ): TypedCompileTimeConstant<T> =
-        wrap(CompileTimeConstant.Parameters(canBeUsedInAnnotation, isPure, isUnsigned, usesVariableAsConstant, usesNonConstValAsConstant))
+        wrap(
+            CompileTimeConstant.Parameters(
+                canBeUsedInAnnotation, isPure, isUnsigned, isUnsignedLong, usesVariableAsConstant, usesNonConstValAsConstant
+            )
+        )
 }
 
 private fun hasLongSuffix(text: String) = text.endsWith('l') || text.endsWith('L')
 private fun hasUnsignedSuffix(text: String) = text.endsWith('u') || text.endsWith('U')
+private fun hasUnsignedLongSuffix(text: String) =
+    text.endsWith("ul") || text.endsWith("uL") ||
+            text.endsWith("Ul") || text.endsWith("UL")
 
 private fun parseNumericLiteral(text: String, type: IElementType): Any? {
     val canonicalText = LiteralFormatUtil.removeUnderscores(text)
@@ -981,13 +1002,33 @@ private fun parseNumericLiteral(text: String, type: IElementType): Any? {
 }
 
 private fun parseLong(text: String): Long? {
-    return try {
-        val hasUnsignedSuffix = hasUnsignedSuffix(text)
-        val hasLongSuffix = hasLongSuffix(text)
-        val textWithoutSuffix = if (hasUnsignedSuffix || hasLongSuffix) text.substring(0, text.length - 1) else text
-        val (number, radix) = extractRadix(textWithoutSuffix)
+    fun String.removeSuffix(i: Int): String = this.substring(0, this.length - i)
 
-        if (hasUnsignedSuffix) {
+    return try {
+        val isUnsigned: Boolean
+        val numberWithoutSuffix: String
+        when {
+            hasUnsignedLongSuffix(text) -> {
+                isUnsigned = true
+                numberWithoutSuffix = text.removeSuffix(2)
+            }
+            hasUnsignedSuffix(text) -> {
+                isUnsigned = true
+                numberWithoutSuffix = text.removeSuffix(1)
+            }
+            hasLongSuffix(text) -> {
+                isUnsigned = false
+                numberWithoutSuffix = text.removeSuffix(1)
+            }
+            else -> {
+                isUnsigned = false
+                numberWithoutSuffix = text
+            }
+        }
+
+        val (number, radix) = extractRadix(numberWithoutSuffix)
+
+        if (isUnsigned) {
             java.lang.Long.parseUnsignedLong(number, radix)
         } else {
             java.lang.Long.parseLong(number, radix)
diff --git a/compiler/psi/src/org/jetbrains/kotlin/lexer/Kotlin.flex b/compiler/psi/src/org/jetbrains/kotlin/lexer/Kotlin.flex
index b73d101df32..669aacdee51 100644
--- a/compiler/psi/src/org/jetbrains/kotlin/lexer/Kotlin.flex
+++ b/compiler/psi/src/org/jetbrains/kotlin/lexer/Kotlin.flex
@@ -92,9 +92,9 @@ EOL_COMMENT="/""/"[^\n]*
 SHEBANG_COMMENT="#!"[^\n]*
 
 INTEGER_LITERAL={DECIMAL_INTEGER_LITERAL}|{HEX_INTEGER_LITERAL}|{BIN_INTEGER_LITERAL}
-DECIMAL_INTEGER_LITERAL=(0|([1-9]({DIGIT_OR_UNDERSCORE})*))({LONG_SUFFIX}|{UNSIGNED_SUFFIX})?
-HEX_INTEGER_LITERAL=0[Xx]({HEX_DIGIT_OR_UNDERSCORE})*({LONG_SUFFIX}|{UNSIGNED_SUFFIX})?
-BIN_INTEGER_LITERAL=0[Bb]({DIGIT_OR_UNDERSCORE})*({LONG_SUFFIX}|{UNSIGNED_SUFFIX})?
+DECIMAL_INTEGER_LITERAL=(0|([1-9]({DIGIT_OR_UNDERSCORE})*))({UNSIGNED_SUFFIX}?{LONG_SUFFIX}?)?
+HEX_INTEGER_LITERAL=0[Xx]({HEX_DIGIT_OR_UNDERSCORE})*({UNSIGNED_SUFFIX}?{LONG_SUFFIX}?)?
+BIN_INTEGER_LITERAL=0[Bb]({DIGIT_OR_UNDERSCORE})*({UNSIGNED_SUFFIX}?{LONG_SUFFIX}?)?
 LONG_SUFFIX=[Ll]
 UNSIGNED_SUFFIX=[Uu]
 
diff --git a/compiler/psi/src/org/jetbrains/kotlin/lexer/_JetLexer.java b/compiler/psi/src/org/jetbrains/kotlin/lexer/_JetLexer.java
index de8bc4c9b67..6397888bf63 100644
--- a/compiler/psi/src/org/jetbrains/kotlin/lexer/_JetLexer.java
+++ b/compiler/psi/src/org/jetbrains/kotlin/lexer/_JetLexer.java
@@ -122,19 +122,19 @@ class _JetLexer implements FlexLexer {
 
   /* The ZZ_CMAP_A table has 3136 entries */
   static final char ZZ_CMAP_A[] = zzUnpackCMap(
-    "\11\0\1\4\1\10\1\40\1\41\1\40\22\0\1\4\1\14\1\30\1\13\1\11\1\72\1\70\1\25"+
-    "\1\76\1\77\1\37\1\65\1\101\1\24\1\21\1\12\1\15\11\1\1\73\1\100\1\66\1\63\1"+
-    "\67\1\64\1\102\1\3\1\17\2\3\1\23\1\22\5\5\1\20\10\5\1\20\2\5\1\16\2\5\1\74"+
-    "\1\26\1\75\1\0\1\2\1\7\1\45\1\56\1\52\1\62\1\44\1\51\1\55\1\33\1\34\1\57\1"+
-    "\54\1\46\1\5\1\47\1\53\1\43\1\5\1\50\1\35\1\32\1\27\1\61\1\60\1\16\1\42\1"+
-    "\5\1\31\1\71\1\36\7\0\1\40\24\0\1\5\12\0\1\5\4\0\1\5\5\0\27\5\1\0\12\5\4\0"+
-    "\14\5\16\0\5\5\7\0\1\5\1\0\1\5\1\0\5\5\1\0\2\5\2\0\4\5\1\0\1\5\6\0\1\5\1\0"+
-    "\3\5\1\0\1\5\1\0\4\5\1\0\23\5\1\0\13\5\10\0\6\5\1\0\26\5\2\0\1\5\6\0\10\5"+
-    "\10\0\13\5\5\0\3\5\15\0\12\6\4\0\6\5\1\0\1\5\17\0\2\5\7\0\2\5\12\6\3\5\2\0"+
-    "\2\5\1\0\16\5\15\0\11\5\13\0\1\5\16\0\12\6\6\5\4\0\2\5\4\0\1\5\5\0\6\5\4\0"+
-    "\1\5\11\0\1\5\3\0\1\5\7\0\11\5\7\0\5\5\1\0\10\5\6\0\26\5\3\0\1\5\2\0\1\5\7"+
-    "\0\12\5\4\0\12\6\1\5\4\0\10\5\2\0\2\5\2\0\26\5\1\0\7\5\1\0\1\5\3\0\4\5\3\0"+
-    "\1\5\20\0\1\5\15\0\2\5\1\0\1\5\5\0\6\5\4\0\2\5\1\0\2\5\1\0\2\5\1\0\2\5\17"+
+    "\11\0\1\4\1\10\1\41\1\42\1\41\22\0\1\4\1\14\1\31\1\13\1\11\1\73\1\71\1\26"+
+    "\1\77\1\100\1\40\1\66\1\102\1\25\1\22\1\12\1\15\11\1\1\74\1\101\1\67\1\64"+
+    "\1\70\1\65\1\103\1\3\1\17\2\3\1\24\1\23\5\5\1\20\10\5\1\21\2\5\1\16\2\5\1"+
+    "\75\1\27\1\76\1\0\1\2\1\7\1\46\1\57\1\53\1\63\1\45\1\52\1\56\1\34\1\35\1\60"+
+    "\1\55\1\47\1\5\1\50\1\54\1\44\1\5\1\51\1\36\1\33\1\30\1\62\1\61\1\16\1\43"+
+    "\1\5\1\32\1\72\1\37\7\0\1\41\24\0\1\5\12\0\1\5\4\0\1\5\5\0\27\5\1\0\12\5\4"+
+    "\0\14\5\16\0\5\5\7\0\1\5\1\0\1\5\1\0\5\5\1\0\2\5\2\0\4\5\1\0\1\5\6\0\1\5\1"+
+    "\0\3\5\1\0\1\5\1\0\4\5\1\0\23\5\1\0\13\5\10\0\6\5\1\0\26\5\2\0\1\5\6\0\10"+
+    "\5\10\0\13\5\5\0\3\5\15\0\12\6\4\0\6\5\1\0\1\5\17\0\2\5\7\0\2\5\12\6\3\5\2"+
+    "\0\2\5\1\0\16\5\15\0\11\5\13\0\1\5\16\0\12\6\6\5\4\0\2\5\4\0\1\5\5\0\6\5\4"+
+    "\0\1\5\11\0\1\5\3\0\1\5\7\0\11\5\7\0\5\5\1\0\10\5\6\0\26\5\3\0\1\5\2\0\1\5"+
+    "\7\0\12\5\4\0\12\6\1\5\4\0\10\5\2\0\2\5\2\0\26\5\1\0\7\5\1\0\1\5\3\0\4\5\3"+
+    "\0\1\5\20\0\1\5\15\0\2\5\1\0\1\5\5\0\6\5\4\0\2\5\1\0\2\5\1\0\2\5\1\0\2\5\17"+
     "\0\4\5\1\0\1\5\7\0\12\6\2\0\3\5\20\0\11\5\1\0\2\5\1\0\2\5\1\0\5\5\3\0\1\5"+
     "\2\0\1\5\30\0\1\5\13\0\10\5\2\0\1\5\3\0\1\5\1\0\6\5\3\0\3\5\1\0\4\5\3\0\2"+
     "\5\1\0\1\5\1\0\2\5\3\0\2\5\3\0\3\5\3\0\14\5\13\0\10\5\1\0\2\5\10\0\3\5\5\0"+
@@ -148,7 +148,7 @@ class _JetLexer implements FlexLexer {
     "\0\15\5\2\0\1\5\1\0\10\5\7\0\15\5\1\0\6\5\23\0\1\5\4\0\1\5\3\0\5\5\2\0\22"+
     "\5\1\0\1\5\5\0\17\5\1\0\16\5\2\0\5\5\13\0\14\5\13\0\1\5\15\0\7\5\7\0\16\5"+
     "\15\0\2\5\12\6\3\0\3\5\11\0\4\5\1\0\4\5\3\0\2\5\11\0\10\5\1\0\1\5\1\0\1\5"+
-    "\1\0\1\5\1\0\6\5\1\0\7\5\1\0\1\5\3\0\3\5\1\0\7\5\3\0\4\5\2\0\6\5\14\0\2\40"+
+    "\1\0\1\5\1\0\6\5\1\0\7\5\1\0\1\5\3\0\3\5\1\0\7\5\3\0\4\5\2\0\6\5\14\0\2\41"+
     "\7\0\1\5\15\0\1\5\2\0\1\5\4\0\1\5\2\0\12\5\1\0\1\5\3\0\5\5\6\0\1\5\1\0\1\5"+
     "\1\0\1\5\1\0\4\5\1\0\13\5\2\0\4\5\5\0\5\5\4\0\1\5\4\0\2\5\13\0\5\5\6\0\4\5"+
     "\3\0\2\5\14\0\10\5\7\0\10\5\1\0\7\5\6\0\2\5\12\0\5\5\5\0\2\5\3\0\7\5\6\0\3"+
@@ -179,7 +179,7 @@ class _JetLexer implements FlexLexer {
     "\3\3\1\16\1\17\14\3\1\20\1\21\1\22\1\23"+
     "\1\24\2\1\1\25\1\26\1\27\1\30\1\31\1\32"+
     "\1\33\1\34\1\35\1\36\1\37\1\36\1\1\1\40"+
-    "\2\36\1\41\1\1\1\41\3\42\1\43\1\44\1\2"+
+    "\2\36\1\41\1\1\1\41\3\42\1\43\1\44\2\2"+
     "\1\0\2\45\1\0\1\46\1\0\1\47\1\50\1\51"+
     "\1\52\1\0\1\53\1\0\2\2\1\45\1\54\1\55"+
     "\1\56\1\57\2\13\1\0\3\3\1\60\1\61\1\62"+
@@ -196,7 +196,7 @@ class _JetLexer implements FlexLexer {
     "\1\3\1\145\2\3\1\146\3\3\1\147\1\150\1\151";
 
   private static int [] zzUnpackAction() {
-    int [] result = new int[231];
+    int [] result = new int[232];
     int offset = 0;
     offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result);
     return result;
@@ -221,38 +221,38 @@ class _JetLexer implements FlexLexer {
   private static final int [] ZZ_ROWMAP = zzUnpackRowMap();
 
   private static final String ZZ_ROWMAP_PACKED_0 =
-    "\0\0\0\103\0\206\0\311\0\u010c\0\u014f\0\u0192\0\u01d5"+
-    "\0\u0218\0\u025b\0\u029e\0\u02e1\0\u0324\0\u0367\0\u03aa\0\u03ed"+
-    "\0\u0430\0\u0473\0\u04b6\0\u04f9\0\u0192\0\u053c\0\u057f\0\u05c2"+
-    "\0\u0192\0\u0605\0\u0648\0\u068b\0\u06ce\0\u0711\0\u0754\0\u0797"+
-    "\0\u07da\0\u081d\0\u0860\0\u08a3\0\u08e6\0\u0929\0\u096c\0\u0192"+
-    "\0\u09af\0\u09f2\0\u0a35\0\u0a78\0\u0abb\0\u0afe\0\u0b41\0\u0192"+
-    "\0\u0192\0\u0192\0\u0192\0\u0b84\0\u0192\0\u0192\0\u0bc7\0\u0192"+
-    "\0\u0c0a\0\u0c4d\0\u0192\0\u0192\0\u0c90\0\u0cd3\0\u0d16\0\u0d59"+
-    "\0\u0192\0\u0d9c\0\u0ddf\0\u0192\0\u0192\0\u0e22\0\u0e65\0\u0192"+
-    "\0\u0ea8\0\u0eeb\0\u0f2e\0\u0f71\0\u0fb4\0\u0ff7\0\u0192\0\u103a"+
-    "\0\u107d\0\u10c0\0\u1103\0\u1146\0\u1189\0\u11cc\0\u120f\0\u0192"+
-    "\0\u0192\0\u0192\0\u0192\0\u1252\0\u1295\0\u12d8\0\u131b\0\u135e"+
-    "\0\u0218\0\u13a1\0\u0218\0\u13e4\0\u0192\0\u1427\0\u146a\0\u14ad"+
-    "\0\u14f0\0\u1533\0\u1576\0\u15b9\0\u15fc\0\u163f\0\u1682\0\u16c5"+
-    "\0\u1708\0\u174b\0\u178e\0\u0218\0\u17d1\0\u0192\0\u0192\0\u0192"+
-    "\0\u0192\0\u0192\0\u0192\0\u0192\0\u0192\0\u0192\0\u0192\0\u1814"+
-    "\0\u1857\0\u0192\0\u0192\0\u189a\0\u18dd\0\u1920\0\u1963\0\u0192"+
-    "\0\u0192\0\u19a6\0\u0192\0\u19e9\0\u0192\0\u1a2c\0\u1a6f\0\u1ab2"+
-    "\0\u1ab2\0\u0192\0\u1af5\0\u0192\0\u0192\0\u1b38\0\u1b7b\0\u1bbe"+
-    "\0\u1c01\0\u0218\0\u1c44\0\u1c87\0\u1cca\0\u1d0d\0\u0192\0\u1d50"+
-    "\0\u1d93\0\u0218\0\u1dd6\0\u0218\0\u1e19\0\u1e5c\0\u1e9f\0\u1ee2"+
-    "\0\u1f25\0\u1f68\0\u0218\0\u0218\0\u0192\0\u1fab\0\u1fee\0\u18dd"+
-    "\0\u0192\0\u2031\0\u0192\0\u0192\0\u0192\0\u0218\0\u2074\0\u20b7"+
-    "\0\u0218\0\u20fa\0\u213d\0\u2180\0\u0218\0\u0218\0\u21c3\0\u2206"+
-    "\0\u2249\0\u228c\0\u22cf\0\u2312\0\u2355\0\u0218\0\u0192\0\u2398"+
-    "\0\u0cd3\0\u0218\0\u23db\0\u241e\0\u2461\0\u0218\0\u24a4\0\u24e7"+
-    "\0\u0218\0\u0218\0\u252a\0\u256d\0\u0218\0\u0218\0\u25b0\0\u25f3"+
-    "\0\u0218\0\u2636\0\u2679\0\u0218\0\u26bc\0\u0218\0\u26ff\0\u2742"+
-    "\0\u0218\0\u2785\0\u27c8\0\u280b\0\u0218\0\u0218\0\u0218";
+    "\0\0\0\104\0\210\0\314\0\u0110\0\u0154\0\u0198\0\u01dc"+
+    "\0\u0220\0\u0264\0\u02a8\0\u02ec\0\u0330\0\u0374\0\u03b8\0\u03fc"+
+    "\0\u0440\0\u0484\0\u04c8\0\u050c\0\u0198\0\u0550\0\u0594\0\u05d8"+
+    "\0\u0198\0\u061c\0\u0660\0\u06a4\0\u06e8\0\u072c\0\u0770\0\u07b4"+
+    "\0\u07f8\0\u083c\0\u0880\0\u08c4\0\u0908\0\u094c\0\u0990\0\u0198"+
+    "\0\u09d4\0\u0a18\0\u0a5c\0\u0aa0\0\u0ae4\0\u0b28\0\u0b6c\0\u0198"+
+    "\0\u0198\0\u0198\0\u0198\0\u0bb0\0\u0198\0\u0198\0\u0bf4\0\u0198"+
+    "\0\u0c38\0\u0c7c\0\u0198\0\u0198\0\u0cc0\0\u0d04\0\u0d48\0\u0d8c"+
+    "\0\u0198\0\u0dd0\0\u0e14\0\u0198\0\u0198\0\u0e58\0\u0e9c\0\u0ee0"+
+    "\0\u0198\0\u0f24\0\u0f68\0\u0fac\0\u0ff0\0\u1034\0\u1078\0\u0198"+
+    "\0\u10bc\0\u1100\0\u1144\0\u1188\0\u11cc\0\u1210\0\u1254\0\u1298"+
+    "\0\u0198\0\u0198\0\u0198\0\u0198\0\u12dc\0\u1320\0\u1364\0\u13a8"+
+    "\0\u13ec\0\u0220\0\u1430\0\u0220\0\u1474\0\u0198\0\u14b8\0\u14fc"+
+    "\0\u1540\0\u1584\0\u15c8\0\u160c\0\u1650\0\u1694\0\u16d8\0\u171c"+
+    "\0\u1760\0\u17a4\0\u17e8\0\u182c\0\u0220\0\u1870\0\u0198\0\u0198"+
+    "\0\u0198\0\u0198\0\u0198\0\u0198\0\u0198\0\u0198\0\u0198\0\u0198"+
+    "\0\u18b4\0\u18f8\0\u0198\0\u0198\0\u193c\0\u1980\0\u19c4\0\u1a08"+
+    "\0\u0198\0\u0198\0\u1a4c\0\u0198\0\u1a90\0\u0198\0\u1ad4\0\u1b18"+
+    "\0\u1b5c\0\u1b5c\0\u0198\0\u1ba0\0\u0198\0\u0198\0\u1be4\0\u1c28"+
+    "\0\u1c6c\0\u1cb0\0\u0220\0\u1cf4\0\u1d38\0\u1d7c\0\u1dc0\0\u0198"+
+    "\0\u1e04\0\u1e48\0\u0220\0\u1e8c\0\u0220\0\u1ed0\0\u1f14\0\u1f58"+
+    "\0\u1f9c\0\u1fe0\0\u2024\0\u0220\0\u0220\0\u0198\0\u2068\0\u20ac"+
+    "\0\u1980\0\u0198\0\u20f0\0\u0198\0\u0198\0\u0198\0\u0220\0\u2134"+
+    "\0\u2178\0\u0220\0\u21bc\0\u2200\0\u2244\0\u0220\0\u0220\0\u2288"+
+    "\0\u22cc\0\u2310\0\u2354\0\u2398\0\u23dc\0\u2420\0\u0220\0\u0198"+
+    "\0\u2464\0\u0d04\0\u0220\0\u24a8\0\u24ec\0\u2530\0\u0220\0\u2574"+
+    "\0\u25b8\0\u0220\0\u0220\0\u25fc\0\u2640\0\u0220\0\u0220\0\u2684"+
+    "\0\u26c8\0\u0220\0\u270c\0\u2750\0\u0220\0\u2794\0\u0220\0\u27d8"+
+    "\0\u281c\0\u0220\0\u2860\0\u28a4\0\u28e8\0\u0220\0\u0220\0\u0220";
 
   private static int [] zzUnpackRowMap() {
-    int [] result = new int[231];
+    int [] result = new int[232];
     int offset = 0;
     offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result);
     return result;
@@ -276,249 +276,250 @@ class _JetLexer implements FlexLexer {
 
   private static final String ZZ_TRANS_PACKED_0 =
     "\1\7\1\10\2\11\1\12\1\11\1\7\1\13\1\12"+
-    "\1\14\1\15\1\16\1\17\1\20\3\11\1\21\2\11"+
+    "\1\14\1\15\1\16\1\17\1\20\4\11\1\21\2\11"+
     "\1\22\1\23\1\7\1\11\1\24\1\25\1\26\1\11"+
     "\1\27\1\30\1\31\1\32\1\0\1\12\1\11\1\33"+
     "\1\34\1\35\1\11\1\36\1\37\1\40\1\41\1\42"+
     "\2\11\1\43\1\11\1\44\1\45\1\46\1\47\1\50"+
     "\1\51\1\52\1\53\1\54\1\55\1\56\1\57\1\60"+
     "\1\61\1\62\1\63\1\64\1\65\1\66\10\67\1\70"+
-    "\1\71\14\67\1\72\1\67\1\73\62\67\1\74\1\71"+
-    "\14\67\1\74\1\67\1\75\52\67\2\7\2\76\1\7"+
-    "\1\76\1\7\1\77\1\0\5\7\3\76\1\7\2\76"+
+    "\1\71\15\67\1\72\1\67\1\73\62\67\1\74\1\71"+
+    "\15\67\1\74\1\67\1\75\52\67\2\7\2\76\1\7"+
+    "\1\76\1\7\1\77\1\0\5\7\4\76\1\7\2\76"+
     "\3\7\1\76\2\7\1\100\3\76\2\7\2\0\21\76"+
-    "\20\7\12\101\1\102\24\101\1\103\1\0\42\101\1\7"+
+    "\20\7\12\101\1\102\25\101\1\103\1\0\42\101\1\7"+
     "\1\10\2\11\1\12\1\11\1\7\1\13\1\12\1\14"+
-    "\1\15\1\16\1\17\1\20\3\11\1\21\2\11\1\22"+
+    "\1\15\1\16\1\17\1\20\4\11\1\21\2\11\1\22"+
     "\1\23\1\7\1\11\1\24\1\104\1\26\1\11\1\27"+
     "\1\30\1\105\1\32\1\0\1\12\1\11\1\33\1\34"+
     "\1\35\1\11\1\36\1\37\1\40\1\41\1\42\2\11"+
     "\1\43\1\11\1\44\1\45\1\46\1\47\1\50\1\51"+
     "\1\52\1\53\1\54\1\55\1\56\1\57\1\60\1\61"+
-    "\1\62\1\63\1\64\1\65\1\66\104\0\2\10\12\0"+
-    "\1\10\2\0\1\106\1\107\1\110\1\111\3\0\1\106"+
-    "\14\0\1\111\1\0\1\106\2\0\1\110\32\0\3\11"+
-    "\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\11"+
-    "\2\0\4\11\4\0\21\11\24\0\1\12\3\0\1\12"+
-    "\30\0\1\12\41\0\7\112\2\0\72\112\2\0\2\113"+
-    "\1\0\1\113\1\0\1\114\6\0\3\113\1\0\2\113"+
-    "\3\0\1\113\2\0\4\113\4\0\21\113\32\0\1\115"+
-    "\24\0\1\116\23\0\1\117\33\0\1\120\122\0\1\121"+
-    "\26\0\1\122\20\0\2\123\12\0\1\123\1\124\1\125"+
-    "\1\106\1\107\1\110\1\111\3\0\1\106\14\0\1\111"+
-    "\1\0\1\106\2\0\1\110\4\0\1\125\25\0\1\126"+
-    "\13\0\1\126\3\0\1\127\105\0\1\130\36\0\1\131"+
-    "\3\0\1\132\13\0\10\23\1\0\14\23\1\133\1\134"+
-    "\54\23\30\0\1\135\53\0\3\11\1\0\2\11\6\0"+
-    "\4\11\1\0\2\11\3\0\1\11\2\0\1\11\1\136"+
-    "\2\11\4\0\1\137\5\11\1\140\12\11\21\0\3\11"+
-    "\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\11"+
-    "\2\0\3\11\1\141\4\0\5\11\1\142\1\11\1\143"+
-    "\11\11\21\0\3\11\1\0\2\11\6\0\4\11\1\0"+
-    "\2\11\3\0\1\144\2\0\4\11\4\0\21\11\103\0"+
-    "\1\145\20\0\3\11\1\0\2\11\6\0\4\11\1\0"+
-    "\2\11\3\0\1\11\2\0\4\11\4\0\3\11\1\146"+
-    "\15\11\21\0\3\11\1\0\2\11\6\0\4\11\1\0"+
-    "\2\11\3\0\1\11\2\0\4\11\4\0\4\11\1\147"+
-    "\14\11\21\0\3\11\1\0\2\11\6\0\4\11\1\0"+
-    "\2\11\3\0\1\11\2\0\3\11\1\150\4\0\21\11"+
-    "\21\0\3\11\1\0\2\11\6\0\4\11\1\0\2\11"+
-    "\3\0\1\151\2\0\4\11\4\0\21\11\21\0\3\11"+
-    "\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\11"+
-    "\2\0\4\11\4\0\2\11\1\152\16\11\21\0\3\11"+
-    "\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\153"+
-    "\2\0\4\11\4\0\3\11\1\154\5\11\1\155\7\11"+
-    "\21\0\3\11\1\0\2\11\6\0\4\11\1\0\2\11"+
-    "\3\0\1\11\2\0\4\11\4\0\4\11\1\156\4\11"+
-    "\1\157\7\11\21\0\3\11\1\0\2\11\6\0\4\11"+
-    "\1\0\2\11\3\0\1\11\2\0\4\11\4\0\14\11"+
-    "\1\160\4\11\21\0\3\11\1\0\2\11\6\0\4\11"+
-    "\1\0\2\11\3\0\1\11\2\0\4\11\4\0\6\11"+
-    "\1\161\12\11\21\0\3\11\1\0\2\11\6\0\4\11"+
-    "\1\0\2\11\3\0\1\11\2\0\1\11\1\162\2\11"+
-    "\4\0\21\11\21\0\3\11\1\0\2\11\6\0\4\11"+
-    "\1\0\2\11\3\0\1\11\2\0\4\11\4\0\3\11"+
-    "\1\163\15\11\21\0\3\11\1\0\2\11\6\0\4\11"+
+    "\1\62\1\63\1\64\1\65\1\66\105\0\2\10\12\0"+
+    "\1\10\2\0\1\106\1\107\1\110\1\111\1\112\3\0"+
+    "\1\107\14\0\1\112\1\0\1\106\2\0\1\111\32\0"+
+    "\3\11\1\0\2\11\6\0\5\11\1\0\2\11\3\0"+
+    "\1\11\2\0\4\11\4\0\21\11\24\0\1\12\3\0"+
+    "\1\12\31\0\1\12\41\0\7\113\2\0\73\113\2\0"+
+    "\2\114\1\0\1\114\1\0\1\115\6\0\4\114\1\0"+
+    "\2\114\3\0\1\114\2\0\4\114\4\0\21\114\32\0"+
+    "\1\116\25\0\1\117\23\0\1\120\33\0\1\121\124\0"+
+    "\1\122\26\0\1\123\20\0\2\124\12\0\1\124\1\125"+
+    "\1\126\1\106\1\107\1\110\1\111\1\112\3\0\1\107"+
+    "\14\0\1\112\1\0\1\106\2\0\1\111\4\0\1\126"+
+    "\25\0\1\127\13\0\1\127\4\0\1\130\106\0\1\131"+
+    "\36\0\1\132\3\0\1\133\13\0\10\23\1\0\15\23"+
+    "\1\134\1\135\54\23\31\0\1\136\53\0\3\11\1\0"+
+    "\2\11\6\0\5\11\1\0\2\11\3\0\1\11\2\0"+
+    "\1\11\1\137\2\11\4\0\1\140\5\11\1\141\12\11"+
+    "\21\0\3\11\1\0\2\11\6\0\5\11\1\0\2\11"+
+    "\3\0\1\11\2\0\3\11\1\142\4\0\5\11\1\143"+
+    "\1\11\1\144\11\11\21\0\3\11\1\0\2\11\6\0"+
+    "\5\11\1\0\2\11\3\0\1\145\2\0\4\11\4\0"+
+    "\21\11\104\0\1\146\20\0\3\11\1\0\2\11\6\0"+
+    "\5\11\1\0\2\11\3\0\1\11\2\0\4\11\4\0"+
+    "\3\11\1\147\15\11\21\0\3\11\1\0\2\11\6\0"+
+    "\5\11\1\0\2\11\3\0\1\11\2\0\4\11\4\0"+
+    "\4\11\1\150\14\11\21\0\3\11\1\0\2\11\6\0"+
+    "\5\11\1\0\2\11\3\0\1\11\2\0\3\11\1\151"+
+    "\4\0\21\11\21\0\3\11\1\0\2\11\6\0\5\11"+
+    "\1\0\2\11\3\0\1\152\2\0\4\11\4\0\21\11"+
+    "\21\0\3\11\1\0\2\11\6\0\5\11\1\0\2\11"+
+    "\3\0\1\11\2\0\4\11\4\0\2\11\1\153\16\11"+
+    "\21\0\3\11\1\0\2\11\6\0\5\11\1\0\2\11"+
+    "\3\0\1\154\2\0\4\11\4\0\3\11\1\155\5\11"+
+    "\1\156\7\11\21\0\3\11\1\0\2\11\6\0\5\11"+
+    "\1\0\2\11\3\0\1\11\2\0\4\11\4\0\4\11"+
+    "\1\157\4\11\1\160\7\11\21\0\3\11\1\0\2\11"+
+    "\6\0\5\11\1\0\2\11\3\0\1\11\2\0\4\11"+
+    "\4\0\14\11\1\161\4\11\21\0\3\11\1\0\2\11"+
+    "\6\0\5\11\1\0\2\11\3\0\1\11\2\0\4\11"+
+    "\4\0\6\11\1\162\12\11\21\0\3\11\1\0\2\11"+
+    "\6\0\5\11\1\0\2\11\3\0\1\11\2\0\1\11"+
+    "\1\163\2\11\4\0\21\11\21\0\3\11\1\0\2\11"+
+    "\6\0\5\11\1\0\2\11\3\0\1\11\2\0\4\11"+
+    "\4\0\3\11\1\164\15\11\21\0\3\11\1\0\2\11"+
+    "\6\0\5\11\1\0\2\11\3\0\1\11\2\0\4\11"+
+    "\4\0\11\11\1\165\7\11\104\0\1\166\3\0\1\167"+
+    "\77\0\1\170\1\0\1\171\101\0\1\172\103\0\1\173"+
+    "\110\0\1\174\104\0\1\175\75\0\1\176\113\0\1\177"+
+    "\110\0\1\200\2\0\10\67\2\0\15\67\1\0\1\67"+
+    "\1\0\52\67\2\0\2\201\1\0\1\201\1\0\1\202"+
+    "\6\0\4\201\1\0\2\201\3\0\1\201\1\0\1\203"+
+    "\4\201\4\0\21\201\20\0\10\204\1\0\17\204\1\205"+
+    "\53\204\31\0\1\206\53\0\3\76\1\0\2\76\6\0"+
+    "\5\76\1\0\2\76\3\0\1\76\2\0\4\76\4\0"+
+    "\21\76\20\0\7\207\2\0\73\207\1\0\3\76\1\0"+
+    "\2\76\6\0\5\76\1\0\2\76\3\0\1\76\2\0"+
+    "\1\76\1\210\2\76\4\0\21\76\60\0\1\211\55\0"+
+    "\1\212\113\0\1\213\101\0\1\106\1\0\1\213\24\0"+
+    "\1\106\35\0\1\127\13\0\1\127\4\0\1\214\62\0"+
+    "\2\215\12\0\1\215\5\0\1\111\1\0\1\215\24\0"+
+    "\1\111\13\0\1\215\15\0\7\113\1\216\1\0\73\113"+
+    "\1\0\3\114\1\0\2\114\6\0\5\114\1\0\2\114"+
+    "\3\0\1\114\2\0\4\114\4\0\21\114\20\0\7\217"+
+    "\2\0\73\217\10\116\1\0\73\116\40\0\1\220\43\0"+
+    "\10\121\1\0\73\121\36\0\1\221\11\0\1\222\117\0"+
+    "\1\223\20\0\2\124\12\0\1\124\4\0\1\224\1\111"+
+    "\1\112\20\0\1\112\4\0\1\111\32\0\3\125\11\0"+
+    "\1\125\1\0\1\125\1\106\1\107\1\213\2\125\3\0"+
+    "\1\107\14\0\2\125\1\106\2\0\2\125\3\0\1\125"+
+    "\3\0\1\125\21\0\2\126\12\0\1\126\2\0\1\106"+
+    "\1\107\1\213\5\0\1\107\16\0\1\106\35\0\2\127"+
+    "\12\0\1\127\5\0\1\111\1\112\20\0\1\112\4\0"+
+    "\1\111\53\0\1\225\61\0\10\23\1\0\73\23\31\0"+
+    "\1\226\53\0\3\11\1\0\2\11\6\0\5\11\1\0"+
+    "\2\11\3\0\1\11\2\0\2\11\1\227\1\11\4\0"+
+    "\6\11\1\230\12\11\21\0\3\11\1\0\2\11\6\0"+
+    "\5\11\1\0\2\11\3\0\1\11\2\0\4\11\4\0"+
+    "\1\11\1\231\17\11\21\0\3\11\1\0\2\11\6\0"+
+    "\5\11\1\0\2\11\3\0\1\232\2\0\4\11\4\0"+
+    "\1\233\20\11\21\0\3\11\1\0\2\11\6\0\5\11"+
+    "\1\0\2\11\3\0\1\11\2\0\1\234\3\11\4\0"+
+    "\21\11\21\0\3\11\1\0\2\11\6\0\5\11\1\0"+
+    "\2\11\3\0\1\11\2\0\4\11\4\0\1\11\1\235"+
+    "\17\11\21\0\3\11\1\0\2\11\6\0\5\11\1\0"+
+    "\2\11\3\0\1\11\2\0\4\11\4\0\10\11\1\236"+
+    "\10\11\21\0\3\11\1\0\2\11\6\0\5\11\1\0"+
+    "\2\11\3\0\1\11\2\0\3\11\1\237\4\0\21\11"+
+    "\21\0\3\11\1\0\2\11\6\0\5\11\1\0\2\11"+
+    "\3\0\1\11\2\0\4\11\4\0\21\11\1\0\1\240"+
+    "\17\0\3\11\1\0\2\11\6\0\5\11\1\0\2\11"+
+    "\3\0\1\11\2\0\4\11\4\0\4\11\1\241\14\11"+
+    "\21\0\3\11\1\0\2\11\6\0\5\11\1\0\2\11"+
+    "\3\0\1\11\2\0\1\242\3\11\4\0\21\11\21\0"+
+    "\3\11\1\0\2\11\6\0\5\11\1\0\2\11\3\0"+
+    "\1\11\2\0\4\11\4\0\5\11\1\243\13\11\21\0"+
+    "\3\11\1\0\2\11\6\0\5\11\1\0\2\11\3\0"+
+    "\1\11\2\0\4\11\4\0\4\11\1\244\14\11\21\0"+
+    "\3\11\1\0\2\11\6\0\5\11\1\0\2\11\3\0"+
+    "\1\11\2\0\4\11\4\0\6\11\1\245\12\11\21\0"+
+    "\3\11\1\0\2\11\6\0\5\11\1\0\2\11\3\0"+
+    "\1\11\2\0\4\11\4\0\3\11\1\246\15\11\21\0"+
+    "\3\11\1\0\2\11\6\0\5\11\1\0\2\11\3\0"+
+    "\1\11\2\0\4\11\4\0\5\11\1\247\13\11\21\0"+
+    "\3\11\1\0\2\11\6\0\5\11\1\0\2\11\3\0"+
+    "\1\11\2\0\4\11\4\0\15\11\1\250\3\11\21\0"+
+    "\3\11\1\0\2\11\6\0\5\11\1\0\2\11\3\0"+
+    "\1\11\2\0\4\11\4\0\2\11\1\251\16\11\21\0"+
+    "\3\11\1\0\2\11\6\0\5\11\1\0\2\11\3\0"+
+    "\1\11\2\0\2\11\1\252\1\11\4\0\2\11\1\253"+
+    "\16\11\21\0\3\11\1\0\2\11\6\0\5\11\1\0"+
+    "\2\11\3\0\1\11\2\0\4\11\4\0\4\11\1\254"+
+    "\1\11\1\255\12\11\104\0\1\256\20\0\3\201\1\0"+
+    "\2\201\6\0\5\201\1\0\2\201\3\0\1\201\2\0"+
+    "\4\201\4\0\21\201\20\0\7\257\2\0\73\257\1\0"+
+    "\1\260\1\0\1\260\11\0\1\260\1\0\1\260\3\0"+
+    "\2\260\20\0\2\260\3\0\2\260\3\0\1\260\3\0"+
+    "\1\260\51\0\1\261\52\0\7\207\1\262\1\0\73\207"+
+    "\1\0\3\76\1\0\2\76\6\0\5\76\1\0\2\76"+
+    "\3\0\1\76\2\0\2\76\1\263\1\76\4\0\21\76"+
+    "\42\0\1\214\62\0\2\215\12\0\1\215\5\0\1\111"+
+    "\26\0\1\111\31\0\7\217\1\264\1\0\73\217\12\0"+
+    "\1\265\72\0\3\266\1\0\2\266\6\0\5\266\1\0"+
+    "\2\266\3\0\1\266\2\0\4\266\4\0\21\266\21\0"+
+    "\1\127\13\0\1\127\67\0\3\11\1\0\2\11\6\0"+
+    "\5\11\1\0\2\11\3\0\1\11\2\0\3\11\1\267"+
+    "\4\0\21\11\21\0\3\11\1\0\2\11\6\0\5\11"+
     "\1\0\2\11\3\0\1\11\2\0\4\11\4\0\11\11"+
-    "\1\164\7\11\103\0\1\165\3\0\1\166\76\0\1\167"+
-    "\1\0\1\170\100\0\1\171\102\0\1\172\107\0\1\173"+
-    "\103\0\1\174\74\0\1\175\112\0\1\176\107\0\1\177"+
-    "\2\0\10\67\2\0\14\67\1\0\1\67\1\0\52\67"+
-    "\2\0\2\200\1\0\1\200\1\0\1\201\6\0\3\200"+
-    "\1\0\2\200\3\0\1\200\1\0\1\202\4\200\4\0"+
-    "\21\200\20\0\10\203\1\0\16\203\1\204\53\203\30\0"+
-    "\1\205\53\0\3\76\1\0\2\76\6\0\4\76\1\0"+
-    "\2\76\3\0\1\76\2\0\4\76\4\0\21\76\20\0"+
-    "\7\206\2\0\72\206\1\0\3\76\1\0\2\76\6\0"+
-    "\4\76\1\0\2\76\3\0\1\76\2\0\1\76\1\207"+
-    "\2\76\4\0\21\76\57\0\1\210\55\0\1\211\111\0"+
-    "\1\212\62\0\1\126\13\0\1\126\3\0\1\213\62\0"+
-    "\2\214\12\0\1\214\4\0\1\110\1\0\1\214\24\0"+
-    "\1\110\13\0\1\214\15\0\7\112\1\215\1\0\72\112"+
-    "\1\0\3\113\1\0\2\113\6\0\4\113\1\0\2\113"+
-    "\3\0\1\113\2\0\4\113\4\0\21\113\20\0\7\216"+
-    "\2\0\72\216\10\115\1\0\72\115\37\0\1\217\43\0"+
-    "\10\120\1\0\72\120\35\0\1\220\11\0\1\221\116\0"+
-    "\1\222\20\0\2\123\12\0\1\123\3\0\1\223\1\110"+
-    "\1\111\20\0\1\111\4\0\1\110\32\0\3\124\11\0"+
-    "\1\124\1\0\1\124\1\106\1\212\2\124\3\0\1\106"+
-    "\14\0\2\124\1\106\2\0\2\124\3\0\1\124\3\0"+
-    "\1\124\21\0\2\125\12\0\1\125\2\0\1\106\1\212"+
-    "\5\0\1\106\16\0\1\106\35\0\2\126\12\0\1\126"+
-    "\4\0\1\110\1\111\20\0\1\111\4\0\1\110\52\0"+
-    "\1\224\61\0\10\23\1\0\72\23\30\0\1\225\53\0"+
-    "\3\11\1\0\2\11\6\0\4\11\1\0\2\11\3\0"+
-    "\1\11\2\0\2\11\1\226\1\11\4\0\6\11\1\227"+
-    "\12\11\21\0\3\11\1\0\2\11\6\0\4\11\1\0"+
-    "\2\11\3\0\1\11\2\0\4\11\4\0\1\11\1\230"+
-    "\17\11\21\0\3\11\1\0\2\11\6\0\4\11\1\0"+
-    "\2\11\3\0\1\231\2\0\4\11\4\0\1\232\20\11"+
-    "\21\0\3\11\1\0\2\11\6\0\4\11\1\0\2\11"+
-    "\3\0\1\11\2\0\1\233\3\11\4\0\21\11\21\0"+
-    "\3\11\1\0\2\11\6\0\4\11\1\0\2\11\3\0"+
-    "\1\11\2\0\4\11\4\0\1\11\1\234\17\11\21\0"+
-    "\3\11\1\0\2\11\6\0\4\11\1\0\2\11\3\0"+
-    "\1\11\2\0\4\11\4\0\10\11\1\235\10\11\21\0"+
-    "\3\11\1\0\2\11\6\0\4\11\1\0\2\11\3\0"+
-    "\1\11\2\0\3\11\1\236\4\0\21\11\21\0\3\11"+
-    "\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\11"+
-    "\2\0\4\11\4\0\21\11\1\0\1\237\17\0\3\11"+
-    "\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\11"+
-    "\2\0\4\11\4\0\4\11\1\240\14\11\21\0\3\11"+
-    "\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\11"+
-    "\2\0\1\241\3\11\4\0\21\11\21\0\3\11\1\0"+
-    "\2\11\6\0\4\11\1\0\2\11\3\0\1\11\2\0"+
-    "\4\11\4\0\5\11\1\242\13\11\21\0\3\11\1\0"+
-    "\2\11\6\0\4\11\1\0\2\11\3\0\1\11\2\0"+
-    "\4\11\4\0\4\11\1\243\14\11\21\0\3\11\1\0"+
-    "\2\11\6\0\4\11\1\0\2\11\3\0\1\11\2\0"+
-    "\4\11\4\0\6\11\1\244\12\11\21\0\3\11\1\0"+
-    "\2\11\6\0\4\11\1\0\2\11\3\0\1\11\2\0"+
-    "\4\11\4\0\3\11\1\245\15\11\21\0\3\11\1\0"+
-    "\2\11\6\0\4\11\1\0\2\11\3\0\1\11\2\0"+
-    "\4\11\4\0\5\11\1\246\13\11\21\0\3\11\1\0"+
-    "\2\11\6\0\4\11\1\0\2\11\3\0\1\11\2\0"+
-    "\4\11\4\0\15\11\1\247\3\11\21\0\3\11\1\0"+
-    "\2\11\6\0\4\11\1\0\2\11\3\0\1\11\2\0"+
-    "\4\11\4\0\2\11\1\250\16\11\21\0\3\11\1\0"+
-    "\2\11\6\0\4\11\1\0\2\11\3\0\1\11\2\0"+
-    "\2\11\1\251\1\11\4\0\2\11\1\252\16\11\21\0"+
-    "\3\11\1\0\2\11\6\0\4\11\1\0\2\11\3\0"+
-    "\1\11\2\0\4\11\4\0\4\11\1\253\1\11\1\254"+
-    "\12\11\103\0\1\255\20\0\3\200\1\0\2\200\6\0"+
-    "\4\200\1\0\2\200\3\0\1\200\2\0\4\200\4\0"+
-    "\21\200\20\0\7\256\2\0\72\256\1\0\1\257\1\0"+
-    "\1\257\11\0\1\257\1\0\1\257\2\0\2\257\20\0"+
-    "\2\257\3\0\2\257\3\0\1\257\3\0\1\257\50\0"+
-    "\1\260\52\0\7\206\1\261\1\0\72\206\1\0\3\76"+
-    "\1\0\2\76\6\0\4\76\1\0\2\76\3\0\1\76"+
-    "\2\0\2\76\1\262\1\76\4\0\21\76\41\0\1\213"+
-    "\62\0\2\214\12\0\1\214\4\0\1\110\26\0\1\110"+
-    "\31\0\7\216\1\263\1\0\72\216\12\0\1\264\71\0"+
-    "\3\265\1\0\2\265\6\0\4\265\1\0\2\265\3\0"+
-    "\1\265\2\0\4\265\4\0\21\265\21\0\1\126\13\0"+
-    "\1\126\66\0\3\11\1\0\2\11\6\0\4\11\1\0"+
-    "\2\11\3\0\1\11\2\0\3\11\1\266\4\0\21\11"+
-    "\21\0\3\11\1\0\2\11\6\0\4\11\1\0\2\11"+
-    "\3\0\1\11\2\0\4\11\4\0\11\11\1\267\7\11"+
-    "\21\0\3\11\1\0\2\11\6\0\4\11\1\0\2\11"+
-    "\3\0\1\11\2\0\4\11\4\0\2\11\1\270\16\11"+
-    "\21\0\3\11\1\0\2\11\6\0\4\11\1\0\2\11"+
-    "\3\0\1\11\2\0\4\11\4\0\2\11\1\271\16\11"+
-    "\21\0\3\11\1\0\2\11\6\0\4\11\1\0\2\11"+
-    "\3\0\1\11\2\0\4\11\4\0\2\11\1\272\16\11"+
-    "\21\0\3\11\1\0\2\11\6\0\4\11\1\0\2\11"+
-    "\3\0\1\11\2\0\4\11\4\0\2\11\1\273\16\11"+
-    "\21\0\3\11\1\0\2\11\6\0\4\11\1\0\2\11"+
-    "\3\0\1\11\2\0\4\11\4\0\12\11\1\274\6\11"+
-    "\21\0\3\11\1\0\2\11\6\0\4\11\1\0\2\11"+
-    "\3\0\1\11\2\0\4\11\4\0\2\11\1\275\16\11"+
-    "\21\0\3\11\1\0\2\11\6\0\4\11\1\0\2\11"+
-    "\3\0\1\11\2\0\4\11\4\0\4\11\1\276\14\11"+
-    "\21\0\3\11\1\0\2\11\6\0\4\11\1\0\2\11"+
-    "\3\0\1\277\2\0\4\11\4\0\21\11\21\0\3\11"+
-    "\1\0\2\11\6\0\4\11\1\0\2\11\3\0\1\11"+
-    "\2\0\3\11\1\300\4\0\21\11\21\0\3\11\1\0"+
-    "\2\11\6\0\4\11\1\0\2\11\3\0\1\11\2\0"+
-    "\3\11\1\301\4\0\21\11\21\0\3\11\1\0\2\11"+
-    "\6\0\4\11\1\0\2\11\3\0\1\11\2\0\1\302"+
-    "\3\11\4\0\21\11\21\0\3\11\1\0\2\11\6\0"+
-    "\4\11\1\0\2\11\3\0\1\11\2\0\4\11\4\0"+
-    "\2\11\1\303\16\11\21\0\3\11\1\0\2\11\6\0"+
-    "\4\11\1\0\2\11\3\0\1\11\2\0\4\11\4\0"+
-    "\3\11\1\304\15\11\21\0\3\11\1\0\2\11\6\0"+
-    "\4\11\1\0\2\11\3\0\1\11\2\0\4\11\4\0"+
-    "\4\11\1\305\14\11\21\0\3\11\1\0\2\11\6\0"+
-    "\4\11\1\0\2\11\3\0\1\11\2\0\4\11\4\0"+
-    "\5\11\1\306\13\11\20\0\7\256\1\307\1\0\72\256"+
-    "\1\0\1\310\1\0\1\310\11\0\1\310\1\0\1\310"+
-    "\2\0\2\310\20\0\2\310\3\0\2\310\3\0\1\310"+
-    "\3\0\1\310\21\0\3\76\1\0\2\76\6\0\4\76"+
-    "\1\0\2\76\3\0\1\76\2\0\3\76\1\311\4\0"+
-    "\21\76\21\0\3\11\1\0\2\11\6\0\4\11\1\0"+
-    "\2\11\3\0\1\11\2\0\4\11\4\0\16\11\1\312"+
-    "\2\11\21\0\3\11\1\0\2\11\6\0\4\11\1\0"+
-    "\2\11\3\0\1\11\2\0\4\11\4\0\3\11\1\313"+
-    "\5\11\1\314\7\11\21\0\3\11\1\0\2\11\6\0"+
-    "\4\11\1\0\2\11\3\0\1\11\2\0\4\11\4\0"+
-    "\6\11\1\315\12\11\21\0\3\11\1\0\2\11\6\0"+
-    "\4\11\1\0\2\11\3\0\1\11\2\0\4\11\4\0"+
-    "\6\11\1\316\12\11\21\0\3\11\1\0\2\11\6\0"+
-    "\4\11\1\0\2\11\3\0\1\11\2\0\4\11\4\0"+
-    "\3\11\1\317\15\11\21\0\3\11\1\0\2\11\6\0"+
-    "\4\11\1\0\2\11\3\0\1\11\2\0\4\11\4\0"+
-    "\6\11\1\320\12\11\21\0\3\11\1\0\2\11\6\0"+
-    "\4\11\1\0\2\11\3\0\1\11\2\0\4\11\4\0"+
-    "\2\11\1\321\16\11\21\0\3\11\1\0\2\11\6\0"+
-    "\4\11\1\0\2\11\3\0\1\11\2\0\3\11\1\322"+
-    "\4\0\21\11\21\0\3\11\1\0\2\11\6\0\4\11"+
-    "\1\0\2\11\3\0\1\11\2\0\2\11\1\323\1\11"+
-    "\4\0\21\11\21\0\3\11\1\0\2\11\6\0\4\11"+
-    "\1\0\2\11\3\0\1\11\2\0\4\11\4\0\10\11"+
-    "\1\324\10\11\21\0\3\11\1\0\2\11\6\0\4\11"+
+    "\1\270\7\11\21\0\3\11\1\0\2\11\6\0\5\11"+
+    "\1\0\2\11\3\0\1\11\2\0\4\11\4\0\2\11"+
+    "\1\271\16\11\21\0\3\11\1\0\2\11\6\0\5\11"+
+    "\1\0\2\11\3\0\1\11\2\0\4\11\4\0\2\11"+
+    "\1\272\16\11\21\0\3\11\1\0\2\11\6\0\5\11"+
+    "\1\0\2\11\3\0\1\11\2\0\4\11\4\0\2\11"+
+    "\1\273\16\11\21\0\3\11\1\0\2\11\6\0\5\11"+
+    "\1\0\2\11\3\0\1\11\2\0\4\11\4\0\2\11"+
+    "\1\274\16\11\21\0\3\11\1\0\2\11\6\0\5\11"+
     "\1\0\2\11\3\0\1\11\2\0\4\11\4\0\12\11"+
-    "\1\325\6\11\21\0\3\11\1\0\2\11\6\0\4\11"+
+    "\1\275\6\11\21\0\3\11\1\0\2\11\6\0\5\11"+
     "\1\0\2\11\3\0\1\11\2\0\4\11\4\0\2\11"+
-    "\1\326\16\11\21\0\1\327\1\0\1\327\11\0\1\327"+
-    "\1\0\1\327\2\0\2\327\20\0\2\327\3\0\2\327"+
-    "\3\0\1\327\3\0\1\327\21\0\3\11\1\0\2\11"+
-    "\6\0\4\11\1\0\2\11\3\0\1\11\2\0\4\11"+
-    "\4\0\4\11\1\330\14\11\21\0\3\11\1\0\2\11"+
-    "\6\0\4\11\1\0\2\11\3\0\1\11\2\0\4\11"+
-    "\4\0\7\11\1\331\11\11\21\0\3\11\1\0\2\11"+
-    "\6\0\4\11\1\0\2\11\3\0\1\11\2\0\4\11"+
-    "\4\0\7\11\1\332\11\11\21\0\3\11\1\0\2\11"+
-    "\6\0\4\11\1\0\2\11\3\0\1\11\2\0\4\11"+
-    "\4\0\13\11\1\333\5\11\21\0\3\11\1\0\2\11"+
-    "\6\0\4\11\1\0\2\11\3\0\1\11\2\0\4\11"+
-    "\4\0\5\11\1\334\13\11\21\0\3\11\1\0\2\11"+
-    "\6\0\4\11\1\0\2\11\3\0\1\11\2\0\4\11"+
-    "\4\0\5\11\1\335\13\11\21\0\3\11\1\0\2\11"+
-    "\6\0\4\11\1\0\2\11\3\0\1\11\2\0\1\336"+
-    "\3\11\4\0\21\11\21\0\1\203\1\0\1\203\11\0"+
-    "\1\203\1\0\1\203\2\0\2\203\20\0\2\203\3\0"+
-    "\2\203\3\0\1\203\3\0\1\203\21\0\3\11\1\0"+
-    "\2\11\6\0\4\11\1\0\2\11\3\0\1\11\2\0"+
-    "\2\11\1\337\1\11\4\0\21\11\21\0\3\11\1\0"+
-    "\2\11\6\0\4\11\1\0\2\11\3\0\1\11\2\0"+
-    "\4\11\4\0\3\11\1\340\15\11\21\0\3\11\1\0"+
-    "\2\11\6\0\4\11\1\0\2\11\3\0\1\11\2\0"+
-    "\4\11\4\0\2\11\1\341\16\11\21\0\3\11\1\0"+
-    "\2\11\6\0\4\11\1\0\2\11\3\0\1\342\2\0"+
-    "\4\11\4\0\21\11\21\0\3\11\1\0\2\11\6\0"+
-    "\4\11\1\0\2\11\3\0\1\11\2\0\4\11\4\0"+
-    "\3\11\1\343\15\11\21\0\3\11\1\0\2\11\6\0"+
-    "\4\11\1\0\2\11\3\0\1\11\2\0\4\11\4\0"+
-    "\10\11\1\344\10\11\21\0\3\11\1\0\2\11\6\0"+
-    "\4\11\1\0\2\11\3\0\1\11\2\0\4\11\4\0"+
-    "\2\11\1\345\16\11\21\0\3\11\1\0\2\11\6\0"+
-    "\4\11\1\0\2\11\3\0\1\11\2\0\3\11\1\346"+
-    "\4\0\21\11\21\0\3\11\1\0\2\11\6\0\4\11"+
-    "\1\0\2\11\3\0\1\11\2\0\4\11\4\0\2\11"+
-    "\1\347\16\11\20\0";
+    "\1\276\16\11\21\0\3\11\1\0\2\11\6\0\5\11"+
+    "\1\0\2\11\3\0\1\11\2\0\4\11\4\0\4\11"+
+    "\1\277\14\11\21\0\3\11\1\0\2\11\6\0\5\11"+
+    "\1\0\2\11\3\0\1\300\2\0\4\11\4\0\21\11"+
+    "\21\0\3\11\1\0\2\11\6\0\5\11\1\0\2\11"+
+    "\3\0\1\11\2\0\3\11\1\301\4\0\21\11\21\0"+
+    "\3\11\1\0\2\11\6\0\5\11\1\0\2\11\3\0"+
+    "\1\11\2\0\3\11\1\302\4\0\21\11\21\0\3\11"+
+    "\1\0\2\11\6\0\5\11\1\0\2\11\3\0\1\11"+
+    "\2\0\1\303\3\11\4\0\21\11\21\0\3\11\1\0"+
+    "\2\11\6\0\5\11\1\0\2\11\3\0\1\11\2\0"+
+    "\4\11\4\0\2\11\1\304\16\11\21\0\3\11\1\0"+
+    "\2\11\6\0\5\11\1\0\2\11\3\0\1\11\2\0"+
+    "\4\11\4\0\3\11\1\305\15\11\21\0\3\11\1\0"+
+    "\2\11\6\0\5\11\1\0\2\11\3\0\1\11\2\0"+
+    "\4\11\4\0\4\11\1\306\14\11\21\0\3\11\1\0"+
+    "\2\11\6\0\5\11\1\0\2\11\3\0\1\11\2\0"+
+    "\4\11\4\0\5\11\1\307\13\11\20\0\7\257\1\310"+
+    "\1\0\73\257\1\0\1\311\1\0\1\311\11\0\1\311"+
+    "\1\0\1\311\3\0\2\311\20\0\2\311\3\0\2\311"+
+    "\3\0\1\311\3\0\1\311\21\0\3\76\1\0\2\76"+
+    "\6\0\5\76\1\0\2\76\3\0\1\76\2\0\3\76"+
+    "\1\312\4\0\21\76\21\0\3\11\1\0\2\11\6\0"+
+    "\5\11\1\0\2\11\3\0\1\11\2\0\4\11\4\0"+
+    "\16\11\1\313\2\11\21\0\3\11\1\0\2\11\6\0"+
+    "\5\11\1\0\2\11\3\0\1\11\2\0\4\11\4\0"+
+    "\3\11\1\314\5\11\1\315\7\11\21\0\3\11\1\0"+
+    "\2\11\6\0\5\11\1\0\2\11\3\0\1\11\2\0"+
+    "\4\11\4\0\6\11\1\316\12\11\21\0\3\11\1\0"+
+    "\2\11\6\0\5\11\1\0\2\11\3\0\1\11\2\0"+
+    "\4\11\4\0\6\11\1\317\12\11\21\0\3\11\1\0"+
+    "\2\11\6\0\5\11\1\0\2\11\3\0\1\11\2\0"+
+    "\4\11\4\0\3\11\1\320\15\11\21\0\3\11\1\0"+
+    "\2\11\6\0\5\11\1\0\2\11\3\0\1\11\2\0"+
+    "\4\11\4\0\6\11\1\321\12\11\21\0\3\11\1\0"+
+    "\2\11\6\0\5\11\1\0\2\11\3\0\1\11\2\0"+
+    "\4\11\4\0\2\11\1\322\16\11\21\0\3\11\1\0"+
+    "\2\11\6\0\5\11\1\0\2\11\3\0\1\11\2\0"+
+    "\3\11\1\323\4\0\21\11\21\0\3\11\1\0\2\11"+
+    "\6\0\5\11\1\0\2\11\3\0\1\11\2\0\2\11"+
+    "\1\324\1\11\4\0\21\11\21\0\3\11\1\0\2\11"+
+    "\6\0\5\11\1\0\2\11\3\0\1\11\2\0\4\11"+
+    "\4\0\10\11\1\325\10\11\21\0\3\11\1\0\2\11"+
+    "\6\0\5\11\1\0\2\11\3\0\1\11\2\0\4\11"+
+    "\4\0\12\11\1\326\6\11\21\0\3\11\1\0\2\11"+
+    "\6\0\5\11\1\0\2\11\3\0\1\11\2\0\4\11"+
+    "\4\0\2\11\1\327\16\11\21\0\1\330\1\0\1\330"+
+    "\11\0\1\330\1\0\1\330\3\0\2\330\20\0\2\330"+
+    "\3\0\2\330\3\0\1\330\3\0\1\330\21\0\3\11"+
+    "\1\0\2\11\6\0\5\11\1\0\2\11\3\0\1\11"+
+    "\2\0\4\11\4\0\4\11\1\331\14\11\21\0\3\11"+
+    "\1\0\2\11\6\0\5\11\1\0\2\11\3\0\1\11"+
+    "\2\0\4\11\4\0\7\11\1\332\11\11\21\0\3\11"+
+    "\1\0\2\11\6\0\5\11\1\0\2\11\3\0\1\11"+
+    "\2\0\4\11\4\0\7\11\1\333\11\11\21\0\3\11"+
+    "\1\0\2\11\6\0\5\11\1\0\2\11\3\0\1\11"+
+    "\2\0\4\11\4\0\13\11\1\334\5\11\21\0\3\11"+
+    "\1\0\2\11\6\0\5\11\1\0\2\11\3\0\1\11"+
+    "\2\0\4\11\4\0\5\11\1\335\13\11\21\0\3\11"+
+    "\1\0\2\11\6\0\5\11\1\0\2\11\3\0\1\11"+
+    "\2\0\4\11\4\0\5\11\1\336\13\11\21\0\3\11"+
+    "\1\0\2\11\6\0\5\11\1\0\2\11\3\0\1\11"+
+    "\2\0\1\337\3\11\4\0\21\11\21\0\1\204\1\0"+
+    "\1\204\11\0\1\204\1\0\1\204\3\0\2\204\20\0"+
+    "\2\204\3\0\2\204\3\0\1\204\3\0\1\204\21\0"+
+    "\3\11\1\0\2\11\6\0\5\11\1\0\2\11\3\0"+
+    "\1\11\2\0\2\11\1\340\1\11\4\0\21\11\21\0"+
+    "\3\11\1\0\2\11\6\0\5\11\1\0\2\11\3\0"+
+    "\1\11\2\0\4\11\4\0\3\11\1\341\15\11\21\0"+
+    "\3\11\1\0\2\11\6\0\5\11\1\0\2\11\3\0"+
+    "\1\11\2\0\4\11\4\0\2\11\1\342\16\11\21\0"+
+    "\3\11\1\0\2\11\6\0\5\11\1\0\2\11\3\0"+
+    "\1\343\2\0\4\11\4\0\21\11\21\0\3\11\1\0"+
+    "\2\11\6\0\5\11\1\0\2\11\3\0\1\11\2\0"+
+    "\4\11\4\0\3\11\1\344\15\11\21\0\3\11\1\0"+
+    "\2\11\6\0\5\11\1\0\2\11\3\0\1\11\2\0"+
+    "\4\11\4\0\10\11\1\345\10\11\21\0\3\11\1\0"+
+    "\2\11\6\0\5\11\1\0\2\11\3\0\1\11\2\0"+
+    "\4\11\4\0\2\11\1\346\16\11\21\0\3\11\1\0"+
+    "\2\11\6\0\5\11\1\0\2\11\3\0\1\11\2\0"+
+    "\3\11\1\347\4\0\21\11\21\0\3\11\1\0\2\11"+
+    "\6\0\5\11\1\0\2\11\3\0\1\11\2\0\4\11"+
+    "\4\0\2\11\1\350\16\11\20\0";
 
   private static int [] zzUnpackTrans() {
-    int [] result = new int[10318];
+    int [] result = new int[10540];
     int offset = 0;
     offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result);
     return result;
@@ -558,7 +559,7 @@ class _JetLexer implements FlexLexer {
   private static final String ZZ_ATTRIBUTE_PACKED_0 =
     "\6\0\1\11\15\1\1\11\3\1\1\11\16\1\1\11"+
     "\7\1\4\11\1\1\2\11\1\1\1\11\2\1\2\11"+
-    "\4\1\1\11\2\1\2\11\1\1\1\0\1\11\1\1"+
+    "\4\1\1\11\2\1\2\11\2\1\1\0\1\11\1\1"+
     "\1\0\1\1\1\0\2\1\1\11\1\1\1\0\1\1"+
     "\1\0\4\1\4\11\1\1\1\0\7\1\1\11\20\1"+
     "\12\11\1\1\1\0\2\11\1\1\2\0\1\1\2\11"+
@@ -567,7 +568,7 @@ class _JetLexer implements FlexLexer {
     "\1\1\3\11\21\1\1\11\1\0\16\1\1\0\20\1";
 
   private static int [] zzUnpackAttribute() {
-    int [] result = new int[231];
+    int [] result = new int[232];
     int offset = 0;
     offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result);
     return result;
@@ -929,14 +930,14 @@ class _JetLexer implements FlexLexer {
         zzStartRead = commentStart;
         return commentStateToTokenType(state);
             }  // fall though
-            case 232: break;
+            case 233: break;
             case DOC_COMMENT: {
               int state = yystate();
         popState();
         zzStartRead = commentStart;
         return commentStateToTokenType(state);
             }  // fall though
-            case 233: break;
+            case 234: break;
             default:
         return null;
         }
diff --git a/compiler/testData/diagnostics/testsWithUnsignedTypes/explicitUnsignedLongTypeCheck.kt b/compiler/testData/diagnostics/testsWithUnsignedTypes/explicitUnsignedLongTypeCheck.kt
new file mode 100644
index 00000000000..f5f0a84a0bb
--- /dev/null
+++ b/compiler/testData/diagnostics/testsWithUnsignedTypes/explicitUnsignedLongTypeCheck.kt
@@ -0,0 +1,18 @@
+// !LANGUAGE: +InlineClasses
+// !SKIP_METADATA_VERSION_CHECK
+// !DIAGNOSTICS: -UNUSED_PARAMETER
+
+val a0: Int = <!CONSTANT_EXPECTED_TYPE_MISMATCH!>1uL<!>
+val a1: UInt = <!CONSTANT_EXPECTED_TYPE_MISMATCH!>1uL<!>
+val a3: ULong = 1uL
+val a4 = 1UL + 2UL
+val a5 = <!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>-<!>1UL
+
+fun takeULong(u: ULong) {}
+
+fun test() {
+    takeULong(3UL)
+    takeULong(1UL + 3uL)
+    takeULong(1u + 0uL)
+    takeULong(1uL + 4u)
+}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithUnsignedTypes/explicitUnsignedLongTypeCheck.txt b/compiler/testData/diagnostics/testsWithUnsignedTypes/explicitUnsignedLongTypeCheck.txt
new file mode 100644
index 00000000000..c376a8f1437
--- /dev/null
+++ b/compiler/testData/diagnostics/testsWithUnsignedTypes/explicitUnsignedLongTypeCheck.txt
@@ -0,0 +1,9 @@
+package
+
+public val a0: kotlin.Int = 1.toULong()
+public val a1: kotlin.UInt = 1.toULong()
+public val a3: kotlin.ULong = 1.toULong()
+public val a4: kotlin.ULong
+public val a5: [ERROR : Type for -1UL]
+public fun takeULong(/*0*/ u: kotlin.ULong): kotlin.Unit
+public fun test(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/testsWithUnsignedTypes/unsignedLiteralsInsideConstVals.kt b/compiler/testData/diagnostics/testsWithUnsignedTypes/unsignedLiteralsInsideConstVals.kt
index b7f3305ffc6..6327517a02e 100644
--- a/compiler/testData/diagnostics/testsWithUnsignedTypes/unsignedLiteralsInsideConstVals.kt
+++ b/compiler/testData/diagnostics/testsWithUnsignedTypes/unsignedLiteralsInsideConstVals.kt
@@ -9,3 +9,8 @@ const val u4: ULong = 4u
 
 const val u5 = 1U
 const val u6: UByte = 0xFFU
+
+const val u7 = 1uL
+const val u8 = 1UL
+const val u9 = 1UL
+const val u10 = 0xFFFF_FFFF_FFFFuL
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithUnsignedTypes/unsignedLiteralsInsideConstVals.txt b/compiler/testData/diagnostics/testsWithUnsignedTypes/unsignedLiteralsInsideConstVals.txt
index 30bd0e31874..0933b0559e9 100644
--- a/compiler/testData/diagnostics/testsWithUnsignedTypes/unsignedLiteralsInsideConstVals.txt
+++ b/compiler/testData/diagnostics/testsWithUnsignedTypes/unsignedLiteralsInsideConstVals.txt
@@ -2,8 +2,12 @@ package
 
 public const val u0: kotlin.UInt = 1.toUInt()
 public const val u1: kotlin.UByte = 2.toUByte()
+public const val u10: kotlin.ULong = 281474976710655.toULong()
 public const val u2: kotlin.UShort = 3.toUShort()
 public const val u3: kotlin.UInt = 3.toUInt()
 public const val u4: kotlin.ULong = 4.toULong()
 public const val u5: kotlin.UInt = 1.toUInt()
 public const val u6: kotlin.UByte = -1.toUByte()
+public const val u7: kotlin.ULong = 1.toULong()
+public const val u8: kotlin.ULong = 1.toULong()
+public const val u9: kotlin.ULong = 1.toULong()
diff --git a/compiler/testData/diagnostics/testsWithUnsignedTypes/unsignedLiteralsOverflowSignedBorder.kt b/compiler/testData/diagnostics/testsWithUnsignedTypes/unsignedLiteralsOverflowSignedBorder.kt
index 944006e0514..f83ccaebd30 100644
--- a/compiler/testData/diagnostics/testsWithUnsignedTypes/unsignedLiteralsOverflowSignedBorder.kt
+++ b/compiler/testData/diagnostics/testsWithUnsignedTypes/unsignedLiteralsOverflowSignedBorder.kt
@@ -13,6 +13,8 @@ const val u7 = 18446744073709551615u
 
 val u8: Comparable<*> = 0xFFFF_FFFF_FFFF_FFFFu
 
+const val u9 = 0xFFFF_FFFF_FFFF_FFFFUL
+
 fun takeUByte(ubyte: UByte) {}
 
 fun test() {
diff --git a/compiler/testData/diagnostics/testsWithUnsignedTypes/unsignedLiteralsOverflowSignedBorder.txt b/compiler/testData/diagnostics/testsWithUnsignedTypes/unsignedLiteralsOverflowSignedBorder.txt
index e5da6b85570..5a6ad7606e4 100644
--- a/compiler/testData/diagnostics/testsWithUnsignedTypes/unsignedLiteralsOverflowSignedBorder.txt
+++ b/compiler/testData/diagnostics/testsWithUnsignedTypes/unsignedLiteralsOverflowSignedBorder.txt
@@ -10,5 +10,6 @@ public const val u5: kotlin.ULong = -1.toULong()
 public const val u6: kotlin.ULong = -1.toULong()
 public const val u7: kotlin.ULong = -1.toULong()
 public val u8: kotlin.Comparable<*>
+public const val u9: kotlin.ULong = -1.toULong()
 public fun takeUByte(/*0*/ ubyte: kotlin.UByte): kotlin.Unit
 public fun test(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/testsWithUnsignedTypes/wrongLongSuffixForULong.kt b/compiler/testData/diagnostics/testsWithUnsignedTypes/wrongLongSuffixForULong.kt
new file mode 100644
index 00000000000..5c26acd9d13
--- /dev/null
+++ b/compiler/testData/diagnostics/testsWithUnsignedTypes/wrongLongSuffixForULong.kt
@@ -0,0 +1,4 @@
+val a1 = 1u<!WRONG_LONG_SUFFIX!>l<!>
+val a2 = 0x1u<!WRONG_LONG_SUFFIX!>l<!>
+val a3 = 0B1u<!WRONG_LONG_SUFFIX!>l<!>
+val a4 = 1U<!WRONG_LONG_SUFFIX!>l<!>
diff --git a/compiler/testData/diagnostics/testsWithUnsignedTypes/wrongLongSuffixForULong.txt b/compiler/testData/diagnostics/testsWithUnsignedTypes/wrongLongSuffixForULong.txt
new file mode 100644
index 00000000000..47ef4699e0f
--- /dev/null
+++ b/compiler/testData/diagnostics/testsWithUnsignedTypes/wrongLongSuffixForULong.txt
@@ -0,0 +1,6 @@
+package
+
+public val a1: kotlin.ULong = 1.toULong()
+public val a2: kotlin.ULong = 1.toULong()
+public val a3: kotlin.ULong = 1.toULong()
+public val a4: kotlin.ULong = 1.toULong()
diff --git a/compiler/testData/psi/UnsignedLiteral.kt b/compiler/testData/psi/UnsignedLiteral.kt
index 438767d2ac4..d3e417031c1 100644
--- a/compiler/testData/psi/UnsignedLiteral.kt
+++ b/compiler/testData/psi/UnsignedLiteral.kt
@@ -17,5 +17,6 @@ val array = array<Any>(
     1Lu,
     1LU,
     1uL,
-    1UL
+    1UL,
+    3Ul
 )
\ No newline at end of file
diff --git a/compiler/testData/psi/UnsignedLiteral.txt b/compiler/testData/psi/UnsignedLiteral.txt
index 0cdd129ba76..cf833e5b266 100644
--- a/compiler/testData/psi/UnsignedLiteral.txt
+++ b/compiler/testData/psi/UnsignedLiteral.txt
@@ -158,22 +158,17 @@ KtFile: UnsignedLiteral.kt
         PsiElement(COMMA)(',')
         PsiWhiteSpace('\n    ')
         VALUE_ARGUMENT
-          BINARY_EXPRESSION
-            INTEGER_CONSTANT
-              PsiElement(INTEGER_LITERAL)('1u')
-            OPERATION_REFERENCE
-              PsiElement(IDENTIFIER)('L')
-            PsiErrorElement:Expecting an element
-              <empty list>
+          INTEGER_CONSTANT
+            PsiElement(INTEGER_LITERAL)('1uL')
         PsiElement(COMMA)(',')
         PsiWhiteSpace('\n    ')
         VALUE_ARGUMENT
-          BINARY_EXPRESSION
-            INTEGER_CONSTANT
-              PsiElement(INTEGER_LITERAL)('1U')
-            OPERATION_REFERENCE
-              PsiElement(IDENTIFIER)('L')
-            PsiErrorElement:Expecting an element
-              <empty list>
+          INTEGER_CONSTANT
+            PsiElement(INTEGER_LITERAL)('1UL')
+        PsiElement(COMMA)(',')
+        PsiWhiteSpace('\n    ')
+        VALUE_ARGUMENT
+          INTEGER_CONSTANT
+            PsiElement(INTEGER_LITERAL)('3Ul')
         PsiWhiteSpace('\n')
         PsiElement(RPAR)(')')
\ No newline at end of file
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestData.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestData.kt
index 634f9128fad..aed24c44a32 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestData.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestData.kt
@@ -66,7 +66,7 @@ class ConstraintSystemTestData(
         val matcher = INTEGER_VALUE_TYPE_PATTERN.matcher(name)
         if (matcher.find()) {
             val number = matcher.group(1)!!
-            val parameters = CompileTimeConstant.Parameters(false, false, false, false, false)
+            val parameters = CompileTimeConstant.Parameters(false, false, false, false, false, false)
             return KotlinTypeFactory.simpleTypeWithNonTrivialMemberScope(
                 Annotations.EMPTY,
                 IntegerValueTypeConstructor(number.toLong(), functionFoo.module, parameters),
diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsWithUnsignedTypesGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsWithUnsignedTypesGenerated.java
index 4cafd989599..b076d972332 100644
--- a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsWithUnsignedTypesGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsWithUnsignedTypesGenerated.java
@@ -34,6 +34,11 @@ public class DiagnosticsWithUnsignedTypesGenerated extends AbstractDiagnosticsWi
         runTest("compiler/testData/diagnostics/testsWithUnsignedTypes/allowedVarargsOfUnsignedTypes.kt");
     }
 
+    @TestMetadata("explicitUnsignedLongTypeCheck.kt")
+    public void testExplicitUnsignedLongTypeCheck() throws Exception {
+        runTest("compiler/testData/diagnostics/testsWithUnsignedTypes/explicitUnsignedLongTypeCheck.kt");
+    }
+
     @TestMetadata("forbiddenEqualsOnUnsignedTypes.kt")
     public void testForbiddenEqualsOnUnsignedTypes() throws Exception {
         runTest("compiler/testData/diagnostics/testsWithUnsignedTypes/forbiddenEqualsOnUnsignedTypes.kt");
@@ -63,4 +68,9 @@ public class DiagnosticsWithUnsignedTypesGenerated extends AbstractDiagnosticsWi
     public void testVarargTypeToArrayTypeCheck() throws Exception {
         runTest("compiler/testData/diagnostics/testsWithUnsignedTypes/varargTypeToArrayTypeCheck.kt");
     }
+
+    @TestMetadata("wrongLongSuffixForULong.kt")
+    public void testWrongLongSuffixForULong() throws Exception {
+        runTest("compiler/testData/diagnostics/testsWithUnsignedTypes/wrongLongSuffixForULong.kt");
+    }
 }
diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/CompileTimeConstant.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/CompileTimeConstant.kt
index 43f245c5605..378d2fd041a 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/CompileTimeConstant.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/CompileTimeConstant.kt
@@ -47,6 +47,8 @@ interface CompileTimeConstant<out T> {
         val isPure: Boolean,
         // `isUnsignedNumberLiteral` means that this constant represents simple number literal with `u` suffix (123u, 0xFEu)
         val isUnsignedNumberLiteral: Boolean,
+        // `isUnsignedLongNumberLiteral` means that this constant represents simple number literal with `{uU}{lL}` suffix (123uL, 0xFEUL)
+        val isUnsignedLongNumberLiteral: Boolean,
         val usesVariableAsConstant: Boolean,
         val usesNonConstValAsConstant: Boolean
     )