ProvableHQ/leo
1
1
Fork 0
mirror of https://github.com/ProvableHQ/leo.git synced 2024-12-25 19:22:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/AleoHQ/leo

Browse Source
This commit is contained in:
howardwu 2020-12-03 15:59:01 -04:00
commit 47f9cd4b11
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
type-inference/src/objects/frame.rs
View File

@ -310,7 +310,6 @@ impl Frame {
if variables.names.len() == 1 { if variables.names.len() == 1 {
// Insert variable into symbol table // Insert variable into symbol table
let variable = variables.names[0].clone(); let variable = variables.names[0].clone();
self.insert_variable(variable.identifier.name, actual_type, span)?; self.insert_variable(variable.identifier.name, actual_type, span)?;
} else { } else {
// Expect a tuple type. // Expect a tuple type.
@ -867,7 +866,7 @@ impl Frame {
fn parse_array_access(&mut self, type_: Type, r_or_e: &RangeOrExpression, span: &Span) -> Result<Type, FrameError> { fn parse_array_access(&mut self, type_: Type, r_or_e: &RangeOrExpression, span: &Span) -> Result<Type, FrameError> {
// Check the type is an array. // Check the type is an array.
let element_type = match type_ { let element_type = match type_ {
Type::Array(type_) => type_, Type::Array(type_) => *type_,
type_ => return Err(FrameError::array_access(&type_, span)), type_ => return Err(FrameError::array_access(&type_, span)),
}; };
@ -890,6 +889,9 @@ impl Frame {
self.assert_index(&type_, span); self.assert_index(&type_, span);
} }
// Return a new array type.
Ok(Type::Array(Box::new(element_type)))
} }
RangeOrExpression::Expression(expression) => { RangeOrExpression::Expression(expression) => {
// Parse the expression type. // Parse the expression type.
@ -897,10 +899,11 @@ impl Frame {
// Assert the type is an index. // Assert the type is an index.
self.assert_index(&type_, span); self.assert_index(&type_, span);
// Return the element type.
Ok(element_type)
} }
} }
Ok(*element_type)
} }
/// ///