demotape 0.0.2 → 0.0.3

data/demotape.y

@@ -1,520 +1,239 @@
 class DemoTape::Parser
-rule
-  tape: commands { result = val[0] }
-      | /* empty */ { result = [] }
-
-  commands: command trailing_space NEWLINE { result = [val[0]] }
-          | commands command trailing_space NEWLINE { result = val[0] << val[1] }
-
-  trailing_space: SPACE { result = nil }
-                | /* empty */ { result = nil }
-
-  command: IDENTIFIER SPACE PLUS {
-             space_index = @token_index - 2
-             line_info = @lexer.line_map[space_index] || {}
-             error_msg = "Unexpected token \"SPACE\" at #{@file}:#{line_info[:line]}:#{line_info[:column]}:\n"
-             error_msg += "  #{line_info[:content]}\n"
-             error_msg += "  #{' ' * (line_info[:column] - 1)}^"
-             raise DemoTape::ParseError, error_msg
-           }
-         | key_combo SPACE NUMBER {
-             @command_start_index = @last_key_index
-             keys = val[0][:keys]
-             key_tokens = val[0][:tokens]
-             command_name = keys.shift
-
-             tokens = key_tokens + [make_token(:number, val[2], @token_index - 1)]
-
-             cmd = DemoTape::Command.new(command_name, "", keys:, count: val[2])
-             cmd.tokens = tokens
-             result = attach_location(cmd).prepare!
-           }
-         | key_combo {
-             @command_start_index = @last_key_index
-             keys = val[0][:keys]
-             key_tokens = val[0][:tokens]
-             command_name = keys.shift
-
-             cmd = DemoTape::Command.new(command_name, "", keys:)
-             cmd.tokens = key_tokens
-             result = attach_location(cmd).prepare!
-           }
-         | IDENTIFIER SPACE NUMBER {
-             @command_start_index = @token_index - 4
-             duration_index = @token_index - 2
-
-             tokens = [
-               make_token(:identifier, val[0], @token_index - 4),
-               make_token(:number, val[2], @token_index - 2)
-             ]
-
-             # Duration commands (Sleep, Wait) treat bare numbers as seconds
-             # Key commands treat numbers as repeat counts
-             if ["Sleep", "Wait"].include?(val[0])
-               cmd = DemoTape::Command.new(val[0], "#{val[2]}s")
-               cmd.tokens = tokens
-               result = attach_location(cmd, duration_index: duration_index).prepare!
-             else
-               cmd = DemoTape::Command.new(val[0], "", count: val[2])
-               cmd.tokens = tokens
-               result = attach_location(cmd).prepare!
-             end
-           }
-         | IDENTIFIER AT duration SPACE string {
-             @command_start_index = @token_index - 6
-             speed_index = @token_index - 3  # TIME_UNIT position
-
-             tokens = [
-               make_token(:identifier, val[0], @token_index - 6),
-               make_token(:operator, "@", @token_index - 5),
-               make_token(:duration, val[2], @token_index - 4),
-               make_token(:string, val[4], @token_index - 1)
-             ]
-
-             cmd = DemoTape::Command.new(val[0], val[4], speed: val[2])
-             cmd.tokens = tokens
-             result = attach_location(cmd, speed_index: speed_index).prepare!
-           }
-         | IDENTIFIER AT duration SPACE NUMBER {
-             @command_start_index = @token_index - 6
-             speed_index = @token_index - 3  # TIME_UNIT position
-
-             tokens = [
-               make_token(:identifier, val[0], @token_index - 6),
-               make_token(:operator, "@", @token_index - 5),
-               make_token(:duration, val[2], @token_index - 4),
-               make_token(:number, val[4], @token_index - 1)
-             ]
-
-             cmd = DemoTape::Command.new(val[0], "", speed: val[2], count: val[4])
-             cmd.tokens = tokens
-             result = attach_location(cmd, speed_index: speed_index).prepare!
-           }
-         | IDENTIFIER AT NUMBER SPACE NUMBER {
-             @command_start_index = @token_index - 5
-             speed_index = @token_index - 3
-
-             tokens = [
-               make_token(:identifier, val[0], @token_index - 5),
-               make_token(:operator, "@", @token_index - 4),
-               make_token(:number, val[2], @token_index - 3),
-               make_token(:number, val[4], @token_index - 1)
-             ]
-
-             cmd = DemoTape::Command.new(val[0], "", speed: "#{val[2]}s", count: val[4])
-             cmd.tokens = tokens
-             result = attach_location(cmd, speed_index: speed_index).prepare!
-           }
-         | IDENTIFIER AT NUMBER SPACE string {
-             @command_start_index = @token_index - 5
-             speed_index = @token_index - 3
-
-             tokens = [
-               make_token(:identifier, val[0], @token_index - 5),
-               make_token(:operator, "@", @token_index - 4),
-               make_token(:number, val[2], @token_index - 3),
-               make_token(:string, val[4], @token_index - 1)
-             ]
-
-             cmd = DemoTape::Command.new(val[0], val[4], speed: "#{val[2]}s")
-             cmd.tokens = tokens
-             result = attach_location(cmd, speed_index: speed_index).prepare!
-           }
-         | IDENTIFIER AT NUMBER {
-             @command_start_index = @token_index - 3
-             speed_index = @token_index - 1
-
-             tokens = [
-               make_token(:identifier, val[0], @token_index - 3),
-               make_token(:operator, "@", @token_index - 2),
-               make_token(:number, val[2], @token_index - 1)
-             ]
-
-             cmd = DemoTape::Command.new(val[0], "", speed: "#{val[2]}s")
-             cmd.tokens = tokens
-             result = attach_location(cmd, speed_index: speed_index).prepare!
-           }
-         | IDENTIFIER AT duration {
-             @command_start_index = @token_index - 4
-             speed_index = @token_index - 1  # TIME_UNIT position
-
-             tokens = [
-               make_token(:identifier, val[0], @token_index - 4),
-               make_token(:operator, "@", @token_index - 3),
-               make_token(:duration, val[2], @token_index - 2)
-             ]
-
-             cmd = DemoTape::Command.new(val[0], "", speed: val[2])
-             cmd.tokens = tokens
-             result = attach_location(cmd, speed_index: speed_index).prepare!
-           }
-         | IDENTIFIER AT duration SPACE REGEX {
-             @command_start_index = @token_index - 6
-             timeout_index = @token_index - 3  # TIME_UNIT position
-             regex_index = @token_index - 1
-
-             begin
-               Regexp.new(val[4])
-             rescue RegexpError => e
-               line_info = @lexer.line_map[regex_index] || {}
-               error_msg = "Invalid regex: #{e.message} at #{@file}:#{line_info[:line]}:#{line_info[:column]}:\n"
-               error_msg += "  #{line_info[:content]}\n"
-               error_msg += "  #{' ' * (line_info[:column] - 1)}^"
-               raise DemoTape::ParseError, error_msg
-             end
-
-             tokens = [
-               make_token(:identifier, val[0], @token_index - 6),
-               make_token(:operator, "@", @token_index - 5),
-               make_token(:duration, val[2], @token_index - 4),
-               make_token(:regex, val[4], regex_index)
-             ]
-
-             cmd = DemoTape::Command.new(val[0], val[4], timeout: val[2])
-             cmd.tokens = tokens
-             result = attach_location(cmd, timeout_index: timeout_index).prepare!
-           }
-         | IDENTIFIER SPACE REGEX {
-             @command_start_index = @token_index - 3
-             regex_index = @token_index - 1
-
-             begin
-               Regexp.new(val[2])
-             rescue RegexpError => e
-               line_info = @lexer.line_map[regex_index] || {}
-               error_msg = "Invalid regex: #{e.message} at #{@file}:#{line_info[:line]}:#{line_info[:column]}:\n"
-               error_msg += "  #{line_info[:content]}\n"
-               error_msg += "  #{' ' * (line_info[:column] - 1)}^"
-               raise DemoTape::ParseError, error_msg
-             end
-
-             tokens = [
-               make_token(:identifier, val[0], @token_index - 3),
-               make_token(:regex, val[2], regex_index)
-             ]
-
-             cmd = DemoTape::Command.new(val[0], val[2])
-             cmd.tokens = tokens
-             result = attach_location(cmd).prepare!
-           }
-         | IDENTIFIER SPACE IDENTIFIER SPACE NUMBER COMMA NUMBER COMMA NUMBER COMMA NUMBER {
-             @command_start_index = @token_index - 9
-
-             tokens = [
-               make_token(:identifier, val[0], @token_index - 9),
-               make_token(:identifier, val[2], @token_index - 7),
-               make_token(:number, val[4], @token_index - 5),
-               make_token(:operator, ",", @token_index - 4),
-               make_token(:number, val[6], @token_index - 3),
-               make_token(:operator, ",", @token_index - 2),
-               make_token(:number, val[8], @token_index - 1),
-               make_token(:operator, ",", @token_index - 1),
-               make_token(:number, val[10], @token_index - 1)
-             ]
-
-             cmd = DemoTape::Command.new(val[0], [val[4], val[6], val[8], val[10]], option: val[2])
-             cmd.tokens = tokens
-             result = attach_location(cmd).prepare!
-           }
-         | IDENTIFIER SPACE IDENTIFIER SPACE NUMBER COMMA SPACE NUMBER COMMA SPACE NUMBER COMMA SPACE NUMBER {
-             @command_start_index = @token_index - 13
-
-             tokens = [
-               make_token(:identifier, val[0], @token_index - 13),
-               make_token(:identifier, val[2], @token_index - 11),
-               make_token(:number, val[4], @token_index - 9),
-               make_token(:operator, ",", @token_index - 8),
-               make_token(:number, val[7], @token_index - 6),
-               make_token(:operator, ",", @token_index - 5),
-               make_token(:number, val[10], @token_index - 3),
-               make_token(:operator, ",", @token_index - 2),
-               make_token(:number, val[13], @token_index - 1)
-             ]
-
-             cmd = DemoTape::Command.new(val[0], [val[4], val[7], val[10], val[13]], option: val[2])
-             cmd.tokens = tokens
-             result = attach_location(cmd).prepare!
-           }
-         | IDENTIFIER SPACE IDENTIFIER SPACE NUMBER COMMA NUMBER COMMA NUMBER {
-             @command_start_index = @token_index - 7
-
-             tokens = [
-               make_token(:identifier, val[0], @token_index - 7),
-               make_token(:identifier, val[2], @token_index - 5),
-               make_token(:number, val[4], @token_index - 3),
-               make_token(:operator, ",", @token_index - 2),
-               make_token(:number, val[6], @token_index - 1),
-               make_token(:operator, ",", @token_index - 1),
-               make_token(:number, val[8], @token_index - 1)
-             ]
-
-             cmd = DemoTape::Command.new(val[0], [val[4], val[6], val[8]], option: val[2])
-             cmd.tokens = tokens
-             result = attach_location(cmd).prepare!
-           }
-         | IDENTIFIER SPACE IDENTIFIER SPACE NUMBER COMMA SPACE NUMBER COMMA SPACE NUMBER {
-             @command_start_index = @token_index - 11
-
-             tokens = [
-               make_token(:identifier, val[0], @token_index - 11),
-               make_token(:identifier, val[2], @token_index - 9),
-               make_token(:number, val[4], @token_index - 7),
-               make_token(:operator, ",", @token_index - 6),
-               make_token(:number, val[7], @token_index - 4),
-               make_token(:operator, ",", @token_index - 3),
-               make_token(:number, val[10], @token_index - 1)
-             ]
-
-             cmd = DemoTape::Command.new(val[0], [val[4], val[7], val[10]], option: val[2])
-             cmd.tokens = tokens
-             result = attach_location(cmd).prepare!
-           }
-         | IDENTIFIER SPACE IDENTIFIER SPACE NUMBER COMMA NUMBER {
-             @command_start_index = @token_index - 5
-
-             tokens = [
-               make_token(:identifier, val[0], @token_index - 5),
-               make_token(:identifier, val[2], @token_index - 3),
-               make_token(:number, val[4], @token_index - 1),
-               make_token(:operator, ",", @token_index - 1),
-               make_token(:number, val[6], @token_index - 1)
-             ]
-
-             cmd = DemoTape::Command.new(val[0], [val[4], val[6]], option: val[2])
-             cmd.tokens = tokens
-             result = attach_location(cmd).prepare!
-           }
-         | IDENTIFIER SPACE IDENTIFIER SPACE NUMBER COMMA SPACE NUMBER {
-             @command_start_index = @token_index - 8
-
-             tokens = [
-               make_token(:identifier, val[0], @token_index - 8),
-               make_token(:identifier, val[2], @token_index - 6),
-               make_token(:number, val[4], @token_index - 4),
-               make_token(:operator, ",", @token_index - 3),
-               make_token(:number, val[7], @token_index - 1)
-             ]
-
-             cmd = DemoTape::Command.new(val[0], [val[4], val[7]], option: val[2])
-             cmd.tokens = tokens
-             result = attach_location(cmd).prepare!
-           }
-         | IDENTIFIER SPACE IDENTIFIER SPACE duration {
-             @command_start_index = @token_index - 6
-
-             tokens = [
-               make_token(:identifier, val[0], @token_index - 6),
-               make_token(:identifier, val[2], @token_index - 4),
-               make_token(:duration, val[4], @token_index - 2)
-             ]
-
-             cmd = DemoTape::Command.new(val[0], val[4], option: val[2])
-             cmd.tokens = tokens
-             result = attach_location(cmd).prepare!
-           }
-         | IDENTIFIER SPACE IDENTIFIER SPACE NUMBER {
-             @command_start_index = @token_index - 5
-
-             tokens = [
-               make_token(:identifier, val[0], @token_index - 5),
-               make_token(:identifier, val[2], @token_index - 3),
-               make_token(:number, val[4], @token_index - 1)
-             ]
-
-             cmd = DemoTape::Command.new(val[0], val[4].to_s, option: val[2])
-             cmd.tokens = tokens
-             result = attach_location(cmd).prepare!
-           }
-         | IDENTIFIER SPACE IDENTIFIER SPACE IDENTIFIER {
-             @command_start_index = @token_index - 5
-
-             tokens = [
-               make_token(:identifier, val[0], @token_index - 5),
-               make_token(:identifier, val[2], @token_index - 3),
-               make_token(:identifier, val[4], @token_index - 1)
-             ]
-
-             cmd = DemoTape::Command.new(val[0], val[4], option: val[2])
-             cmd.tokens = tokens
-             result = attach_location(cmd).prepare!
-           }
-         | IDENTIFIER SPACE IDENTIFIER SPACE string {
-             @command_start_index = @token_index - 5
-
-             tokens = [
-               make_token(:identifier, val[0], @token_index - 5),
-               make_token(:identifier, val[2], @token_index - 3),
-               make_token(:string, val[4], @token_index - 1)
-             ]
-
-             cmd = DemoTape::Command.new(val[0], val[4], option: val[2])
-             cmd.tokens = tokens
-             result = attach_location(cmd).prepare!
-           }
-         | IDENTIFIER SPACE string {
-             @command_start_index = @token_index - 3
-
-             tokens = [
-               make_token(:identifier, val[0], @token_index - 3),
-               make_token(:string, val[2], @token_index - 1)
-             ]
-
-             cmd = DemoTape::Command.new(val[0], val[2])
-             cmd.tokens = tokens
-             result = attach_location(cmd).prepare!
-           }
-         | IDENTIFIER SPACE duration {
-             @command_start_index = @token_index - 4
-             duration_index = @token_index - 1  # TIME_UNIT position
-
-             tokens = [
-               make_token(:identifier, val[0], @token_index - 4),
-               make_token(:duration, val[2], @token_index - 2)
-             ]
-
-             cmd = DemoTape::Command.new(val[0], val[2])
-             cmd.tokens = tokens
-             result = attach_location(cmd, duration_index: duration_index).prepare!
-           }
-         | IDENTIFIER {
-             @command_start_index = @token_index - 2
-
-             tokens = [make_token(:identifier, val[0], @token_index - 2)]
-
-             cmd = DemoTape::Command.new(val[0], "")
-             cmd.tokens = tokens
-             result = attach_location(cmd).prepare!
-           }
-
-  key_combo: IDENTIFIER PLUS IDENTIFIER {
-               @last_key_index = @token_index - 1
-
-               tokens = [
-                 make_token(:identifier, val[0], @token_index - 3),
-                 make_token(:operator, "+", @token_index - 2),
-                 make_token(:identifier, val[2], @token_index - 1)
-               ]
 
-               result = { keys: [val[0], val[2]], tokens: tokens }
-             }
-           | IDENTIFIER PLUS NUMBER {
-               @last_key_index = @token_index - 1
+# Precedence rules to resolve shift/reduce conflicts
+# When we see LEADING_SPACE and END is in lookahead, reduce group_body instead of shifting
+prechigh
+  nonassoc END
+  left LEADING_SPACE
+preclow
 
-               tokens = [
-                 make_token(:identifier, val[0], @token_index - 3),
-                 make_token(:operator, "+", @token_index - 2),
-                 make_token(:number, val[2], @token_index - 1)
-               ]
-
-               result = { keys: [val[0], val[2].to_s], tokens: tokens }
-             }
-           | key_combo PLUS IDENTIFIER {
-               @last_key_index = @token_index - 1
-
-               tokens = val[0][:tokens] + [
-                 make_token(:operator, "+", @token_index - 2),
-                 make_token(:identifier, val[2], @token_index - 1)
-               ]
-
-               result = { keys: val[0][:keys] << val[2], tokens: tokens }
-             }
-           | key_combo PLUS NUMBER {
-               @last_key_index = @token_index - 1
-
-               tokens = val[0][:tokens] + [
-                 make_token(:operator, "+", @token_index - 2),
-                 make_token(:number, val[2], @token_index - 1)
-               ]
-
-               result = { keys: val[0][:keys] << val[2].to_s, tokens: tokens }
-             }
-
-  string: STRING { result = val[0] }
-        | WORD { result = val[0] }
-
-  duration: NUMBER TIME_UNIT { result = "#{val[0]}#{val[1]}" }
-
-end
+rule
+  # Document is a flat list - mix of tokens and command contexts
+  document: lines { result = val[0].flatten.compact }
+          | /* empty */ { result = [] }
+
+  lines: line { result = val[0] }
+       | lines line { result = val[0] + val[1] }
+
+  # A line can be a comment, newline, group, or command
+  line: COMMENT NEWLINE {
+          result = [
+            make_token(:comment, val[0], index_for_value(val[0])),
+            make_token(:newline, val[1], index_for_value(val[1]))
+          ]
+        }
+      | LEADING_SPACE COMMENT NEWLINE {
+          result = [
+            make_token(:leading_space, val[0], index_for_value(val[0])),
+            make_token(:comment, val[1], index_for_value(val[1])),
+            make_token(:newline, val[2], index_for_value(val[2]))
+          ]
+        }
+      | NEWLINE { result = [make_token(:newline, val[0], index_for_value(val[0]))] }
+      | group { result = [val[0]] }
+      | line_tokens NEWLINE {
+          tokens, start_idx = val[0]
+          result = [
+            { type: :command, tokens: tokens, line: line_for_token_at(start_idx), column: column_for_token_at(start_idx) },
+            make_token(:newline, val[1], index_for_value(val[1]))
+          ]
+        }
+      | LEADING_SPACE line_tokens NEWLINE {
+          idx_lead = index_for_value(val[0])
+          tokens, _ = val[1]
+          result = [
+            { type: :command, tokens: [make_token(:leading_space, val[0], idx_lead)] + tokens, line: line_for_token_at(idx_lead), column: column_for_token_at(idx_lead) },
+            make_token(:newline, val[2], index_for_value(val[2]))
+          ]
+        }
+
+  # Group block: tokens ending with 'do', body, then 'end'
+  group: line_tokens DO NEWLINE group_body END NEWLINE {
+           tokens, start_idx = val[0]
+           idx_do = index_for_value(val[1])
+           idx_nl = index_for_value(val[2])
+           idx_end = index_for_value(val[4])
+           result = {
+             type: :group,
+             tokens: tokens + [make_token(:keyword, val[1], idx_do), make_token(:keyword, val[4], idx_end)],
+             children: [make_token(:newline, val[2], idx_nl)] + val[3],
+             line: line_for_token_at(start_idx),
+             column: column_for_token_at(start_idx)
+           }
+         }
+       | line_tokens DO NEWLINE group_body LEADING_SPACE END NEWLINE {
+           tokens, start_idx = val[0]
+           idx_do = index_for_value(val[1])
+           idx_nl = index_for_value(val[2])
+           idx_end = index_for_value(val[5])
+           # Discard the LEADING_SPACE before END (val[4])
+           result = {
+             type: :group,
+             tokens: tokens + [make_token(:keyword, val[1], idx_do), make_token(:keyword, val[5], idx_end)],
+             children: [make_token(:newline, val[2], idx_nl)] + val[3],
+             line: line_for_token_at(start_idx),
+             column: column_for_token_at(start_idx)
+           }
+         }
+       | LEADING_SPACE line_tokens DO NEWLINE group_body END NEWLINE {
+           idx_lead = index_for_value(val[0])
+           tokens, _ = val[1]
+           idx_do = index_for_value(val[2])
+           idx_nl = index_for_value(val[3])
+           idx_end = index_for_value(val[5])
+           result = {
+             type: :group,
+             tokens: [make_token(:leading_space, val[0], idx_lead)] + tokens + [make_token(:keyword, val[2], idx_do), make_token(:keyword, val[5], idx_end)],
+             children: [make_token(:newline, val[3], idx_nl)] + val[4],
+             line: line_for_token_at(idx_lead),
+             column: column_for_token_at(idx_lead)
+           }
+         }
+       | LEADING_SPACE line_tokens DO NEWLINE group_body LEADING_SPACE END NEWLINE {
+           idx_lead = index_for_value(val[0])
+           tokens, _ = val[1]
+           idx_do = index_for_value(val[2])
+           idx_nl = index_for_value(val[3])
+           idx_end = index_for_value(val[6])
+           # Discard the LEADING_SPACE before END (val[5])
+           result = {
+             type: :group,
+             tokens: [make_token(:leading_space, val[0], idx_lead)] + tokens + [make_token(:keyword, val[2], idx_do), make_token(:keyword, val[6], idx_end)],
+             children: [make_token(:newline, val[3], idx_nl)] + val[4],
+             line: line_for_token_at(idx_lead),
+             column: column_for_token_at(idx_lead)
+           }
+         }
+       | line_tokens DO TRAILING_SPACE NEWLINE group_body END NEWLINE {
+           tokens, start_idx = val[0]
+           idx_do = index_for_value(val[1])
+           idx_trail = index_for_value(val[2])
+           idx_nl = index_for_value(val[3])
+           idx_end = index_for_value(val[5])
+           result = {
+             type: :group,
+             tokens: tokens + [make_token(:keyword, val[1], idx_do), make_token(:trailing_space, val[2], idx_trail), make_token(:keyword, val[5], idx_end)],
+             children: [make_token(:newline, val[3], idx_nl)] + val[4],
+             line: line_for_token_at(start_idx),
+             column: column_for_token_at(start_idx)
+           }
+         }
+       | line_tokens DO TRAILING_SPACE NEWLINE group_body LEADING_SPACE END NEWLINE {
+           tokens, start_idx = val[0]
+           idx_do = index_for_value(val[1])
+           idx_trail = index_for_value(val[2])
+           idx_nl = index_for_value(val[3])
+           idx_end = index_for_value(val[6])
+           # Discard the LEADING_SPACE before END (val[5])
+           result = {
+             type: :group,
+             tokens: tokens + [make_token(:keyword, val[1], idx_do), make_token(:trailing_space, val[2], idx_trail), make_token(:keyword, val[6], idx_end)],
+             children: [make_token(:newline, val[3], idx_nl)] + val[4],
+             line: line_for_token_at(start_idx),
+             column: column_for_token_at(start_idx)
+           }
+         }
+       | LEADING_SPACE line_tokens DO TRAILING_SPACE NEWLINE group_body LEADING_SPACE END NEWLINE {
+           idx_lead = index_for_value(val[0])
+           tokens, _ = val[1]
+           idx_do = index_for_value(val[2])
+           idx_trail = index_for_value(val[3])
+           idx_nl = index_for_value(val[4])
+           idx_end = index_for_value(val[7])
+           # Discard the LEADING_SPACE before END (val[6])
+           result = {
+             type: :group,
+             tokens: [make_token(:leading_space, val[0], idx_lead)] + tokens + [make_token(:keyword, val[2], idx_do), make_token(:trailing_space, val[3], idx_trail), make_token(:keyword, val[7], idx_end)],
+             children: [make_token(:newline, val[4], idx_nl)] + val[5],
+             line: line_for_token_at(idx_lead),
+             column: column_for_token_at(idx_lead)
+           }
+         }
+       | LEADING_SPACE line_tokens DO TRAILING_SPACE NEWLINE group_body END NEWLINE {
+           idx_lead = index_for_value(val[0])
+           tokens, _ = val[1]
+           idx_do = index_for_value(val[2])
+           idx_trail = index_for_value(val[3])
+           idx_nl = index_for_value(val[4])
+           idx_end = index_for_value(val[6])
+           result = {
+             type: :group,
+             tokens: [make_token(:leading_space, val[0], idx_lead)] + tokens + [make_token(:keyword, val[2], idx_do), make_token(:trailing_space, val[3], idx_trail), make_token(:keyword, val[6], idx_end)],
+             children: [make_token(:newline, val[4], idx_nl)] + val[5],
+             line: line_for_token_at(idx_lead),
+             column: column_for_token_at(idx_lead)
+           }
+         }
+
+
+  # Group body - same structure as document
+  group_body: /* empty */ { result = [] }
+            | group_lines { result = val[0].flatten.compact }
+
+  group_lines: group_line { result = val[0] }
+             | group_lines group_line { result = val[0] + val[1] }
+
+  # Group line - same as document line but need to be careful not to consume LEADING_SPACE before END
+  group_line: COMMENT NEWLINE {
+                result = [
+                  make_token(:comment, val[0], index_for_value(val[0])),
+                  make_token(:newline, val[1], index_for_value(val[1]))
+                ]
+              }
+            | NEWLINE { result = [make_token(:newline, val[0], index_for_value(val[0]))] }
+            | line_tokens NEWLINE {
+                tokens, start_idx = val[0]
+                result = [
+                  { type: :command, tokens: tokens, line: line_for_token_at(start_idx), column: column_for_token_at(start_idx) },
+                  make_token(:newline, val[1], index_for_value(val[1]))
+                ]
+              }
+            | LEADING_SPACE line_tokens NEWLINE {
+                idx_lead = index_for_value(val[0])
+                tokens, _ = val[1]
+                result = [
+                  { type: :command, tokens: [make_token(:leading_space, val[0], idx_lead)] + tokens, line: line_for_token_at(idx_lead), column: column_for_token_at(idx_lead) },
+                  make_token(:newline, val[2], index_for_value(val[2]))
+                ]
+              }
+            | LEADING_SPACE COMMENT NEWLINE {
+                result = [
+                  make_token(:leading_space, val[0], index_for_value(val[0])),
+                  make_token(:comment, val[1], index_for_value(val[1])),
+                  make_token(:newline, val[2], index_for_value(val[2]))
+                ]
+              }
+
+  # Collect all tokens on a line (anything but NEWLINE and COMMENT)
+  # Returns [tokens_array, start_index]
+  line_tokens: line_token { result = [[val[0][:token]], val[0][:index]] }
+             | line_tokens line_token { result = [val[0][0] << val[1][:token], val[0][1]] }
+
+  line_token: IDENTIFIER { idx = index_for_value(val[0]); result = { token: make_token(:identifier, val[0], idx), index: idx } }
+            | STRING { idx = index_for_value(val[0]); result = { token: make_token(:string, val[0], idx), index: idx } }
+            | MULTILINE_STRING { idx = index_for_value(val[0]); result = { token: make_token(:multiline_string, val[0], idx), index: idx } }
+            | NUMBER { idx = index_for_value(val[0]); result = { token: make_token(:number, val[0], idx), index: idx } }
+            | DURATION { idx = index_for_value(val[0]); result = { token: make_token(:duration, val[0], idx), index: idx } }
+            | REGEX { idx = index_for_value(val[0]); result = { token: make_token(:regex, val[0], idx), index: idx } }
+            | SPACE { idx = index_for_value(val[0]); result = { token: make_token(:space, val[0], idx), index: idx } }
+            | TRAILING_SPACE { idx = index_for_value(val[0]); result = { token: make_token(:trailing_space, val[0], idx), index: idx } }
+            | COMMA { idx = index_for_value(val[0]); result = { token: make_token(:operator, ",", idx), index: idx } }
+            | PLUS { idx = index_for_value(val[0]); result = { token: make_token(:operator, "+", idx), index: idx } }
+            | AT { idx = index_for_value(val[0]); result = { token: make_token(:operator, "@", idx), index: idx } }
+            | TIME_UNIT { idx = index_for_value(val[0]); result = { token: make_token(:time_unit, val[0], idx), index: idx } }
 
 ---- header
 
 ---- inner
