mirror of
https://github.com/ProvableHQ/leo.git
synced 2024-09-20 10:18:35 +03:00
add constant keyword, only used for params
This commit is contained in:
parent
20006958c0
commit
cfc5b00bad
@ -22,7 +22,7 @@ use std::fmt;
|
||||
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
|
||||
pub enum ParamMode {
|
||||
Const,
|
||||
Constant,
|
||||
Private,
|
||||
Public,
|
||||
}
|
||||
@ -32,7 +32,7 @@ impl fmt::Display for ParamMode {
|
||||
use ParamMode::*;
|
||||
|
||||
match self {
|
||||
Const => write!(f, "const"),
|
||||
Constant => write!(f, "constant"),
|
||||
Private => write!(f, "private"),
|
||||
Public => write!(f, "public"),
|
||||
}
|
||||
|
@ -66,10 +66,10 @@ impl ParserContext<'_> {
|
||||
///
|
||||
pub fn parse_function_parameter_mode(&mut self) -> Result<ParamMode> {
|
||||
let public = self.eat(Token::Public);
|
||||
let const_ = self.eat(Token::Const);
|
||||
let constant = self.eat(Token::Constant);
|
||||
|
||||
match (public, const_) {
|
||||
(None, Some(_)) => Ok(ParamMode::Const),
|
||||
match (public, constant) {
|
||||
(None, Some(_)) => Ok(ParamMode::Constant),
|
||||
(None, None) => Ok(ParamMode::Private),
|
||||
(Some(_), None) => Ok(ParamMode::Public),
|
||||
(Some(p), Some(c)) => Err(ParserError::inputs_multiple_variable_types_specified(&(p.span + c.span)).into()),
|
||||
|
@ -49,7 +49,7 @@ impl ParserContext<'_> {
|
||||
let mut definitions = Vec::new();
|
||||
|
||||
while let Some(SpannedToken {
|
||||
token: Token::Const | Token::Public | Token::Ident(_),
|
||||
token: Token::Constant | Token::Public | Token::Ident(_),
|
||||
..
|
||||
}) = self.peek_option()
|
||||
{
|
||||
|
@ -26,7 +26,7 @@ impl ParserContext<'_> {
|
||||
/// Returns an [`Identifier`] AST node if the given [`Expression`] AST node evaluates to an
|
||||
/// identifier access. The access is stored in the given accesses.
|
||||
///
|
||||
pub fn construct_assignee_access(expr: Expression, _accesses: &mut Vec<AssigneeAccess>) -> Result<Identifier> {
|
||||
pub fn construct_assignee_access(expr: Expression, _accesses: &mut [AssigneeAccess]) -> Result<Identifier> {
|
||||
match expr {
|
||||
Expression::Identifier(id) => Ok(id),
|
||||
_ => return Err(ParserError::invalid_assignment_target(expr.span()).into()),
|
||||
|
@ -393,6 +393,7 @@ impl Token {
|
||||
"char" => Token::Char,
|
||||
"console" => Token::Console,
|
||||
"const" => Token::Const,
|
||||
"constant" => Token::Constant,
|
||||
"else" => Token::Else,
|
||||
"false" => Token::False,
|
||||
"field" => Token::Field,
|
||||
|
@ -183,8 +183,7 @@ mod tests {
|
||||
?
|
||||
// test
|
||||
/* test */
|
||||
//"#
|
||||
.into(),
|
||||
//"#,
|
||||
)
|
||||
.unwrap();
|
||||
let mut output = String::new();
|
||||
@ -213,7 +212,7 @@ ppp test
|
||||
test */
|
||||
test
|
||||
"#;
|
||||
let tokens = tokenize("test_path", raw.into()).unwrap();
|
||||
let tokens = tokenize("test_path", raw).unwrap();
|
||||
let mut line_indicies = vec![0];
|
||||
for (i, c) in raw.chars().enumerate() {
|
||||
if c == '\n' {
|
||||
|
@ -116,6 +116,8 @@ pub enum Token {
|
||||
Console,
|
||||
/// Const variable and a const function.
|
||||
Const,
|
||||
/// Constant parameter
|
||||
Constant,
|
||||
Else,
|
||||
For,
|
||||
Function,
|
||||
@ -180,6 +182,7 @@ impl Token {
|
||||
Token::Char => sym::char,
|
||||
Token::Console => sym::console,
|
||||
Token::Const => sym::Const,
|
||||
Token::Constant => sym::Const,
|
||||
Token::Else => sym::Else,
|
||||
Token::False => sym::False,
|
||||
Token::Field => sym::field,
|
||||
@ -281,6 +284,7 @@ impl fmt::Display for Token {
|
||||
|
||||
Console => write!(f, "console"),
|
||||
Const => write!(f, "const"),
|
||||
Constant => write!(f, "constant"),
|
||||
Else => write!(f, "else"),
|
||||
For => write!(f, "for"),
|
||||
Function => write!(f, "function"),
|
||||
|
@ -68,7 +68,7 @@ fn read_manifest_file(path: &Path) -> String {
|
||||
|
||||
/// Read the manifest file and check that the remote format is updated.
|
||||
fn remote_is_updated(path: &Path) -> bool {
|
||||
let manifest_string = read_manifest_file(&path);
|
||||
let manifest_string = read_manifest_file(path);
|
||||
for line in manifest_string.lines() {
|
||||
if line.starts_with("remote") {
|
||||
return false;
|
||||
@ -80,7 +80,7 @@ fn remote_is_updated(path: &Path) -> bool {
|
||||
|
||||
/// Read the manifest file and check that the project format is updated.
|
||||
fn project_is_updated(path: &Path) -> bool {
|
||||
let manifest_string = read_manifest_file(&path);
|
||||
let manifest_string = read_manifest_file(path);
|
||||
|
||||
!manifest_string.contains(OLD_PROJECT_FORMAT) && manifest_string.contains(NEW_PROJECT_FORMAT)
|
||||
}
|
||||
|
@ -111,6 +111,7 @@ symbols! {
|
||||
CoreFunction,
|
||||
console,
|
||||
Const: "const",
|
||||
Constant,
|
||||
Else: "else",
|
||||
error,
|
||||
False: "false",
|
||||
|
@ -5,21 +5,21 @@ outputs:
|
||||
- name: ""
|
||||
expected_input: []
|
||||
functions:
|
||||
"{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":3,\\\"line_stop\\\":3,\\\"col_start\\\":10,\\\"col_stop\\\":11,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x(const y: u32) {\\\"}\"}":
|
||||
identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":3,\\\"line_stop\\\":3,\\\"col_start\\\":10,\\\"col_stop\\\":11,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x(const y: u32) {\\\"}\"}"
|
||||
"{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":3,\\\"line_stop\\\":3,\\\"col_start\\\":10,\\\"col_stop\\\":11,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x(constant y: u32) {\\\"}\"}":
|
||||
identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":3,\\\"line_stop\\\":3,\\\"col_start\\\":10,\\\"col_stop\\\":11,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x(constant y: u32) {\\\"}\"}"
|
||||
input:
|
||||
- Variable:
|
||||
identifier: "{\"name\":\"y\",\"span\":\"{\\\"line_start\\\":3,\\\"line_stop\\\":3,\\\"col_start\\\":18,\\\"col_stop\\\":19,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x(const y: u32) {\\\"}\"}"
|
||||
mode: Const
|
||||
identifier: "{\"name\":\"y\",\"span\":\"{\\\"line_start\\\":3,\\\"line_stop\\\":3,\\\"col_start\\\":21,\\\"col_stop\\\":22,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x(constant y: u32) {\\\"}\"}"
|
||||
mode: Constant
|
||||
type_:
|
||||
IntegerType: U32
|
||||
span:
|
||||
line_start: 3
|
||||
line_stop: 3
|
||||
col_start: 18
|
||||
col_stop: 19
|
||||
col_start: 21
|
||||
col_stop: 22
|
||||
path: ""
|
||||
content: "function x(const y: u32) {"
|
||||
content: "function x(constant y: u32) {"
|
||||
const_: false
|
||||
output: ~
|
||||
core_mapping: ~
|
||||
@ -112,17 +112,17 @@ outputs:
|
||||
span:
|
||||
line_start: 3
|
||||
line_stop: 7
|
||||
col_start: 26
|
||||
col_start: 29
|
||||
col_stop: 2
|
||||
path: ""
|
||||
content: "function x(const y: u32) {\n ...\n ...\n ...\n}"
|
||||
content: "function x(constant y: u32) {\n ...\n ...\n ...\n}"
|
||||
span:
|
||||
line_start: 3
|
||||
line_stop: 7
|
||||
col_start: 1
|
||||
col_stop: 2
|
||||
path: ""
|
||||
content: "function x(const y: u32) {\n ...\n ...\n ...\n}"
|
||||
content: "function x(constant y: u32) {\n ...\n ...\n ...\n}"
|
||||
"{\"name\":\"main\",\"span\":\"{\\\"line_start\\\":9,\\\"line_stop\\\":9,\\\"col_start\\\":10,\\\"col_stop\\\":14,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function main(y: bool) -> bool {\\\"}\"}":
|
||||
identifier: "{\"name\":\"main\",\"span\":\"{\\\"line_start\\\":9,\\\"line_stop\\\":9,\\\"col_start\\\":10,\\\"col_stop\\\":14,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function main(y: bool) -> bool {\\\"}\"}"
|
||||
input:
|
||||
|
@ -2,4 +2,4 @@
|
||||
namespace: Parse
|
||||
expectation: Fail
|
||||
outputs:
|
||||
- "Error [EPAR0370009]: unexpected string: expected 'ident', got 'input'\n --> test:3:18\n |\n 3 | function x(const input) {\n | ^^^^^"
|
||||
- "Error [EPAR0370009]: unexpected string: expected 'ident', got 'const'\n --> test:3:12\n |\n 3 | function x(const input) {\n | ^^^^^"
|
||||
|
@ -5,11 +5,11 @@ outputs:
|
||||
- name: ""
|
||||
expected_input: []
|
||||
functions:
|
||||
"{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":3,\\\"line_stop\\\":3,\\\"col_start\\\":10,\\\"col_stop\\\":11,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x(x: u32, const y: i32) {\\\"}\"}":
|
||||
identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":3,\\\"line_stop\\\":3,\\\"col_start\\\":10,\\\"col_stop\\\":11,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x(x: u32, const y: i32) {\\\"}\"}"
|
||||
"{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":3,\\\"line_stop\\\":3,\\\"col_start\\\":10,\\\"col_stop\\\":11,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x(x: u32, constant y: i32) {\\\"}\"}":
|
||||
identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":3,\\\"line_stop\\\":3,\\\"col_start\\\":10,\\\"col_stop\\\":11,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x(x: u32, constant y: i32) {\\\"}\"}"
|
||||
input:
|
||||
- Variable:
|
||||
identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":3,\\\"line_stop\\\":3,\\\"col_start\\\":12,\\\"col_stop\\\":13,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x(x: u32, const y: i32) {\\\"}\"}"
|
||||
identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":3,\\\"line_stop\\\":3,\\\"col_start\\\":12,\\\"col_stop\\\":13,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x(x: u32, constant y: i32) {\\\"}\"}"
|
||||
mode: Private
|
||||
type_:
|
||||
IntegerType: U32
|
||||
@ -19,19 +19,19 @@ outputs:
|
||||
col_start: 12
|
||||
col_stop: 13
|
||||
path: ""
|
||||
content: "function x(x: u32, const y: i32) {"
|
||||
content: "function x(x: u32, constant y: i32) {"
|
||||
- Variable:
|
||||
identifier: "{\"name\":\"y\",\"span\":\"{\\\"line_start\\\":3,\\\"line_stop\\\":3,\\\"col_start\\\":26,\\\"col_stop\\\":27,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x(x: u32, const y: i32) {\\\"}\"}"
|
||||
mode: Const
|
||||
identifier: "{\"name\":\"y\",\"span\":\"{\\\"line_start\\\":3,\\\"line_stop\\\":3,\\\"col_start\\\":29,\\\"col_stop\\\":30,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x(x: u32, constant y: i32) {\\\"}\"}"
|
||||
mode: Constant
|
||||
type_:
|
||||
IntegerType: I32
|
||||
span:
|
||||
line_start: 3
|
||||
line_stop: 3
|
||||
col_start: 26
|
||||
col_stop: 27
|
||||
col_start: 29
|
||||
col_stop: 30
|
||||
path: ""
|
||||
content: "function x(x: u32, const y: i32) {"
|
||||
content: "function x(x: u32, constant y: i32) {"
|
||||
const_: false
|
||||
output: ~
|
||||
core_mapping: ~
|
||||
@ -59,44 +59,44 @@ outputs:
|
||||
span:
|
||||
line_start: 3
|
||||
line_stop: 5
|
||||
col_start: 34
|
||||
col_start: 37
|
||||
col_stop: 2
|
||||
path: ""
|
||||
content: "function x(x: u32, const y: i32) {\n ...\n}"
|
||||
content: "function x(x: u32, constant y: i32) {\n ...\n}"
|
||||
span:
|
||||
line_start: 3
|
||||
line_stop: 5
|
||||
col_start: 1
|
||||
col_stop: 2
|
||||
path: ""
|
||||
content: "function x(x: u32, const y: i32) {\n ...\n}"
|
||||
"{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":7,\\\"line_stop\\\":7,\\\"col_start\\\":10,\\\"col_stop\\\":11,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x(const x: u32, y: i32) {\\\"}\"}":
|
||||
identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":7,\\\"line_stop\\\":7,\\\"col_start\\\":10,\\\"col_stop\\\":11,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x(const x: u32, y: i32) {\\\"}\"}"
|
||||
content: "function x(x: u32, constant y: i32) {\n ...\n}"
|
||||
"{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":7,\\\"line_stop\\\":7,\\\"col_start\\\":10,\\\"col_stop\\\":11,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x(constant x: u32, y: i32) {\\\"}\"}":
|
||||
identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":7,\\\"line_stop\\\":7,\\\"col_start\\\":10,\\\"col_stop\\\":11,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x(constant x: u32, y: i32) {\\\"}\"}"
|
||||
input:
|
||||
- Variable:
|
||||
identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":7,\\\"line_stop\\\":7,\\\"col_start\\\":18,\\\"col_stop\\\":19,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x(const x: u32, y: i32) {\\\"}\"}"
|
||||
mode: Const
|
||||
identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":7,\\\"line_stop\\\":7,\\\"col_start\\\":21,\\\"col_stop\\\":22,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x(constant x: u32, y: i32) {\\\"}\"}"
|
||||
mode: Constant
|
||||
type_:
|
||||
IntegerType: U32
|
||||
span:
|
||||
line_start: 7
|
||||
line_stop: 7
|
||||
col_start: 18
|
||||
col_stop: 19
|
||||
col_start: 21
|
||||
col_stop: 22
|
||||
path: ""
|
||||
content: "function x(const x: u32, y: i32) {"
|
||||
content: "function x(constant x: u32, y: i32) {"
|
||||
- Variable:
|
||||
identifier: "{\"name\":\"y\",\"span\":\"{\\\"line_start\\\":7,\\\"line_stop\\\":7,\\\"col_start\\\":26,\\\"col_stop\\\":27,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x(const x: u32, y: i32) {\\\"}\"}"
|
||||
identifier: "{\"name\":\"y\",\"span\":\"{\\\"line_start\\\":7,\\\"line_stop\\\":7,\\\"col_start\\\":29,\\\"col_stop\\\":30,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x(constant x: u32, y: i32) {\\\"}\"}"
|
||||
mode: Private
|
||||
type_:
|
||||
IntegerType: I32
|
||||
span:
|
||||
line_start: 7
|
||||
line_stop: 7
|
||||
col_start: 26
|
||||
col_stop: 27
|
||||
col_start: 29
|
||||
col_stop: 30
|
||||
path: ""
|
||||
content: "function x(const x: u32, y: i32) {"
|
||||
content: "function x(constant x: u32, y: i32) {"
|
||||
const_: false
|
||||
output: ~
|
||||
core_mapping: ~
|
||||
@ -124,14 +124,14 @@ outputs:
|
||||
span:
|
||||
line_start: 7
|
||||
line_stop: 9
|
||||
col_start: 34
|
||||
col_start: 37
|
||||
col_stop: 2
|
||||
path: ""
|
||||
content: "function x(const x: u32, y: i32) {\n ...\n}"
|
||||
content: "function x(constant x: u32, y: i32) {\n ...\n}"
|
||||
span:
|
||||
line_start: 7
|
||||
line_stop: 9
|
||||
col_start: 1
|
||||
col_stop: 2
|
||||
path: ""
|
||||
content: "function x(const x: u32, y: i32) {\n ...\n}"
|
||||
content: "function x(constant x: u32, y: i32) {\n ...\n}"
|
||||
|
@ -2,4 +2,4 @@
|
||||
namespace: Parse
|
||||
expectation: Fail
|
||||
outputs:
|
||||
- "Error [EPAR0370009]: unexpected string: expected 'ident', got 'public'\n --> test:3:26\n |\n 3 | function x(x: u32, const public y: i32) {\n | ^^^^^^"
|
||||
- "Error [EPAR0370009]: unexpected string: expected 'ident', got 'const'\n --> test:3:20\n |\n 3 | function x(x: u32, const public y: i32) {\n | ^^^^^"
|
||||
|
@ -2,4 +2,4 @@
|
||||
namespace: Parse
|
||||
expectation: Fail
|
||||
outputs:
|
||||
- "Error [EPAR0370041]: A parameter cannot be both public and const.\n --> test:3:20\n |\n 3 | function x(x: u32, public const y: i32) {\n | ^^^^^^^^^^^^"
|
||||
- "Error [EPAR0370009]: unexpected string: expected 'ident', got 'const'\n --> test:3:27\n |\n 3 | function x(x: u32, public const y: i32) {\n | ^^^^^"
|
||||
|
@ -5,9 +5,9 @@ outputs:
|
||||
- sections:
|
||||
- name: main
|
||||
definitions:
|
||||
- mode: Const
|
||||
- mode: Constant
|
||||
type_: Boolean
|
||||
name: "{\"name\":\"a\",\"span\":\"{\\\"line_start\\\":4,\\\"line_stop\\\":4,\\\"col_start\\\":7,\\\"col_stop\\\":8,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"const a: bool = true; \\\"}\"}"
|
||||
name: "{\"name\":\"a\",\"span\":\"{\\\"line_start\\\":4,\\\"line_stop\\\":4,\\\"col_start\\\":10,\\\"col_stop\\\":11,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"constant a: bool = true; \\\"}\"}"
|
||||
value:
|
||||
Value:
|
||||
Boolean:
|
||||
@ -15,21 +15,21 @@ outputs:
|
||||
- span:
|
||||
line_start: 4
|
||||
line_stop: 4
|
||||
col_start: 18
|
||||
col_stop: 22
|
||||
col_start: 21
|
||||
col_stop: 25
|
||||
path: ""
|
||||
content: "const a: bool = true; "
|
||||
content: "constant a: bool = true; "
|
||||
span:
|
||||
line_start: 4
|
||||
line_stop: 4
|
||||
col_start: 10
|
||||
col_stop: 14
|
||||
col_start: 13
|
||||
col_stop: 17
|
||||
path: ""
|
||||
content: "const a: bool = true; "
|
||||
- mode: Const
|
||||
content: "constant a: bool = true; "
|
||||
- mode: Constant
|
||||
type_:
|
||||
IntegerType: U8
|
||||
name: "{\"name\":\"b\",\"span\":\"{\\\"line_start\\\":5,\\\"line_stop\\\":5,\\\"col_start\\\":7,\\\"col_stop\\\":8,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"const b: u8 = 2; \\\"}\"}"
|
||||
name: "{\"name\":\"b\",\"span\":\"{\\\"line_start\\\":5,\\\"line_stop\\\":5,\\\"col_start\\\":10,\\\"col_stop\\\":11,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"constant b: u8 = 2; \\\"}\"}"
|
||||
value:
|
||||
Value:
|
||||
Implicit:
|
||||
@ -37,20 +37,20 @@ outputs:
|
||||
- span:
|
||||
line_start: 5
|
||||
line_stop: 5
|
||||
col_start: 18
|
||||
col_stop: 19
|
||||
col_start: 21
|
||||
col_stop: 22
|
||||
path: ""
|
||||
content: "const b: u8 = 2; "
|
||||
content: "constant b: u8 = 2; "
|
||||
span:
|
||||
line_start: 5
|
||||
line_stop: 5
|
||||
col_start: 10
|
||||
col_stop: 12
|
||||
col_start: 13
|
||||
col_stop: 15
|
||||
path: ""
|
||||
content: "const b: u8 = 2; "
|
||||
- mode: Const
|
||||
content: "constant b: u8 = 2; "
|
||||
- mode: Constant
|
||||
type_: Field
|
||||
name: "{\"name\":\"c\",\"span\":\"{\\\"line_start\\\":6,\\\"line_stop\\\":6,\\\"col_start\\\":7,\\\"col_stop\\\":8,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"const c: field = 0; \\\"}\"}"
|
||||
name: "{\"name\":\"c\",\"span\":\"{\\\"line_start\\\":6,\\\"line_stop\\\":6,\\\"col_start\\\":10,\\\"col_stop\\\":11,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"constant c: field = 0; \\\"}\"}"
|
||||
value:
|
||||
Value:
|
||||
Implicit:
|
||||
@ -58,20 +58,20 @@ outputs:
|
||||
- span:
|
||||
line_start: 6
|
||||
line_stop: 6
|
||||
col_start: 18
|
||||
col_stop: 19
|
||||
col_start: 21
|
||||
col_stop: 22
|
||||
path: ""
|
||||
content: "const c: field = 0; "
|
||||
content: "constant c: field = 0; "
|
||||
span:
|
||||
line_start: 6
|
||||
line_stop: 6
|
||||
col_start: 10
|
||||
col_stop: 15
|
||||
col_start: 13
|
||||
col_stop: 18
|
||||
path: ""
|
||||
content: "const c: field = 0; "
|
||||
- mode: Const
|
||||
content: "constant c: field = 0; "
|
||||
- mode: Constant
|
||||
type_: Group
|
||||
name: "{\"name\":\"d\",\"span\":\"{\\\"line_start\\\":7,\\\"line_stop\\\":7,\\\"col_start\\\":7,\\\"col_stop\\\":8,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"const d: group = (0, 1)group; \\\"}\"}"
|
||||
name: "{\"name\":\"d\",\"span\":\"{\\\"line_start\\\":7,\\\"line_stop\\\":7,\\\"col_start\\\":10,\\\"col_stop\\\":11,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"constant d: group = (0, 1)group; \\\"}\"}"
|
||||
value:
|
||||
Value:
|
||||
Group:
|
||||
@ -82,37 +82,37 @@ outputs:
|
||||
- span:
|
||||
line_start: 7
|
||||
line_stop: 7
|
||||
col_start: 19
|
||||
col_stop: 20
|
||||
col_start: 22
|
||||
col_stop: 23
|
||||
path: ""
|
||||
content: "const d: group = (0, 1)group; "
|
||||
content: "constant d: group = (0, 1)group; "
|
||||
y:
|
||||
Number:
|
||||
- "1"
|
||||
- span:
|
||||
line_start: 7
|
||||
line_stop: 7
|
||||
col_start: 22
|
||||
col_stop: 23
|
||||
col_start: 25
|
||||
col_stop: 26
|
||||
path: ""
|
||||
content: "const d: group = (0, 1)group; "
|
||||
content: "constant d: group = (0, 1)group; "
|
||||
span:
|
||||
line_start: 7
|
||||
line_stop: 7
|
||||
col_start: 19
|
||||
col_stop: 29
|
||||
col_start: 22
|
||||
col_stop: 32
|
||||
path: ""
|
||||
content: "const d: group = (0, 1)group; "
|
||||
content: "constant d: group = (0, 1)group; "
|
||||
span:
|
||||
line_start: 7
|
||||
line_stop: 7
|
||||
col_start: 10
|
||||
col_stop: 15
|
||||
col_start: 13
|
||||
col_stop: 18
|
||||
path: ""
|
||||
content: "const d: group = (0, 1)group; "
|
||||
- mode: Const
|
||||
content: "constant d: group = (0, 1)group; "
|
||||
- mode: Constant
|
||||
type_: Address
|
||||
name: "{\"name\":\"e\",\"span\":\"{\\\"line_start\\\":8,\\\"line_stop\\\":8,\\\"col_start\\\":7,\\\"col_stop\\\":8,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"const e: address = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;\\\"}\"}"
|
||||
name: "{\"name\":\"e\",\"span\":\"{\\\"line_start\\\":8,\\\"line_stop\\\":8,\\\"col_start\\\":10,\\\"col_stop\\\":11,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"constant e: address = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;\\\"}\"}"
|
||||
value:
|
||||
Value:
|
||||
Address:
|
||||
@ -120,17 +120,17 @@ outputs:
|
||||
- span:
|
||||
line_start: 8
|
||||
line_stop: 8
|
||||
col_start: 20
|
||||
col_stop: 83
|
||||
col_start: 23
|
||||
col_stop: 86
|
||||
path: ""
|
||||
content: "const e: address = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;"
|
||||
content: "constant e: address = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;"
|
||||
span:
|
||||
line_start: 8
|
||||
line_stop: 8
|
||||
col_start: 10
|
||||
col_stop: 17
|
||||
col_start: 13
|
||||
col_stop: 20
|
||||
path: ""
|
||||
content: "const e: address = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;"
|
||||
content: "constant e: address = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;"
|
||||
span:
|
||||
line_start: 3
|
||||
line_stop: 3
|
||||
|
@ -2,4 +2,4 @@
|
||||
namespace: Input
|
||||
expectation: Fail
|
||||
outputs:
|
||||
- "Error [EPAR0370009]: unexpected string: expected 'ident', got 'public'\n --> test:4:7\n |\n 4 | const public a: bool = true; \n | ^^^^^^"
|
||||
- "Error [EPAR0370009]: unexpected string: expected 'ident', got 'public'\n --> test:4:10\n |\n 4 | constant public a: bool = true; \n | ^^^^^^"
|
||||
|
@ -2,4 +2,4 @@
|
||||
namespace: Input
|
||||
expectation: Fail
|
||||
outputs:
|
||||
- "Error [EPAR0370041]: A parameter cannot be both public and const.\n --> test:4:1\n |\n 4 | public const a: bool = true; \n | ^^^^^^^^^^^^"
|
||||
- "Error [EPAR0370041]: A parameter cannot be both public and const.\n --> test:4:1\n |\n 4 | public constant a: bool = true; \n | ^^^^^^^^^^^^^^^"
|
||||
|
@ -3,7 +3,7 @@ namespace: Parse
|
||||
expectation: Pass
|
||||
*/
|
||||
|
||||
function x(const y: u32) {
|
||||
function x(constant y: u32) {
|
||||
if y < 5u32 {
|
||||
x(y+1);
|
||||
}
|
||||
|
@ -5,4 +5,8 @@ expectation: Fail
|
||||
|
||||
function x(const input) {
|
||||
return ();
|
||||
}
|
||||
|
||||
function y(constant input) {
|
||||
return ();
|
||||
}
|
@ -3,10 +3,10 @@ namespace: Parse
|
||||
expectation: Pass
|
||||
*/
|
||||
|
||||
function x(x: u32, const y: i32) {
|
||||
function x(x: u32, constant y: i32) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
function x(const x: u32, y: i32) {
|
||||
function x(constant x: u32, y: i32) {
|
||||
return 0;
|
||||
}
|
@ -7,6 +7,6 @@ function x(x: u32, const public y: i32) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
function x(const public x: u32, y: i32) {
|
||||
function x(constant public x: u32, y: i32) {
|
||||
return 0;
|
||||
}
|
@ -7,6 +7,6 @@ function x(x: u32, public const y: i32) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
function x(public const x: u32, y: i32) {
|
||||
function x(public constant x: u32, y: i32) {
|
||||
return 0;
|
||||
}
|
@ -4,11 +4,11 @@ expectation: Pass
|
||||
*/
|
||||
|
||||
[main]
|
||||
const a: bool = true;
|
||||
const b: u8 = 2;
|
||||
const c: field = 0;
|
||||
const d: group = (0, 1)group;
|
||||
const e: address = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;
|
||||
constant a: bool = true;
|
||||
constant b: u8 = 2;
|
||||
constant c: field = 0;
|
||||
constant d: group = (0, 1)group;
|
||||
constant e: address = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;
|
||||
|
||||
[registers]
|
||||
r0: bool = true;
|
||||
|
@ -4,11 +4,11 @@ expectation: Fail
|
||||
*/
|
||||
|
||||
[main]
|
||||
const public a: bool = true;
|
||||
const public b: u8 = 2;
|
||||
const public c: field = 0;
|
||||
const public d: group = (0, 1)group;
|
||||
const public e: address = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;
|
||||
constant public a: bool = true;
|
||||
constant public b: u8 = 2;
|
||||
constant public c: field = 0;
|
||||
constant public d: group = (0, 1)group;
|
||||
constant public e: address = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;
|
||||
|
||||
[registers]
|
||||
r0: bool = true;
|
||||
|
@ -4,11 +4,11 @@ expectation: Fail
|
||||
*/
|
||||
|
||||
[main]
|
||||
public const a: bool = true;
|
||||
public const b: u8 = 2;
|
||||
public const c: field = 0;
|
||||
public const d: group = (0, 1)group;
|
||||
public const e: address = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;
|
||||
public constant a: bool = true;
|
||||
public constant b: u8 = 2;
|
||||
public constant c: field = 0;
|
||||
public constant d: group = (0, 1)group;
|
||||
public constant e: address = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;
|
||||
|
||||
[registers]
|
||||
r0: bool = true;
|
||||
|
Loading…
Reference in New Issue
Block a user