Added Unicode and emoji support

go.mod

@@ -0,0 +1,5 @@
+module github.com/gjvnq/xpath
+
+go 1.12
+
+require github.com/antchfx/xpath v0.0.0-20190319080838-ce1d48779e67

go.sum

@@ -0,0 +1,2 @@
+github.com/antchfx/xpath v0.0.0-20190319080838-ce1d48779e67 h1:uj4UuiIs53RhHSySIupR1TEIouckjSfnljF3QbN1yh0=
+github.com/antchfx/xpath v0.0.0-20190319080838-ce1d48779e67/go.mod h1:Yee4kTMuNiPYJ7nSNorELQMr1J33uOpXDMByNYhvtNk=

parse.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"strconv"
 	"unicode"
+	"unicode/utf8"
 )
 
 // A XPath expression token type.
@@ -329,6 +330,7 @@ func (p *parser) parsePathExpr(n node) node {
 		}
 	} else {
 		opnd = p.parseLocationPath(nil)
+
 	}
 	return opnd
 }
@@ -363,6 +365,7 @@ func (p *parser) parseLocationPath(n node) (opnd node) {
 		p.next()
 		opnd = newRootNode("//")
 		opnd = p.parseRelativeLocationPath(newAxisNode("descendant-or-self", "", "", "", opnd))
+
 	default:
 		opnd = p.parseRelativeLocationPath(n)
 	}
@@ -649,8 +652,9 @@ func (s *scanner) nextChar() bool {
 		s.curr = rune(0)
 		return false
 	}
-	s.curr = rune(s.text[s.pos])
-	s.pos++
+	size := 0
+	s.curr, size = utf8.DecodeRuneInString(s.text[s.pos:])
+	s.pos += size
 	return true
 }
 
@@ -770,7 +774,7 @@ func (s *scanner) scanFraction() float64 {
 	)
 	for isDigit(s.curr) {
 		s.nextChar()
-		c++
+		c += utf8.RuneLen(s.curr)
 	}
 	v, err := strconv.ParseFloat(s.text[i:i+c], 64)
 	if err != nil {
@@ -786,14 +790,14 @@ func (s *scanner) scanNumber() float64 {
 	)
 	for isDigit(s.curr) {
 		s.nextChar()
-		c++
+		c += utf8.RuneLen(s.curr)
 	}
 	if s.curr == '.' {
 		s.nextChar()
-		c++
+		c += utf8.RuneLen(s.curr)
 		for isDigit(s.curr) {
 			s.nextChar()
-			c++
+			c += utf8.RuneLen(s.curr)
 		}
 	}
 	v, err := strconv.ParseFloat(s.text[i:i+c], 64)
@@ -814,7 +818,7 @@ func (s *scanner) scanString() string {
 		if !s.nextChar() {
 			panic(errors.New("xpath: scanString got unclosed string"))
 		}
-		c++
+		c += utf8.RuneLen(s.curr)
 	}
 	s.nextChar()
 	return s.text[i : i+c]
@@ -826,7 +830,7 @@ func (s *scanner) scanName() string {
 		i = s.pos - 1
 	)
 	for isName(s.curr) {
-		c++
+		c += utf8.RuneLen(s.curr)
 		if !s.nextChar() {
 			break
 		}

query.go

@@ -528,7 +528,6 @@ func (f *filterQuery) Select(t iterator) NodeNavigator {
 			return node
 		}
 		node = node.Copy()
-		//fmt.Println(node.LocalName())
 
 		t.Current().MoveTo(node)
 		if f.do(t) {

xpath_test.go

@@ -30,6 +30,14 @@ func TestCompile(t *testing.T) {
 		t.Fatalf("/a/b/(c, .[not(c)]) should be correct but got error %s", err)
 	}
 }
+
+func TestCompile2(t *testing.T) {
+	_, err := Compile("//ul/li/@clášs日本語")
+	if err != nil {
+		t.Fatalf("//ul/li/@clášs日本語 should be correct but got error %s", err)
+	}
+}
+
 func TestSelf(t *testing.T) {
 	testXPath(t, html, ".", "html")
 	testXPath(t, html.FirstChild, ".", "head")