Tolerate ../ prefixes in suffix-tree paths. Fix #103. Fix #109.

These occur when `root_for_relative_js_paths` is set inward of the JS code.

sphinx_js/parsers.py

@@ -9,16 +9,17 @@
     # Invalid JS symbol names and wild-and-crazy placement of slashes later in
     # the path (after the FS path is over) will be caught at name-resolution
     # time.
-    # Note that "." is a non-separator char only when used at the very front.
-    path = maybe_cur_dir middle_segments name
+    #
+    # Note that "." is a non-separator char only when used in ./ and ../
+    # prefixes.
+    path = relative_dir* middle_segments name
 
     # A name is a series of non-separator (not ~#/.), non-(, and backslashed
     # characters.
     name = ~r"(?:[^(/#~.\\]|\\.)+"
 
     sep = ~r"[#~/.]"
-    maybe_cur_dir = cur_dir?
-    cur_dir = "./"
+    relative_dir = "./" / "../"
     middle_segments = name_and_sep*
     name_and_sep = name sep
     formal_params = ~r".*"
@@ -40,8 +41,8 @@ def visit_sep(self, node, children):
         return node.text
 
     def visit_path(self, node, children):
-        cur_dir, middle_segments, name = children
-        segments = cur_dir[:]
+        relative_dirs, middle_segments, name = children
+        segments = relative_dirs[:]
         segments.extend(middle_segments)
         segments.append(name)
         return segments
@@ -53,16 +54,21 @@ def visit_name_and_sep(self, node, children):
     def visit_formal_params(self, node, children):
         return node.text
 
-    def visit_maybe_cur_dir(self, node, children):
-        """Return ['./'] or []."""
-        return children
+    def visit_relative_dir(self, node, children):
+        """Return './' or '../'."""
+        return node.text
 
     def visit_cur_dir(self, node, children):
         return node.text
 
     def visit_middle_segments(self, node, children):
         return children
 
+    def generic_visit(self, node, visited_children):
+        """``relative_dir*`` has already turned each item of ``children`` into
+        './' or '../'. Just pass the list of those through."""
+        return visited_children
+
 
 def _backslash_unescape(str):
     """Return a string with backslash escape sequences replaced with their

tests/test_dot_dot_paths/source/code.js

@@ -0,0 +1,5 @@
+/**
+ * Bar function
+ */
+function bar(node) {
+}

tests/test_dot_dot_paths/source/docs/conf.py

@@ -0,0 +1,11 @@
+# -*- coding: utf-8 -*-
+extensions = [
+    'sphinx_js'
+]
+
+# Minimal stuff needed for Sphinx to work:
+source_suffix = '.rst'
+master_doc = 'index'
+author = u'Erik Rose'
+exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
+root_for_relative_js_paths = './'

tests/test_dot_dot_paths/source/docs/index.rst

@@ -0,0 +1 @@
+.. js:autofunction:: bar

tests/test_dot_dot_paths/test_dot_dot_paths.py

@@ -0,0 +1,16 @@
+from tests.testing import SphinxBuildTestCase
+
+
+class Tests(SphinxBuildTestCase):
+    def test_dot_dot(self):
+        """Make sure the build doesn't explode with a parse error on
+        the "../more.bar" path that is constructed when the JSDoc doclets are
+        imbibed.
+
+        Also make sure it render correctly afterward.
+
+        """
+        self._file_contents_eq(
+            'index',
+            'bar(node)\n\n'
+            '   Bar function\n')

tests/test_parsers.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from sphinx_js.parsers import PathVisitor
+from sphinx_js.parsers import PathVisitor, path_and_formal_params
 
 
 def test_escapes():
@@ -8,3 +8,12 @@ def test_escapes():
         [r'd.i:nr/', r'ut\ils.', 'max'],
         '(whatever)',
     ]
+
+
+def test_relative_dirs():
+    """Make sure all sorts of relative-dir prefixes result in proper path
+    segment arrays."""
+    assert PathVisitor().visit(
+        path_and_formal_params['path'].parse('./hi')) == ['./', 'hi']
+    assert PathVisitor().visit(
+        path_and_formal_params['path'].parse('../../hi')) == ['../', '../', 'hi']