Order tokens

willfaught · willfaught · commit 4035c6c2d9c5 · 2025-10-04T16:08:02.000-07:00
diff --git a/parser.go b/parser.go
@@ -89,7 +89,7 @@ func (p *parser) parseFactor() *Factor {
 
 func (p *parser) parseTerm() *Term {
 	fs := []*Factor{p.parseFactor()}
-	for tokenEnd < p.token && p.token < tokenPipe {
+	for tokenEnd < p.token && p.token < tokenEqual {
 		fs = append(fs, p.parseFactor())
 	}
 	return &Term{Factors: fs}
diff --git a/tokens.go b/tokens.go
@@ -8,16 +8,16 @@ const (
 	tokenInvalid token = iota
 	tokenEnd
 	tokenIdentifier
-	tokenLiteral
-	tokenLeftParen
-	tokenLeftBracket
 	tokenLeftBrace
-	tokenPipe
+	tokenLeftBracket
+	tokenLeftParen
+	tokenLiteral
 	tokenEqual
-	tokenRightParen
-	tokenRightBracket
-	tokenRightBrace
 	tokenPeriod
+	tokenPipe
+	tokenRightBrace
+	tokenRightBracket
+	tokenRightParen
 )
 
 func tokenString(t token, text string) string {

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ func (p parser) parseFactor() Factor {`
`89`	`89`
`90`	`90`	`func (p parser) parseTerm() Term {`
`91`	`91`	`fs := []*Factor{p.parseFactor()}`
`92`		`- for tokenEnd < p.token && p.token < tokenPipe {`
	`92`	`+ for tokenEnd < p.token && p.token < tokenEqual {`
`93`	`93`	`fs = append(fs, p.parseFactor())`
`94`	`94`	`}`
`95`	`95`	`return &Term{Factors: fs}`