ProvableHQ/leo
1
1
Fork 0
mirror of https://github.com/ProvableHQ/leo.git synced 2024-11-23 23:23:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

error on Self outside of cicuits

Browse Source
This commit is contained in:
gluax 2021-03-12 18:29:53 -05:00
parent 04f62cdd8c
commit 88166a64f9
3 changed files with 103 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
ast/src/reducer/canonicalization.rs
View File

@ -15,45 +15,15 @@
// along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
use crate::*;
use indexmap::IndexMap;
// use indexmap::IndexMap;
pub struct Canonicalizer;
impl Canonicalizer {
fn _is_self(&self, identifier: &Identifier) -> bool {
matches!(identifier.name.as_str(), "Self")
}
fn is_self_type(&self, type_option: Option<&Type>) -> bool {
matches!(type_option, Some(Type::SelfType))
}
fn _canonicalize_function_input(&self, function_input: &FunctionInput, circuit_name: &Identifier) -> FunctionInput {
match function_input {
FunctionInput::SelfKeyword(self_keyword) => {
return FunctionInput::Variable(FunctionInputVariable {
identifier: circuit_name.clone(),
const_: false,
mutable: false,
type_: Type::Circuit(circuit_name.clone()),
span: self_keyword.span.clone(),
});
}
FunctionInput::MutSelfKeyword(mut_self_keyword) => {
return FunctionInput::Variable(FunctionInputVariable {
identifier: circuit_name.clone(),
const_: false,
mutable: true,
type_: Type::Circuit(circuit_name.clone()),
span: mut_self_keyword.span.clone(),
});
}
_ => {}
}
function_input.clone()
}
fn canonicalize_expression(&self, expression: &Expression, circuit_name: &Identifier) -> Expression {
match expression {
Expression::CircuitInit(circuit_init) => {
@ -173,11 +143,15 @@ impl Canonicalizer {
}
impl ReconstructingReducer for Canonicalizer {
fn reduce_type(&mut self, _type_: &Type, new: Type) -> Type {
fn reduce_type(&mut self, _type_: &Type, new: Type, in_circuit: bool) -> Type {
match new {
Type::Array(_, mut dimensions) => {
// TODO need to throw errors in all these.
// Throw error if dimensions is empty.
// if array_init.dimensions.0.len() == 0 {
// }
let mut next = Type::Array(
Box::new(Type::Group),
ArrayDimensions(vec![dimensions.remove_last().unwrap()]),
@ -194,12 +168,20 @@ impl ReconstructingReducer for Canonicalizer {
array
}
Type::SelfType if !in_circuit => {
println!("Brrr bad Self");
new.clone()
}
_ => new.clone(),
}
}
fn reduce_array_init(&mut self, array_init: &ArrayInitExpression, element: Expression) -> ArrayInitExpression {
// TODO ERROR HERE if len is 0
// if array_init.dimensions.0.len() == 0 {
// }
let element = Box::new(element);
if array_init.dimensions.0.len() == 1 {
@ -288,10 +270,11 @@ impl ReconstructingReducer for Canonicalizer {
input: Vec<FunctionInput>,
output: Option<Type>,
block: Block,
_in_circuit: bool,
) -> Function {
let new_output = match output {
None => Some(Type::Tuple(vec![])),
_ => output.clone(),
_ => output,
};
Function {
@ -304,13 +287,13 @@ impl ReconstructingReducer for Canonicalizer {
}
}
// fn reduce_circuit(&mut self, _circuit: &Circuit, circuit_name: Identifier, members: Vec<CircuitMember>) -> Circuit {
// Circuit {
// circuit_name: circuit_name.clone(),
// members: members
// .iter()
// .map(|member| self.canonicalize_circuit_member(member, &circuit_name))
// .collect(),
// }
// }
fn reduce_circuit(&mut self, _circuit: &Circuit, circuit_name: Identifier, members: Vec<CircuitMember>) -> Circuit {
Circuit {
circuit_name: circuit_name.clone(),
members: members
.iter()
.map(|member| self.canonicalize_circuit_member(member, &circuit_name))
.collect(),
}
}
}

101
ast/src/reducer/reconstructing_director.rs
View File

@ -28,16 +28,18 @@ impl<R: ReconstructingReducer> ReconstructingDirector<R> {
Self { reducer }
}
pub fn reduce_type(&mut self, type_: &Type) -> Type {
pub fn reduce_type(&mut self, type_: &Type, in_circuit: bool) -> Type {
let new = match type_ {
// Data type wrappers
Type::Array(type_, dimensions) => Type::Array(Box::new(self.reduce_type(type_)), dimensions.clone()),
Type::Tuple(types) => Type::Tuple(types.iter().map(|type_| self.reduce_type(type_)).collect()),
Type::Array(type_, dimensions) => {
Type::Array(Box::new(self.reduce_type(type_, in_circuit)), dimensions.clone())
}
Type::Tuple(types) => Type::Tuple(types.iter().map(|type_| self.reduce_type(type_, in_circuit)).collect()),
Type::Circuit(identifier) => Type::Circuit(self.reduce_identifier(identifier)),
_ => type_.clone(),
};
self.reducer.reduce_type(type_, new)
self.reducer.reduce_type(type_, new, in_circuit)
}
// Expressions
@ -240,19 +242,21 @@ impl<R: ReconstructingReducer> ReconstructingDirector<R> {
}
// Statements
pub fn reduce_statement(&mut self, statement: &Statement) -> Statement {
pub fn reduce_statement(&mut self, statement: &Statement, in_circuit: bool) -> Statement {
let new = match statement {
Statement::Return(return_statement) => Statement::Return(self.reduce_return(&return_statement)),
Statement::Definition(definition) => Statement::Definition(self.reduce_definition(&definition)),
Statement::Definition(definition) => Statement::Definition(self.reduce_definition(&definition, in_circuit)),
Statement::Assign(assign) => Statement::Assign(self.reduce_assign(&assign)),
Statement::Conditional(conditional) => Statement::Conditional(self.reduce_conditional(&conditional)),
Statement::Iteration(iteration) => Statement::Iteration(self.reduce_iteration(&iteration)),
Statement::Conditional(conditional) => {
Statement::Conditional(self.reduce_conditional(&conditional, in_circuit))
}
Statement::Iteration(iteration) => Statement::Iteration(self.reduce_iteration(&iteration, in_circuit)),
Statement::Console(console) => Statement::Console(self.reduce_console(&console)),
Statement::Expression(expression) => Statement::Expression(self.reduce_expression_statement(&expression)),
Statement::Block(block) => Statement::Block(self.reduce_block(&block)),
Statement::Block(block) => Statement::Block(self.reduce_block(&block, in_circuit)),
};
self.reducer.reduce_statement(statement, new)
self.reducer.reduce_statement(statement, new, in_circuit)
}
pub fn reduce_return(&mut self, return_statement: &ReturnStatement) -> ReturnStatement {
@ -267,16 +271,20 @@ impl<R: ReconstructingReducer> ReconstructingDirector<R> {
self.reducer.reduce_variable_name(variable_name, identifier)
}
pub fn reduce_definition(&mut self, definition: &DefinitionStatement) -> DefinitionStatement {
pub fn reduce_definition(&mut self, definition: &DefinitionStatement, in_circuit: bool) -> DefinitionStatement {
let variable_names = definition
.variable_names
.iter()
.map(|variable_name| self.reduce_variable_name(variable_name))
.collect();
let type_ = definition.type_.as_ref().map(|inner| self.reduce_type(inner));
let type_ = definition
.type_
.as_ref()
.map(|inner| self.reduce_type(inner, in_circuit));
let value = self.reduce_expression(&definition.value);
self.reducer.reduce_definition(definition, variable_names, type_, value)
self.reducer
.reduce_definition(definition, variable_names, type_, value, in_circuit)
}
pub fn reduce_assignee_access(&mut self, access: &AssigneeAccess) -> AssigneeAccess {
@ -311,24 +319,26 @@ impl<R: ReconstructingReducer> ReconstructingDirector<R> {
self.reducer.reduce_assign(assign, assignee, value)
}
pub fn reduce_conditional(&mut self, conditional: &ConditionalStatement) -> ConditionalStatement {
pub fn reduce_conditional(&mut self, conditional: &ConditionalStatement, in_circuit: bool) -> ConditionalStatement {
let condition = self.reduce_expression(&conditional.condition);
let block = self.reduce_block(&conditional.block);
let block = self.reduce_block(&conditional.block, in_circuit);
let next = conditional
.next
.as_ref()
.map(|condition| self.reduce_statement(condition));
.map(|condition| self.reduce_statement(condition, in_circuit));
self.reducer.reduce_conditional(conditional, condition, block, next)
self.reducer
.reduce_conditional(conditional, condition, block, next, in_circuit)
}
pub fn reduce_iteration(&mut self, iteration: &IterationStatement) -> IterationStatement {
pub fn reduce_iteration(&mut self, iteration: &IterationStatement, in_circuit: bool) -> IterationStatement {
let variable = self.reduce_identifier(&iteration.variable);
let start = self.reduce_expression(&iteration.start);
let stop = self.reduce_expression(&iteration.stop);
let block = self.reduce_block(&iteration.block);
let block = self.reduce_block(&iteration.block, in_circuit);
self.reducer.reduce_iteration(iteration, variable, start, stop, block)
self.reducer
.reduce_iteration(iteration, variable, start, stop, block, in_circuit)
}
pub fn reduce_console(&mut self, console_function_call: &ConsoleStatement) -> ConsoleStatement {
@ -361,14 +371,14 @@ impl<R: ReconstructingReducer> ReconstructingDirector<R> {
self.reducer.reduce_expression_statement(expression, inner_expression)
}
pub fn reduce_block(&mut self, block: &Block) -> Block {
pub fn reduce_block(&mut self, block: &Block, in_circuit: bool) -> Block {
let statements = block
.statements
.iter()
.map(|statement| self.reduce_statement(statement))
.map(|statement| self.reduce_statement(statement, in_circuit))
.collect();
self.reducer.reduce_block(block, statements)
self.reducer.reduce_block(block, statements, in_circuit)
}
// Program
@ -376,7 +386,7 @@ impl<R: ReconstructingReducer> ReconstructingDirector<R> {
let inputs = program
.expected_input
.iter()
.map(|input| self.reduce_function_input(input))
.map(|input| self.reduce_function_input(input, false))
.collect();
let imports = program
.imports
@ -391,29 +401,39 @@ impl<R: ReconstructingReducer> ReconstructingDirector<R> {
let functions = program
.functions
.iter()
.map(|(identifier, function)| (self.reduce_identifier(identifier), self.reduce_function(function)))
.map(|(identifier, function)| {
(
self.reduce_identifier(identifier),
self.reduce_function(function, false),
)
})
.collect();
self.reducer
.reduce_program(program, inputs, imports, circuits, functions)
}
pub fn reduce_function_input_variable(&mut self, variable: &FunctionInputVariable) -> FunctionInputVariable {
pub fn reduce_function_input_variable(
&mut self,
variable: &FunctionInputVariable,
in_circuit: bool,
) -> FunctionInputVariable {
let identifier = self.reduce_identifier(&variable.identifier);
let type_ = self.reduce_type(&variable.type_);
let type_ = self.reduce_type(&variable.type_, in_circuit);
self.reducer.reduce_function_input_variable(variable, identifier, type_)
self.reducer
.reduce_function_input_variable(variable, identifier, type_, in_circuit)
}
pub fn reduce_function_input(&mut self, input: &FunctionInput) -> FunctionInput {
pub fn reduce_function_input(&mut self, input: &FunctionInput, in_circuit: bool) -> FunctionInput {
let new = match input {
FunctionInput::Variable(function_input_variable) => {
FunctionInput::Variable(self.reduce_function_input_variable(function_input_variable))
FunctionInput::Variable(self.reduce_function_input_variable(function_input_variable, in_circuit))
}
_ => input.clone(),
};
self.reducer.reduce_function_input(input, new)
self.reducer.reduce_function_input(input, new, in_circuit)
}
pub fn reduce_package_or_packages(&mut self, package_or_packages: &PackageOrPackages) -> PackageOrPackages {
@ -442,9 +462,11 @@ impl<R: ReconstructingReducer> ReconstructingDirector<R> {
pub fn reduce_circuit_member(&mut self, circuit_member: &CircuitMember) -> CircuitMember {
let new = match circuit_member {
CircuitMember::CircuitVariable(identifier, type_) => {
CircuitMember::CircuitVariable(self.reduce_identifier(&identifier), self.reduce_type(&type_))
CircuitMember::CircuitVariable(self.reduce_identifier(&identifier), self.reduce_type(&type_, true))
}
CircuitMember::CircuitFunction(function) => {
CircuitMember::CircuitFunction(self.reduce_function(&function, true))
}
CircuitMember::CircuitFunction(function) => CircuitMember::CircuitFunction(self.reduce_function(&function)),
};
self.reducer.reduce_circuit_member(circuit_member, new)
@ -467,7 +489,7 @@ impl<R: ReconstructingReducer> ReconstructingDirector<R> {
self.reducer.reduce_annotation(annotation, name)
}
pub fn reduce_function(&mut self, function: &Function) -> Function {
pub fn reduce_function(&mut self, function: &Function, in_circuit: bool) -> Function {
let identifier = self.reduce_identifier(&function.identifier);
let annotations = function
.annotations
@ -477,12 +499,15 @@ impl<R: ReconstructingReducer> ReconstructingDirector<R> {
let input = function
.input
.iter()
.map(|input| self.reduce_function_input(input))
.map(|input| self.reduce_function_input(input, false))
.collect();
let output = function.output.as_ref().map(|output| self.reduce_type(output));
let block = self.reduce_block(&function.block);
let output = function
.output
.as_ref()
.map(|output| self.reduce_type(output, in_circuit));
let block = self.reduce_block(&function.block, false);
self.reducer
.reduce_function(function, identifier, annotations, input, output, block)
.reduce_function(function, identifier, annotations, input, output, block, in_circuit)
}
}

19
ast/src/reducer/reconstructing_reducer.rs
View File

@ -20,7 +20,7 @@ use indexmap::IndexMap;
// Needed to fix clippy bug.
#[allow(clippy::redundant_closure)]
pub trait ReconstructingReducer {
fn reduce_type(&mut self, _type_: &Type, new: Type) -> Type {
fn reduce_type(&mut self, _type_: &Type, new: Type, _in_circuit: bool) -> Type {
new
}
@ -221,7 +221,7 @@ pub trait ReconstructingReducer {
}
// Statements
fn reduce_statement(&mut self, _statement: &Statement, new: Statement) -> Statement {
fn reduce_statement(&mut self, _statement: &Statement, new: Statement, _in_circuit: bool) -> Statement {
new
}
@ -246,6 +246,7 @@ pub trait ReconstructingReducer {
variable_names: Vec<VariableName>,
type_: Option<Type>,
value: Expression,
_in_circuit: bool,
) -> DefinitionStatement {
DefinitionStatement {
declaration_type: definition.declaration_type.clone(),
@ -288,6 +289,7 @@ pub trait ReconstructingReducer {
condition: Expression,
block: Block,
statement: Option<Statement>,
_in_circuit: bool,
) -> ConditionalStatement {
ConditionalStatement {
condition,
@ -304,6 +306,7 @@ pub trait ReconstructingReducer {
start: Expression,
stop: Expression,
block: Block,
_in_circuit: bool,
) -> IterationStatement {
IterationStatement {
variable,
@ -332,7 +335,7 @@ pub trait ReconstructingReducer {
}
}
fn reduce_block(&mut self, block: &Block, statements: Vec<Statement>) -> Block {
fn reduce_block(&mut self, block: &Block, statements: Vec<Statement>, _in_circuit: bool) -> Block {
Block {
statements,
span: block.span.clone(),
@ -362,6 +365,7 @@ pub trait ReconstructingReducer {
variable: &FunctionInputVariable,
identifier: Identifier,
type_: Type,
_in_circuit: bool,
) -> FunctionInputVariable {
FunctionInputVariable {
identifier,
@ -372,7 +376,12 @@ pub trait ReconstructingReducer {
}
}
fn reduce_function_input(&mut self, _input: &FunctionInput, new: FunctionInput) -> FunctionInput {
fn reduce_function_input(
&mut self,
_input: &FunctionInput,
new: FunctionInput,
_in_circuit: bool,
) -> FunctionInput {
new
}
@ -407,6 +416,7 @@ pub trait ReconstructingReducer {
}
}
#[allow(clippy::too_many_arguments)]
fn reduce_function(
&mut self,
function: &Function,
@ -415,6 +425,7 @@ pub trait ReconstructingReducer {
input: Vec<FunctionInput>,
output: Option<Type>,
block: Block,
_in_circuit: bool,
) -> Function {
Function {
identifier,