From aa4d6d08fc216128748f29bc6cb776674fd0ef47 Mon Sep 17 00:00:00 2001 From: Alexandre Date: Fri, 22 Dec 2017 03:32:01 +0000 Subject: [PATCH 1/7] modifications for voodooi2c --- cldoc/cmdgir.py | 3 --- cldoc/generators/report.py | 6 ------ cldoc/generators/search.py | 2 +- cldoc/generators/xml.py | 5 ----- cldoc/nodes/cclass.py | 2 +- html/styles/cldoc.css.map | 7 +++++++ 6 files changed, 9 insertions(+), 16 deletions(-) create mode 100644 html/styles/cldoc.css.map diff --git a/cldoc/cmdgir.py b/cldoc/cmdgir.py index d39044c..5baab21 100644 --- a/cldoc/cmdgir.py +++ b/cldoc/cmdgir.py @@ -686,9 +686,6 @@ def parse_signal(self, node): return None def parse_field(self, cursor): - if 'private' in cursor.node.attrib and cursor.node.attrib['private'] == '1': - return None - return nodes.Field(cursor, GirComment(cursor)) def parse_constructor(self, cursor): diff --git a/cldoc/generators/report.py b/cldoc/generators/report.py index b4eb2cc..e0268bf 100644 --- a/cldoc/generators/report.py +++ b/cldoc/generators/report.py @@ -69,9 +69,6 @@ def arguments(self, root): if not isinstance(node, nodes.Function): continue - if node.access == cindex.CXXAccessSpecifier.PRIVATE: - continue - if node.comment is None: continue @@ -138,9 +135,6 @@ def coverage(self, root): for node in self.tree.all_nodes: cname = node.__class__.__name__ - if node.access == cindex.CXXAccessSpecifier.PRIVATE: - continue - if not cname in pertype: pertype[cname] = Report.Coverage(name=cname.lower()) diff --git a/cldoc/generators/search.py b/cldoc/generators/search.py index 07b5485..a53e026 100644 --- a/cldoc/generators/search.py +++ b/cldoc/generators/search.py @@ -25,7 +25,7 @@ def __init__(self, tree): self.db = [] for node in tree.root.descendants(): - if not node._refid is None and node.access != cindex.CXXAccessSpecifier.PRIVATE: + if not node._refid is None: self.make_index(node) def make_index(self, node): diff --git a/cldoc/generators/xml.py b/cldoc/generators/xml.py index faba2b8..1b77613 100644 --- a/cldoc/generators/xml.py +++ b/cldoc/generators/xml.py @@ -501,8 +501,6 @@ def node_to_xml(self, node): self.call_type_specific(node, elem, 'to_xml') for child in node.sorted_children(): - if child.access == cindex.CXXAccessSpecifier.PRIVATE: - continue self.refid(child) @@ -544,9 +542,6 @@ def node_to_xml_ref(self, node): return elem def generate_node(self, node): - # Ignore private stuff - if node.access == cindex.CXXAccessSpecifier.PRIVATE: - return self.refid(node) diff --git a/cldoc/nodes/cclass.py b/cldoc/nodes/cclass.py index b89fda5..578ede6 100644 --- a/cldoc/nodes/cclass.py +++ b/cldoc/nodes/cclass.py @@ -65,7 +65,7 @@ def resolve_nodes(self): yield child for base in self._all_bases(): - if base.node and base.access != cindex.CXXAccessSpecifier.PRIVATE: + if base.node: yield base.node for child in base.node.resolve_nodes: diff --git a/html/styles/cldoc.css.map b/html/styles/cldoc.css.map new file mode 100644 index 0000000..7ff8a31 --- /dev/null +++ b/html/styles/cldoc.css.map @@ -0,0 +1,7 @@ +{ +"version": 3, +"mappings": "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", +"sources": ["../sass/highlight.scss","../sass/theme.scss","../sass/cldoc.scss"], +"names": [], +"file": "cldoc.css" +} From 8c95d9cecafd4304fd9dc3bbf81740cdd5f2e134 Mon Sep 17 00:00:00 2001 From: Alexandre Date: Fri, 22 Dec 2017 05:25:03 +0000 Subject: [PATCH 2/7] add static cursor 603 --- cldoc/clang/cindex.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cldoc/clang/cindex.py b/cldoc/clang/cindex.py index 721575a..33f4599 100644 --- a/cldoc/clang/cindex.py +++ b/cldoc/clang/cindex.py @@ -1158,6 +1158,8 @@ def __repr__(self): # A static_assert or _Static_assert node CursorKind.STATIC_ASSERT = CursorKind(602) +CursorKind.STATIC_ASSERT = CursorKind(603) + # A code completion overload candidate. CursorKind.OVERLOAD_CANDIDATE = CursorKind(700) From d4b0572d0884c12e08ca646210db46feae4ebd13 Mon Sep 17 00:00:00 2001 From: Andrew Somerville Date: Fri, 16 Feb 2018 22:01:42 -0500 Subject: [PATCH 3/7] upgrade to version of pyparsing that works --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 54ca168..af7681f 100644 --- a/setup.py +++ b/setup.py @@ -159,6 +159,6 @@ def run(self): }, package_data={'cldoc': datafiles}, cmdclass=cmdclass, - install_requires=['pyparsing ==1.5.7']) + install_requires=['pyparsing ==2.0.3']) # vi:ts=4:et From 7066c18d8c8e667e5949a60c03a7f5a05466820c Mon Sep 17 00:00:00 2001 From: Andrew Somerville Date: Fri, 16 Feb 2018 22:03:08 -0500 Subject: [PATCH 4/7] update travis settings with a specific ubuntu dist, a recent clang version, and specific node version which is necessay for running tests --- .travis.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index db4305c..9e216e4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,21 @@ +dist: trusty + language: python python: - "2.7" +env: + - NODE_VERSION="6" + before_install: + - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test + - curl https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - + - echo "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-5.0 main" | sudo tee -a /etc/apt/sources.list - sudo apt-get update -qq - - sudo apt-get install -y libclang1-3.4 + - sudo apt-get install -y libclang1-5.0 + - nvm install $NODE_VERSION + - node --version install: - (cd cldoc-static && npm install) From 01df92d66c9ba1fb23b49f850e2880a638c909ce Mon Sep 17 00:00:00 2001 From: Andrew Somerville Date: Fri, 16 Feb 2018 22:04:25 -0500 Subject: [PATCH 5/7] add clang 5.0 to list so that the system uses it to find a libclang.so --- cldoc/tree.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cldoc/tree.py b/cldoc/tree.py index 845f8ba..470d99a 100644 --- a/cldoc/tree.py +++ b/cldoc/tree.py @@ -50,7 +50,7 @@ if not lname is None: cindex.Config.set_library_file(lname) else: - versions = [None, '3.5', '3.4', '3.3', '3.2'] + versions = [None, '3.5', '3.4', '3.3', '3.2', '5.0'] for v in versions: name = 'clang' From 9b7a890aee096eaf929e055224b87e3c9197c3ae Mon Sep 17 00:00:00 2001 From: Andrew Somerville Date: Fri, 16 Feb 2018 22:06:19 -0500 Subject: [PATCH 6/7] add information about information about which file fails the test --- tests/regression.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/regression.py b/tests/regression.py index e185189..9754d3a 100644 --- a/tests/regression.py +++ b/tests/regression.py @@ -62,7 +62,12 @@ def t(self): exp = open(f).read() self.maxDiff = None - self.assertMultiLineEqual(got, exp) + + try: + self.assertMultiLineEqual(got, exp) + except AssertionError as e: + e.args = ("In file: {}: \n".format(f) + e.args[0],) + raise e fs.fs.rmtree(gendir) From ff1bdbba6d31898c1c9c9f248fd7e9751d1ba15e Mon Sep 17 00:00:00 2001 From: Andrew Somerville Date: Fri, 16 Feb 2018 22:06:50 -0500 Subject: [PATCH 7/7] update output for regression tests --- tests/output/abstract-A.html.static | 3 ++- tests/output/base-A.html.static | 3 ++- tests/output/base-Base.html.static | 3 ++- tests/output/class-A.html.static | 3 ++- tests/output/constructor-A.html.static | 3 ++- tests/output/cstruct-A.html.static | 3 ++- tests/output/destructor-A.html.static | 3 ++- tests/output/functionpointer-index.html.static | 2 +- tests/output/interface-A.html.static | 3 ++- tests/output/interface-Impl.html.static | 3 ++- tests/output/method-A.html.static | 3 ++- tests/output/multins-foo.A.html.static | 4 +++- tests/output/multins-foo.B.html.static | 4 +++- tests/output/multins-foo.html.static | 3 ++- tests/output/namespace-A.B.html.static | 3 ++- tests/output/namespace-A.html.static | 3 ++- tests/output/operator-N.A.html.static | 3 ++- tests/output/operator-N.html.static | 3 ++- tests/output/struct-A.html.static | 3 ++- tests/output/template-A.html.static | 3 ++- tests/output/utf8-A.html.static | 3 ++- tests/output/virtual-A.html.static | 3 ++- 22 files changed, 45 insertions(+), 22 deletions(-) diff --git a/tests/output/abstract-A.html.static b/tests/output/abstract-A.html.static index 5454073..5a6134a 100644 --- a/tests/output/abstract-A.html.static +++ b/tests/output/abstract-A.html.static @@ -26,7 +26,8 @@
-

