Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions crates/ovsm/src/lexer/sexpr_scanner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -283,8 +283,8 @@ impl SExprScanner {
"nil" | "null" => TokenKind::Null,
_ => {
// Check if it's a keyword argument (starts with :)
if text.starts_with(':') {
TokenKind::Identifier(text[1..].to_string()) // Remove the :
if let Some(stripped) = text.strip_prefix(':') {
TokenKind::Identifier(stripped.to_string()) // Remove the :
} else {
// Otherwise it's an identifier or symbol
TokenKind::Identifier(text)
Expand Down
13 changes: 4 additions & 9 deletions crates/ovsm/src/parser/sexpr_parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -655,14 +655,9 @@ impl SExprParser {

while !self.check(&TokenKind::RightParen) {
if let TokenKind::Identifier(name) = &self.peek().kind {
// Handle &optional, &rest, &key markers
if name == "&optional" || name == "&rest" || name == "&key" {
params.push(name.clone());
self.advance();
} else {
params.push(name.clone());
self.advance();
}
// Handle &optional, &rest, &key markers and regular params
params.push(name.clone());
self.advance();
} else if self.check(&TokenKind::LeftParen) {
// Handle (param-name default-value) form
self.advance(); // consume (
Expand Down Expand Up @@ -1058,7 +1053,7 @@ impl SExprParser {
Ok(self.advance())
} else {
let token = self.peek();
let message = self.build_error_message(&kind, &token);
let message = self.build_error_message(&kind, token);

Err(Error::SyntaxError {
line: token.line,
Expand Down
Loading