From a44550cd890055a8fbb7429dbcce54709443a1ac Mon Sep 17 00:00:00 2001 From: Andrey Vlasovskikh Date: Fri, 26 Apr 2013 18:50:19 +0400 Subject: [PATCH] Fixed missing name declaration for Cython functions (PY-8806) --- .../python/parsing/FunctionParsing.java | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/python/src/com/jetbrains/python/parsing/FunctionParsing.java b/python/src/com/jetbrains/python/parsing/FunctionParsing.java index 7bb12f969585..d7c0202ee57f 100644 --- a/python/src/com/jetbrains/python/parsing/FunctionParsing.java +++ b/python/src/com/jetbrains/python/parsing/FunctionParsing.java @@ -1,11 +1,9 @@ package com.jetbrains.python.parsing; import com.intellij.lang.PsiBuilder; -import com.intellij.openapi.diagnostic.Logger; import com.intellij.psi.tree.IElementType; import com.jetbrains.python.PyElementTypes; import com.jetbrains.python.PyTokenTypes; -import org.jetbrains.annotations.Nullable; import static com.jetbrains.python.PyBundle.message; @@ -13,9 +11,7 @@ import static com.jetbrains.python.PyBundle.message; * @author yole */ public class FunctionParsing extends Parsing { - private static final Logger LOG = Logger.getInstance("#com.jetbrains.python.parsing.FunctionParsing"); private static final IElementType FUNCTION_TYPE = PyElementTypes.FUNCTION_DECLARATION; - private static final IElementType PARAMETER_LIST_TYPE = PyElementTypes.PARAMETER_LIST; public FunctionParsing(ParsingContext context) { super(context); @@ -31,31 +27,16 @@ public class FunctionParsing extends Parsing { return FUNCTION_TYPE; } - @Nullable - protected IElementType getNameType() { - return null; - } - protected void parseFunctionInnards(PsiBuilder.Marker functionMarker) { myBuilder.advanceLexer(); - final IElementType elementType = getNameType(); - final PsiBuilder.Marker mark = myBuilder.mark(); - boolean nameFound = false; if (myBuilder.getTokenType() == PyTokenTypes.IDENTIFIER) { myBuilder.advanceLexer(); - nameFound = true; } else { myBuilder.error(message("PARSE.expected.func.name")); } parseParameterList(); parseReturnTypeAnnotation(); - if (elementType != null && nameFound) { - mark.done(elementType); - } - else { - mark.drop(); - } checkMatches(PyTokenTypes.COLON, message("PARSE.expected.colon")); getStatementParser().parseSuite(functionMarker, getFunctionType(), myContext.emptyParsingScope().withFunction(true)); }