ClassA

+

ClassA +

Member Functions

diff --git a/tests/output/base-A.html.static b/tests/output/base-A.html.static index 5d9c74f..7226205 100644 --- a/tests/output/base-A.html.static +++ b/tests/output/base-A.html.static @@ -30,7 +30,8 @@
-

ClassA

+

ClassA +

The class A.

diff --git a/tests/output/base-Base.html.static b/tests/output/base-Base.html.static index a449a5f..1b185c6 100644 --- a/tests/output/base-Base.html.static +++ b/tests/output/base-Base.html.static @@ -30,7 +30,8 @@
-

ClassBase

+

ClassBase +

Subclasses

diff --git a/tests/output/class-A.html.static b/tests/output/class-A.html.static index ee8b1e6..0ea03e3 100644 --- a/tests/output/class-A.html.static +++ b/tests/output/class-A.html.static @@ -18,7 +18,8 @@
-

ClassA

+

ClassA +

The class A.

diff --git a/tests/output/constructor-A.html.static b/tests/output/constructor-A.html.static index e2597eb..4333b28 100644 --- a/tests/output/constructor-A.html.static +++ b/tests/output/constructor-A.html.static @@ -26,7 +26,8 @@
-

ClassA

+

ClassA +

Constructors

diff --git a/tests/output/cstruct-A.html.static b/tests/output/cstruct-A.html.static index 6351fa2..209b1e2 100644 --- a/tests/output/cstruct-A.html.static +++ b/tests/output/cstruct-A.html.static @@ -30,7 +30,8 @@
-

