ElnuDev/renrs
1
0
Fork 0
generated from ElnuDev/rust-project
Code Issues Pull requests Projects Releases Packages Wiki Activity

cargo fmt

Browse source
This commit is contained in:
Elnu 2023-05-30 12:34:50 -07:00
parent 683917dd74
commit 149842c121
3 changed files with 26 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
renrs/src/lib.rs
View file

@ -33,4 +33,4 @@ impl Iterator for State {
}
None
}
}
}

24
renrs/src/parser/block.rs
View file

@ -2,7 +2,7 @@ use debug_cell::RefCell;
use std::{collections::HashMap, rc::Rc};
use super::{
command::{parse_command, Command, AssignType},
command::{parse_command, AssignType, Command},
control::{parse_control, Control},
event::Event,
token::Token,
@ -24,15 +24,19 @@ pub struct CommandContext {
impl CommandContext {
pub fn execute(&self) -> Option<Event> {
use Command::*;
use AssignType::*;
use Command::*;
Some(
match &self.command {
Say { name, text } => Event::Say {
name: name.clone(),
text: text.clone(),
},
Command::Assign { assign_type, variable, value } => match assign_type {
Command::Assign {
assign_type,
variable,
value,
} => match assign_type {
Define => panic!("define command should not be executed at runtime!"),
GlobalAssign => {
if let Token::Keyword(_) = value {
@ -51,7 +55,7 @@ impl CommandContext {
.borrow_mut()
.insert(variable.clone(), value.clone());
return None;
},
}
Let => {
if let Token::Keyword(_) = value {
todo!("assignment variable interpolation isn't implemented");
@ -62,14 +66,14 @@ impl CommandContext {
.borrow_mut()
.insert(variable.clone(), value.clone());
return None;
},
}
Assign => {
if let Token::Keyword(_) = value {
todo!("assignment variable interpolation isn't implemented");
}
todo!("local variable assignment isn't implemented")
},
}
}
},
Eat { .. } => return None,
}
.process(&self.context),
@ -187,7 +191,11 @@ pub fn parse_block(
continue;
}
Rule::Line => BlockElement::Command(match parse_command(pair) {
Command::Assign { variable, value, assign_type: AssignType::Define } => {
Command::Assign {
variable,
value,
assign_type: AssignType::Define,
} => {
let mut value = value;
if let Token::Keyword(keyword) = value {
value = definitions

22
renrs/src/parser/command.rs
View file

@ -64,19 +64,15 @@ pub fn parse_command(pair: Pair) -> Command {
name: Some(name.clone()),
text: text.clone(),
},
// https://github.com/rust-lang/rust/issues/51114
[Keyword(keyword), Keyword(variable), Keyword(equals), value]
if equals.eq("=") =>
{
Assign {
assign_type: match keyword.parse() {
Ok(assign_type) => assign_type,
Err(_) => unknown!(),
},
variable: variable.clone(),
value: value.clone(),
}
}
// https://github.com/rust-lang/rust/issues/51114
[Keyword(keyword), Keyword(variable), Keyword(equals), value] if equals.eq("=") => Assign {
assign_type: match keyword.parse() {
Ok(assign_type) => assign_type,
Err(_) => unknown!(),
},
variable: variable.clone(),
value: value.clone(),
},
[Keyword(keyword), Str(food), tail @ ..] if keyword.eq("eat") => Eat {
food: food.to_owned(),
politely: match tail {