sibling combinators are working now

Author: ba0f3

README.md

@@ -1,7 +1,7 @@
 # q.nim
-Simple package for query HTML/XML elements using a CSS3 or jQuery-like selector syntax for [Nim](http://nim-lang.org).
+Simple package for query HTML/XML elements using a CSS3 or [jQuery](http://jquery.com)-like selector syntax for [Nim](http://nim-lang.org).
 
-This project is under development, just some basic selectors are implemented.
+This project is in alpha stage, some features are not supported yet.
 
 ## Selectors
 - [x] [Type selectors](http://www.w3.org/TR/css3-selectors/#type-selectors)
@@ -11,10 +11,18 @@ This project is under development, just some basic selectors are implemented.
 - [x] [Universal selector](http://www.w3.org/TR/css3-selectors/#universal-selector)
 - [x] [Attribute selectors](http://www.w3.org/TR/css3-selectors/#attribute-selectors)
 - [x] [Child combinator](http://www.w3.org/TR/css3-selectors/#child-combinators)
-- [ ] [Adjacent sibling combinator](http://www.w3.org/TR/css3-selectors/#adjacent-sibling-combinators)
-- [ ] [General sibling combinator](http://www.w3.org/TR/css3-selectors/#general-sibling-combinators)
+- [x] [Adjacent sibling combinator](http://www.w3.org/TR/css3-selectors/#adjacent-sibling-combinators)
+- [x] [General sibling combinator](http://www.w3.org/TR/css3-selectors/#general-sibling-combinators)
 - [ ] [Structural pseudo-classes](http://www.w3.org/TR/css3-selectors/#structural-pseudos)
 
+##Installation
+    $ nimble install q
+
+##Changes
+    0.0.2 - supports sibling combinators and multiple class, attributes selectors
+    0.0.1 - initial release
+
+
 ##Usage
 
 ```nim

q.nim

@@ -136,28 +136,30 @@ proc searchSimple(parents: var seq[XmlNode], selector: Selector) =
 
 proc searchCombined(parent: XmlNode, selectors: seq[Selector], found: var seq[XmlNode]) =
   var starts: seq[int] = @[0]
-  var matches: seq[int] = @[]
+  var matches: seq[int]
 
-  for i in 0..selectors.len-1: # matching selector by selector
+  # matching selector by selector
+  for i in 0..selectors.len-1:
     var selector = selectors[i]
+    matches = @[]
+
     for j in starts:
       for k in j..parent.len-1:
         var child = parent[k]
         if child.kind != xnElement:
           continue
-        echo i, ", ", j, ", ", k
 
         if match(child, selector):
           if i < selectors.len-1:
             # save current index for next search
-            matches.add(k)
+            # next selector will only search for nodes followed by this node
+            matches.add(k+1)
           else:
             # no more selector, return matches
             if not found.contains(child):
               found.add(child)
           if selector.combinator == '+':
             break
-
     starts = matches
 
 proc searchCombined(parents: var seq[XmlNode], selectors: seq[Selector]) =
@@ -178,8 +180,6 @@ proc parseSelector(token: string): Selector =
       if matches[i].isNil:
         continue
 
-      #echo matches[i]
-
       let ch = matches[i][0]
       case ch:
       of '#':
@@ -197,7 +197,6 @@ proc parseSelector(token: string): Selector =
     discard
 
 proc select*(q: QueryContext, s: string = ""): seq[XmlNode] =
-  echo "Selectors: ", s
   result = q.root
 
   if s.isNil or s == "":
@@ -237,10 +236,8 @@ proc select*(q: QueryContext, s: string = ""): seq[XmlNode] =
 
       nextToken = tokens[pos+i+1]
       i += 2
-      echo "nextCombinator ", nextCombinator, " nextSelector ", nextToken
 
       var tmp = parseSelector(nextToken)
-
       tmp.combinator = nextCombinator[0]
       selectors.add(tmp)
 

tests/test.html

@@ -24,8 +24,10 @@
     </ul>
     <a href="#">Link 100</a>
     <div class="col-2"></div>
+    <a href="#">Link 104</a>
     <div class="col-3"></div>
     <a href="#">Link 101</a>
+    <a href="#">Link 102</a>
   </nav>
   <form class="form-horizontal">
     <div class="form-group">

tests/test.nim

@@ -1,18 +1,19 @@
-import q
+import "../q"
 import xmltree
 
 var d = q(path="test.html")
-#echo d.select("head *")
-#echo d.select("ul li a")
-#echo d.select("ul.menu > li a")
-#echo d.select("ul.menu > li > a")
-#echo d.select("ul.menu.and > li > a")
-#echo d.select("#link1")
-#echo d.select("input[type]")
-#echo d.select("input[type=password]")
-#echo d.select("input[type='password']")
-#echo d.select("input[type=\"password\"]")
-#echo d.select("input[type^=pa]")
-#echo d.select("input[type$=ord]")
-#echo d.select("input[type*=ss]")
+
+echo d.select("head *")
+echo d.select("ul li a")
+echo d.select("ul.menu > li a")
+echo d.select("ul.menu > li > a")
+echo d.select("ul.menu.and > li > a")
+echo d.select("#link1")
+echo d.select("input[type]")
+echo d.select("input[type=password]")
+echo d.select("input[type='password']")
+echo d.select("input[type=\"password\"]")
+echo d.select("input[type^=pa]")
+echo d.select("input[type$=ord]")
+echo d.select("input[type*=ss]")
 echo d.select("nav ul.menu ~ div + a")