Merge pull request #1334 from AleoHQ/bug/Self-in-tuple-or-list-arg-errors

[Bugfix] proper canoncialization of function inputs
This commit is contained in:
gluax 2021-09-10 05:57:06 -07:00 committed by GitHub
commit 9af730e8ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 14 deletions

View File

@ -470,15 +470,15 @@ impl Canonicalizer {
fn canonicalize_function_input(&mut self, input: &FunctionInput) -> FunctionInput { fn canonicalize_function_input(&mut self, input: &FunctionInput) -> FunctionInput {
if let FunctionInput::Variable(variable) = input { if let FunctionInput::Variable(variable) = input {
if variable.type_.is_self() { let type_ = self.canonicalize_self_type(Some(&variable.type_)).unwrap();
return FunctionInput::Variable(FunctionInputVariable {
identifier: variable.identifier.clone(), return FunctionInput::Variable(FunctionInputVariable {
const_: variable.const_, identifier: variable.identifier.clone(),
mutable: variable.mutable, const_: variable.const_,
type_: Type::Identifier(self.circuit_name.as_ref().unwrap().clone()), mutable: variable.mutable,
span: variable.span.clone(), type_,
}); span: variable.span.clone(),
} });
} }
input.clone() input.clone()

View File

@ -20,7 +20,7 @@ circuit Foo {
y[Self {x: 0}.x] += 2; y[Self {x: 0}.x] += 2;
} }
function func() { function func(a: [Self; 3], y: (Self)) {
const x: Self = Foo {x: Self {x: 1}.x}; const x: Self = Foo {x: Self {x: 1}.x};
} }

View File

@ -16,7 +16,7 @@ outputs:
r0: r0:
type: bool type: bool
value: "true" value: "true"
initial_ast: d8ff1c8c84bc93bbd4e712dde7eb3c9dbe433199f5902b6dc3329cf3ca607811 initial_ast: ec52d3b3e69bef6d104f2dcfa9e713a728d7b0e15439c9da3b521b6cbfe719d4
imports_resolved_ast: d8ff1c8c84bc93bbd4e712dde7eb3c9dbe433199f5902b6dc3329cf3ca607811 imports_resolved_ast: ec52d3b3e69bef6d104f2dcfa9e713a728d7b0e15439c9da3b521b6cbfe719d4
canonicalized_ast: 9ef4d52afc2cbbcaa7759af48d1603feb28287d619293135a7856625a37299f7 canonicalized_ast: c85604dd75a964f7a6cfc0dddbeeeccf28a7c43915b944740528a0ff6230db78
type_inferenced_ast: f3a91e1cd91f60c94ffe809369eeecb2f22996b6f14c1589a5c7a825519a6b1e type_inferenced_ast: 258670051ac595a600362cb5a6793fb5ba9361cd914f7483057ad66204fc1b36