From 7341a82b0bdb46a05770ac5b211ac779badc898d Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Thu, 22 Mar 2012 12:36:40 +0100 Subject: [PATCH] Support for !! (analog of sure()/npe()) --- .../jet/lang/diagnostics/Errors.java | 1 + .../lang/parsing/JetExpressionParsing.java | 8 +- .../BasicExpressionTypingVisitor.java | 57 +- .../src/org/jetbrains/jet/lexer/Jet.flex | 1 + .../org/jetbrains/jet/lexer/JetTokens.java | 3 +- .../org/jetbrains/jet/lexer/_JetLexer.java | 713 +++++++++--------- .../nullabilityAndAutoCasts/AssertNotNull.jet | 35 + grammar/src/expressions.grm | 2 +- .../annotations/DebugInfoAnnotator.java | 2 +- .../formatter/JetFormattingModelBuilder.java | 2 +- 10 files changed, 449 insertions(+), 375 deletions(-) create mode 100644 compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/AssertNotNull.jet diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java index c599e0e1d84..1ca46d8fbae 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java @@ -322,6 +322,7 @@ public interface Errors { DiagnosticFactory AMBIGUOUS_LABEL = DiagnosticFactory.create(ERROR, "Ambiguous label"); DiagnosticFactory1 UNSUPPORTED = DiagnosticFactory1.create(ERROR, "Unsupported [{0}]"); DiagnosticFactory1 UNNECESSARY_SAFE_CALL = DiagnosticFactory1.create(WARNING, "Unnecessary safe call on a non-null receiver of type {0}"); + DiagnosticFactory1 UNNECESSARY_NOT_NULL_ASSERTION = DiagnosticFactory1.create(WARNING, "Unnecessary non-null assertion (!!) on a non-null receiver of type {0}"); DiagnosticFactory2 NAME_IN_CONSTRAINT_IS_NOT_A_TYPE_PARAMETER = DiagnosticFactory2.create(ERROR, "{0} does not refer to a type parameter of {1}", new Renderer() { @NotNull @Override diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java b/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java index 0831cff822c..301b719e26c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java @@ -53,7 +53,7 @@ public class JetExpressionParsing extends AbstractJetParsing { FUN_KEYWORD, FOR_KEYWORD, NULL_KEYWORD, TRUE_KEYWORD, FALSE_KEYWORD, IS_KEYWORD, THROW_KEYWORD, RETURN_KEYWORD, BREAK_KEYWORD, CONTINUE_KEYWORD, OBJECT_KEYWORD, IF_KEYWORD, TRY_KEYWORD, ELSE_KEYWORD, WHILE_KEYWORD, DO_KEYWORD, - WHEN_KEYWORD, RBRACKET, RBRACE, RPAR, PLUSPLUS, MINUSMINUS, + WHEN_KEYWORD, RBRACKET, RBRACE, RPAR, PLUSPLUS, MINUSMINUS, EXCLEXCL, // MUL, PLUS, MINUS, EXCL, DIV, PERC, LTEQ, // TODO GTEQ, foo=x @@ -126,7 +126,7 @@ public class JetExpressionParsing extends AbstractJetParsing { @SuppressWarnings({"UnusedDeclaration"}) private enum Precedence { - POSTFIX(PLUSPLUS, MINUSMINUS, + POSTFIX(PLUSPLUS, MINUSMINUS, EXCLEXCL, // HASH, DOT, SAFE_ACCESS), // typeArguments? valueArguments : typeArguments : arrayAccess @@ -235,7 +235,7 @@ public class JetExpressionParsing extends AbstractJetParsing { opSet.removeAll(usedSet); assert false : opSet; } - assert usedSet.size() == opSet.size(); + assert usedSet.size() == opSet.size() : "Either some operations are unused, or something that's not an operation is used"; usedSet.removeAll(opSet); @@ -350,7 +350,7 @@ public class JetExpressionParsing extends AbstractJetParsing { * atomicExpression postfixUnaryOperation? * * postfixUnaryOperation - * : "++" : "--" + * : "++" : "--" : "!!" * : typeArguments? valueArguments (getEntryPoint? functionLiteral) * : typeArguments (getEntryPoint? functionLiteral) * : arrayAccess diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java index f6eee07a0f0..6e52b10a73f 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java @@ -33,6 +33,7 @@ import org.jetbrains.jet.lang.resolve.calls.CallMaker; import org.jetbrains.jet.lang.resolve.calls.OverloadResolutionResults; import org.jetbrains.jet.lang.resolve.calls.OverloadResolutionResultsUtil; import org.jetbrains.jet.lang.resolve.calls.autocasts.DataFlowInfo; +import org.jetbrains.jet.lang.resolve.calls.autocasts.DataFlowValueFactory; import org.jetbrains.jet.lang.resolve.constants.*; import org.jetbrains.jet.lang.resolve.constants.StringValue; import org.jetbrains.jet.lang.resolve.scopes.JetScope; @@ -661,7 +662,10 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { public JetType visitUnaryExpression(JetUnaryExpression expression, ExpressionTypingContext context, boolean isStatement) { JetExpression baseExpression = expression.getBaseExpression(); if (baseExpression == null) return null; + JetSimpleNameExpression operationSign = expression.getOperationReference(); + + // If it's a labeled expression if (JetTokens.LABELS.contains(operationSign.getReferencedNameElementType())) { String referencedName = operationSign.getReferencedName(); referencedName = referencedName == null ? " " : referencedName; @@ -672,12 +676,10 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { context.labelResolver.exitLabeledElement(baseExpression); return DataFlowUtils.checkType(type, expression, context); } + IElementType operationType = operationSign.getReferencedNameElementType(); - String name = OperatorConventions.UNARY_OPERATION_NAMES.get(operationType); - if (name == null) { - context.trace.report(UNSUPPORTED.on(operationSign, "visitUnaryExpression")); - return null; - } + + // Type check the base expression TemporaryBindingTrace temporaryTrace = TemporaryBindingTrace.create(context.trace); BindingTrace initialTrace = context.trace; context = context.replaceBindingTrace(temporaryTrace); @@ -687,6 +689,28 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { return null; } + // Special case for expr!! + if (operationType == JetTokens.EXCLEXCL) { + JetType result; + if (isKnownToBeNotNull(baseExpression, context)) { + temporaryTrace.report(UNNECESSARY_NOT_NULL_ASSERTION.on(operationSign, type)); + result = type; + } + else { + result = TypeUtils.makeNotNullable(type); + } + temporaryTrace.commit(); + return DataFlowUtils.checkType(result, expression, context); + } + + // Conventions for unary operations + String name = OperatorConventions.UNARY_OPERATION_NAMES.get(operationType); + if (name == null) { + context.trace.report(UNSUPPORTED.on(operationSign, "visitUnaryExpression")); + return null; + } + + // a[i]++/-- takes special treatment because it is actually let j = i, arr = a in arr.set(j, a.get(j).inc()) if ((operationType == JetTokens.PLUSPLUS || operationType == JetTokens.MINUSMINUS) && baseExpression instanceof JetArrayAccessExpression) { JetExpression stubExpression = ExpressionTypingUtils.createStubExpressionOfNecessaryType(baseExpression.getProject(), type, context.trace); resolveArrayAccessSetMethod((JetArrayAccessExpression) baseExpression, stubExpression, context.replaceExpectedType(NO_EXPECTED_TYPE).replaceBindingTrace(TemporaryBindingTrace.create(initialTrace)), context.trace); @@ -694,16 +718,19 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { ExpressionReceiver receiver = new ExpressionReceiver(baseExpression, type); - OverloadResolutionResults functionDescriptor = context.resolveCallWithGivenNameToDescriptor( + // Resolve the operation reference + OverloadResolutionResults resolutionResults = context.resolveCallWithGivenNameToDescriptor( CallMaker.makeCall(receiver, expression), expression.getOperationReference(), name); - if (!functionDescriptor.isSuccess()) { + if (!resolutionResults.isSuccess()) { temporaryTrace.commit(); return null; } - JetType returnType = functionDescriptor.getResultingDescriptor().getReturnType(); + + // Computing the return type + JetType returnType = resolutionResults.getResultingDescriptor().getReturnType(); JetType result; if (operationType == JetTokens.PLUSPLUS || operationType == JetTokens.MINUSMINUS) { if (JetTypeChecker.INSTANCE.isSubtypeOf(returnType, JetStandardClasses.getUnitType())) { @@ -731,6 +758,20 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { return DataFlowUtils.checkType(result, expression, context); } + private boolean isKnownToBeNotNull(JetExpression expression, ExpressionTypingContext context) { + JetType type = context.trace.get(EXPRESSION_TYPE, expression); + assert type != null : "This method is only supposed to be called when the type is not null"; + if (!type.isNullable()) return true; + List possibleTypes = context.dataFlowInfo + .getPossibleTypes(DataFlowValueFactory.INSTANCE.createDataFlowValue(expression, type, context.trace.getBindingContext())); + for (JetType possibleType : possibleTypes) { + if (!possibleType.isNullable()) { + return true; + } + } + return false; + } + public void checkLValue(BindingTrace trace, JetExpression expression) { checkLValue(trace, expression, false); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lexer/Jet.flex b/compiler/frontend/src/org/jetbrains/jet/lexer/Jet.flex index 47b556c9af2..31d590dad2d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lexer/Jet.flex +++ b/compiler/frontend/src/org/jetbrains/jet/lexer/Jet.flex @@ -266,6 +266,7 @@ LONG_TEMPLATE_ENTRY_END=\} ">=" { return JetTokens.GTEQ ; } "==" { return JetTokens.EQEQ ; } "!=" { return JetTokens.EXCLEQ ; } +"!!" { return JetTokens.EXCLEXCL ; } "&&" { return JetTokens.ANDAND ; } "||" { return JetTokens.OROR ; } //"?." { return JetTokens.SAFE_ACCESS;} diff --git a/compiler/frontend/src/org/jetbrains/jet/lexer/JetTokens.java b/compiler/frontend/src/org/jetbrains/jet/lexer/JetTokens.java index f581555c309..368b102bf55 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lexer/JetTokens.java +++ b/compiler/frontend/src/org/jetbrains/jet/lexer/JetTokens.java @@ -107,6 +107,7 @@ public interface JetTokens { JetToken EXCLEQEQEQ = new JetToken("EXCLEQEQEQ"); JetToken EQEQ = new JetToken("EQEQ"); JetToken EXCLEQ = new JetToken("EXCLEQ"); + JetToken EXCLEXCL = new JetToken("EXCLEXCL"); JetToken ANDAND = new JetToken("ANDAND"); JetToken OROR = new JetToken("OROR"); JetToken SAFE_ACCESS = new JetToken("SAFE_ACCESS"); @@ -184,7 +185,7 @@ public interface JetTokens { TokenSet COMMENTS = TokenSet.create(EOL_COMMENT, BLOCK_COMMENT, DOC_COMMENT); TokenSet STRINGS = TokenSet.create(CHARACTER_LITERAL, REGULAR_STRING_PART); - TokenSet OPERATIONS = TokenSet.create(AS_KEYWORD, AS_SAFE, IS_KEYWORD, IN_KEYWORD, DOT, PLUSPLUS, MINUSMINUS, MUL, PLUS, + TokenSet OPERATIONS = TokenSet.create(AS_KEYWORD, AS_SAFE, IS_KEYWORD, IN_KEYWORD, DOT, PLUSPLUS, MINUSMINUS, EXCLEXCL, MUL, PLUS, MINUS, EXCL, DIV, PERC, LT, GT, LTEQ, GTEQ, EQEQEQ, EXCLEQEQEQ, EQEQ, EXCLEQ, ANDAND, OROR, SAFE_ACCESS, ELVIS, // MAP, FILTER, diff --git a/compiler/frontend/src/org/jetbrains/jet/lexer/_JetLexer.java b/compiler/frontend/src/org/jetbrains/jet/lexer/_JetLexer.java index b73cfa28121..4ac369ff1e3 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lexer/_JetLexer.java +++ b/compiler/frontend/src/org/jetbrains/jet/lexer/_JetLexer.java @@ -1,4 +1,4 @@ -/* The following code was generated by JFlex 1.4.3 on 3/21/12 3:48 PM */ +/* The following code was generated by JFlex 1.4.3 on 3/22/12 10:33 AM */ package org.jetbrains.jet.lexer; @@ -12,7 +12,7 @@ import java.util.Stack; /** * This class is a scanner generated by * JFlex 1.4.3 - * on 3/21/12 3:48 PM from the specification file + * on 3/22/12 10:33 AM from the specification file * /Users/abreslav/work/jet/compiler/frontend/src/org/jetbrains/jet/lexer/Jet.flex */ class _JetLexer implements FlexLexer { @@ -130,20 +130,20 @@ class _JetLexer implements FlexLexer { "\1\0\1\45\1\0\1\46\1\0\1\47\1\50\1\51"+ "\1\52\1\44\2\2\1\44\1\53\1\54\1\55\1\56"+ "\2\11\1\0\3\3\1\57\1\60\1\61\1\3\1\62"+ - "\6\3\1\63\10\3\1\64\1\0\1\65\1\0\1\66"+ - "\1\0\1\67\1\70\1\71\1\72\1\73\1\74\1\75"+ - "\1\76\1\77\1\0\1\100\2\101\2\0\1\40\1\102"+ - "\1\103\1\104\1\44\1\3\2\0\1\105\4\0\1\106"+ - "\4\3\1\107\10\3\1\110\4\3\1\111\1\112\2\3"+ - "\1\113\1\114\1\115\1\116\1\117\1\120\1\121\1\122"+ - "\2\0\2\40\1\45\1\46\1\44\1\0\1\123\1\3"+ - "\1\124\1\3\1\125\4\3\1\126\1\127\4\3\1\130"+ - "\1\3\1\131\1\132\1\77\1\0\1\133\1\134\1\135"+ - "\1\136\1\3\1\137\3\3\1\140\1\141\1\142\1\0"+ - "\1\3\1\143\1\3\1\144\1\3\1\145\1\146"; + "\6\3\1\63\10\3\1\64\1\0\1\65\1\66\1\0"+ + "\1\67\1\0\1\70\1\71\1\72\1\73\1\74\1\75"+ + "\1\76\1\77\1\100\1\0\1\101\2\102\2\0\1\40"+ + "\1\103\1\104\1\105\1\44\1\3\2\0\1\106\4\0"+ + "\1\107\4\3\1\110\10\3\1\111\4\3\1\112\1\113"+ + "\2\3\1\114\1\115\1\116\1\117\1\120\1\121\1\122"+ + "\1\123\2\0\2\40\1\45\1\46\1\44\1\0\1\124"+ + "\1\3\1\125\1\3\1\126\4\3\1\127\1\130\4\3"+ + "\1\131\1\3\1\132\1\133\1\100\1\0\1\134\1\135"+ + "\1\136\1\137\1\3\1\140\3\3\1\141\1\142\1\143"+ + "\1\0\1\3\1\144\1\3\1\145\1\3\1\146\1\147"; private static int [] zzUnpackAction() { - int [] result = new int[229]; + int [] result = new int[230]; int offset = 0; offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result); return result; @@ -182,24 +182,24 @@ class _JetLexer implements FlexLexer { "\0\u0180\0\u0180\0\u1080\0\u10c0\0\u1100\0\u1140\0\u1180\0\u0200"+ "\0\u0200\0\u0200\0\u11c0\0\u0180\0\u1200\0\u1240\0\u1280\0\u12c0"+ "\0\u1300\0\u1340\0\u1380\0\u13c0\0\u1400\0\u1440\0\u1480\0\u14c0"+ - "\0\u1500\0\u1540\0\u1580\0\u0200\0\u15c0\0\u1600\0\u1640\0\u0180"+ - "\0\u1680\0\u0180\0\u0180\0\u16c0\0\u0180\0\u0180\0\u0180\0\u0180"+ - "\0\u0180\0\u1700\0\u1740\0\u0180\0\u0180\0\u1780\0\u17c0\0\u1800"+ - "\0\u1840\0\u0180\0\u0180\0\u0180\0\u1880\0\u0180\0\u18c0\0\u1900"+ - "\0\u0180\0\u1940\0\u1980\0\u19c0\0\u1a00\0\u0180\0\u1a40\0\u1a80"+ - "\0\u1ac0\0\u1b00\0\u0200\0\u1b40\0\u1b80\0\u1bc0\0\u1c00\0\u1c40"+ - "\0\u1c80\0\u1cc0\0\u1d00\0\u0180\0\u1d40\0\u1d80\0\u1dc0\0\u1e00"+ - "\0\u0200\0\u0200\0\u1e40\0\u1e80\0\u0200\0\u0200\0\u1ec0\0\u1ec0"+ - "\0\u0180\0\u0180\0\u0180\0\u0180\0\u1f00\0\u1f40\0\u0180\0\u1f80"+ - "\0\u0180\0\u0180\0\u1fc0\0\u1880\0\u0200\0\u2000\0\u0200\0\u2040"+ - "\0\u0200\0\u2080\0\u20c0\0\u2100\0\u2140\0\u0200\0\u0200\0\u2180"+ - "\0\u21c0\0\u2200\0\u2240\0\u0200\0\u2280\0\u0200\0\u0180\0\u0180"+ - "\0\u22c0\0\u0c00\0\u0200\0\u0200\0\u0200\0\u2300\0\u0200\0\u2340"+ - "\0\u2380\0\u23c0\0\u0200\0\u0200\0\u0200\0\u2400\0\u2440\0\u0200"+ - "\0\u2480\0\u0200\0\u24c0\0\u0200\0\u0200"; + "\0\u1500\0\u1540\0\u1580\0\u0200\0\u15c0\0\u0180\0\u1600\0\u1640"+ + "\0\u0180\0\u1680\0\u0180\0\u0180\0\u16c0\0\u0180\0\u0180\0\u0180"+ + "\0\u0180\0\u0180\0\u1700\0\u1740\0\u0180\0\u0180\0\u1780\0\u17c0"+ + "\0\u1800\0\u1840\0\u0180\0\u0180\0\u0180\0\u1880\0\u0180\0\u18c0"+ + "\0\u1900\0\u0180\0\u1940\0\u1980\0\u19c0\0\u1a00\0\u0180\0\u1a40"+ + "\0\u1a80\0\u1ac0\0\u1b00\0\u0200\0\u1b40\0\u1b80\0\u1bc0\0\u1c00"+ + "\0\u1c40\0\u1c80\0\u1cc0\0\u1d00\0\u0180\0\u1d40\0\u1d80\0\u1dc0"+ + "\0\u1e00\0\u0200\0\u0200\0\u1e40\0\u1e80\0\u0200\0\u0200\0\u1ec0"+ + "\0\u1ec0\0\u0180\0\u0180\0\u0180\0\u0180\0\u1f00\0\u1f40\0\u0180"+ + "\0\u1f80\0\u0180\0\u0180\0\u1fc0\0\u1880\0\u0200\0\u2000\0\u0200"+ + "\0\u2040\0\u0200\0\u2080\0\u20c0\0\u2100\0\u2140\0\u0200\0\u0200"+ + "\0\u2180\0\u21c0\0\u2200\0\u2240\0\u0200\0\u2280\0\u0200\0\u0180"+ + "\0\u0180\0\u22c0\0\u0c00\0\u0200\0\u0200\0\u0200\0\u2300\0\u0200"+ + "\0\u2340\0\u2380\0\u23c0\0\u0200\0\u0200\0\u0200\0\u2400\0\u2440"+ + "\0\u0200\0\u2480\0\u0200\0\u24c0\0\u0200\0\u0200"; private static int [] zzUnpackRowMap() { - int [] result = new int[229]; + int [] result = new int[230]; int offset = 0; offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result); return result; @@ -293,187 +293,187 @@ class _JetLexer implements FlexLexer { "\4\11\1\0\5\11\1\163\14\11\22\0\2\11\1\0"+ "\2\11\5\0\3\11\1\0\1\11\1\0\1\11\3\0"+ "\1\11\2\0\4\11\1\0\1\11\1\164\20\11\53\0"+ - "\1\165\30\0\1\166\75\0\1\167\1\0\1\170\75\0"+ - "\1\171\1\0\1\172\76\0\1\173\1\174\77\0\1\175"+ - "\1\0\1\176\100\0\1\177\100\0\1\200\73\0\1\201"+ - "\14\0\7\70\2\0\12\70\2\0\53\70\2\0\1\202"+ - "\1\0\1\202\1\0\1\203\5\0\2\202\1\0\1\202"+ - "\1\0\1\202\3\0\1\202\1\204\1\0\4\202\1\0"+ - "\22\202\21\0\7\205\1\0\15\205\1\206\52\205\24\0"+ - "\1\207\54\0\2\77\1\0\2\77\5\0\3\77\1\0"+ - "\1\77\1\0\1\77\3\0\1\77\2\0\4\77\1\0"+ - "\22\77\21\0\6\210\2\0\70\210\1\0\2\77\1\0"+ - "\2\77\5\0\3\77\1\0\1\77\1\0\1\77\3\0"+ - "\1\77\2\0\1\77\1\211\2\77\1\0\22\77\55\0"+ - "\1\212\55\0\1\213\66\0\1\125\11\0\1\125\2\0"+ - "\1\214\62\0\1\215\11\0\1\215\4\0\1\215\44\0"+ - "\1\215\12\0\6\111\1\216\1\0\70\111\1\0\2\112"+ - "\1\0\2\112\5\0\3\112\1\0\1\112\1\0\1\112"+ - "\3\0\1\112\2\0\4\112\1\0\22\112\21\0\6\217"+ - "\2\0\70\217\1\0\2\114\1\0\2\114\5\0\3\114"+ - "\1\0\1\114\1\0\1\114\3\0\1\114\2\0\4\114"+ - "\1\0\22\114\21\0\6\220\2\0\70\220\7\117\1\0"+ - "\70\117\34\0\1\221\44\0\1\122\11\0\1\122\2\0"+ - "\1\222\1\110\20\0\1\110\40\0\2\123\10\0\1\123"+ - "\1\0\1\123\1\223\1\123\1\0\1\224\13\0\1\123"+ - "\2\0\1\123\1\224\1\123\3\0\1\123\3\0\1\123"+ - "\3\0\1\123\22\0\1\124\11\0\1\124\2\0\1\225"+ - "\62\0\1\125\11\0\1\125\3\0\1\110\20\0\1\110"+ - "\37\0\7\22\1\0\70\22\24\0\1\226\54\0\2\11"+ - "\1\0\2\11\5\0\3\11\1\0\1\11\1\0\1\11"+ - "\3\0\1\11\2\0\2\11\1\227\1\11\1\0\10\11"+ - "\1\230\11\11\22\0\2\11\1\0\2\11\5\0\3\11"+ - "\1\0\1\11\1\0\1\11\3\0\1\231\2\0\4\11"+ - "\1\0\5\11\1\232\10\11\1\233\3\11\22\0\2\11"+ - "\1\0\2\11\5\0\3\11\1\0\1\11\1\0\1\11"+ - "\3\0\1\11\2\0\4\11\1\0\4\11\1\234\15\11"+ + "\1\165\24\0\1\166\3\0\1\167\75\0\1\170\1\0"+ + "\1\171\75\0\1\172\1\0\1\173\76\0\1\174\1\175"+ + "\77\0\1\176\1\0\1\177\100\0\1\200\100\0\1\201"+ + "\73\0\1\202\14\0\7\70\2\0\12\70\2\0\53\70"+ + "\2\0\1\203\1\0\1\203\1\0\1\204\5\0\2\203"+ + "\1\0\1\203\1\0\1\203\3\0\1\203\1\205\1\0"+ + "\4\203\1\0\22\203\21\0\7\206\1\0\15\206\1\207"+ + "\52\206\24\0\1\210\54\0\2\77\1\0\2\77\5\0"+ + "\3\77\1\0\1\77\1\0\1\77\3\0\1\77\2\0"+ + "\4\77\1\0\22\77\21\0\6\211\2\0\70\211\1\0"+ + "\2\77\1\0\2\77\5\0\3\77\1\0\1\77\1\0"+ + "\1\77\3\0\1\77\2\0\1\77\1\212\2\77\1\0"+ + "\22\77\55\0\1\213\55\0\1\214\66\0\1\125\11\0"+ + "\1\125\2\0\1\215\62\0\1\216\11\0\1\216\4\0"+ + "\1\216\44\0\1\216\12\0\6\111\1\217\1\0\70\111"+ + "\1\0\2\112\1\0\2\112\5\0\3\112\1\0\1\112"+ + "\1\0\1\112\3\0\1\112\2\0\4\112\1\0\22\112"+ + "\21\0\6\220\2\0\70\220\1\0\2\114\1\0\2\114"+ + "\5\0\3\114\1\0\1\114\1\0\1\114\3\0\1\114"+ + "\2\0\4\114\1\0\22\114\21\0\6\221\2\0\70\221"+ + "\7\117\1\0\70\117\34\0\1\222\44\0\1\122\11\0"+ + "\1\122\2\0\1\223\1\110\20\0\1\110\40\0\2\123"+ + "\10\0\1\123\1\0\1\123\1\224\1\123\1\0\1\225"+ + "\13\0\1\123\2\0\1\123\1\225\1\123\3\0\1\123"+ + "\3\0\1\123\3\0\1\123\22\0\1\124\11\0\1\124"+ + "\2\0\1\226\62\0\1\125\11\0\1\125\3\0\1\110"+ + "\20\0\1\110\37\0\7\22\1\0\70\22\24\0\1\227"+ + "\54\0\2\11\1\0\2\11\5\0\3\11\1\0\1\11"+ + "\1\0\1\11\3\0\1\11\2\0\2\11\1\230\1\11"+ + "\1\0\10\11\1\231\11\11\22\0\2\11\1\0\2\11"+ + "\5\0\3\11\1\0\1\11\1\0\1\11\3\0\1\232"+ + "\2\0\4\11\1\0\5\11\1\233\10\11\1\234\3\11"+ "\22\0\2\11\1\0\2\11\5\0\3\11\1\0\1\11"+ "\1\0\1\11\3\0\1\11\2\0\4\11\1\0\4\11"+ "\1\235\15\11\22\0\2\11\1\0\2\11\5\0\3\11"+ "\1\0\1\11\1\0\1\11\3\0\1\11\2\0\4\11"+ - "\1\0\2\11\1\236\17\11\22\0\2\11\1\0\2\11"+ + "\1\0\4\11\1\236\15\11\22\0\2\11\1\0\2\11"+ "\5\0\3\11\1\0\1\11\1\0\1\11\3\0\1\11"+ - "\2\0\4\11\1\0\5\11\1\237\14\11\22\0\2\11"+ + "\2\0\4\11\1\0\2\11\1\237\17\11\22\0\2\11"+ "\1\0\2\11\5\0\3\11\1\0\1\11\1\0\1\11"+ - "\3\0\1\11\2\0\4\11\1\0\12\11\1\240\7\11"+ + "\3\0\1\11\2\0\4\11\1\0\5\11\1\240\14\11"+ "\22\0\2\11\1\0\2\11\5\0\3\11\1\0\1\11"+ - "\1\0\1\11\3\0\1\11\2\0\4\11\1\0\14\11"+ - "\1\241\5\11\22\0\2\11\1\0\2\11\5\0\3\11"+ - "\1\0\1\11\1\0\1\11\3\0\1\11\2\0\3\11"+ - "\1\242\1\0\22\11\22\0\2\11\1\0\2\11\5\0"+ - "\3\11\1\0\1\11\1\0\1\11\3\0\1\11\2\0"+ - "\4\11\1\0\1\243\21\11\22\0\2\11\1\0\2\11"+ + "\1\0\1\11\3\0\1\11\2\0\4\11\1\0\12\11"+ + "\1\241\7\11\22\0\2\11\1\0\2\11\5\0\3\11"+ + "\1\0\1\11\1\0\1\11\3\0\1\11\2\0\4\11"+ + "\1\0\14\11\1\242\5\11\22\0\2\11\1\0\2\11"+ "\5\0\3\11\1\0\1\11\1\0\1\11\3\0\1\11"+ - "\2\0\4\11\1\0\22\11\5\0\1\244\14\0\2\11"+ - "\1\0\2\11\5\0\3\11\1\0\1\11\1\0\1\11"+ - "\3\0\1\11\2\0\1\245\3\11\1\0\22\11\22\0"+ - "\2\11\1\0\2\11\5\0\3\11\1\0\1\11\1\0"+ - "\1\11\3\0\1\11\2\0\4\11\1\0\3\11\1\246"+ - "\16\11\22\0\2\11\1\0\2\11\5\0\3\11\1\0"+ - "\1\11\1\0\1\11\3\0\1\11\2\0\2\11\1\247"+ - "\1\11\1\0\3\11\1\250\16\11\22\0\2\11\1\0"+ + "\2\0\3\11\1\243\1\0\22\11\22\0\2\11\1\0"+ "\2\11\5\0\3\11\1\0\1\11\1\0\1\11\3\0"+ - "\1\11\2\0\4\11\1\0\2\11\1\251\17\11\22\0"+ - "\2\11\1\0\2\11\5\0\3\11\1\0\1\11\1\0"+ - "\1\11\3\0\1\11\2\0\4\11\1\0\10\11\1\252"+ - "\11\11\22\0\2\11\1\0\2\11\5\0\3\11\1\0"+ + "\1\11\2\0\4\11\1\0\1\244\21\11\22\0\2\11"+ + "\1\0\2\11\5\0\3\11\1\0\1\11\1\0\1\11"+ + "\3\0\1\11\2\0\4\11\1\0\22\11\5\0\1\245"+ + "\14\0\2\11\1\0\2\11\5\0\3\11\1\0\1\11"+ + "\1\0\1\11\3\0\1\11\2\0\1\246\3\11\1\0"+ + "\22\11\22\0\2\11\1\0\2\11\5\0\3\11\1\0"+ "\1\11\1\0\1\11\3\0\1\11\2\0\4\11\1\0"+ - "\14\11\1\253\5\11\22\0\2\11\1\0\2\11\5\0"+ + "\3\11\1\247\16\11\22\0\2\11\1\0\2\11\5\0"+ "\3\11\1\0\1\11\1\0\1\11\3\0\1\11\2\0"+ - "\2\11\1\254\1\11\1\0\22\11\22\0\2\11\1\0"+ + "\2\11\1\250\1\11\1\0\3\11\1\251\16\11\22\0"+ + "\2\11\1\0\2\11\5\0\3\11\1\0\1\11\1\0"+ + "\1\11\3\0\1\11\2\0\4\11\1\0\2\11\1\252"+ + "\17\11\22\0\2\11\1\0\2\11\5\0\3\11\1\0"+ + "\1\11\1\0\1\11\3\0\1\11\2\0\4\11\1\0"+ + "\10\11\1\253\11\11\22\0\2\11\1\0\2\11\5\0"+ + "\3\11\1\0\1\11\1\0\1\11\3\0\1\11\2\0"+ + "\4\11\1\0\14\11\1\254\5\11\22\0\2\11\1\0"+ "\2\11\5\0\3\11\1\0\1\11\1\0\1\11\3\0"+ - "\1\11\2\0\4\11\1\0\10\11\1\255\3\11\1\256"+ - "\5\11\54\0\1\257\3\0\1\260\123\0\1\261\74\0"+ - "\1\262\101\0\1\263\100\0\1\264\15\0\2\202\1\0"+ - "\2\202\5\0\3\202\1\0\1\202\1\0\1\202\3\0"+ - "\1\202\2\0\4\202\1\0\22\202\21\0\6\265\2\0"+ - "\70\265\1\0\2\266\10\0\1\266\1\0\1\266\1\0"+ - "\1\266\15\0\1\266\2\0\1\266\1\0\1\266\3\0"+ - "\1\266\3\0\1\266\3\0\1\266\45\0\1\74\53\0"+ - "\6\210\1\267\1\0\70\210\1\0\2\77\1\0\2\77"+ - "\5\0\3\77\1\0\1\77\1\0\1\77\3\0\1\77"+ - "\2\0\2\77\1\270\1\77\1\0\22\77\22\0\1\215"+ - "\11\0\1\215\64\0\6\217\1\271\1\0\70\217\6\220"+ - "\1\272\1\0\70\220\1\0\1\125\11\0\1\125\65\0"+ - "\2\273\10\0\1\273\1\0\1\273\1\214\1\273\15\0"+ - "\1\273\2\0\1\273\1\0\1\273\3\0\1\273\3\0"+ - "\1\273\3\0\1\273\22\0\1\215\11\0\1\215\4\0"+ - "\1\274\44\0\1\274\30\0\1\214\62\0\2\11\1\0"+ - "\2\11\5\0\3\11\1\0\1\11\1\0\1\11\3\0"+ - "\1\11\2\0\3\11\1\275\1\0\22\11\22\0\2\11"+ - "\1\0\2\11\5\0\3\11\1\0\1\11\1\0\1\11"+ - "\3\0\1\11\2\0\4\11\1\0\1\11\1\276\20\11"+ + "\1\11\2\0\2\11\1\255\1\11\1\0\22\11\22\0"+ + "\2\11\1\0\2\11\5\0\3\11\1\0\1\11\1\0"+ + "\1\11\3\0\1\11\2\0\4\11\1\0\10\11\1\256"+ + "\3\11\1\257\5\11\54\0\1\260\3\0\1\261\123\0"+ + "\1\262\74\0\1\263\101\0\1\264\100\0\1\265\15\0"+ + "\2\203\1\0\2\203\5\0\3\203\1\0\1\203\1\0"+ + "\1\203\3\0\1\203\2\0\4\203\1\0\22\203\21\0"+ + "\6\266\2\0\70\266\1\0\2\267\10\0\1\267\1\0"+ + "\1\267\1\0\1\267\15\0\1\267\2\0\1\267\1\0"+ + "\1\267\3\0\1\267\3\0\1\267\3\0\1\267\45\0"+ + "\1\74\53\0\6\211\1\270\1\0\70\211\1\0\2\77"+ + "\1\0\2\77\5\0\3\77\1\0\1\77\1\0\1\77"+ + "\3\0\1\77\2\0\2\77\1\271\1\77\1\0\22\77"+ + "\22\0\1\216\11\0\1\216\64\0\6\220\1\272\1\0"+ + "\70\220\6\221\1\273\1\0\70\221\1\0\1\125\11\0"+ + "\1\125\65\0\2\274\10\0\1\274\1\0\1\274\1\215"+ + "\1\274\15\0\1\274\2\0\1\274\1\0\1\274\3\0"+ + "\1\274\3\0\1\274\3\0\1\274\22\0\1\216\11\0"+ + "\1\216\4\0\1\275\44\0\1\275\30\0\1\215\62\0"+ + "\2\11\1\0\2\11\5\0\3\11\1\0\1\11\1\0"+ + "\1\11\3\0\1\11\2\0\3\11\1\276\1\0\22\11"+ "\22\0\2\11\1\0\2\11\5\0\3\11\1\0\1\11"+ - "\1\0\1\11\3\0\1\11\2\0\4\11\1\0\3\11"+ - "\1\277\16\11\22\0\2\11\1\0\2\11\5\0\3\11"+ - "\1\0\1\11\1\0\1\11\3\0\1\11\2\0\2\11"+ - "\1\300\1\11\1\0\22\11\22\0\2\11\1\0\2\11"+ + "\1\0\1\11\3\0\1\11\2\0\4\11\1\0\1\11"+ + "\1\277\20\11\22\0\2\11\1\0\2\11\5\0\3\11"+ + "\1\0\1\11\1\0\1\11\3\0\1\11\2\0\4\11"+ + "\1\0\3\11\1\300\16\11\22\0\2\11\1\0\2\11"+ "\5\0\3\11\1\0\1\11\1\0\1\11\3\0\1\11"+ - "\2\0\4\11\1\0\3\11\1\301\16\11\22\0\2\11"+ + "\2\0\2\11\1\301\1\11\1\0\22\11\22\0\2\11"+ "\1\0\2\11\5\0\3\11\1\0\1\11\1\0\1\11"+ "\3\0\1\11\2\0\4\11\1\0\3\11\1\302\16\11"+ "\22\0\2\11\1\0\2\11\5\0\3\11\1\0\1\11"+ - "\1\0\1\11\3\0\1\11\2\0\1\303\3\11\1\0"+ - "\22\11\22\0\2\11\1\0\2\11\5\0\3\11\1\0"+ - "\1\11\1\0\1\11\3\0\1\11\2\0\3\11\1\304"+ - "\1\0\22\11\22\0\2\11\1\0\2\11\5\0\3\11"+ - "\1\0\1\11\1\0\1\11\3\0\1\11\2\0\4\11"+ - "\1\0\3\11\1\305\16\11\22\0\2\11\1\0\2\11"+ + "\1\0\1\11\3\0\1\11\2\0\4\11\1\0\3\11"+ + "\1\303\16\11\22\0\2\11\1\0\2\11\5\0\3\11"+ + "\1\0\1\11\1\0\1\11\3\0\1\11\2\0\1\304"+ + "\3\11\1\0\22\11\22\0\2\11\1\0\2\11\5\0"+ + "\3\11\1\0\1\11\1\0\1\11\3\0\1\11\2\0"+ + "\3\11\1\305\1\0\22\11\22\0\2\11\1\0\2\11"+ "\5\0\3\11\1\0\1\11\1\0\1\11\3\0\1\11"+ - "\2\0\4\11\1\0\14\11\1\306\5\11\22\0\2\11"+ + "\2\0\4\11\1\0\3\11\1\306\16\11\22\0\2\11"+ "\1\0\2\11\5\0\3\11\1\0\1\11\1\0\1\11"+ - "\3\0\1\11\2\0\4\11\1\0\3\11\1\307\16\11"+ + "\3\0\1\11\2\0\4\11\1\0\14\11\1\307\5\11"+ "\22\0\2\11\1\0\2\11\5\0\3\11\1\0\1\11"+ - "\1\0\1\11\3\0\1\11\2\0\4\11\1\0\6\11"+ - "\1\310\13\11\22\0\2\11\1\0\2\11\5\0\3\11"+ - "\1\0\1\11\1\0\1\11\3\0\1\311\2\0\4\11"+ - "\1\0\22\11\22\0\2\11\1\0\2\11\5\0\3\11"+ + "\1\0\1\11\3\0\1\11\2\0\4\11\1\0\3\11"+ + "\1\310\16\11\22\0\2\11\1\0\2\11\5\0\3\11"+ "\1\0\1\11\1\0\1\11\3\0\1\11\2\0\4\11"+ - "\1\0\5\11\1\312\14\11\22\0\2\11\1\0\2\11"+ - "\5\0\3\11\1\0\1\11\1\0\1\11\3\0\1\11"+ - "\2\0\4\11\1\0\14\11\1\313\5\11\22\0\2\11"+ - "\1\0\2\11\5\0\3\11\1\0\1\11\1\0\1\11"+ - "\3\0\1\11\2\0\4\11\1\0\2\11\1\314\17\11"+ - "\22\0\2\11\1\0\2\11\5\0\3\11\1\0\1\11"+ - "\1\0\1\11\3\0\1\11\2\0\3\11\1\315\1\0"+ - "\22\11\22\0\2\11\1\0\2\11\5\0\3\11\1\0"+ - "\1\11\1\0\1\11\3\0\1\11\2\0\3\11\1\316"+ - "\1\0\22\11\22\0\2\317\1\0\2\317\5\0\3\317"+ - "\1\0\1\317\1\0\1\317\3\0\1\317\2\0\4\317"+ - "\1\0\22\317\21\0\6\265\1\320\1\0\70\265\1\0"+ - "\2\321\10\0\1\321\1\0\1\321\1\0\1\321\15\0"+ - "\1\321\2\0\1\321\1\0\1\321\3\0\1\321\3\0"+ - "\1\321\3\0\1\321\22\0\2\77\1\0\2\77\5\0"+ - "\3\77\1\0\1\77\1\0\1\77\3\0\1\77\2\0"+ - "\3\77\1\322\1\0\22\77\22\0\2\273\10\0\1\273"+ - "\1\0\1\273\1\0\1\273\1\0\1\224\13\0\1\273"+ - "\2\0\1\273\1\224\1\273\3\0\1\273\3\0\1\273"+ - "\3\0\1\273\22\0\2\11\1\0\2\11\5\0\3\11"+ - "\1\0\1\11\1\0\1\11\3\0\1\11\2\0\4\11"+ - "\1\0\13\11\1\323\6\11\22\0\2\11\1\0\2\11"+ - "\5\0\3\11\1\0\1\11\1\0\1\11\3\0\1\11"+ - "\2\0\1\324\3\11\1\0\22\11\22\0\2\11\1\0"+ - "\2\11\5\0\3\11\1\0\1\11\1\0\1\11\3\0"+ - "\1\11\2\0\4\11\1\0\10\11\1\325\11\11\22\0"+ - "\2\11\1\0\2\11\5\0\3\11\1\0\1\11\1\0"+ - "\1\11\3\0\1\11\2\0\2\11\1\326\1\11\1\0"+ - "\22\11\22\0\2\11\1\0\2\11\5\0\3\11\1\0"+ - "\1\11\1\0\1\11\3\0\1\11\2\0\3\11\1\327"+ - "\1\0\22\11\22\0\2\11\1\0\2\11\5\0\3\11"+ - "\1\0\1\11\1\0\1\11\3\0\1\11\2\0\4\11"+ - "\1\0\1\330\21\11\22\0\2\11\1\0\2\11\5\0"+ - "\3\11\1\0\1\11\1\0\1\11\3\0\1\11\2\0"+ - "\4\11\1\0\5\11\1\331\14\11\22\0\2\11\1\0"+ - "\2\11\5\0\3\11\1\0\1\11\1\0\1\11\3\0"+ - "\1\11\2\0\4\11\1\0\10\11\1\332\11\11\22\0"+ - "\2\11\1\0\2\11\5\0\3\11\1\0\1\11\1\0"+ - "\1\11\3\0\1\11\2\0\4\11\1\0\6\11\1\333"+ - "\13\11\22\0\2\11\1\0\2\11\5\0\3\11\1\0"+ - "\1\11\1\0\1\11\3\0\1\11\2\0\4\11\1\0"+ - "\3\11\1\334\16\11\22\0\2\11\1\0\2\11\5\0"+ - "\3\11\1\0\1\11\1\0\1\11\3\0\1\11\2\0"+ - "\4\11\1\0\3\11\1\335\16\11\22\0\2\336\10\0"+ - "\1\336\1\0\1\336\1\0\1\336\15\0\1\336\2\0"+ - "\1\336\1\0\1\336\3\0\1\336\3\0\1\336\3\0"+ - "\1\336\22\0\2\11\1\0\2\11\5\0\3\11\1\0"+ - "\1\11\1\0\1\11\3\0\1\11\2\0\4\11\1\0"+ - "\2\11\1\337\17\11\22\0\2\11\1\0\2\11\5\0"+ - "\3\11\1\0\1\11\1\0\1\11\3\0\1\11\2\0"+ - "\1\340\3\11\1\0\22\11\22\0\2\11\1\0\2\11"+ - "\5\0\3\11\1\0\1\11\1\0\1\11\3\0\1\11"+ - "\2\0\4\11\1\0\7\11\1\341\12\11\22\0\2\11"+ - "\1\0\2\11\5\0\3\11\1\0\1\11\1\0\1\11"+ - "\3\0\1\11\2\0\4\11\1\0\2\11\1\342\17\11"+ - "\22\0\2\205\10\0\1\205\1\0\1\205\1\0\1\205"+ - "\15\0\1\205\2\0\1\205\1\0\1\205\3\0\1\205"+ - "\3\0\1\205\3\0\1\205\22\0\2\11\1\0\2\11"+ - "\5\0\3\11\1\0\1\11\1\0\1\11\3\0\1\343"+ + "\1\0\6\11\1\311\13\11\22\0\2\11\1\0\2\11"+ + "\5\0\3\11\1\0\1\11\1\0\1\11\3\0\1\312"+ "\2\0\4\11\1\0\22\11\22\0\2\11\1\0\2\11"+ "\5\0\3\11\1\0\1\11\1\0\1\11\3\0\1\11"+ - "\2\0\4\11\1\0\3\11\1\344\16\11\22\0\2\11"+ + "\2\0\4\11\1\0\5\11\1\313\14\11\22\0\2\11"+ + "\1\0\2\11\5\0\3\11\1\0\1\11\1\0\1\11"+ + "\3\0\1\11\2\0\4\11\1\0\14\11\1\314\5\11"+ + "\22\0\2\11\1\0\2\11\5\0\3\11\1\0\1\11"+ + "\1\0\1\11\3\0\1\11\2\0\4\11\1\0\2\11"+ + "\1\315\17\11\22\0\2\11\1\0\2\11\5\0\3\11"+ + "\1\0\1\11\1\0\1\11\3\0\1\11\2\0\3\11"+ + "\1\316\1\0\22\11\22\0\2\11\1\0\2\11\5\0"+ + "\3\11\1\0\1\11\1\0\1\11\3\0\1\11\2\0"+ + "\3\11\1\317\1\0\22\11\22\0\2\320\1\0\2\320"+ + "\5\0\3\320\1\0\1\320\1\0\1\320\3\0\1\320"+ + "\2\0\4\320\1\0\22\320\21\0\6\266\1\321\1\0"+ + "\70\266\1\0\2\322\10\0\1\322\1\0\1\322\1\0"+ + "\1\322\15\0\1\322\2\0\1\322\1\0\1\322\3\0"+ + "\1\322\3\0\1\322\3\0\1\322\22\0\2\77\1\0"+ + "\2\77\5\0\3\77\1\0\1\77\1\0\1\77\3\0"+ + "\1\77\2\0\3\77\1\323\1\0\22\77\22\0\2\274"+ + "\10\0\1\274\1\0\1\274\1\0\1\274\1\0\1\225"+ + "\13\0\1\274\2\0\1\274\1\225\1\274\3\0\1\274"+ + "\3\0\1\274\3\0\1\274\22\0\2\11\1\0\2\11"+ + "\5\0\3\11\1\0\1\11\1\0\1\11\3\0\1\11"+ + "\2\0\4\11\1\0\13\11\1\324\6\11\22\0\2\11"+ + "\1\0\2\11\5\0\3\11\1\0\1\11\1\0\1\11"+ + "\3\0\1\11\2\0\1\325\3\11\1\0\22\11\22\0"+ + "\2\11\1\0\2\11\5\0\3\11\1\0\1\11\1\0"+ + "\1\11\3\0\1\11\2\0\4\11\1\0\10\11\1\326"+ + "\11\11\22\0\2\11\1\0\2\11\5\0\3\11\1\0"+ + "\1\11\1\0\1\11\3\0\1\11\2\0\2\11\1\327"+ + "\1\11\1\0\22\11\22\0\2\11\1\0\2\11\5\0"+ + "\3\11\1\0\1\11\1\0\1\11\3\0\1\11\2\0"+ + "\3\11\1\330\1\0\22\11\22\0\2\11\1\0\2\11"+ + "\5\0\3\11\1\0\1\11\1\0\1\11\3\0\1\11"+ + "\2\0\4\11\1\0\1\331\21\11\22\0\2\11\1\0"+ + "\2\11\5\0\3\11\1\0\1\11\1\0\1\11\3\0"+ + "\1\11\2\0\4\11\1\0\5\11\1\332\14\11\22\0"+ + "\2\11\1\0\2\11\5\0\3\11\1\0\1\11\1\0"+ + "\1\11\3\0\1\11\2\0\4\11\1\0\10\11\1\333"+ + "\11\11\22\0\2\11\1\0\2\11\5\0\3\11\1\0"+ + "\1\11\1\0\1\11\3\0\1\11\2\0\4\11\1\0"+ + "\6\11\1\334\13\11\22\0\2\11\1\0\2\11\5\0"+ + "\3\11\1\0\1\11\1\0\1\11\3\0\1\11\2\0"+ + "\4\11\1\0\3\11\1\335\16\11\22\0\2\11\1\0"+ + "\2\11\5\0\3\11\1\0\1\11\1\0\1\11\3\0"+ + "\1\11\2\0\4\11\1\0\3\11\1\336\16\11\22\0"+ + "\2\337\10\0\1\337\1\0\1\337\1\0\1\337\15\0"+ + "\1\337\2\0\1\337\1\0\1\337\3\0\1\337\3\0"+ + "\1\337\3\0\1\337\22\0\2\11\1\0\2\11\5\0"+ + "\3\11\1\0\1\11\1\0\1\11\3\0\1\11\2\0"+ + "\4\11\1\0\2\11\1\340\17\11\22\0\2\11\1\0"+ + "\2\11\5\0\3\11\1\0\1\11\1\0\1\11\3\0"+ + "\1\11\2\0\1\341\3\11\1\0\22\11\22\0\2\11"+ + "\1\0\2\11\5\0\3\11\1\0\1\11\1\0\1\11"+ + "\3\0\1\11\2\0\4\11\1\0\7\11\1\342\12\11"+ + "\22\0\2\11\1\0\2\11\5\0\3\11\1\0\1\11"+ + "\1\0\1\11\3\0\1\11\2\0\4\11\1\0\2\11"+ + "\1\343\17\11\22\0\2\206\10\0\1\206\1\0\1\206"+ + "\1\0\1\206\15\0\1\206\2\0\1\206\1\0\1\206"+ + "\3\0\1\206\3\0\1\206\3\0\1\206\22\0\2\11"+ + "\1\0\2\11\5\0\3\11\1\0\1\11\1\0\1\11"+ + "\3\0\1\344\2\0\4\11\1\0\22\11\22\0\2\11"+ "\1\0\2\11\5\0\3\11\1\0\1\11\1\0\1\11"+ "\3\0\1\11\2\0\4\11\1\0\3\11\1\345\16\11"+ - "\21\0"; + "\22\0\2\11\1\0\2\11\5\0\3\11\1\0\1\11"+ + "\1\0\1\11\3\0\1\11\2\0\4\11\1\0\3\11"+ + "\1\346\16\11\21\0"; private static int [] zzUnpackTrans() { int [] result = new int[9472]; @@ -521,15 +521,15 @@ class _JetLexer implements FlexLexer { "\4\1\7\11\1\1\1\11\1\1\1\0\2\11\2\1"+ "\1\0\1\1\1\11\2\1\2\11\1\0\1\1\1\0"+ "\1\1\1\0\1\1\1\0\1\11\2\1\1\11\4\1"+ - "\5\11\1\1\1\0\7\1\1\11\20\1\1\0\1\1"+ - "\1\0\1\11\1\0\2\11\1\1\5\11\1\1\1\0"+ - "\2\11\1\1\2\0\1\1\3\11\1\1\1\11\2\0"+ - "\1\11\4\0\1\11\15\1\1\11\14\1\4\11\2\0"+ - "\1\11\1\1\2\11\1\1\1\0\22\1\2\11\1\0"+ - "\14\1\1\0\7\1"; + "\5\11\1\1\1\0\7\1\1\11\20\1\1\0\1\11"+ + "\1\1\1\0\1\11\1\0\2\11\1\1\5\11\1\1"+ + "\1\0\2\11\1\1\2\0\1\1\3\11\1\1\1\11"+ + "\2\0\1\11\4\0\1\11\15\1\1\11\14\1\4\11"+ + "\2\0\1\11\1\1\2\11\1\1\1\0\22\1\2\11"+ + "\1\0\14\1\1\0\7\1"; private static int [] zzUnpackAttribute() { - int [] result = new int[229]; + int [] result = new int[230]; int offset = 0; offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result); return result; @@ -621,11 +621,6 @@ class _JetLexer implements FlexLexer { yybegin(state.state); } - private boolean atCommentState() { - int state = yystate(); - return state == BLOCK_COMMENT || state == DOC_COMMENT; - } - private IElementType commentStateToTokenType(int state) { switch (state) { case BLOCK_COMMENT: @@ -637,10 +632,6 @@ class _JetLexer implements FlexLexer { } } - void p(Object o) { - System.out.println(o); - } - _JetLexer(java.io.Reader in) { this.zzReader = in; @@ -892,23 +883,27 @@ class _JetLexer implements FlexLexer { case 3: { return JetTokens.IDENTIFIER; } - case 103: break; + case 104: break; case 10: { pushState(STRING); return JetTokens.OPEN_QUOTE; } - case 104: break; - case 74: - { return JetTokens.FOR_KEYWORD ; - } case 105: break; - case 100: - { return JetTokens.RETURN_KEYWORD ; + case 53: + { return JetTokens.EXCLEXCL ; } case 106: break; - case 86: - { return JetTokens.NULL_KEYWORD ; + case 75: + { return JetTokens.FOR_KEYWORD ; } case 107: break; + case 101: + { return JetTokens.RETURN_KEYWORD ; + } + case 108: break; + case 87: + { return JetTokens.NULL_KEYWORD ; + } + case 109: break; case 35: { if (lBraceCount == 0) { popState(); @@ -917,160 +912,160 @@ class _JetLexer implements FlexLexer { lBraceCount--; return JetTokens.RBRACE; } - case 108: break; + case 110: break; case 15: { return JetTokens.LT ; } - case 109: break; + case 111: break; case 52: { return JetTokens.DO_KEYWORD ; } - case 110: break; + case 112: break; case 20: { return JetTokens.PLUS ; } - case 111: break; - case 58: + case 113: break; + case 59: { return JetTokens.PLUSEQ ; } - case 112: break; - case 91: + case 114: break; + case 92: { popState(); return JetTokens.THIS_KEYWORD; } - case 113: break; + case 115: break; case 28: { return JetTokens.COMMA ; } - case 114: break; + case 116: break; case 17: { return JetTokens.GT ; } - case 115: break; + case 117: break; case 4: { return JetTokens.WHITE_SPACE; } - case 116: break; + case 118: break; case 25: { return JetTokens.RPAR ; } - case 117: break; - case 56: + case 119: break; + case 57: { return JetTokens.DOUBLE_ARROW; } - case 118: break; - case 84: + case 120: break; + case 85: { return JetTokens.TRUE_KEYWORD ; } - case 119: break; - case 80: + case 121: break; + case 81: { return JetTokens.IDE_TEMPLATE_START ; } - case 120: break; + case 122: break; case 37: { return JetTokens.FIELD_IDENTIFIER; } - case 121: break; - case 60: + case 123: break; + case 61: { return JetTokens.ANDAND ; } - case 122: break; - case 64: + case 124: break; + case 65: { pushState(LONG_TEMPLATE_ENTRY); return JetTokens.LONG_TEMPLATE_ENTRY_START; } - case 123: break; + case 125: break; case 36: { return JetTokens.FLOAT_LITERAL; } - case 124: break; + case 126: break; case 40: { return JetTokens.EOL_COMMENT; } - case 125: break; - case 88: + case 127: break; + case 89: { return JetTokens.WHEN_KEYWORD ; } - case 126: break; - case 70: + case 128: break; + case 71: { pushState(RAW_STRING); return JetTokens.OPEN_QUOTE; } - case 127: break; + case 129: break; case 26: { return JetTokens.COLON ; } - case 128: break; - case 54: + case 130: break; + case 55: { return JetTokens.LTEQ ; } - case 129: break; + case 131: break; case 45: { return JetTokens.ARROW ; } - case 130: break; + case 132: break; case 32: { popState(); return JetTokens.IDENTIFIER; } - case 131: break; + case 133: break; case 22: { return JetTokens.LBRACKET ; } - case 132: break; - case 68: + case 134: break; + case 69: { yypushback(2); return JetTokens.INTEGER_LITERAL; } - case 133: break; + case 135: break; case 9: { return JetTokens.CHARACTER_LITERAL; } - case 134: break; - case 75: + case 136: break; + case 76: { return JetTokens.VAR_KEYWORD ; } - case 135: break; - case 55: + case 137: break; + case 56: { return JetTokens.GTEQ ; } - case 136: break; + case 138: break; case 2: { return JetTokens.INTEGER_LITERAL; } - case 137: break; + case 139: break; case 12: { return JetTokens.RBRACE ; } - case 138: break; - case 95: + case 140: break; + case 96: { return JetTokens.CLASS_KEYWORD ; } - case 139: break; + case 141: break; + case 72: + { return JetTokens.TRY_KEYWORD ; + } + case 142: break; case 14: { return JetTokens.EXCL ; } - case 140: break; - case 71: - { return JetTokens.TRY_KEYWORD ; - } - case 141: break; - case 53: + case 143: break; + case 54: { return JetTokens.EXCLEQ ; } - case 142: break; + case 144: break; case 46: { return JetTokens.MINUSEQ ; } - case 143: break; - case 101: + case 145: break; + case 102: { return JetTokens.PACKAGE_KEYWORD ; } - case 144: break; - case 92: + case 146: break; + case 93: { return JetTokens.THROW_KEYWORD ; } - case 145: break; - case 94: + case 147: break; + case 95: { return JetTokens.SUPER_KEYWORD ; } - case 146: break; - case 67: + case 148: break; + case 68: { if (commentDepth > 0) { commentDepth--; } @@ -1081,241 +1076,241 @@ class _JetLexer implements FlexLexer { return commentStateToTokenType(state); } } - case 147: break; - case 97: + case 149: break; + case 98: { return JetTokens.WHILE_KEYWORD ; } - case 148: break; + case 150: break; case 44: { return JetTokens.MINUSMINUS; } - case 149: break; - case 102: + case 151: break; + case 103: { return JetTokens.CONTINUE_KEYWORD ; } - case 150: break; - case 78: + case 152: break; + case 79: { return JetTokens.NOT_IN; } - case 151: break; + case 153: break; case 39: { return JetTokens.ATAT ; } - case 152: break; + case 154: break; case 6: { return JetTokens.DIV ; } - case 153: break; - case 81: + case 155: break; + case 82: { return JetTokens.IDE_TEMPLATE_END ; } - case 154: break; + case 156: break; case 38: { return JetTokens.LABEL_IDENTIFIER; } - case 155: break; + case 157: break; case 29: { return JetTokens.REGULAR_STRING_PART; } - case 156: break; + case 158: break; case 19: { return JetTokens.QUEST ; } - case 157: break; - case 69: + case 159: break; + case 70: { pushState(DOC_COMMENT); commentDepth = 0; commentStart = getTokenStart(); } - case 158: break; - case 61: + case 160: break; + case 62: { return JetTokens.OROR ; } - case 159: break; + case 161: break; case 21: { return JetTokens.PERC ; } - case 160: break; - case 79: + case 162: break; + case 80: { return JetTokens.EXCLEQEQEQ; } - case 161: break; - case 62: + case 163: break; + case 63: { return JetTokens.PERCEQ ; } - case 162: break; + case 164: break; case 43: { return JetTokens.RANGE ; } - case 163: break; + case 165: break; case 1: { return TokenType.BAD_CHARACTER; } - case 164: break; - case 63: + case 166: break; + case 64: { pushState(SHORT_TEMPLATE_ENTRY); yypushback(yylength() - 1); return JetTokens.SHORT_TEMPLATE_ENTRY_START; } - case 165: break; - case 77: + case 167: break; + case 78: { return JetTokens.NOT_IS; } - case 166: break; + case 168: break; case 13: { return JetTokens.MUL ; } - case 167: break; + case 169: break; case 23: { return JetTokens.RBRACKET ; } - case 168: break; - case 59: + case 170: break; + case 60: { return JetTokens.PLUSPLUS ; } - case 169: break; + case 171: break; case 41: { pushState(BLOCK_COMMENT); commentDepth = 0; commentStart = getTokenStart(); } - case 170: break; - case 83: + case 172: break; + case 84: { return JetTokens.THIS_KEYWORD ; } - case 171: break; + case 173: break; case 7: { return JetTokens.DOT ; } - case 172: break; + case 174: break; case 27: { return JetTokens.SEMICOLON ; } - case 173: break; + case 175: break; case 49: { return JetTokens.IF_KEYWORD ; } - case 174: break; - case 65: + case 176: break; + case 66: { return JetTokens.ESCAPE_SEQUENCE; } - case 175: break; + case 177: break; case 31: { popState(); return JetTokens.CLOSING_QUOTE; } - case 176: break; + case 178: break; case 18: { return JetTokens.EQ ; } - case 177: break; + case 179: break; case 5: { return JetTokens.AT ; } - case 178: break; - case 72: + case 180: break; + case 73: { return JetTokens.AS_SAFE; } - case 179: break; + case 181: break; case 24: { return JetTokens.LPAR ; } - case 180: break; + case 182: break; case 8: { return JetTokens.MINUS ; } - case 181: break; - case 98: + case 183: break; + case 99: { return JetTokens.FALSE_KEYWORD ; } - case 182: break; - case 85: + case 184: break; + case 86: { return JetTokens.TYPE_KEYWORD ; } - case 183: break; - case 66: + case 185: break; + case 67: { commentDepth++; } - case 184: break; - case 73: + case 186: break; + case 74: { return JetTokens.FUN_KEYWORD ; } - case 185: break; + case 187: break; case 47: { return JetTokens.IS_KEYWORD ; } - case 186: break; + case 188: break; case 30: { popState(); yypushback(1); return JetTokens.DANGLING_NEWLINE; } - case 187: break; + case 189: break; case 34: { lBraceCount++; return JetTokens.LBRACE; } - case 188: break; - case 90: + case 190: break; + case 91: { yypushback(3); return JetTokens.EXCL; } - case 189: break; + case 191: break; case 42: { return JetTokens.DIVEQ ; } - case 190: break; - case 87: + case 192: break; + case 88: { return JetTokens.ELSE_KEYWORD ; } - case 191: break; + case 193: break; case 51: { return JetTokens.AS_KEYWORD ; } - case 192: break; + case 194: break; case 48: { return JetTokens.IN_KEYWORD ; } - case 193: break; - case 57: + case 195: break; + case 58: { return JetTokens.EQEQ ; } - case 194: break; - case 82: + case 196: break; + case 83: { return JetTokens.EQEQEQ ; } - case 195: break; - case 76: + case 197: break; + case 77: { return JetTokens.VAL_KEYWORD ; } - case 196: break; - case 89: + case 198: break; + case 90: { return JetTokens.CAPITALIZED_THIS_KEYWORD ; } - case 197: break; + case 199: break; case 50: { return JetTokens.MULTEQ ; } - case 198: break; + case 200: break; case 11: { return JetTokens.LBRACE ; } - case 199: break; - case 99: + case 201: break; + case 100: { return JetTokens.OBJECT_KEYWORD ; } - case 200: break; - case 96: + case 202: break; + case 97: { return JetTokens.BREAK_KEYWORD ; } - case 201: break; - case 93: + case 203: break; + case 94: { return JetTokens.TRAIT_KEYWORD ; } - case 202: break; + case 204: break; case 33: { } - case 203: break; + case 205: break; case 16: { return JetTokens.HASH ; } - case 204: break; + case 206: break; default: if (zzInput == YYEOF && zzStartRead == zzCurrentPos) { zzAtEOF = true; @@ -1327,14 +1322,14 @@ class _JetLexer implements FlexLexer { zzStartRead = commentStart; return commentStateToTokenType(state); } - case 230: break; + case 231: break; case DOC_COMMENT: { int state = yystate(); popState(); zzStartRead = commentStart; return commentStateToTokenType(state); } - case 231: break; + case 232: break; default: return null; } diff --git a/compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/AssertNotNull.jet b/compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/AssertNotNull.jet new file mode 100644 index 00000000000..bf91b286d2b --- /dev/null +++ b/compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/AssertNotNull.jet @@ -0,0 +1,35 @@ +fun main(args : Array) { + val a : Int? = null + val b : Int? = null + a!! : Int + a!! + 2 + a!!.plus(2) + a!!.plus(b!!) + 2.plus(b!!) + 2 + b!! + + val c = 1 + c!! + + val d : Any? = null + + if (d != null) { + d!! + } + + if (d is String) { + d!! + } + + if (d is String?) { + if (d != null) { + d!! + } + if (d is String) { + d!! + } + } + + val f : String = a!! + a!! : String +} \ No newline at end of file diff --git a/grammar/src/expressions.grm b/grammar/src/expressions.grm index b0da83d76b1..1c3fc4d0f69 100644 --- a/grammar/src/expressions.grm +++ b/grammar/src/expressions.grm @@ -212,7 +212,7 @@ prefixUnaryOperation ; postfixUnaryOperation - : "++" : "--" + : "++" : "--" : "!!" : callSuffix : arrayAccess : memberAccessOperation postfixUnaryExpression // TODO: Review diff --git a/idea/src/org/jetbrains/jet/plugin/annotations/DebugInfoAnnotator.java b/idea/src/org/jetbrains/jet/plugin/annotations/DebugInfoAnnotator.java index 231bc62bc43..fe144866701 100644 --- a/idea/src/org/jetbrains/jet/plugin/annotations/DebugInfoAnnotator.java +++ b/idea/src/org/jetbrains/jet/plugin/annotations/DebugInfoAnnotator.java @@ -50,7 +50,7 @@ import static org.jetbrains.jet.lexer.JetTokens.*; */ public class DebugInfoAnnotator implements Annotator { - public static final TokenSet EXCLUDED = TokenSet.create(COLON, AS_KEYWORD, AS_SAFE, IS_KEYWORD, NOT_IS, OROR, ANDAND, EQ, EQEQEQ, EXCLEQEQEQ, ELVIS); + public static final TokenSet EXCLUDED = TokenSet.create(COLON, AS_KEYWORD, AS_SAFE, IS_KEYWORD, NOT_IS, OROR, ANDAND, EQ, EQEQEQ, EXCLEQEQEQ, ELVIS, EXCLEXCL); private static volatile boolean debugInfoEnabled = true; diff --git a/idea/src/org/jetbrains/jet/plugin/formatter/JetFormattingModelBuilder.java b/idea/src/org/jetbrains/jet/plugin/formatter/JetFormattingModelBuilder.java index daba83c28db..375b08288cd 100644 --- a/idea/src/org/jetbrains/jet/plugin/formatter/JetFormattingModelBuilder.java +++ b/idea/src/org/jetbrains/jet/plugin/formatter/JetFormattingModelBuilder.java @@ -75,7 +75,7 @@ public class JetFormattingModelBuilder implements FormattingModelBuilder { .aroundInside(TokenSet.create(LT, GT, LTEQ, GTEQ), BINARY_EXPRESSION).spaceIf(jetCommonSettings.SPACE_AROUND_RELATIONAL_OPERATORS) .around(TokenSet.create(PLUS, MINUS)).spaceIf(jetCommonSettings.SPACE_AROUND_ADDITIVE_OPERATORS) .aroundInside(TokenSet.create(MUL, DIV, PERC), BINARY_EXPRESSION).spaceIf(jetCommonSettings.SPACE_AROUND_MULTIPLICATIVE_OPERATORS) - .around(TokenSet.create(PLUSPLUS, MINUSMINUS, MINUS, PLUS, EXCL)).spaceIf(jetCommonSettings.SPACE_AROUND_UNARY_OPERATOR) + .around(TokenSet.create(PLUSPLUS, MINUSMINUS, EXCLEXCL, MINUS, PLUS, EXCL)).spaceIf(jetCommonSettings.SPACE_AROUND_UNARY_OPERATOR) .around(RANGE).spaceIf(jetSettings.SPACE_AROUND_RANGE) .beforeInside(BLOCK, FUN).spaceIf(jetCommonSettings.SPACE_BEFORE_METHOD_LBRACE)