AleoHQ/leo
1
1
Fork 0
mirror of https://github.com/AleoHQ/leo.git synced 2024-11-29 22:36:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/doc-bugs' of github.com:AleoHQ/leo into feature/signed-integer-syntax

Browse Source
This commit is contained in:
collin 2020-07-15 12:34:48 -07:00
commit c584e382d9
3 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ast/src/ast.rs
View File

@ -45,8 +45,9 @@ fn precedence_climber() -> PrecClimber<Rule> {
PrecClimber::new(vec![
Operator::new(Rule::operation_or, Assoc::Left),
Operator::new(Rule::operation_and, Assoc::Left),
Operator::new(Rule::operation_eq, Assoc::Left) | Operator::new(Rule::operation_ne, Assoc::Left),
Operator::new(Rule::operation_ge, Assoc::Left)
Operator::new(Rule::operation_eq, Assoc::Left)
| Operator::new(Rule::operation_ne, Assoc::Left)
| Operator::new(Rule::operation_ge, Assoc::Left)
| Operator::new(Rule::operation_gt, Assoc::Left)
| Operator::new(Rule::operation_le, Assoc::Left)
| Operator::new(Rule::operation_lt, Assoc::Left),

18
ast/src/leo.pest
View File

@ -9,10 +9,20 @@ file = { SOI ~ NEWLINE* ~ import* ~ NEWLINE* ~ circuit* ~ NEWLINE* ~ function_de
// Declared in common/identifier.rs
identifier = @{ ((!protected_name ~ ASCII_ALPHA) | (protected_name ~ (ASCII_ALPHANUMERIC | "_"))) ~ (ASCII_ALPHANUMERIC | "_")* }
protected_name = {
"for"| "if" | "else" | "as" | "return"
| declare | mutable | static_ | value_boolean
| type_array | type_data
| macro_name | macro_symbol
"address"
| "as"
| "const"
| "else"
| "false"
| "function"
| "for"
| "if"
| "in"
| "let"
| "mut"
| "return"
| "static"
| "true"
}
// Declared in common/line_end.rs

7
leo/commands/build.rs
View File

@ -55,7 +55,10 @@ impl CLI for BuildCommand {
lib_file_path.push(LIB_FILE_NAME);
// Compile the library file but do not output
let _program = Compiler::<Fq, EdwardsGroupType>::new_from_path(package_name.clone(), lib_file_path)?;
let _program =
Compiler::<Fq, EdwardsGroupType>::new_from_path(package_name.clone(), lib_file_path.clone())?;
log::info!("Compiled library file {:?}", lib_file_path);
};
// Compile the main.leo file along with constraints
@ -109,7 +112,7 @@ impl CLI for BuildCommand {
log::debug!("Checksum saved ({:?})", path);
}
log::info!("Compiled program in {:?}", main_file_path);
log::info!("Compiled program file {:?}", main_file_path);
return Ok(Some((program, checksum_differs)));
}