Added 'inline' keyword

compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java

@@ -91,11 +91,9 @@ public class JetControlFlowProcessor {
     }
 
     private class CFPVisitor extends JetVisitorVoid {
-//        private final boolean preferBlock;
         private final boolean inCondition;
 
         private CFPVisitor(boolean inCondition) {
-//            this.preferBlock = preferBlock;
             this.inCondition = inCondition;
         }
 

compiler/frontend/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java

@@ -2771,6 +2771,11 @@ public class JetTypeInferrer {
             return context.services.checkType(functionDescriptor.getReturnType(), arrayAccessExpression, context);
         }
 
+        @Override
+        public JetType visitAnnotatedExpression(JetAnnotatedExpression expression, TypeInferenceContext data) {
+            return getType(expression.getBaseExpression(), data);
+        }
+
         @Override
         public JetType visitJetElement(JetElement element, TypeInferenceContext context) {
             context.trace.report(UNSUPPORTED.on(element, "in a block"));

compiler/frontend/src/org/jetbrains/jet/lexer/JetTokens.java

@@ -136,6 +136,7 @@ public interface JetTokens {
     JetKeywordToken CATCH_KEYWORD     = JetKeywordToken.softKeyword("catch");
     JetKeywordToken OUT_KEYWORD       = JetKeywordToken.softKeyword("out");
     JetKeywordToken VARARG_KEYWORD       = JetKeywordToken.softKeyword("vararg");
+    JetKeywordToken INLINE_KEYWORD       = JetKeywordToken.softKeyword("inline");
 
     JetKeywordToken FINALLY_KEYWORD   = JetKeywordToken.softKeyword("finally");
     JetKeywordToken FINAL_KEYWORD   = JetKeywordToken.softKeyword("final");
@@ -155,12 +156,12 @@ public interface JetTokens {
     TokenSet SOFT_KEYWORDS = TokenSet.create(IMPORT_KEYWORD, WHERE_KEYWORD, BY_KEYWORD, GET_KEYWORD,
             SET_KEYWORD, ABSTRACT_KEYWORD, ENUM_KEYWORD, OPEN_KEYWORD, ANNOTATION_KEYWORD,
             OVERRIDE_KEYWORD, PRIVATE_KEYWORD, PUBLIC_KEYWORD, INTERNAL_KEYWORD, PROTECTED_KEYWORD,
-            CATCH_KEYWORD, FINALLY_KEYWORD, REF_KEYWORD, OUT_KEYWORD, FINAL_KEYWORD, VARARG_KEYWORD
+            CATCH_KEYWORD, FINALLY_KEYWORD, REF_KEYWORD, OUT_KEYWORD, FINAL_KEYWORD, VARARG_KEYWORD, INLINE_KEYWORD
     );
 
     TokenSet MODIFIER_KEYWORDS = TokenSet.create(ABSTRACT_KEYWORD, ENUM_KEYWORD,
             OPEN_KEYWORD, ANNOTATION_KEYWORD, OVERRIDE_KEYWORD, PRIVATE_KEYWORD, PUBLIC_KEYWORD, INTERNAL_KEYWORD,
-            PROTECTED_KEYWORD, REF_KEYWORD, OUT_KEYWORD, IN_KEYWORD, FINAL_KEYWORD, VARARG_KEYWORD
+            PROTECTED_KEYWORD, REF_KEYWORD, OUT_KEYWORD, IN_KEYWORD, FINAL_KEYWORD, VARARG_KEYWORD, INLINE_KEYWORD
     );
     TokenSet WHITE_SPACE_OR_COMMENT_BIT_SET = TokenSet.create(WHITE_SPACE, BLOCK_COMMENT, EOL_COMMENT, DOC_COMMENT);
     TokenSet WHITESPACES = TokenSet.create(TokenType.WHITE_SPACE);