Commits November 2014

commits@lists.geany.org

1 participants
90 discussions

[geany/geany] 7e6215: javascript: Fix handling some class-related unterminated statements
by Colomban Wendling 24 Nov '14

24 Nov '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 24 Nov 2014 01:43:29 UTC Commit: 7e6215661e64475a891921848149bd12a57c8a65 https://github.com/geany/geany/commit/7e6215661e64475a891921848149bd12a57c8… Log Message: ----------- javascript: Fix handling some class-related unterminated statements Modified Paths: -------------- tagmanager/ctags/js.c tests/ctags/Makefile.am tests/ctags/js-class-related-unterminated.js tests/ctags/js-class-related-unterminated.js.tags Modified: tagmanager/ctags/js.c 11 lines changed, 7 insertions(+), 4 deletions(-) =================================================================== @@ -967,7 +967,7 @@ static boolean parseBlock (tokenInfo *const token, tokenInfo *const orig_parent) * Ignore the remainder of the line * findCmdTerm(token); */ - parseLine (token, is_class); + read_next_token = parseLine (token, is_class); vStringCopy(token->scope, saveScope); } @@ -979,7 +979,7 @@ static boolean parseBlock (tokenInfo *const token, tokenInfo *const orig_parent) */ vStringCopy(saveScope, token->scope); addToScope (token, parent->string); - parseLine (token, is_class); + read_next_token = parseLine (token, is_class); vStringCopy(token->scope, saveScope); } else if (isKeyword (token, KEYWORD_function)) @@ -1287,9 +1287,12 @@ static boolean parseStatement (tokenInfo *const token, boolean is_inside_class) } if ( isType (method_body_token, TOKEN_OPEN_CURLY)) + { parseBlock (method_body_token, token); - - is_terminated = TRUE; + is_terminated = TRUE; + } + else + is_terminated = isType (method_body_token, TOKEN_SEMICOLON); goto cleanUp; } } Modified: tests/ctags/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -159,6 +159,7 @@ test_sources = \ intro.tex \ invalid_name.f90 \ java_enum.java \ + js-class-related-unterminated.js \ js-scope.js \ js-unknown-construct-nesting.js \ jsFunc_tutorial.js \ Modified: tests/ctags/js-class-related-unterminated.js 50 lines changed, 50 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,50 @@ + +var Cls = { + // add a member just so Cls is recognized as a class from the start + A: {} +} + +Cls.B = function(a, b) { + this.a = a; + this.b = b; +} + +Cls.B.Sub = function() { + this.a = 0 +} + +Cls.B.prototype.m1 = function(a) { + this.a = a; + if (a > 2) { + this.a *= 2 + } +} +Cls.B.prototype.m2 = function(b) { + var a = b +} +Cls.B.prototype.m3 = function(c) { + this.c = c +} +Cls.B.prototype.m4 = function(d) { + this.d = d +} +Cls.B.prototype.m5 = function(e) { + /* this should rather be written `Cls.B.Sub.prototype.dyn1 = this.m6`, but + * then parser then thinks it's a child of this very scope. it isn't really + * possible to fix this as the only reason it's actually not a child of the + * current scope is because it exists in the root scope but not in this one */ + var Sub = Cls.B.Sub; + Sub.prototype.dyn1 = this.m4 +} +Cls.B.prototype.m6 = function(f) { +} + +function main() { + var c = new Cls.B(1, 2); + var d = new Cls.B.Sub(); + print(d.dyn1); + c.m5(); + print(d.dyn1); +} + +main(); Modified: tests/ctags/js-class-related-unterminated.js.tags 13 lines changed, 13 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,13 @@ +# format=tagmanager +A�64�Cls�0 +B�1�Cls�0 +Cls�1�0 +Sub�1�Cls.B�0 +dyn1�128�Cls.B.Sub�0 +m1�128�Cls.B�0 +m2�128�Cls.B�0 +m3�128�Cls.B�0 +m4�128�Cls.B�0 +m5�128�Cls.B�0 +m6�128�Cls.B�0 +main�16�0 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 5a1a22: javascript: Properly handle nested unknown blocks
by Colomban Wendling 24 Nov '14

