Branch: refs/heads/master
Author: Colomban Wendling <ban(a)herbesfolles.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Sat, 19 Mar 2016 22:35:16 UTC
Commit: 801698ddeda2c682bf159a41b22f6475bb1c7a10
https://github.com/geany/geany/commit/801698ddeda2c682bf159a41b22f6475bb1c7…
Log Message:
-----------
Merge pull request #965 from kugel-/gi-fix-structs
gtkdoc: fix gtkdoc header script for structs with inline types
Modified Paths:
--------------
scripts/gen-api-gtkdoc.py
Modified: scripts/gen-api-gtkdoc.py
6 lines changed, 3 insertions(+), 3 deletions(-)
===================================================================
@@ -292,9 +292,9 @@ class DoxyStruct(DoxyElement):
@staticmethod
def from_compounddef(xml, typedefs=[]):
name = xml.find("compoundname").text
- section = xml.find("sectiondef")
d = "struct %s {\n" % name
- for p in section.findall("memberdef"):
+ memberdefs = xml.xpath(".//sectiondef[@kind='public-attrib']/memberdef")
+ for p in memberdefs:
# workaround for struct members. g-ir-scanner can't properly map struct members
# (beginning with struct GeanyFoo) to the typedef and assigns a generic type for them
# thus we fix that up here and enforce usage of the typedef. These are written
@@ -314,7 +314,7 @@ def from_compounddef(xml, typedefs=[]):
d += "};\n"
e = DoxyStruct(name, d)
e.add_brief(xml.find("briefdescription"))
- for p in section.findall("memberdef"):
+ for p in memberdefs:
e.add_member(p)
return e
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Masatake YAMATO <yamato(a)redhat.com>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Mon, 14 Mar 2016 18:49:47 UTC
Commit: e46093d1fcd4209f509314aaeb9ff8ebea1f4651
https://github.com/geany/geany/commit/e46093d1fcd4209f509314aaeb9ff8ebea1f4…
Log Message:
-----------
Ruby: delete rspec related kinds
Close universal-ctags/ctags#453.
(This is about a bug spotted in universal-ctags/ctags#453 by @mislav and
in universal-ctags/ctags#11 by @NewAlexandria.)
Kinds C and d are for Rspec.
Parts of code related to above kinds assume a ruby string
comes after Rspec keywords (describe or context).
This is a wrong assumption. A class name can be used there.
It is nice if ctags can handle these rspec code well, but we
don't have enough resource to make it now.
So in this commit I delete rspec related code temporary. I
just reserve a kind letter 'd' for rspec for the future. 'C'
is completely deleted because (1) describe and context have
the same meaning in rspec, and (2) we would like to assign
'C' for Ruby constant as ripper-tags does.
Signed-off-by: Masatake YAMATO <yamato(a)redhat.com>
Modified Paths:
--------------
tagmanager/ctags/ruby.c
Modified: tagmanager/ctags/ruby.c
21 lines changed, 6 insertions(+), 15 deletions(-)
===================================================================
@@ -27,7 +27,7 @@
* DATA DECLARATIONS
*/
typedef enum {
- K_UNDEFINED = -1, K_CLASS, K_METHOD, K_MODULE, K_SINGLETON, K_DESCRIBE, K_CONTEXT
+ K_UNDEFINED = -1, K_CLASS, K_METHOD, K_MODULE, K_SINGLETON,
} rubyKind;
/*
@@ -38,8 +38,11 @@ static kindOption RubyKinds [] = {
{ TRUE, 'f', "method", "methods" },
{ TRUE, 'm', "namespace", "modules" },
{ TRUE, 'F', "member", "singleton methods" },
- { TRUE, 'd', "describe", "describes" },
- { TRUE, 'C', "context", "contexts" }
+#if 0
+ /* Following two kinds are reserved. */
+ { TRUE, 'd', "describe", "describes and contexts for Rspec" },
+ { TRUE, 'C', "constant", "constants" },
+#endif
};
static NestingLevels* nesting = NULL;
@@ -263,10 +266,6 @@ static rubyKind parseIdentifier (
{
also_ok = "?!=";
}
- else if (kind == K_DESCRIBE || kind == K_CONTEXT)
- {
- also_ok = " ,\".#?!='/-";
- }
else
{
also_ok = "";
@@ -479,14 +478,6 @@ static void findRubyTags (void)
readAndEmitTag (&cp, kind);
}
- else if (canMatchKeyword (&cp, "describe"))
- {
- readAndEmitTag (&cp, K_DESCRIBE);
- }
- else if (canMatchKeyword (&cp, "context"))
- {
- readAndEmitTag (&cp, K_CONTEXT);
- }
while (*cp != '\0')
{
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).