zclwrite: TokenGen interface has EachToken, not AppendToTokens

Although building a flat array of tokens is _one_ use-case for TokenGen,
this new approach means we can also use the interface to write to an
io.Writer without needing to produce an intermediate buffer.

zclwrite/tokens.go

@@ -10,9 +10,13 @@ import (
 // but it's also possible to directly manipulate the tree of token generators
 // to make changes that the AST API doesn't directly allow.
 type TokenGen interface {
-	AppendToTokens(Tokens) Tokens
+	EachToken(TokenCallback)
 }
 
+// TokenCallback is used with TokenGen implementations to specify the action
+// that is to be taken for each token in the flattened token sequence.
+type TokenCallback func(*Token)
+
 // Token is a single sequence of bytes annotated with a type. It is similar
 // in purpose to zclsyntax.Token, but discards the source position information
 // since that is not useful in code generation.
@@ -34,26 +38,30 @@ type Tokens []*Token
 // of tokens from a tree of TokenGens.
 type TokenSeq []TokenGen
 
-func (t *Token) AppendToTokens(src Tokens) Tokens {
+func (t *Token) EachToken(cb TokenCallback) {
-	return append(src, t)
+	cb(t)
 }
 
-func (ts Tokens) AppendToTokens(src Tokens) Tokens {
+func (ts Tokens) EachToken(cb TokenCallback) {
-	return append(src, ts...)
+	for _, t := range ts {
+		cb(t)
+	}
 }
 
-func (ts *TokenSeq) AppendToTokens(src Tokens) Tokens {
+func (ts *TokenSeq) EachToken(cb TokenCallback) {
-	toks := src
 	for _, gen := range *ts {
-		toks = gen.AppendToTokens(toks)
+		gen.EachToken(cb)
 	}
-	return toks
 }
 
 // Tokens returns the flat list of tokens represented by the receiving
 // token sequence.
 func (ts *TokenSeq) Tokens() Tokens {
-	return ts.AppendToTokens(nil)
+	var tokens Tokens
+	ts.EachToken(func(token *Token) {
+		tokens = append(tokens, token)
+	})
+	return tokens
 }
 
 func (ts *TokenSeq) Append(other *TokenSeq) {