StructA

+

StructA +

Fields

diff --git a/tests/output/destructor-A.html.static b/tests/output/destructor-A.html.static index 4131e23..3720939 100644 --- a/tests/output/destructor-A.html.static +++ b/tests/output/destructor-A.html.static @@ -26,7 +26,8 @@
-

ClassA

+

ClassA +

Destructors

diff --git a/tests/output/functionpointer-index.html.static b/tests/output/functionpointer-index.html.static index fcb3aa0..df91979 100644 --- a/tests/output/functionpointer-index.html.static +++ b/tests/output/functionpointer-index.html.static @@ -33,7 +33,7 @@
diff --git a/tests/output/interface-A.html.static b/tests/output/interface-A.html.static index d89cf87..1fac84b 100644 --- a/tests/output/interface-A.html.static +++ b/tests/output/interface-A.html.static @@ -30,7 +30,8 @@
-

ClassA

+

ClassA +

The class A.

diff --git a/tests/output/interface-Impl.html.static b/tests/output/interface-Impl.html.static index ed51f21..65bfba4 100644 --- a/tests/output/interface-Impl.html.static +++ b/tests/output/interface-Impl.html.static @@ -30,7 +30,8 @@
-

ClassImpl

+

ClassImpl +

The Impl class.

diff --git a/tests/output/method-A.html.static b/tests/output/method-A.html.static index 98f9dda..4a5ea4d 100644 --- a/tests/output/method-A.html.static +++ b/tests/output/method-A.html.static @@ -26,7 +26,8 @@
-

