jeff/dust
1
0
Fork 0
Code Issues

Pass parser test

Browse Source
This commit is contained in:
Jeff 2024-09-07 04:37:38 -04:00
parent 812d930488
commit 616f890028
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dust-lang/src/parser.rs
View File

@ -75,15 +75,16 @@ impl<'src> Parser<'src> {
} }
} }
fn emit_byte(&mut self, byte: u8) { fn emit_byte(&mut self, byte: u8, position: Span) {
self.chunk.write(byte, self.current_position); self.chunk.write(byte, position);
} }
fn emit_constant(&mut self, value: Value) -> Result<(), ParseError> { fn emit_constant(&mut self, value: Value) -> Result<(), ParseError> {
let constant_index = self.chunk.push_constant(value)?; let constant_index = self.chunk.push_constant(value)?;
let position = self.current_position;
self.emit_byte(Instruction::Constant as u8); self.emit_byte(Instruction::Constant as u8, position);
self.emit_byte(constant_index); self.emit_byte(constant_index, position);
Ok(()) Ok(())
} }
@ -109,9 +110,11 @@ impl<'src> Parser<'src> {
fn parse_unary(&mut self) -> Result<(), ParseError> { fn parse_unary(&mut self) -> Result<(), ParseError> {
if let Some(Token::Minus) = self.current_token { if let Some(Token::Minus) = self.current_token {
let operator_position = self.current_position;
self.advance()?; self.advance()?;
self.parse_expression()?; self.parse_expression()?;
self.emit_byte(Instruction::Negate as u8); self.emit_byte(Instruction::Negate as u8, operator_position);
} }
Ok(()) Ok(())
@ -124,11 +127,11 @@ impl<'src> Parser<'src> {
self.parse(rule.precedence.increment())?; self.parse(rule.precedence.increment())?;
match operator { let byte = match operator {
TokenKind::Plus => self.emit_byte(Instruction::Add as u8), TokenKind::Plus => Instruction::Add as u8,
TokenKind::Minus => self.emit_byte(Instruction::Subtract as u8), TokenKind::Minus => Instruction::Subtract as u8,
TokenKind::Star => self.emit_byte(Instruction::Multiply as u8), TokenKind::Star => Instruction::Multiply as u8,
TokenKind::Slash => self.emit_byte(Instruction::Divide as u8), TokenKind::Slash => Instruction::Divide as u8,
_ => { _ => {
return Err(ParseError::ExpectedTokenMultiple { return Err(ParseError::ExpectedTokenMultiple {
expected: vec![ expected: vec![
@ -141,7 +144,9 @@ impl<'src> Parser<'src> {
position: self.current_position, position: self.current_position,
}) })
} }
} };
self.emit_byte(byte, operator_position);
Ok(()) Ok(())
} }