24 Nov '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 24 Nov 2014 01:41:57 UTC Commit: 5a1a22d9306fdf0e4352127b12cafd8555ea55b8 https://github.com/geany/geany/commit/5a1a22d9306fdf0e4352127b12cafd8555ea5… Log Message: ----------- javascript: Properly handle nested unknown blocks Properly match open curly braces when parsing a statement not to possibly get fooled by unexpected nested blocks, e.g. after a `switch`'s `case` or a label. This mostly reverts c54c3ad5e815d16e3b48f3c477465627808aadee and replaces it with a more correct and complete solution. Modified Paths: -------------- tagmanager/ctags/js.c tests/ctags/Makefile.am tests/ctags/js-unknown-construct-nesting.js tests/ctags/js-unknown-construct-nesting.js.tags Modified: tagmanager/ctags/js.c 40 lines changed, 11 insertions(+), 29 deletions(-) =================================================================== @@ -169,7 +169,7 @@ static const keywordDesc JsKeywordTable [] = { /* Recursive functions */ static void parseFunction (tokenInfo *const token); -static boolean parseBlock (tokenInfo *const token, tokenInfo *const parent); +static boolean parseBlock (tokenInfo *const token, tokenInfo *const orig_parent); static boolean parseLine (tokenInfo *const token, boolean is_inside_class); static void parseUI5 (tokenInfo *const token); @@ -674,31 +674,6 @@ static void findCmdTerm (tokenInfo *const token) } } -static void findMatchingToken (tokenInfo *const token, tokenType begin_token, tokenType end_token) -{ - int nest_level = 0; - - if ( ! isType (token, end_token)) - { - nest_level++; - while (! (isType (token, end_token) && (nest_level == 0))) - { - readToken (token); - if (isType (token, begin_token)) - { - nest_level++; - } - if (isType (token, end_token)) - { - if (nest_level > 0) - { - nest_level--; - } - } - } - } -} - static void parseSwitch (tokenInfo *const token) { /* @@ -726,9 +701,8 @@ static void parseSwitch (tokenInfo *const token) if (isType (token, TOKEN_OPEN_CURLY)) { - findMatchingToken (token, TOKEN_OPEN_CURLY, TOKEN_CLOSE_CURLY); + parseBlock (token, token); } - } static boolean parseLoop (tokenInfo *const token) @@ -951,11 +925,15 @@ static void parseFunction (tokenInfo *const token) deleteToken (name); } -static boolean parseBlock (tokenInfo *const token, tokenInfo *const parent) +static boolean parseBlock (tokenInfo *const token, tokenInfo *const orig_parent) { boolean is_class = FALSE; boolean read_next_token = TRUE; vString * saveScope = vStringNew (); + tokenInfo *const parent = newToken (); + + /* backup the parent token to allow calls like parseBlock(token, token) */ + copyToken (parent, orig_parent); token->nestLevel++; /* @@ -1041,6 +1019,7 @@ static boolean parseBlock (tokenInfo *const token, tokenInfo *const parent) } while (! isType (token, TOKEN_CLOSE_CURLY) && read_next_token ); } + deleteToken (parent); vStringDelete(saveScope); token->nestLevel--; @@ -1228,6 +1207,9 @@ static boolean parseStatement (tokenInfo *const token, boolean is_inside_class) ! isType (token, TOKEN_SEMICOLON) && ! isType (token, TOKEN_EQUAL_SIGN) ) { + if (isType (token, TOKEN_OPEN_CURLY)) + parseBlock (token, token); + /* Potentially the name of the function */ readToken (token); if (isType (token, TOKEN_PERIOD)) Modified: tests/ctags/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -160,6 +160,7 @@ test_sources = \ invalid_name.f90 \ java_enum.java \ js-scope.js \ + js-unknown-construct-nesting.js \ jsFunc_tutorial.js \ keyword_abstract.cs \ keyword_catch_try.cs \ Modified: tests/ctags/js-unknown-construct-nesting.js 23 lines changed, 23 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,23 @@ + +var o = { + aa: function () { + foo: { + return ; + } + }, + + bb: function (a) { + switch (a) { + case 1: + if (1) { + return 32 + } + break; + case 2: + return 31; + } + return 1; + }, + + cc: function() {} +}; Modified: tests/ctags/js-unknown-construct-nesting.js.tags 5 lines changed, 5 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,5 @@ +# format=tagmanager +aa�128�o�0 +bb�128�o�0 +cc�128�o�0 +o�1�0 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] f158f5: javascript: Fix scope after some constructs
by Colomban Wendling 24 Nov '14

24 Nov '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 24 Nov 2014 01:41:17 UTC Commit: f158f5d362404a3bec09c8841537e981ade5de2f https://github.com/geany/geany/commit/f158f5d362404a3bec09c8841537e981ade5d… Log Message: ----------- javascript: Fix scope after some constructs Modified Paths: -------------- tagmanager/ctags/js.c tests/ctags/Makefile.am tests/ctags/js-scope.js tests/ctags/js-scope.js.tags tests/ctags/ui5.controller.js.tags Modified: tagmanager/ctags/js.c 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -1243,7 +1243,6 @@ static boolean parseStatement (tokenInfo *const token, boolean is_inside_class) { if ( is_class ) { - vStringCopy(saveScope, token->scope); addToScope(token, name->string); } else Modified: tests/ctags/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -159,6 +159,7 @@ test_sources = \ intro.tex \ invalid_name.f90 \ java_enum.java \ + js-scope.js \ jsFunc_tutorial.js \ keyword_abstract.cs \ keyword_catch_try.cs \ Modified: tests/ctags/js-scope.js 18 lines changed, 18 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,18 @@ + +function A() { + this.a = 1; +} + +A.prototype = { + m1 : function() { + this.a = 2; + + foo.bar.baz.hello(1); + foo.bar.baz.hello(2); + foo.bar.baz.hello(3); + }, + + m2: function() { + return this.a; + }, +}; Modified: tests/ctags/js-scope.js.tags 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,4 @@ +# format=tagmanager +A�1�0 +m1�128�A�0 +m2�128�A�0 Modified: tests/ctags/ui5.controller.js.tags 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -1,6 +1,6 @@ # format=tagmanager onInit�128�app.my_form�0 -refreshForm�128�sap.app.my_form�0 -refreshSettlements�128�sap.app.my_form�0 -setRefreshed�128�sap.app.my_form�0 +refreshForm�128�app.my_form�0 +refreshSettlements�128�app.my_form�0 +setRefreshed�128�app.my_form�0 successfulRequest�128�app.my_form�0 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] f886f7: Javascript parser: Removed warning of unused variable is_inside_class and cleanUp
by dfishburn 24 Nov '14

24 Nov '14

1 0

[geany/geany] c54c3a: Added new method findMatchingToken() to skip over blocks of code. Updated parseSwitch() to use the new method.
by dfishburn 24 Nov '14

24 Nov '14

1 0

[geany/geany] 52d2d7: Udated jscript to be able to parse SAPUI5 controller and view files.
by dfishburn 24 Nov '14

24 Nov '14

Branch: refs/heads/master Author: dfishburn <dfishburn@c5d04d22-be80-434c-894e-aa346cc9e8e8> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 24 Nov 2014 00:39:36 UTC Commit: 52d2d735272b2d9298aedbf202ed1853b840ada9 https://github.com/geany/geany/commit/52d2d735272b2d9298aedbf202ed1853b840a… Log Message: ----------- Udated jscript to be able to parse SAPUI5 controller and view files. Added test case tests/ctags/ui5.controller.js git-svn-id: https://svn.code.sf.net/p/ctags/code/trunk@808 c5d04d22-be80-434c-894e-aa346cc9e8e8 Modified Paths: -------------- tagmanager/ctags/js.c tests/ctags/Makefile.am tests/ctags/ui5.controller.js tests/ctags/ui5.controller.js.tags Modified: tagmanager/ctags/js.c 55 lines changed, 55 insertions(+), 0 deletions(-) =================================================================== @@ -69,6 +69,7 @@ typedef enum eKeywordId { KEYWORD_try, KEYWORD_catch, KEYWORD_finally, + KEYWORD_sap, KEYWORD_return } keywordId; @@ -158,6 +159,7 @@ static const keywordDesc JsKeywordTable [] = { { "try", KEYWORD_try }, { "catch", KEYWORD_catch }, { "finally", KEYWORD_finally }, + { "sap", KEYWORD_sap }, { "return", KEYWORD_return } }; @@ -169,6 +171,7 @@ static const keywordDesc JsKeywordTable [] = { static void parseFunction (tokenInfo *const token); static boolean parseBlock (tokenInfo *const token, tokenInfo *const parent); static boolean parseLine (tokenInfo *const token, boolean is_inside_class); +static void parseUI5 (tokenInfo *const token); static boolean isIdentChar (const int c) { @@ -1629,6 +1632,56 @@ static boolean parseStatement (tokenInfo *const token, boolean is_inside_class) return is_terminated; } +static void parseUI5 (tokenInfo *const token) +{ + tokenInfo *const name = newToken (); + boolean is_inside_class = FALSE; + /* + * SAPUI5 is built on top of jQuery. + * It follows a standard format: + * sap.ui.controller("id.of.controller", { + * method_name : function... { + * }, + * + * method_name : function ... { + * } + * } + * + * Handle the parsing of the initial controller (and the + * same for "view") and then allow the methods to be + * parsed as usual. + */ + + readToken (token); + + if (isType (token, TOKEN_PERIOD)) + { + readToken (token); + while (! isType (token, TOKEN_OPEN_PAREN) ) + { + readToken (token); + } + readToken (token); + + if (isType (token, TOKEN_STRING)) + { + copyToken(name, token); + readToken (token); + } + + if (isType (token, TOKEN_COMMA)) + readToken (token); + + do + { + parseMethods (token, name); + } while (! isType (token, TOKEN_CLOSE_CURLY) ); + } +cleanUp: + deleteToken (name); + +} + static boolean parseLine (tokenInfo *const token, boolean is_inside_class) { boolean is_terminated = TRUE; @@ -1691,6 +1744,8 @@ static void parseJsFile (tokenInfo *const token) if (isType (token, TOKEN_KEYWORD) && token->keyword == KEYWORD_function) parseFunction (token); + else if (isType (token, TOKEN_KEYWORD) && token->keyword == KEYWORD_sap) + parseUI5 (token); else parseLine (token, FALSE); } while (TRUE); Modified: tests/ctags/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -258,6 +258,7 @@ test_sources = \ test_input2.rs \ traffic_signal.v \ traits.php \ + ui5.controller.js \ union.f \ value.f \ whitespaces.php \ Modified: tests/ctags/ui5.controller.js 23 lines changed, 23 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,23 @@ +sap.ui.controller("app.my_form", { + + onInit : function () { + this.selectListView = null; + sap.ui.getCore().byId("id_createButton").setEnabled(true); + }, + + refreshForm : function (AUFNR) { + if (AUFNR && AUFNR !== '') { + this.objId = this.oView.sId; + } + return; + }, + + refreshSettlements : function (AUFNR) { + }, + + setRefreshed : function (value) { + this.refreshed = value; + }, +}); + + Modified: tests/ctags/ui5.controller.js.tags 5 lines changed, 5 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,5 @@ +# format=tagmanager +onInit�128�app.my_form�0 +refreshForm�128�sap.app.my_form�0 +refreshSettlements�128�sap.app.my_form�0 +setRefreshed�128�sap.app.my_form�0 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 846335: Update of Japanese translation
by Frank Lanitz 18 Nov '14

18 Nov '14

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Tue, 18 Nov 2014 16:28:28 UTC Commit: 846335b3f03c4d522a6e5ff99c08645c2faf9c7e https://github.com/geany/geany/commit/846335b3f03c4d522a6e5ff99c08645c2faf9… Log Message: ----------- Update of Japanese translation Modified Paths: -------------- po/ja.po Modified: po/ja.po 2897 lines changed, 1469 insertions(+), 1428 deletions(-) =================================================================== No diff available, check online -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 50cbe6: Merge pull request #382 from cousteaulecommandant/patch-3
by Frank Lanitz 18 Nov '14

18 Nov '14

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Tue, 18 Nov 2014 13:54:37 UTC Commit: 50cbe660fa91fa10ac72229a945269368b3261eb https://github.com/geany/geany/commit/50cbe660fa91fa10ac72229a945269368b326… Log Message: ----------- Merge pull request #382 from cousteaulecommandant/patch-3 Update es.po Modified Paths: -------------- po/es.po Modified: po/es.po 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -5813,15 +5813,15 @@ msgstr "_Dividir ventana" #: ../plugins/splitwindow.c:408 msgid "_Side by Side" -msgstr "_Horizontal" +msgstr "_Izquierda y derecha" #: ../plugins/splitwindow.c:413 msgid "_Top and Bottom" -msgstr "_Vertical" +msgstr "_Arriba y abajo" #: ../plugins/splitwindow.c:429 msgid "Side by Side" -msgstr "Yuxtapuestos" +msgstr "Izquierda y derecha" #: ../plugins/splitwindow.c:431 msgid "Top and Bottom" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 58e01b: Update es.po
by cousteaulecommandant 18 Nov '14

18 Nov '14

Branch: refs/heads/master Author: cousteaulecommandant <cousteaulecommandant(a)users.noreply.github.com> Committer: cousteaulecommandant <cousteaulecommandant(a)users.noreply.github.com> Date: Tue, 18 Nov 2014 12:12:11 UTC Commit: 58e01b2d248706fc22939cbed22a22d9c8c0d60d https://github.com/geany/geany/commit/58e01b2d248706fc22939cbed22a22d9c8c0d… Log Message: ----------- Update es.po Use same text in Split Window menu as in Keybindings dialog. Also, translate "Side by side" as "Izquierda y derecha" ("left and right") rather than "Yuxtapuestos" ("juxtaposed") which is a rather weird (and inaccurate) word. Modified Paths: -------------- po/es.po Modified: po/es.po 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -5813,15 +5813,15 @@ msgstr "_Dividir ventana" #: ../plugins/splitwindow.c:408 msgid "_Side by Side" -msgstr "_Horizontal" +msgstr "_Izquierda y derecha" #: ../plugins/splitwindow.c:413 msgid "_Top and Bottom" -msgstr "_Vertical" +msgstr "_Arriba y abajo" #: ../plugins/splitwindow.c:429 msgid "Side by Side" -msgstr "Yuxtapuestos" +msgstr "Izquierda y derecha" #: ../plugins/splitwindow.c:431 msgid "Top and Bottom" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 299f62: Autotools: Fix checking for Git revision
by Colomban Wendling 11 Nov '14

11 Nov '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 11 Nov 2014 18:01:58 UTC Commit: 299f624f65cc5c5a1ee4be6f38053a2f7ebc2a4b https://github.com/geany/geany/commit/299f624f65cc5c5a1ee4be6f38053a2f7ebc2… Log Message: ----------- Autotools: Fix checking for Git revision Fix check when building out of tree, and properly handle errors. Modified Paths: -------------- m4/geany-revision.m4 Modified: m4/geany-revision.m4 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -9,8 +9,8 @@ AC_DEFUN([GEANY_CHECK_REVISION], AC_MSG_CHECKING([for Git revision]) # try Git first GIT=`which git 2>/dev/null` - if test -d ".git" -a "x${GIT}" != "x" -a -x "${GIT}"; then - REVISION=`git rev-parse --short --revs-only HEAD || 0` + if test -d "$srcdir/.git" -a "x${GIT}" != "x" -a -x "${GIT}"; then + REVISION=`cd "$srcdir"; "${GIT}" rev-parse --short --revs-only HEAD 2>/dev/null || echo 0` fi if test "x${REVISION}" != "x0"; then -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits November 2014