ClassA

+

ClassA +

Member Functions

diff --git a/tests/output/multins-foo.A.html.static b/tests/output/multins-foo.A.html.static index bcd2003..a865ed3 100644 --- a/tests/output/multins-foo.A.html.static +++ b/tests/output/multins-foo.A.html.static @@ -18,7 +18,9 @@
-

Classfoo::A

+

Classfoo::A +

+
diff --git a/tests/output/multins-foo.B.html.static b/tests/output/multins-foo.B.html.static index 1a5c19b..4085484 100644 --- a/tests/output/multins-foo.B.html.static +++ b/tests/output/multins-foo.B.html.static @@ -18,7 +18,9 @@
-

Classfoo::B

+

Classfoo::B +

+ diff --git a/tests/output/multins-foo.html.static b/tests/output/multins-foo.html.static index 65d8c72..d881d75 100644 --- a/tests/output/multins-foo.html.static +++ b/tests/output/multins-foo.html.static @@ -23,7 +23,8 @@
-

Namespacefoo

+

Namespacefoo +

Classes

int ( *)(int , int) + class="plain">, int)
diff --git a/tests/output/namespace-A.B.html.static b/tests/output/namespace-A.B.html.static index 49a281b..1980a8f 100644 --- a/tests/output/namespace-A.B.html.static +++ b/tests/output/namespace-A.B.html.static @@ -18,7 +18,8 @@
-

ClassA::B

+

ClassA::B +

Class B in namespace A.

diff --git a/tests/output/namespace-A.html.static b/tests/output/namespace-A.html.static index 24f4101..0db33e5 100644 --- a/tests/output/namespace-A.html.static +++ b/tests/output/namespace-A.html.static @@ -42,7 +42,8 @@
-

NamespaceA

+

NamespaceA +

Longer description of namespace A.

diff --git a/tests/output/operator-N.A.html.static b/tests/output/operator-N.A.html.static index 2e24465..12e6ec1 100644 --- a/tests/output/operator-N.A.html.static +++ b/tests/output/operator-N.A.html.static @@ -26,7 +26,8 @@
-

StructN::A

+

StructN::A +

Member Functions

diff --git a/tests/output/operator-N.html.static b/tests/output/operator-N.html.static index c5f38a3..cc5311b 100644 --- a/tests/output/operator-N.html.static +++ b/tests/output/operator-N.html.static @@ -22,7 +22,8 @@
-

NamespaceN

+

NamespaceN +

Structures

diff --git a/tests/output/struct-A.html.static b/tests/output/struct-A.html.static index f92d15f..3be36d1 100644 --- a/tests/output/struct-A.html.static +++ b/tests/output/struct-A.html.static @@ -18,7 +18,8 @@
-

StructA

+

StructA +

A longer description of A.

diff --git a/tests/output/template-A.html.static b/tests/output/template-A.html.static index 0ae8b8a..733f3d4 100644 --- a/tests/output/template-A.html.static +++ b/tests/output/template-A.html.static @@ -34,7 +34,8 @@
-

ClassA<T>

+

ClassA<T> +

A longer description of A.

diff --git a/tests/output/utf8-A.html.static b/tests/output/utf8-A.html.static index 4d20e41..c01d832 100644 --- a/tests/output/utf8-A.html.static +++ b/tests/output/utf8-A.html.static @@ -18,7 +18,8 @@
-

ClassA

+

ClassA +

Copyright ©

diff --git a/tests/output/virtual-A.html.static b/tests/output/virtual-A.html.static index 6cd7860..7db273b 100644 --- a/tests/output/virtual-A.html.static +++ b/tests/output/virtual-A.html.static @@ -26,7 +26,8 @@
-

ClassA

+

ClassA +

Member Functions