4a4f1fffad
Successfully extracted utility methods from parser/mod.rs to common.rs: - Created ParserUtils trait with token manipulation methods - Extracted current_token, peek_token, advance, skip_newlines, etc. - All parser modules now use trait-based utilities - Reduced mod.rs by ~60 lines ✅ Build successful with no errors ✅ All functionality preserved - tested with using nyashstd 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
122 lines
3.9 KiB
Rust
122 lines
3.9 KiB
Rust
/*!
|
||
* Parser Common Utilities
|
||
*
|
||
* パーサーモジュール間で共有されるヘルパー関数や型定義
|
||
* Extracted from parser/mod.rs as part of modularization
|
||
*/
|
||
|
||
use crate::tokenizer::{Token, TokenType};
|
||
use crate::ast::Span;
|
||
use super::ParseError;
|
||
|
||
/// Parser utility methods
|
||
pub trait ParserUtils {
|
||
fn tokens(&self) -> &Vec<Token>;
|
||
fn current(&self) -> usize;
|
||
fn current_mut(&mut self) -> &mut usize;
|
||
|
||
/// 現在のトークンを取得
|
||
fn current_token(&self) -> &Token {
|
||
self.tokens().get(self.current()).unwrap_or(&Token {
|
||
token_type: TokenType::EOF,
|
||
line: 0,
|
||
column: 0,
|
||
})
|
||
}
|
||
|
||
/// 次のトークンを先読み（位置を進めない）
|
||
fn peek_token(&self) -> &TokenType {
|
||
if self.current() + 1 < self.tokens().len() {
|
||
&self.tokens()[self.current() + 1].token_type
|
||
} else {
|
||
&TokenType::EOF
|
||
}
|
||
}
|
||
|
||
/// N個先のトークンを先読み
|
||
fn peek_nth_token(&self, n: usize) -> &TokenType {
|
||
if self.current() + n < self.tokens().len() {
|
||
&self.tokens()[self.current() + n].token_type
|
||
} else {
|
||
&TokenType::EOF
|
||
}
|
||
}
|
||
|
||
/// 位置を1つ進める
|
||
fn advance(&mut self) {
|
||
if !self.is_at_end() {
|
||
*self.current_mut() += 1;
|
||
}
|
||
}
|
||
|
||
/// NEWLINEトークンをスキップ
|
||
fn skip_newlines(&mut self) {
|
||
while matches!(self.current_token().token_type, TokenType::NEWLINE) && !self.is_at_end() {
|
||
self.advance();
|
||
}
|
||
}
|
||
|
||
/// 指定されたトークンタイプを消費 (期待通りでなければエラー)
|
||
fn consume(&mut self, expected: TokenType) -> Result<Token, ParseError> {
|
||
if std::mem::discriminant(&self.current_token().token_type) ==
|
||
std::mem::discriminant(&expected) {
|
||
let token = self.current_token().clone();
|
||
self.advance();
|
||
Ok(token)
|
||
} else {
|
||
let line = self.current_token().line;
|
||
Err(ParseError::UnexpectedToken {
|
||
found: self.current_token().token_type.clone(),
|
||
expected: format!("{:?}", expected),
|
||
line,
|
||
})
|
||
}
|
||
}
|
||
|
||
/// 現在のトークンが指定されたタイプかチェック
|
||
fn match_token(&self, token_type: &TokenType) -> bool {
|
||
std::mem::discriminant(&self.current_token().token_type) ==
|
||
std::mem::discriminant(token_type)
|
||
}
|
||
|
||
/// 複数のトークンタイプのいずれかにマッチするかチェック
|
||
fn match_any_token(&self, token_types: &[TokenType]) -> bool {
|
||
let current_discriminant = std::mem::discriminant(&self.current_token().token_type);
|
||
token_types.iter().any(|tt| {
|
||
std::mem::discriminant(tt) == current_discriminant
|
||
})
|
||
}
|
||
|
||
/// 終端に達したかチェック
|
||
fn is_at_end(&self) -> bool {
|
||
self.current() >= self.tokens().len() ||
|
||
matches!(self.current_token().token_type, TokenType::EOF)
|
||
}
|
||
|
||
/// 現在のトークンが行の終わり（NEWLINE or EOF）かチェック
|
||
fn is_line_end(&self) -> bool {
|
||
matches!(self.current_token().token_type, TokenType::NEWLINE | TokenType::EOF)
|
||
}
|
||
|
||
/// エラー報告用の現在位置情報を取得
|
||
fn current_position(&self) -> (usize, usize) {
|
||
let token = self.current_token();
|
||
(token.line, token.column)
|
||
}
|
||
|
||
/// 現在のトークンからSpanを作成
|
||
fn current_span(&self) -> Span {
|
||
let token = self.current_token();
|
||
Span {
|
||
start: 0, // Token doesn't have byte offset, so using 0
|
||
end: 0,
|
||
line: token.line,
|
||
column: token.column,
|
||
}
|
||
}
|
||
}
|
||
|
||
/// Helper function to create unknown span
|
||
pub fn unknown_span() -> Span {
|
||
Span::unknown()
|
||
} |