jeff/dust
1
0
Fork 0
Code

Clean up

Browse Source
This commit is contained in:
Jeff 2024-03-20 08:53:51 -04:00
parent 936b1f5de9
commit 5de92ced6e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,6 +34,7 @@ pub fn parser<'src>() -> impl Parser<
let identifiers: RefCell<HashMap<&str, Identifier>> = RefCell::new(HashMap::new()); let identifiers: RefCell<HashMap<&str, Identifier>> = RefCell::new(HashMap::new());
let _custom_types: Rc<RefCell<HashMap<Identifier, Type>>> = let _custom_types: Rc<RefCell<HashMap<Identifier, Type>>> =
Rc::new(RefCell::new(HashMap::new())); Rc::new(RefCell::new(HashMap::new()));
let custom_types = (_custom_types.clone(), _custom_types.clone());
let identifier = select! { let identifier = select! {
Token::Identifier(text) => { Token::Identifier(text) => {
@ -63,7 +64,6 @@ pub fn parser<'src>() -> impl Parser<
} }
.map_with(|value, state| Expression::Value(value).with_position(state.span())); .map_with(|value, state| Expression::Value(value).with_position(state.span()));
let custom_types = _custom_types.clone();
let r#type = recursive(|r#type| { let r#type = recursive(|r#type| {
let function_type = r#type let function_type = r#type
.clone() .clone()
@ -111,6 +111,7 @@ pub fn parser<'src>() -> impl Parser<
just(Token::Keyword("list")).to(Type::List), just(Token::Keyword("list")).to(Type::List),
identifier.clone().try_map(move |identifier, span| { identifier.clone().try_map(move |identifier, span| {
custom_types custom_types
.0
.borrow() .borrow()
.get(&identifier) .get(&identifier)
.cloned() .cloned()
@ -124,7 +125,6 @@ pub fn parser<'src>() -> impl Parser<
let type_specification = just(Token::Control(Control::Colon)).ignore_then(r#type.clone()); let type_specification = just(Token::Control(Control::Colon)).ignore_then(r#type.clone());
let custom_types = _custom_types.clone();
let positioned_statement = recursive(|positioned_statement| { let positioned_statement = recursive(|positioned_statement| {
let block = positioned_statement let block = positioned_statement
.clone() .clone()
@ -245,8 +245,8 @@ pub fn parser<'src>() -> impl Parser<
just(Token::Control(Control::ParenOpen)), just(Token::Control(Control::ParenOpen)),
just(Token::Control(Control::ParenClose)), just(Token::Control(Control::ParenClose)),
), ),
|op, expression, span| { |function_expression, arguments, span| {
Expression::FunctionCall(FunctionCall::new(op, expression)) Expression::FunctionCall(FunctionCall::new(function_expression, arguments))
.with_position(span) .with_position(span)
}, },
), ),
@ -479,7 +479,7 @@ pub fn parser<'src>() -> impl Parser<
fields, fields,
}; };
custom_types.as_ref().borrow_mut().insert(name, r#type); custom_types.1.borrow_mut().insert(name, r#type);
Statement::StructureDefinition(definition).with_position(state.span()) Statement::StructureDefinition(definition).with_position(state.span())
}); });