Improve alignment token generation (#10)

xuri · Mar 18, 2024 · ab9948c · ab9948c
1 parent 5bacf1a
commit ab9948c
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 62 deletions.
diff --git a/nfp.go b/nfp.go
@@ -444,18 +444,20 @@ func (ps *Parser) getTokens() Tokens {
 		}
 
 		if ps.currentChar() == Underscore {
-			if ps.nextChar() == ParenOpen || ps.nextChar() == ParenClose {
-				if ps.Token.TType != "" {
-					ps.Tokens.add(ps.Token.TValue, ps.Token.TType, ps.Token.Parts)
-				}
-				ps.Token.TValue = ps.nextChar()
-				ps.Token.TType = TokenTypeAlignment
+			if ps.Token.TType != "" {
+				ps.Tokens.add(ps.Token.TValue, ps.Token.TType, ps.Token.Parts)
 			}
+			ps.Token.TValue = Whitespace
+			ps.Token.TType = TokenTypeAlignment
 			ps.Offset += 2
 			continue
 		}
 
 		if ps.currentChar() == Asterisk {
+			if ps.Token.TValue != "" {
+				ps.Tokens.add(ps.Token.TValue, ps.Token.TType, ps.Token.Parts)
+				ps.Token = Token{}
+			}
 			ps.Tokens.add(ps.nextChar(), TokenTypeRepeatsChar, ps.Token.Parts)
 			ps.Token = Token{}
 			ps.Offset += 2