defer chan close and removed dead code

Author: iv-p

lexer.go

@@ -108,10 +108,10 @@ func lex(input string) *lexer {
 
 // run runs the state machine for the lexer.
 func (l *lexer) run() {
+	defer close(l.items)
 	for state := lexStart; state != nil; {
 		state = state(l)
 	}
-	close(l.items)
 }
 
 func lexStart(l *lexer) lexStateFn {
@@ -209,11 +209,6 @@ func lexEOF(l *lexer) lexStateFn {
 	return lexIdentifier
 }
 
-// isSpace reports whether r is a space character.
-func isSpace(r rune) bool {
-	return r == ' ' || r == '\t'
-}
-
 // isAlphaNumeric reports whether r is an alphabetic, digit, or underscore.
 func isValidIdentifierRune(r rune) bool {
 	return strings.ContainsRune("_-", r) || unicode.IsLetter(r) || unicode.IsDigit(r)

lexer_test.go

@@ -41,8 +41,8 @@ var lexTests = []lexTest{
 	{"error", "somekey.", []item{mkItem(itemIdentifier, "somekey"), iDot, iEOF}},
 }
 
-// collect gathers the emitted items into a slice.
-func collect(t *lexTest) (items []item) {
+// collectItems gathers the emitted items into a slice.
+func collectItems(t *lexTest) (items []item) {
 	l := lex(t.input)
 	for {
 		item := l.nextItem()
@@ -54,7 +54,7 @@ func collect(t *lexTest) (items []item) {
 	return
 }
 
-func equal(i1, i2 []item, checkPos bool) bool {
+func itemEqual(i1, i2 []item, checkPos bool) bool {
 	if len(i1) != len(i2) {
 		return false
 	}
@@ -71,8 +71,8 @@ func equal(i1, i2 []item, checkPos bool) bool {
 
 func TestLex(t *testing.T) {
 	for _, test := range lexTests {
-		items := collect(&test)
-		if !equal(items, test.items, false) {
+		items := collectItems(&test)
+		if !itemEqual(items, test.items, false) {
 			t.Errorf("%s: got\n\t%+v\nexpected\n\t%v", test.name, items, test.items)
 		}
 	}

parser.go

@@ -56,10 +56,10 @@ func (p *parser) nextItem() token {
 }
 
 func (p *parser) run() {
+	defer close(p.tokens)
 	for state := parseStart; state != nil; {
 		state = state(p)
 	}
-	close(p.tokens)
 }
 
 func (p *parser) getBufOrNext() item {

parser_test.go

@@ -37,8 +37,8 @@ var parseTests = []parseTest{
 	{"somekey.", []token{mkToken(tokenIdentifier, "somekey"), tEnd}},
 }
 
-// collect gathers the emitted items into a slice.
-func pcollect(t *parseTest) (tokens []token) {
+// collectTokens gathers the emitted items into a slice.
+func collectTokens(t *parseTest) (tokens []token) {
 	p := parse(t.input)
 	for {
 		token := p.nextItem()
@@ -50,7 +50,7 @@ func pcollect(t *parseTest) (tokens []token) {
 	return
 }
 
-func pequal(i1, i2 []token) bool {
+func tokenEqual(i1, i2 []token) bool {
 	if len(i1) != len(i2) {
 		return false
 	}
@@ -67,8 +67,8 @@ func pequal(i1, i2 []token) bool {
 
 func TestParse(t *testing.T) {
 	for _, test := range parseTests {
-		tokens := pcollect(&test)
-		if !pequal(tokens, test.tokens) {
+		tokens := collectTokens(&test)
+		if !tokenEqual(tokens, test.tokens) {
 			t.Errorf("got\n\t%+v\nexpected\n\t%v", tokens, test.tokens)
 		}
 	}