Permalink
Browse files

JavaScript parser: lowercase "object" isn't a keyword

Closes #3036476.
  • Loading branch information...
1 parent b9ca95c commit dc6e4f272309fa51ad0f2cdccc448adeef4c083d @b4n b4n committed Sep 25, 2012
Showing with 1 addition and 5 deletions.
  1. +1 −5 tagmanager/ctags/js.c
View
@@ -55,7 +55,6 @@ typedef enum eKeywordId {
KEYWORD_NONE = -1,
KEYWORD_function,
KEYWORD_capital_function,
- KEYWORD_object,
KEYWORD_capital_object,
KEYWORD_prototype,
KEYWORD_var,
@@ -141,7 +140,6 @@ static const keywordDesc JsKeywordTable [] = {
/* keyword keyword ID */
{ "function", KEYWORD_function },
{ "Function", KEYWORD_capital_function },
- { "object", KEYWORD_object },
{ "Object", KEYWORD_capital_object },
{ "prototype", KEYWORD_prototype },
{ "var", KEYWORD_var },
@@ -1420,11 +1418,9 @@ static boolean parseStatement (tokenInfo *const token, boolean is_inside_class)
readToken (token);
if ( isKeyword (token, KEYWORD_function) ||
isKeyword (token, KEYWORD_capital_function) ||
- isKeyword (token, KEYWORD_object) ||
isKeyword (token, KEYWORD_capital_object) )
{
- if ( isKeyword (token, KEYWORD_object) ||
- isKeyword (token, KEYWORD_capital_object) )
+ if ( isKeyword (token, KEYWORD_capital_object) )
is_class = TRUE;
readToken (token);

0 comments on commit dc6e4f2

Please sign in to comment.