Travis test fixes

.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)

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)
 

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):

cldoc/generators/report.py

@@ -69,8 +69,6 @@ def arguments(self, root):
             if not isinstance(node, nodes.Function):
                 continue
 
-            if node.access == cindex.AccessSpecifier.PRIVATE:
-                continue
 
             if node.comment is None:
                 continue
@@ -138,8 +136,6 @@ def coverage(self, root):
         for node in self.tree.all_nodes:
             cname = node.__class__.__name__
 
-            if node.access == cindex.AccessSpecifier.PRIVATE:
-                continue
 
             if not cname in pertype:
                 pertype[cname] = Report.Coverage(name=cname.lower())

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.AccessSpecifier.PRIVATE:
+            if not node._refid is None:
                 self.make_index(node)
 
     def make_index(self, node):

cldoc/generators/xml.py

@@ -501,9 +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.AccessSpecifier.PRIVATE:
-                continue
-
             self.refid(child)
 
             if self.is_page(child):
@@ -544,10 +541,6 @@ def node_to_xml_ref(self, node):
         return elem
 
     def generate_node(self, node):
-        # Ignore private stuff
-        if node.access == cindex.AccessSpecifier.PRIVATE:
-            return
-
         self.refid(node)
 
         if self.is_page(node):

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.AccessSpecifier.PRIVATE:
+            if base.node:
                 yield base.node
 
                 for child in base.node.resolve_nodes:

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'

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

tests/output/abstract-A.html.static

@@ -26,7 +26,8 @@
         </div>
     </div>
     <div id="cldoc_content">
-        <h1 id="A"><span><span class="keyword">Class</span><span>A</span></span></h1>
+        <h1 id="A"><span><span class="keyword">Class</span><span>A</span></span>
+        </h1>
         <h2 data-cldoc-dynamic="1" id="member functions">Member Functions</h2>
         <div class="member_functions">
             <div class="function">

tests/output/base-A.html.static

@@ -30,7 +30,8 @@
         </div>
     </div>
     <div id="cldoc_content">
-        <h1 id="A"><span><span class="keyword">Class</span><span>A</span></span></h1>
+        <h1 id="A"><span><span class="keyword">Class</span><span>A</span></span>
+        </h1>
         <div class="description">
             <div class="doc">
                 <p>The class A.</p>

tests/output/base-Base.html.static

@@ -30,7 +30,8 @@
         </div>
     </div>
     <div id="cldoc_content">
-        <h1 id="Base"><span><span class="keyword">Class</span><span>Base</span></span></h1>
+        <h1 id="Base"><span><span class="keyword">Class</span><span>Base</span></span>
+        </h1>
         <h2 data-cldoc-dynamic="1" id="subclasses">Subclasses</h2>
         <table class="subclasses">
             <tbody>

tests/output/class-A.html.static

@@ -18,7 +18,8 @@
         </div>
     </div>
     <div id="cldoc_content">
-        <h1 id="A"><span><span class="keyword">Class</span><span>A</span></span></h1>
+        <h1 id="A"><span><span class="keyword">Class</span><span>A</span></span>
+        </h1>
         <div class="description">
             <div class="doc">
                 <p>The class A.</p>

tests/output/constructor-A.html.static

@@ -26,7 +26,8 @@
         </div>
     </div>
     <div id="cldoc_content">
-        <h1 id="A"><span><span class="keyword">Class</span><span>A</span></span></h1>
+        <h1 id="A"><span><span class="keyword">Class</span><span>A</span></span>
+        </h1>
         <h2 data-cldoc-dynamic="1" id="constructors">Constructors</h2>
         <div class="constructors">
             <div class="function">

tests/output/cstruct-A.html.static

@@ -30,7 +30,8 @@
         </div>
     </div>
     <div id="cldoc_content">
-        <h1 id="A"><span><span class="keyword">Struct</span><span>A</span></span></h1>
+        <h1 id="A"><span><span class="keyword">Struct</span><span>A</span></span>
+        </h1>
         <h2 data-cldoc-dynamic="1" id="fields">Fields</h2>
         <table class="fields">
             <tbody>

tests/output/destructor-A.html.static

@@ -26,7 +26,8 @@
         </div>
     </div>
     <div id="cldoc_content">
-        <h1 id="A"><span><span class="keyword">Class</span><span>A</span></span></h1>
+        <h1 id="A"><span><span class="keyword">Class</span><span>A</span></span>
+        </h1>
         <h2 data-cldoc-dynamic="1" id="destructors">Destructors</h2>
         <div class="destructors">
             <div class="function">

tests/output/functionpointer-index.html.static

