refactor(parser): extract helpers from three oversize parsers#69
Merged
Conversation
Three parser functions carried #[allow(clippy::too_many_lines)]: - parse_simple_command (simple_command.rs): 88 -> 55 lines - parse_cond_primary (conditionals.rs): 79 -> 13 lines - parse_coproc (functions.rs): 114 -> 27 lines Shared extraction: - helpers.rs: add pub(super) const fn is_redirect_op_kind(TokenType) that returns true for the 12 redirect operator kinds. Reused by simple_command.rs, functions.rs, and redirects.rs (the third call site previously had the same 12-variant matches! inlined). simple_command.rs: - try_parse_fd_redirect(&mut self, tok) -> Result<Option<Node>> encapsulates the adjacent-fd / varfd redirect lookahead. - build_word_node(Token) -> Node builds a Word node preserving the token's position as the node span. Documented to distinguish it from helpers::word_node_from_token (which uses Node::empty). conditionals.rs: - try_parse_cond_negation(&mut self, start, kind) -> Result<Option<Node>> - try_parse_cond_group(&mut self, start, kind) -> Result<Option<Node>> - parse_cond_operand(&mut self, start, first) -> Result<Node> Extract TokenType via Copy before downstream lexer calls to avoid borrow conflicts with the peeked &Token. functions.rs: - coproc_starts_command(TokenType) -> bool (free const fn) unifies the two "starts_command && !coproc|time|bang" checks. - build_coproc_with_command(start, name) for paths A and C. - parse_coproc_redirect_only(start, first_tok) for path B. - parse_coproc_word_loop(first_tok) -> (Vec<Node>, Vec<Node>) for path D. - build_coproc_synthetic_command(&self, start, name, words, redirects) assembles the synthetic Command inside a Coproc (used by B and D). Drops all three too_many_lines attributes. AST remains byte-identical: all 252 unit/integration + 12 oracle tests pass. Part of #61 (v0.2.0). Closes #58 Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
mpecan
pushed a commit
that referenced
this pull request
Apr 19, 2026
🤖 I have created a release *beep* *boop* --- ## [0.2.0](rable-v0.1.15...rable-v0.2.0) (2026-04-18) ### ⚠ BREAKING CHANGES * tighten lexer API surface and relocate WordSpan to ast ([#70](#70)) ### Bug Fixes * **format:** align cmdsub reformatter with bash canonical form ([#49](#49)) ([c7a4411](c7a4411)) * **lexer:** accept sloppy heredoc terminator in cmdsub mode ([#50](#50)) ([40f394f](40f394f)) * **lexer:** backticks opaque when content is invalid ([#71](#71)) ([e72166f](e72166f)), closes [#38](#38) * **lexer:** disable reserved-word recognition after assignment words ([#44](#44)) ([42e1fc0](42e1fc0)) * **lexer:** stop treating ]] and unbalanced [...] as special outside conditionals ([#45](#45)) ([4bf5a5c](4bf5a5c)) * **parser:** fall back from (( … )) arith to nested subshells ([#48](#48)) ([1437f00](1437f00)) ### Code Refactoring * **format:** introduce Formatter struct ([#65](#65)) ([d965a8f](d965a8f)) * **lexer:** drop Result<Token> wrapper from operator readers ([#62](#62)) ([d52a841](d52a841)) * **lexer:** split read_word_token into classify + advance + dispatch helpers ([#63](#63)) ([3ba09f5](3ba09f5)) * **parser:** extract fill_heredoc_contents visitor helpers ([#68](#68)) ([40e6165](40e6165)) * **parser:** extract helpers from three oversize parsers ([#69](#69)) ([25d0762](25d0762)) * **sexp:** dispatch NodeKind Display to per-category helpers ([#66](#66)) ([44b0330](44b0330)) * **sexp:** table-drive ANSI-C escape dispatch ([#67](#67)) ([91a5267](91a5267)) * tighten lexer API surface and relocate WordSpan to ast ([#70](#70)) ([5171d01](5171d01)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). Co-authored-by: repository-butler[bot] <166800726+repository-butler[bot]@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Extracts helpers from three parser functions that each carried
#[allow(clippy::too_many_lines)]:parse_simple_commandsrc/parser/simple_command.rsparse_cond_primarysrc/parser/conditionals.rsparse_coprocsrc/parser/functions.rsAll three
#[allow]attributes dropped.Shared
src/parser/helpers.rs: newpub(super) const fn is_redirect_op_kind(TokenType) -> boolcollapses the 12-variant redirect-operator matches! used in 3 places (simple_command.rs,functions.rs, andredirects.rs::is_redirect_operator).simple_command.rstry_parse_fd_redirect(&mut self, tok) -> Result<Option<Node>>— encapsulates the adjacent-fd / varfd redirect lookahead.build_word_node(Token) -> Node— span-preserving Word node builder, documented distinct fromhelpers::word_node_from_token(which usesNode::empty).conditionals.rstry_parse_cond_negation,try_parse_cond_group,parse_cond_operandmethods extract the!,(...), and operand-dispatch branches. Dispatcher extractsTokenType(Copy) to avoid borrow-vs-mut conflicts with the peeked&Token.functions.rscoproc_starts_command(TokenType) -> bool(freeconst fn) unifies the twostarts_command() && !matches!(Coproc|Time|Bang)checks.build_coproc_with_command,parse_coproc_redirect_only,parse_coproc_word_loop,build_coproc_synthetic_commandmethods split the 4 dispatch paths (A/B/C/D) ofparse_coproc.Test plan
cargo fmtcargo clippy --all-targets -- -D warnings— no warningscargo test— 252 passedoracle_*tests pass (cargo test --test integration oracle_)Stack
Part of the v0.2.0 refactoring cycle (#61). This is PR 8 of 10.
Closes #58
🤖 Generated with Claude Code