Merge branch 'lint' of https://github.com/ryancox/cascadia

fuzz/fuzz.go

@@ -2,6 +2,7 @@ package fuzz
 
 import "github.com/andybalholm/cascadia"
 
+// Fuzz is the entrypoint used by the go-fuzz framework
 func Fuzz(data []byte) int {
 	sel, err := cascadia.Compile(string(data))
 	if err != nil {

parser.go

@@ -1,4 +1,4 @@
-// The cascadia package is an implementation of CSS selectors.
+// Package cascadia is an implementation of CSS selectors.
 package cascadia
 
 import (
@@ -414,9 +414,9 @@ func (p *parser) parseAttributeSelector() (Selector, error) {
 	return nil, fmt.Errorf("attribute operator %q is not supported", op)
 }
 
-var expectedParenthesis = errors.New("expected '(' but didn't find it")
-var expectedClosingParenthesis = errors.New("expected ')' but didn't find it")
-var unmatchedParenthesis = errors.New("unmatched '('")
+var errExpectedParenthesis = errors.New("expected '(' but didn't find it")
+var errExpectedClosingParenthesis = errors.New("expected ')' but didn't find it")
+var errUnmatchedParenthesis = errors.New("unmatched '('")
 
 // parsePseudoclassSelector parses a pseudoclass selector like :not(p).
 func (p *parser) parsePseudoclassSelector() (Selector, error) {
@@ -437,14 +437,14 @@ func (p *parser) parsePseudoclassSelector() (Selector, error) {
 	switch name {
 	case "not", "has", "haschild":
 		if !p.consumeParenthesis() {
-			return nil, expectedParenthesis
+			return nil, errExpectedParenthesis
 		}
-		sel, err := p.parseSelectorGroup()
-		if err != nil {
-			return nil, err
+		sel, parseErr := p.parseSelectorGroup()
+		if parseErr != nil {
+			return nil, parseErr
 		}
 		if !p.consumeClosingParenthesis() {
-			return nil, expectedClosingParenthesis
+			return nil, errExpectedClosingParenthesis
 		}
 
 		switch name {
@@ -458,10 +458,10 @@ func (p *parser) parsePseudoclassSelector() (Selector, error) {
 
 	case "contains", "containsown":
 		if !p.consumeParenthesis() {
-			return nil, expectedParenthesis
+			return nil, errExpectedParenthesis
 		}
 		if p.i == len(p.s) {
-			return nil, unmatchedParenthesis
+			return nil, errUnmatchedParenthesis
 		}
 		var val string
 		switch p.s[p.i] {
@@ -479,7 +479,7 @@ func (p *parser) parsePseudoclassSelector() (Selector, error) {
 			return nil, errors.New("unexpected EOF in pseudo selector")
 		}
 		if !p.consumeClosingParenthesis() {
-			return nil, expectedClosingParenthesis
+			return nil, errExpectedClosingParenthesis
 		}
 
 		switch name {
@@ -491,7 +491,7 @@ func (p *parser) parsePseudoclassSelector() (Selector, error) {
 
 	case "matches", "matchesown":
 		if !p.consumeParenthesis() {
-			return nil, expectedParenthesis
+			return nil, errExpectedParenthesis
 		}
 		rx, err := p.parseRegex()
 		if err != nil {
@@ -501,7 +501,7 @@ func (p *parser) parsePseudoclassSelector() (Selector, error) {
 			return nil, errors.New("unexpected EOF in pseudo selector")
 		}
 		if !p.consumeClosingParenthesis() {
-			return nil, expectedClosingParenthesis
+			return nil, errExpectedClosingParenthesis
 		}
 
 		switch name {
@@ -513,14 +513,14 @@ func (p *parser) parsePseudoclassSelector() (Selector, error) {
 
 	case "nth-child", "nth-last-child", "nth-of-type", "nth-last-of-type":
 		if !p.consumeParenthesis() {
-			return nil, expectedParenthesis
+			return nil, errExpectedParenthesis
 		}
 		a, b, err := p.parseNth()
 		if err != nil {
 			return nil, err
 		}
 		if !p.consumeClosingParenthesis() {
-			return nil, expectedClosingParenthesis
+			return nil, errExpectedClosingParenthesis
 		}
 		if a == 0 {
 			switch name {
@@ -570,7 +570,7 @@ func (p *parser) parseInteger() (int, error) {
 		i++
 	}
 	if i == start {
-		return 0, errors.New("expected integer, but didn't find it.")
+		return 0, errors.New("expected integer, but didn't find it")
 	}
 	p.i = i
 
@@ -602,9 +602,9 @@ func (p *parser) parseNth() (a, b int, err error) {
 		p.i++
 		goto readN
 	case 'o', 'O', 'e', 'E':
-		id, err := p.parseName()
-		if err != nil {
-			return 0, 0, err
+		id, nameErr := p.parseName()
+		if nameErr != nil {
+			return 0, 0, nameErr
 		}
 		id = toLowerASCII(id)
 		if id == "odd" {