Change output subex internals to allow structures

Also add substitute register syntactic sugar

1 files changed, 21 insertions, 14 deletions

diff --git a/main/lex.go b/main/lex.go
index 496abd0..a28975f 100644
--- a/main/lex.go
+++ b/main/lex.go
@@ -171,21 +171,28 @@ func lexCommand(l *lexer) stateFunc {
 	l.ignore()
 	r := l.next()
 	switch r {
-		case eof:
-			l.emit(TokenEOF)
-			return nil
-		case '{':
-			l.emit(TokenLBrace)
-			return lexCommand
-		case '}':
-			l.emit(TokenRBrace)
-			return lexCommand
-		case 's', 'S':
-			l.emit(TokenCommand)
+	case eof:
+		l.emit(TokenEOF)
+		return nil
+	case '{':
+		l.emit(TokenLBrace)
+		return lexCommand
+	case '}':
+		l.emit(TokenRBrace)
+		return lexCommand
+	case 's', 'S':
+		l.emit(TokenCommand)
+		return lexSubstitution
+	case 'x', 'X', 'y', 'Y', 'z', 'Z':
+		l.emit(TokenCommand)
+		if l.peek() == '/' {
 			return lexSubstitution
-		case ':', 'b':
-			l.emit(TokenCommand)
-			return lexLabel
+		} else {
+			return lexCommand
+		}
+	case ':', 'b':
+		l.emit(TokenCommand)
+		return lexLabel
 	}
 	if isAlpha(r) {
 		l.emit(TokenCommand)