AleoHQ/leo
1
1
Fork 0
mirror of https://github.com/AleoHQ/leo.git synced 2024-09-21 03:57:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

Refactor: all structs parsed as having None program

Browse Source
This commit is contained in:
evan-schott 2024-04-15 18:32:12 -07:00
parent 5f32d736ca
commit e9c996f774
2 changed files with 11 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
compiler/parser/src/parser/file.rs
View File

@ -223,10 +223,13 @@ impl ParserContext<'_> {
self.expect(&Token::LeftCurly)?;
let (members, end) = self.parse_struct_members()?;
// Only provide a program name for records.
let external = if is_record { self.program_name } else { None };
Ok((struct_name.name, Composite {
identifier: struct_name,
members,
external: self.program_name,
external,
is_record,
span: start + end,
id: self.node_builder.next_id(),
@ -282,84 +285,22 @@ impl ParserContext<'_> {
let name = self.expect_identifier()?;
self.expect(&Token::Colon)?;
if self.peek_is_external() {
let external = self.expect_identifier()?;
let mut span = name.span + external.span;
let type_ = self.parse_type()?.0;
// Parse `.leo/` or `.aleo/`.
self.eat(&Token::Dot);
self.eat_any(&[Token::Leo, Token::Aleo]);
self.eat(&Token::Div);
// Parse record name.
let record = self.expect_identifier()?;
// Parse `.record`.
self.eat(&Token::Dot);
self.eat(&Token::Record);
span = span + self.prev_token.span;
Ok(functions::Input::External(External {
identifier: name,
program_name: external,
record,
span,
id: self.node_builder.next_id(),
}))
} else {
let type_ = self.parse_type()?.0;
Ok(functions::Input::Internal(FunctionInput {
identifier: name,
mode,
type_,
span: name.span,
id: self.node_builder.next_id(),
}))
}
Ok(functions::Input { identifier: name, mode, type_, span: name.span, id: self.node_builder.next_id() })
}
/// Returns a [`FunctionOutput`] AST node if the next tokens represent a function output.
fn parse_function_output(&mut self) -> Result<FunctionOutput> {
/// Returns a [`Output`] AST node if the next tokens represent a function output.
fn parse_function_output(&mut self) -> Result<Output> {
// TODO: Could this span be made more accurate?
let mode = self.parse_mode()?;
let (type_, span) = self.parse_type()?;
Ok(FunctionOutput { mode, type_, span, id: self.node_builder.next_id() })
Ok(Output { mode, type_, span, id: self.node_builder.next_id() })
}
/// Returns a [`Output`] AST node if the next tokens represent a function output.
fn parse_output(&mut self) -> Result<Output> {
if self.peek_is_external() {
let external = self.expect_identifier()?;
let mut span = external.span;
// Parse `.leo/` or `.aleo/`.
self.eat(&Token::Dot);
self.eat_any(&[Token::Leo, Token::Aleo]);
self.eat(&Token::Div);
// Parse record name.
let record = self.expect_identifier()?;
// Parse `.record`.
self.eat(&Token::Dot);
self.eat(&Token::Record);
span = span + self.prev_token.span;
Ok(Output::External(External {
identifier: Identifier::new(Symbol::intern("dummy"), self.node_builder.next_id()),
program_name: external,
record,
span,
id: self.node_builder.next_id(),
}))
} else {
Ok(Output::Internal(self.parse_function_output()?))
}
}
pub fn peek_is_external(&self) -> bool {
matches!((&self.token.token, self.look_ahead(1, |t| &t.token)), (Token::Identifier(_), Token::Dot))
self.parse_function_output()
}
/// Returns an [`Annotation`] AST node if the next tokens represent an annotation.

2
compiler/parser/src/parser/type_.rs
View File

@ -104,7 +104,7 @@ impl ParserContext<'_> {
}
}
Ok((Type::Composite(CompositeType { id: ident, program: self.program_name }), ident.span))
Ok((Type::Composite(CompositeType { id: ident, program: None }), ident.span))
} else if self.token.token == Token::LeftSquare {
// Parse the left bracket.
self.expect(&Token::LeftSquare)?;