Branch: refs/heads/master Author: Colomban Wendling ban@herbesfolles.org Committer: Colomban Wendling ban@herbesfolles.org Date: Tue, 25 Sep 2012 00:11:58 Commit: dc6e4f272309fa51ad0f2cdccc448adeef4c083d https://github.com/geany/geany/commit/dc6e4f272309fa51ad0f2cdccc448adeef4c08...
Log Message: ----------- JavaScript parser: lowercase "object" isn't a keyword
Closes #3036476.
Modified Paths: -------------- tagmanager/ctags/js.c
Modified: tagmanager/ctags/js.c 6 files changed, 1 insertions(+), 5 deletions(-) =================================================================== @@ -55,7 +55,6 @@ KEYWORD_NONE = -1, KEYWORD_function, KEYWORD_capital_function, - KEYWORD_object, KEYWORD_capital_object, KEYWORD_prototype, KEYWORD_var, @@ -141,7 +140,6 @@ /* 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);
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).