+  include Helpers
+
   def parse(str, file: "<unknown>")
     @file = file
     @lexer = DemoTape::Lexer.new
     @tokens = @lexer.tokenize(str)
     @token_index = 0
-    do_parse
-  end
-
-  def next_token
-    token = @tokens.shift
-    @current_token_index = @token_index
-    @token_index += 1
-    token
-  end
-
-  def make_token(type, value, index)
-    line_info = @lexer.line_map[index] || {}
-    token_class = case type
-                  when :identifier then Token::Identifier
-                  when :string then Token::String
-                  when :number then Token::Number
-                  when :duration then Token::Duration
-                  when :regex then Token::Regex
-                  when :time_unit then Token::TimeUnit
-                  when :operator then Token::Operator
-                  else Token::Base
-                  end
-
-    token_class.new(
-      value,
-      line: line_info[:line],
-      column: line_info[:column],
-      raw: line_info[:raw]
-    )
-  end
-
-  def attach_location(command, duration_index: nil, speed_index: nil, timeout_index: nil)
-    line_info = @lexer.line_map[@command_start_index] || {}
-    command.line = line_info[:line]
-    command.column = line_info[:column]
-    command.line_content = line_info[:content]
-    command.file = @file
-
-    # Attach duration/speed/timeout specific columns if provided
-    if duration_index
-      duration_info = @lexer.line_map[duration_index] || {}
-      command.duration_column = duration_info[:column]
-    end
-
-    if speed_index
-      speed_info = @lexer.line_map[speed_index] || {}
-      command.speed_column = speed_info[:column]
-    end
-
-    if timeout_index
-      timeout_info = @lexer.line_map[timeout_index] || {}
-      command.timeout_column = timeout_info[:column]
-    end
-
-    command
-  end
-
-  def on_error(token_id, token_value, value_stack)
-    # Get line metadata from the lexer's line map
-    line_info = @lexer.line_map[@current_token_index] || {}
-    line_num = line_info[:line] || "?"
-    col_num = line_info[:column] || 1
-    line_content = line_info[:content] || ""
-
-    token_name = token_to_str(token_id) || token_id.to_s
-
-    error_msg = "Unexpected token #{token_name.inspect} at #{@file}:#{line_num}:#{col_num}:\n"
-    error_msg += "  #{line_content}\n"
-    error_msg += "  #{' ' * (col_num - 1)}^"
-
-    raise DemoTape::ParseError, error_msg
+    @token_indices = {}  # Map token object_id to its index
+    validate_tree!(do_parse)
   end
 
 ---- footer