@@ -33,7 +33,7 @@
                                 <td class="argument_type"><span class="type"><span class="function-type"><span class="sub-type"><span class="sub-type"><span class="name builtin">int</span></span>
                                     </span><span class="function-qualified"><span class="plain">(</span><span class="qualifier"> *</span><span class="plain">)</span></span><span class="function-arguments"><span class="plain">(</span><span class="sub-type"><span class="name builtin">int</span></span>
                                     <span
-                                    class="plain">, </span><span class="sub-type"><span class="name builtin">int</span></span><span class="plain">)</span></span>
+                                        class="plain">, </span><span class="sub-type"><span class="name builtin">int</span></span><span class="plain">)</span></span>
                                         </span>
                                         </span>
                                 </td>

tests/output/interface-A.html.static

@@ -30,7 +30,8 @@
         </div>
     </div>
     <div id="cldoc_content">
-        <h1 id="A"><span><span class="keyword">Class</span><span>A</span></span></h1>
+        <h1 id="A"><span><span class="keyword">Class</span><span>A</span></span>
+        </h1>
         <div class="description">
             <div class="doc">
                 <p>The class A.</p>

tests/output/interface-Impl.html.static

@@ -30,7 +30,8 @@
         </div>
     </div>
     <div id="cldoc_content">
-        <h1 id="Impl"><span><span class="keyword">Class</span><span>Impl</span></span></h1>
+        <h1 id="Impl"><span><span class="keyword">Class</span><span>Impl</span></span>
+        </h1>
         <div class="description">
             <div class="doc">
                 <p>The Impl class.</p>

tests/output/method-A.html.static

@@ -26,7 +26,8 @@
         </div>
     </div>
     <div id="cldoc_content">
-        <h1 id="A"><span><span class="keyword">Class</span><span>A</span></span></h1>
+        <h1 id="A"><span><span class="keyword">Class</span><span>A</span></span>
+        </h1>
         <h2 data-cldoc-dynamic="1" id="member functions">Member Functions</h2>
         <div class="member_functions">
             <div class="function">

tests/output/multins-foo.A.html.static

@@ -18,7 +18,9 @@
         </div>
     </div>
     <div id="cldoc_content">
-        <h1 id="foo::A"><span><span class="keyword">Class</span><span>foo::A</span></span></h1></div>
+        <h1 id="foo::A"><span><span class="keyword">Class</span><span>foo::A</span></span>
+        </h1>
+    </div>
 
 </body>
 

tests/output/multins-foo.B.html.static

@@ -18,7 +18,9 @@
         </div>
     </div>
     <div id="cldoc_content">
-        <h1 id="foo::B"><span><span class="keyword">Class</span><span>foo::B</span></span></h1></div>
+        <h1 id="foo::B"><span><span class="keyword">Class</span><span>foo::B</span></span>
+        </h1>
+    </div>
 
 </body>
 

tests/output/multins-foo.html.static

@@ -23,7 +23,8 @@
         </div>
     </div>
     <div id="cldoc_content">
-        <h1 id="foo"><span><span class="keyword">Namespace</span><span>foo</span></span></h1>
+        <h1 id="foo"><span><span class="keyword">Namespace</span><span>foo</span></span>
+        </h1>
         <h2 data-cldoc-dynamic="1" id="classes">Classes</h2>
         <table class="classes">
             <tbody>

tests/output/namespace-A.B.html.static

@@ -18,7 +18,8 @@
         </div>
     </div>
     <div id="cldoc_content">
-        <h1 id="A::B"><span><span class="keyword">Class</span><span>A::B</span></span></h1>
+        <h1 id="A::B"><span><span class="keyword">Class</span><span>A::B</span></span>
+        </h1>
         <div class="description">
             <div class="doc">
                 <p>Class B in namespace A.</p>

tests/output/namespace-A.html.static

@@ -42,7 +42,8 @@
         </div>
     </div>
     <div id="cldoc_content">
-        <h1 id="A"><span><span class="keyword">Namespace</span><span>A</span></span></h1>
+        <h1 id="A"><span><span class="keyword">Namespace</span><span>A</span></span>
+        </h1>
         <div class="description">
             <div class="doc">
                 <p>Longer description of namespace A.</p>

tests/output/operator-N.A.html.static

@@ -26,7 +26,8 @@
         </div>
     </div>
     <div id="cldoc_content">
-        <h1 id="N::A"><span><span class="keyword">Struct</span><span>N::A</span></span></h1>
+        <h1 id="N::A"><span><span class="keyword">Struct</span><span>N::A</span></span>
+        </h1>
         <h2 data-cldoc-dynamic="1" id="member functions">Member Functions</h2>
         <div class="member_functions">
             <div class="function">

tests/output/operator-N.html.static

@@ -22,7 +22,8 @@
         </div>
     </div>
     <div id="cldoc_content">
-        <h1 id="N"><span><span class="keyword">Namespace</span><span>N</span></span></h1>
+        <h1 id="N"><span><span class="keyword">Namespace</span><span>N</span></span>
+        </h1>
         <h2 data-cldoc-dynamic="1" id="structures">Structures</h2>
         <table class="structures">
             <tbody>