From cfc5b00bad1c81092901fcb2bc138391af73b56e Mon Sep 17 00:00:00 2001
From: gluax <16431709+gluax@users.noreply.github.com>
Date: Sun, 10 Apr 2022 23:10:55 -0700
Subject: [PATCH 1/6] add constant keyword, only used for params

---
 .../ast/src/functions/input/function_input.rs |  4 +-
 compiler/parser/src/parser/file.rs            |  6 +-
 compiler/parser/src/parser/input.rs           |  2 +-
 compiler/parser/src/parser/statement.rs       |  2 +-
 compiler/parser/src/tokenizer/lexer.rs        |  1 +
 compiler/parser/src/tokenizer/mod.rs          |  5 +-
 compiler/parser/src/tokenizer/token.rs        |  4 +
 leo/package/tests/manifest/manifest.rs        |  4 +-
 leo/span/src/symbol.rs                        |  1 +
 .../functions/bounded_recursion.leo.out       | 20 ++--
 .../parser/functions/const_input_fail.leo.out |  2 +-
 .../parser/functions/const_param.leo.out      | 52 +++++------
 .../functions/const_public_param_fail.leo.out |  2 +-
 .../functions/public_const_param_fail.leo.out |  2 +-
 .../parser/parser/inputs/input_const.leo.out  | 92 +++++++++----------
 .../inputs/input_const_public_fail.leo.out    |  2 +-
 .../inputs/input_public_const_fail.leo.out    |  2 +-
 tests/parser/functions/bounded_recursion.leo  |  2 +-
 tests/parser/functions/const_input_fail.leo   |  4 +
 tests/parser/functions/const_param.leo        |  4 +-
 .../functions/const_public_param_fail.leo     |  2 +-
 .../functions/public_const_param_fail.leo     |  2 +-
 tests/parser/inputs/input_const.leo           | 10 +-
 .../parser/inputs/input_const_public_fail.leo | 10 +-
 .../parser/inputs/input_public_const_fail.leo | 10 +-
 25 files changed, 128 insertions(+), 119 deletions(-)

diff --git a/compiler/ast/src/functions/input/function_input.rs b/compiler/ast/src/functions/input/function_input.rs
index be5afef527..19494375e5 100644
--- a/compiler/ast/src/functions/input/function_input.rs
+++ b/compiler/ast/src/functions/input/function_input.rs
@@ -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"),
         }
diff --git a/compiler/parser/src/parser/file.rs b/compiler/parser/src/parser/file.rs
index a90b35165f..fcfd1a1713 100644
--- a/compiler/parser/src/parser/file.rs
+++ b/compiler/parser/src/parser/file.rs
@@ -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()),
diff --git a/compiler/parser/src/parser/input.rs b/compiler/parser/src/parser/input.rs
index 2c0b68d6f8..e0f1a3ec37 100644
--- a/compiler/parser/src/parser/input.rs
+++ b/compiler/parser/src/parser/input.rs
@@ -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()
         {
diff --git a/compiler/parser/src/parser/statement.rs b/compiler/parser/src/parser/statement.rs
index 354257738c..440a66e8c5 100644
--- a/compiler/parser/src/parser/statement.rs
+++ b/compiler/parser/src/parser/statement.rs
@@ -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()),
diff --git a/compiler/parser/src/tokenizer/lexer.rs b/compiler/parser/src/tokenizer/lexer.rs
index f65260ff24..b7a1162b29 100644
--- a/compiler/parser/src/tokenizer/lexer.rs
+++ b/compiler/parser/src/tokenizer/lexer.rs
@@ -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,
diff --git a/compiler/parser/src/tokenizer/mod.rs b/compiler/parser/src/tokenizer/mod.rs
index 2b99a86027..52309e06bd 100644
--- a/compiler/parser/src/tokenizer/mod.rs
+++ b/compiler/parser/src/tokenizer/mod.rs
@@ -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' {
diff --git a/compiler/parser/src/tokenizer/token.rs b/compiler/parser/src/tokenizer/token.rs
index 05862cb591..9d4164363a 100644
--- a/compiler/parser/src/tokenizer/token.rs
+++ b/compiler/parser/src/tokenizer/token.rs
@@ -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"),
diff --git a/leo/package/tests/manifest/manifest.rs b/leo/package/tests/manifest/manifest.rs
index d58fce5150..a00743a8bb 100644
--- a/leo/package/tests/manifest/manifest.rs
+++ b/leo/package/tests/manifest/manifest.rs
@@ -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)
 }
diff --git a/leo/span/src/symbol.rs b/leo/span/src/symbol.rs
index 095f0f83b6..a051db60c5 100644
--- a/leo/span/src/symbol.rs
+++ b/leo/span/src/symbol.rs
@@ -111,6 +111,7 @@ symbols! {
     CoreFunction,
     console,
     Const: "const",
+    Constant,
     Else: "else",
     error,
     False: "false",
diff --git a/tests/expectations/parser/parser/functions/bounded_recursion.leo.out b/tests/expectations/parser/parser/functions/bounded_recursion.leo.out
index a788043e32..b26580013a 100644
--- a/tests/expectations/parser/parser/functions/bounded_recursion.leo.out
+++ b/tests/expectations/parser/parser/functions/bounded_recursion.leo.out
@@ -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:
diff --git a/tests/expectations/parser/parser/functions/const_input_fail.leo.out b/tests/expectations/parser/parser/functions/const_input_fail.leo.out
index d0d34e7510..0ed857b27c 100644
--- a/tests/expectations/parser/parser/functions/const_input_fail.leo.out
+++ b/tests/expectations/parser/parser/functions/const_input_fail.leo.out
@@ -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     |            ^^^^^"
diff --git a/tests/expectations/parser/parser/functions/const_param.leo.out b/tests/expectations/parser/parser/functions/const_param.leo.out
index 7d45b0007a..c88d7684b1 100644
--- a/tests/expectations/parser/parser/functions/const_param.leo.out
+++ b/tests/expectations/parser/parser/functions/const_param.leo.out
@@ -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}"
diff --git a/tests/expectations/parser/parser/functions/const_public_param_fail.leo.out b/tests/expectations/parser/parser/functions/const_public_param_fail.leo.out
index 24c32456b2..b0b6b50cde 100644
--- a/tests/expectations/parser/parser/functions/const_public_param_fail.leo.out
+++ b/tests/expectations/parser/parser/functions/const_public_param_fail.leo.out
@@ -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     |                    ^^^^^"
diff --git a/tests/expectations/parser/parser/functions/public_const_param_fail.leo.out b/tests/expectations/parser/parser/functions/public_const_param_fail.leo.out
index 98cce4b400..2c19755651 100644
--- a/tests/expectations/parser/parser/functions/public_const_param_fail.leo.out
+++ b/tests/expectations/parser/parser/functions/public_const_param_fail.leo.out
@@ -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     |                           ^^^^^"
diff --git a/tests/expectations/parser/parser/inputs/input_const.leo.out b/tests/expectations/parser/parser/inputs/input_const.leo.out
index ad0b1a231a..aa63f60951 100644
--- a/tests/expectations/parser/parser/inputs/input_const.leo.out
+++ b/tests/expectations/parser/parser/inputs/input_const.leo.out
@@ -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
diff --git a/tests/expectations/parser/parser/inputs/input_const_public_fail.leo.out b/tests/expectations/parser/parser/inputs/input_const_public_fail.leo.out
index c06dc8bb66..f618c2ebbb 100644
--- a/tests/expectations/parser/parser/inputs/input_const_public_fail.leo.out
+++ b/tests/expectations/parser/parser/inputs/input_const_public_fail.leo.out
@@ -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     |          ^^^^^^"
diff --git a/tests/expectations/parser/parser/inputs/input_public_const_fail.leo.out b/tests/expectations/parser/parser/inputs/input_public_const_fail.leo.out
index 410702f056..2060e85c72 100644
--- a/tests/expectations/parser/parser/inputs/input_public_const_fail.leo.out
+++ b/tests/expectations/parser/parser/inputs/input_public_const_fail.leo.out
@@ -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     | ^^^^^^^^^^^^^^^"
diff --git a/tests/parser/functions/bounded_recursion.leo b/tests/parser/functions/bounded_recursion.leo
index 6ca5a10f4e..44465998a0 100644
--- a/tests/parser/functions/bounded_recursion.leo
+++ b/tests/parser/functions/bounded_recursion.leo
@@ -3,7 +3,7 @@ namespace: Parse
 expectation: Pass
 */
 
-function x(const y: u32) {
+function x(constant y: u32) {
     if y < 5u32 {
         x(y+1);
     }
diff --git a/tests/parser/functions/const_input_fail.leo b/tests/parser/functions/const_input_fail.leo
index 2b4c0b69a6..ac4b998021 100644
--- a/tests/parser/functions/const_input_fail.leo
+++ b/tests/parser/functions/const_input_fail.leo
@@ -5,4 +5,8 @@ expectation: Fail
 
 function x(const input) {
     return ();
+}
+
+function y(constant input) {
+    return ();
 }
\ No newline at end of file
diff --git a/tests/parser/functions/const_param.leo b/tests/parser/functions/const_param.leo
index a69f08e3d7..19407f1b46 100644
--- a/tests/parser/functions/const_param.leo
+++ b/tests/parser/functions/const_param.leo
@@ -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;
 }
\ No newline at end of file
diff --git a/tests/parser/functions/const_public_param_fail.leo b/tests/parser/functions/const_public_param_fail.leo
index 9d91630c72..1085d25358 100644
--- a/tests/parser/functions/const_public_param_fail.leo
+++ b/tests/parser/functions/const_public_param_fail.leo
@@ -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;
 }
\ No newline at end of file
diff --git a/tests/parser/functions/public_const_param_fail.leo b/tests/parser/functions/public_const_param_fail.leo
index d9bc818a6d..a40b6e175f 100644
--- a/tests/parser/functions/public_const_param_fail.leo
+++ b/tests/parser/functions/public_const_param_fail.leo
@@ -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;
 }
\ No newline at end of file
diff --git a/tests/parser/inputs/input_const.leo b/tests/parser/inputs/input_const.leo
index 8db7f767ff..5a72f3f754 100644
--- a/tests/parser/inputs/input_const.leo
+++ b/tests/parser/inputs/input_const.leo
@@ -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;                 
diff --git a/tests/parser/inputs/input_const_public_fail.leo b/tests/parser/inputs/input_const_public_fail.leo
index d9721dd77b..5e892b9795 100644
--- a/tests/parser/inputs/input_const_public_fail.leo
+++ b/tests/parser/inputs/input_const_public_fail.leo
@@ -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;                 
diff --git a/tests/parser/inputs/input_public_const_fail.leo b/tests/parser/inputs/input_public_const_fail.leo
index b775eb9c51..bce42f3e53 100644
--- a/tests/parser/inputs/input_public_const_fail.leo
+++ b/tests/parser/inputs/input_public_const_fail.leo
@@ -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;                 

From 304044546ce1ab5bb73a2d29e026a502f3c1721e Mon Sep 17 00:00:00 2001
From: gluax <16431709+gluax@users.noreply.github.com>
Date: Mon, 11 Apr 2022 10:01:54 -0700
Subject: [PATCH 2/6] add constant keyword to grammar, change parameter grammar

---
 docs/grammar/README.md        | Bin 22302 -> 46382 bytes
 docs/grammar/abnf-grammar.txt |   3 ++-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/grammar/README.md b/docs/grammar/README.md
index f8edf344cdd8765d1ba507cf20bf2e503283d831..891e76c7fdb2e39c30e5085ef5457567207b7d92 100644
GIT binary patch
literal 46382
zcmeHQ`Ey*w5uTq@mH%P0DF@qOeaNvLK#+2T?WD>9DiTEzLlGS-vq4vMU>m}}o}|BN
zH8b<(=$@w)R;bjLwAb|4J$+5j@!tOD-)rvB9l6);*e%=(_q9896L;OMxf}Gn;_kS+
z?j1MtuU6>)#65C*Zca24w@y?i)PC;v>3QP*><-+vyXAiAe&IF<Y2iQJrDsq~&fg!o
zP2vSEhi;etpHfSF`|KQbkJ@cf3$%KDjwXopc7nc3RCAAa;_*-2OOG^n?-GyK^w}9b
zZ_{T7^o+JUUanJm4Zdf-KR|<oXtm>R6V)-j+oxx=-X$DJ#BI)eo4IcxeSuDn&$W{F
z@~QjCeM(qQsl|bBwMp8UxKD`l7QI@KY|sUs(c*;uLk{To=*KoEUS~V>+19x%!ubjD
z<^Hb^`af|`eDBetP3ql(-W|BN31jYi0xO`G-}>j1^Y16_9(|VfA(ajY&<`|n-6M;h
zfd=0aUhpVr^ff*2`IaS)>_2vkm+S}4EQnL^uCKi$&?Pj5{)>%YQp-JWgDvX$gmes@
z@6z)gX$Nw!S4`Yz<l!6cPwr!~;0CpPM7I2#o<E~kf29ZBZ_p?2(PuyfC-@t9&Anb@
zi5BD^N5o@6-$7pXQ~3P>Q9wt~I{5#^Jtp)u;>;W#xj&L5&%89?&))gOzyFBZuG0h7
z{+OsBCA<p~ZcvLglKq)~hfhDHPd}k{>qK>n+O3l;qNBOzJ<eZu&t*cyz#k{n!#VY8
z)9d;qit5j)1tJn2jaPeK7qAfgkRue4u<-Apr%n3XrnbmgtfOG%G15ZAh(Scd3qlmj
z1=Lz*LdHV|J0RLqA4%{WNWDtEIi<%D_3K^AAGZk=k6XmyfO>h0D30m%ZEyb&=_mBb
z2a$Fl+idW_XYvQhUXgB)&yYo)66z-T)js{_h#XR<?*(U-+M^$!oxAtlln`M9plwq>
z5T{d;Y?b8Oq-W6m-9I)dIu6eLG^d#m*2G;S8ShXpK6DSsE1%FOx6eO)OrPU1qfzFL
z|Bk<((D#U<PYD~nL*9j6!>c3u3=w|nGb6s0@8BaC1rDh%K-eJMnfrYtbG_H_L5u_6
z(KE22)tP_ZGW5Si9W?O{NhSSTrI_AG^jVh;nF1rmjCuzz+c8L#(*!w?7lItmNK3I@
z>vF)?j=h#P$%7#eBK(xR`k3Uicu9*s$oF9)-x_5qn|vn}b@1A`L6*=q@I}oNYi6A?
zq>b|qc@2-^(8@pQHS&T*jv8ew)k-AQ)a1<=!;#Zaef7yxqm1Qw7|HXNNgmFVGm2P5
zmL;PMDFT1wj1{U(LoQjNQE^O;;fe%fHERns6_43BNA+sva|n8g8VBQ=9uvcU<`{a<
zS7;0m+PLSlsx{*x+S%vz|H#WNok=}%yGwg{rV<@oG~bAB$8tzDAA219Z7tII;|~Ap
z(RkY?ZF{UzwTH|uR#_#9t(jCbSIbUfp)K-<ZTHP6kMGA$?Xg0YL-6_)nyt*-eaZyk
zv-?zc*z>|N?9#T#^haBK(G?-JoV*Mx^kWaL@F3Fo3RPQI-3o7YS|MZ)ncHKuz&sKa
zqn_d0^sLR$Mk+k^;&ukKwaKyJ>0HC(75<)5Uoh)A^lK$wx#twsty=9%n(zOb#!Ae3
zj>+Pvz)>}0-Qv{0Z&BayGp6S>N)GE<4L7H_;l85zg7gE=`HbeJAK@WgsQPrfm8jTS
z0fjBluKqFO338Ww2vTeIXz|dr)}qaAQIb&O(C(k`2zt}-LQ9K%;eD9-viIqhP200g
zu>yDK$1?WjfX6ll_6~VAR%T|AJyR@;CF`6tt<)(+!!{{3J~kAKW$F^^R;tso#iq2D
zaFg;cuM}ZsA=ar=TI_>4tqo1nqaDejOFNpbTRWEMx>wUP8b5aZh=B1y=6%qAyQWRQ
zMedYZR4|rp?;*Zs)nR*yJ-bfJy3zPv6u)22<w>+$|1RrqnO<M!AhB?pvQDojr+zK(
z;NR2kELN6oc@hmhT;>^JUE{K2Fz2ZGqAqj4|CjZwN%C`#Q(JYQN23iV#2lh-La`#2
z4mGFDnZ#?_bC<jZ$Y%`SPz~^!c5N`jv#hqK?OEn)H0n)h6x^W)`vl&Xq7+$xTW=A^
zL#i&dcCz21x5K;)`{7s#wzfX)Xvuq)8uFa@W3H&R!-)a3h0fcW;(bQF753<{kHvf5
zTKgAdDXiolsr(nT(xIU(Xoc#5q18QF&(^UXxZfFC-6brGWV;3|?CG?v0I$-$C7fQ^
zRuK^?VMnRW{mjtQGm{O@X!TIH!5LXow*fc?8>I94Jk!9}j;PPae#Hebg4rc>!1HiD
zk7@{#jb4%LcM1Kzi}(K?(I<cNR@NlN{P^XCB-Idtqz}BL4--i@Nz(6(lJ@8?);3F^
zYn0b?+WLU+raH}6*))x4wT4D7HILRKjgLlesqcBG9%o;8Zyl$1UeF)%hjzZ8P8)oN
z_r31<ok7&sSc}JA;X5Xu!P<}P`u9jyrpu*@_e>$xLz7fEnf1!o5IE&9PIo#6OWV>h
z&r>$ZQoI^ArJd678d+UF$H*<OG2Y8-8E>?Rs7s;wXr0pHoeQctP?4fi;3~wjwqK%R
zZKhe}Casra6*%N2)=OPx(c4#Ehc~>p$gDAchOf)sHP^>{T54FAqMqe%q|%&|cj0Ur
zs%ai^_&kxcgv^JOjc@sfEvJQEYBq~CVzClVP+^@Hr;|`6Yk4DW&z8AMbBMa$^B$JQ
zY}C}qUO1J5RpC^7x?HGATL>)aP<r?f&l9-vVIPrCxYkTR<Eke8jBA+mGpSf6boMvb
zKt67zl4({>TU+eh(v7a&7PY2XuIpp%NEM%cmTPu#ULB_Gu9{}U46EO3>$GL9vS$V=
zo=s>YK<X{a_pKv8$J?Pyf)Rg4Q7m)5evR0%S{e!xTn!DSV?)1I+Vrdm_6?l9KcgHf
zb%J;dvU^xBNIfRc$LShNzr1bwSYF7*;~^xzPxDV6*V{7z&It7}r<`^3e#)v(IGNku
zR~>`<iyT@yL5P#M!}GyIDQ2W2=t*{DamKrhW*KYx`Dr<$A5rE}wSH(EYjl>euwPnz
zgzU$Z{DpI^*v~85Q&wQ}b78P_UbpI>VCDgCe8mJ-M@q8KsSQ?rv66BTPB^uRdDh~R
z`Jny_r`v6PO0!^Ill921`D+iB#D=WP_xpw>&3I&yt<QrrdHT>qhF+U%QuN|ka!uWK
zafIpl#fHN<W$M20<A05Ya|C9%U%1j~^E?u2NSa1#bQaCkPqX%E&W4j}u0|7U&Q@90
zkTlKJ=q#Gc#|qRBA)o8srXd7v!PD}ZBd@eddy9QCX$UOSHR>n)Uv^s39G}b8-r4Nc
zTMt?)FV@B^dTgCM?3LDzmC7pnQ<`ou@5I%h`e>|sq#Y~x<{hI>k)`a_kS=Q<9?M(H
zl&MX}RAQ+2YT0Bt=vuZIE43E!V{v<;bSw{hY>nk$j|gx`V>KV)H5+Q<l}0Z$TaWHF
zo;_H?-xdiPXB&#}wEKd_*N!B-wHVSkYV^X#?u{BpJCg9W<xY*S4aHJ__00A3(WD10
z9j9N>_=juNO8c-AT65BNLM?eiN73}IBZ!^LJ<;&XR2Dn-&Iff{_9CYCJagZBi(<d+
zfx&(_3HyV&2I9N6V1;tH`l$B{C&_WGe~Fs=P|KJ&f7qf%g_5p(){rdTTBFr`s77b;
zqMqJeOw+lpaK{K)>#6l&nJbJx#o8ix^yI|;`U)I+Bh})4JyL5P*@GqdbG#>L(u_wI
z+4|;8nmm1IB15muH7R=WEZGD(7N<&Zw-8(hg!(L;GSTx#o1Swu<c0=or!g!MC7Gax
zF)6He<g=2N6q@#1w6Voo?KB>mrYsia>z?;X-`gYX*`j7^wk@vP5|#`n4u&3Qqqpzs
z+wj`^;Wmu+9<>dlv~!k5qz$K4BLG30y|??Kd2yRsVx_HfjYpeWc<B1n_~;12tM1bp
zk2<Abw_{GjZ&M2odrWEk>`219<*ypI7Of>;p3rqf`*b#wuj<jxE5@xkA5Pt`{45H2
zZR&nQ4>>C{b^oFVufwPN=-l>we>XQidjb^P+bxf8Zo3+xt|oLJMBjYS#Q1I0au&Vj
zD~Fj6U&F<(Z_-?<E>TO`>k;~m1_sYRnVZZkOPYE+!n>8cj^Di(ee-Vg`VaKFrq>yr
zP!0CNS>AF>-Uqr7okio8X(rA0gK)<Vobko}k>*>WEqhjaHh3r(v{pLZTx!=E)l2QM
zX14DuLY${6wTR;Y-=})WE3cLWT7<V~C4-bSq2ZQj1TWRShLpAzj8uynM%r31Vm)gJ
zaa&8~!#c<-`h%r)?~Gfsf5!d_Z%psB!FjE8j~0u+q*z+d)7GN9AfHAbS_*ARZVjbG
zliLBkPw(_O^AU#6@wZOn5$0rkh7eVJ|Gh(jFL-%Q%4Zq4r!7uq>0VH$WuM?Yd0D65
z(Wf-i<h@JhU-q7r>Ed2p*2!~AuZA_8y<as-?pe#8i0QIca*6YdU#8Szs7xhMS(jGB
ztyAU^n)_5-q1!cIqKf?~d~d5I!YOpz_tqM*C8}78@V!k6+&7HxpN(+?S7TwF!7fjm
zo+YdMEPOKPE%4>hCiEqIWAW7zqUKR08u8PT92#DUM(}F-&@gLs7M~x^u<aJEQN~^;
zZLB^Q-=iVeRv)j1YZ20mSeCSnO`_7efMDxVwWwpsq@7JBK9Pqz+hQfxE=`$^<-k>o
ze8&sE4l&?z#A(rtcun;?M36ql*G!1)me{SKYq3$IlbCDwOh<2JN#Rk`t%hEs6Wo?g
zHS89xC2xrB^eB*)>}h2$w0J<7QtM}#%F@F)Q)A}A_n<+p#Z1*wMQaGG5nQ?Soc^X1
z%~+%OlK#?JBCbo4^`qMAj;v{<b#q>?rO2B0($*HO;cjynGx<LGu?Er=ZryLJNUX&v
zT>%E|#T-jkgPwVvNpERe4a#+_A!}OK=q+~W)ppvRb=q2yk#WIhZA*Mx?X79giX&OH
z)k~ch))dOSa26}YmQF38$48x(t!H1K|M}R`-e=9Sb|j0PfyQ?Y!7pmz#LX*OiIKaJ
z$vv^Om17GE+rG5si5N^*-D~eq&86PhM=QCw)Jx>w@?Jqpno@r-L&SVP+*J(s3B+&u
z@TxXe*G~NUm^LPs<kbA5L?ao+BA145!4Q5W?P&NV8o^6#uOX$aEzw}<o1XtHC~0kg
zDyw8SoF+sSCY3?C4Qep1)3|;>orb^Q&p(}?>GxVkWFQ*GXB!P6j51ngvt<ut9oc2o
zc=sT3Rc%4k>}ScpTC`X&Bn~y1HC`IMC002WaQ8~ND--q#$Btk<XzX8FA8eiwk1g;s
z4Hcfq`{I%@Y#M+xniuuxK(lZU)>ZPVeX_tFjn50Jf-rvInjE~tFAk3Nt$s}QupS-u
zdmDQmd~S?<a!=~3EhC>M>6P)S$4S4vv}o-|v}9;r;ly6e#p1_?!!gs}lb*;yv{<E?
zI$jaGN)mC!F-{^aDr|buJkf?CBSwEuH2(dFmPp_gTAXml`XjDL;+)hw&$i)kB-k{0
zdEU<_2H&(4e7f#UOCcvF-?SWjKGT}REH$I8M_Sa`P%M!)_rI-*nE=L}@pDWY4o8|T
zDtjZ%hKl)soa41oT%H_!f|!3z68ExeXFH2`*?OdTmkq_@UD&rdaQ}!__bxIo=s}Yi
z0e(4H^X?uChgm?MG~uMVEmADj?vX&Vc@LIU6SkgcoNXu;Z^K>2PnPCwJ!tH0Jvtoc
zbA2+&^$dK{*BXca3!c}b2hIO_uq<B4UI0|g<B<O@vd-3n#$MRdpP$AHaXp8uzNHmB
zMq|G6qg3BpJh7*@%k_k}sZY;~^Ae3usjn8#D$(h?D<!HpU)em>Vv8PM)pXQ@Wzik3
zI^)wm`(!ihDC(NaX;^RZFY3rIG2$GNAlIS_t0CW#6sYqy>6{*}(3qXyIiF7f^4ckK
zMhk;=!_uKA<1upE=Y4KTf?rEHq?O-ZE#U42a&la>){7xp;9uhEr4GMnYVmBVyqZ^A
zaiqcuQfkPdrO?(QD7UbNZAVIZ%de!BY-8iuLKyNwe7B;(%2C4+zAfL^c(rH+U&}HY
z4~<^<STmBw&x&Ko*1?<gEFIc%cAlQ!C5i7Vl;(WY8*<%hx;~p<L!#+VmrO%odHHN&
z+_qIM;hI@X#wv~angvTV7He58uWQVT6l)HnC`R-0)wQ9*45yc|0(7->%(Z0cB#&mZ
z5{*Q*^jO1?b{1R9sH<g3-PTs5*w%sO|Mm{Qs&$$6-lA$1<0`H)&}|yGj_n3n>k$_+
zxFxfN)|y|3mZG6jhSN|=H1<fbRM@&+?G+enJ+?!wevePm#IG?+iRtARvcfOU;(Jsu
z+jOUd%RsmH_OksY)`R9Jaa-{>drvfUJCemWTlJ^zjV<ap>g5-Ots}F|m$+WSzHmLG
zO#N@`)xNj!Nqs!67V|4bLTk;Ep{009DZ^+eB^tpi)dU(|iAM0GKF~0voy7yoGhwVH
z@NW^~Y7EQoMcQ!KE4l8=b4FhKmr?VXvmPr}B$lvbRleJ0zFIQWRegokI%g=$I^?5y
zfel4`tJGtSLy5-XbDTq4YYMtOb&NOzrmc~WkeTqDeuG~~z%Id_Z(+4p4MWpkjc$w%
zMecsh2_@@`y#}$5^-TG$ovBf&@F{Fw_lc>rd|l?JX|7BqzFd+;LoCr)>`<0Ow?dgN
z_Sv`vdn{j%S&BONvs?qDX}m<QX{SVE(N3(@;ngL&j#|{Qrr@pkrAv%ceB~Y2Ca8~I
z&}WvBCgzo2^VBD6PS4WHRa_Xq!WonFY9Gu1#$G#P_korKnlH3ydwoJOMW23!inSVB
zZs=oaUdru~dq!SS#`rmcrmZ%0DPs-$(8FO!Yq7_WrnZZv+sKL($L^2@5nQT)+apjs
zZ<f~*ZMed0$Yn<36>Pcb_X_#G%_r0@Tz!U&D)%^)db(eRFvqZXT4=4=JhT)Kvh`5I
zwV?>llASaTB^tpKJ!=@!Zk%_QEI-D#OE~P=7A+35yp1NmV$$MQ7Hm!D7K~-tV>#Af
zTOj(m8aSd8h=?0p8<o}xQisc0I=)3FDEVr>k72Pu2}#p<iRLmRg@46)c>Y1RMVYP^
z3FX!n9p)Zb#?tg^#j$zwf;`G{=NjC>1ua=GHyfu-()t~mY2EemiLZP2X(T%(?DeR!
z9C!Ci;RU|<%hzP&Hzs(Ub=%bYoQCyqjqciThx+%>JtFBbkHjYr-CFYQF}1i$?Vg-J
zAeW5t!{_(t8^kkw10y=GW8r=xr}UW9=ZNbA`XAS^Slik4-yhRAphS%cTE@Wa0zJiP
z8DL<a5OX4Yc0_a&+Uw@?;}hD~hJ2|Nb1m|kEZdFGWrP_4=ObhzzUz-={jCp=wT~To
z>n?l?pI4?1$Vxpv(Tf;l{@ysJYjN17Xgu`RT%OcrOp*JCrRX~S6(&79w{(zVv7C9N
zwxVqqeRz*3ZgI`Md)XXH{<v%&Wn1TwpU)@Tx+!_3KB8gmqn1lbh*C$iWx@H!I161&
rjv<;whLR;OB1H*L<j6f=<CIg_YKEG%E)vZgy*HbYm&QAM6@UK)p$U%3

literal 22302
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

diff --git a/docs/grammar/abnf-grammar.txt b/docs/grammar/abnf-grammar.txt
index 92a41f8474..5c409d61dc 100644
--- a/docs/grammar/abnf-grammar.txt
+++ b/docs/grammar/abnf-grammar.txt
@@ -69,6 +69,7 @@ keyword = %s"address"
         / %s"char"
         / %s"console"
         / %s"const"
+        / %s"constant"
         / %s"else"
         / %s"field"
         / %s"for"
@@ -317,7 +318,7 @@ function-declaration = %s"function" identifier
 
 function-parameters = function-parameter *( "," function-parameter ) [ "," ]
 
-function-parameter = [ %s"public" / %s"const" ] identifier ":" type
+function-parameter = [ %s"public" / %s"constant" ] identifier ":" type
 
 declaration = function-declaration
 

From 9f79ca71690f6b7705abac0385d512ea14222791 Mon Sep 17 00:00:00 2001
From: gluax <16431709+gluax@users.noreply.github.com>
Date: Tue, 12 Apr 2022 11:46:35 -0700
Subject: [PATCH 3/6] allow const but throw a recoverable error

---
 compiler/parser/src/parser/file.rs            |  10 +
 compiler/parser/src/parser/input.rs           |   2 +-
 leo/errors/src/parser/parser_errors.rs        |   8 +
 .../parser/functions/const_input_fail.leo.out |   2 +-
 .../functions/const_public_param_fail.leo.out |   2 +-
 .../functions/public_const_param_fail.leo.out |   2 +-
 .../parser/parser/inputs/input_const.leo.out  | 274 +----------------
 .../parser/inputs/input_constant.leo.out      | 275 ++++++++++++++++++
 .../inputs/input_constant_public_fail.leo.out |   5 +
 .../inputs/input_public_const_fail.leo.out    |   2 +-
 .../inputs/input_public_constant_fail.leo.out |   5 +
 tests/parser/inputs/input_const.leo           |  20 +-
 tests/parser/inputs/input_constant.leo        |  18 ++
 ...ail.leo => input_constant_public_fail.leo} |   0
 .../parser/inputs/input_public_const_fail.leo |  19 --
 .../inputs/input_public_constant_fail.leo     |  19 ++
 16 files changed, 357 insertions(+), 306 deletions(-)
 create mode 100644 tests/expectations/parser/parser/inputs/input_constant.leo.out
 create mode 100644 tests/expectations/parser/parser/inputs/input_constant_public_fail.leo.out
 create mode 100644 tests/expectations/parser/parser/inputs/input_public_constant_fail.leo.out
 create mode 100644 tests/parser/inputs/input_constant.leo
 rename tests/parser/inputs/{input_const_public_fail.leo => input_constant_public_fail.leo} (100%)
 delete mode 100644 tests/parser/inputs/input_public_const_fail.leo
 create mode 100644 tests/parser/inputs/input_public_constant_fail.leo

diff --git a/compiler/parser/src/parser/file.rs b/compiler/parser/src/parser/file.rs
index fcfd1a1713..33cbf9e0d2 100644
--- a/compiler/parser/src/parser/file.rs
+++ b/compiler/parser/src/parser/file.rs
@@ -67,10 +67,20 @@ impl ParserContext<'_> {
     pub fn parse_function_parameter_mode(&mut self) -> Result<ParamMode> {
         let public = self.eat(Token::Public);
         let constant = self.eat(Token::Constant);
+        let const_ = self.eat(Token::Const);
+
+        if const_.is_some() {
+            dbg!(&const_.as_ref().unwrap().span);
+            self.emit_err(ParserError::const_parameter_or_input(&const_.as_ref().unwrap().span));
+        }
 
         match (public, constant) {
             (None, Some(_)) => Ok(ParamMode::Constant),
+            (None, None) if const_.is_some() => Ok(ParamMode::Constant),
             (None, None) => Ok(ParamMode::Private),
+            (Some(p), None) if const_.is_some() => {
+                Err(ParserError::inputs_multiple_variable_types_specified(&(p.span + const_.unwrap().span)).into())
+            }
             (Some(_), None) => Ok(ParamMode::Public),
             (Some(p), Some(c)) => Err(ParserError::inputs_multiple_variable_types_specified(&(p.span + c.span)).into()),
         }
diff --git a/compiler/parser/src/parser/input.rs b/compiler/parser/src/parser/input.rs
index e0f1a3ec37..afdcf3d7b4 100644
--- a/compiler/parser/src/parser/input.rs
+++ b/compiler/parser/src/parser/input.rs
@@ -49,7 +49,7 @@ impl ParserContext<'_> {
         let mut definitions = Vec::new();
 
         while let Some(SpannedToken {
-            token: Token::Constant | Token::Public | Token::Ident(_),
+            token: Token::Const | Token::Constant | Token::Public | Token::Ident(_),
             ..
         }) = self.peek_option()
         {
diff --git a/leo/errors/src/parser/parser_errors.rs b/leo/errors/src/parser/parser_errors.rs
index 217e305152..741f7ccd9b 100644
--- a/leo/errors/src/parser/parser_errors.rs
+++ b/leo/errors/src/parser/parser_errors.rs
@@ -366,4 +366,12 @@ create_errors!(
          msg: "A parameter cannot be both public and const.",
          help: None,
      }
+
+     /// For when a user used const on a parameter or input instead of constant.
+     @formatted
+     const_parameter_or_input {
+         args: (),
+         msg: "`constant` is preferred over `const` for function parameters to indicate a R1CS constant.",
+         help: None,
+     }
 );
diff --git a/tests/expectations/parser/parser/functions/const_input_fail.leo.out b/tests/expectations/parser/parser/functions/const_input_fail.leo.out
index 0ed857b27c..309a679337 100644
--- a/tests/expectations/parser/parser/functions/const_input_fail.leo.out
+++ b/tests/expectations/parser/parser/functions/const_input_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Parse
 expectation: Fail
 outputs:
-  - "Error [EPAR0370009]: unexpected string: expected 'ident', got 'const'\n    --> test:3:12\n     |\n   3 | function x(const input) {\n     |            ^^^^^"
+  - "Error [EPAR0370042]: `constant` is preferred over `const` for function parameters to indicate a R1CS constant.\n    --> test:3:12\n     |\n   3 | function x(const input) {\n     |            ^^^^^\nError [EPAR0370009]: unexpected string: expected 'ident', got 'input'\n    --> test:3:18\n     |\n   3 | function x(const input) {\n     |                  ^^^^^"
diff --git a/tests/expectations/parser/parser/functions/const_public_param_fail.leo.out b/tests/expectations/parser/parser/functions/const_public_param_fail.leo.out
index b0b6b50cde..9b17602f02 100644
--- a/tests/expectations/parser/parser/functions/const_public_param_fail.leo.out
+++ b/tests/expectations/parser/parser/functions/const_public_param_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Parse
 expectation: Fail
 outputs:
-  - "Error [EPAR0370009]: unexpected string: expected 'ident', got 'const'\n    --> test:3:20\n     |\n   3 | function x(x: u32, const public y: i32) {\n     |                    ^^^^^"
+  - "Error [EPAR0370042]: `constant` is preferred over `const` for function parameters to indicate a R1CS constant.\n    --> test:3:20\n     |\n   3 | function x(x: u32, const public y: i32) {\n     |                    ^^^^^\nError [EPAR0370009]: unexpected string: expected 'ident', got 'public'\n    --> test:3:26\n     |\n   3 | function x(x: u32, const public y: i32) {\n     |                          ^^^^^^"
diff --git a/tests/expectations/parser/parser/functions/public_const_param_fail.leo.out b/tests/expectations/parser/parser/functions/public_const_param_fail.leo.out
index 2c19755651..cd850eadcb 100644
--- a/tests/expectations/parser/parser/functions/public_const_param_fail.leo.out
+++ b/tests/expectations/parser/parser/functions/public_const_param_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Parse
 expectation: Fail
 outputs:
-  - "Error [EPAR0370009]: unexpected string: expected 'ident', got 'const'\n    --> test:3:27\n     |\n   3 | function x(x: u32, public const y: i32) {\n     |                           ^^^^^"
+  - "Error [EPAR0370042]: `constant` is preferred over `const` for function parameters to indicate a R1CS constant.\n    --> test:3:27\n     |\n   3 | function x(x: u32, public const y: i32) {\n     |                           ^^^^^\nError [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     |                    ^^^^^^^^^^^^"
diff --git a/tests/expectations/parser/parser/inputs/input_const.leo.out b/tests/expectations/parser/parser/inputs/input_const.leo.out
index aa63f60951..5d120639e3 100644
--- a/tests/expectations/parser/parser/inputs/input_const.leo.out
+++ b/tests/expectations/parser/parser/inputs/input_const.leo.out
@@ -1,275 +1,5 @@
 ---
 namespace: Input
-expectation: Pass
+expectation: Fail
 outputs:
-  - sections:
-      - name: main
-        definitions:
-          - mode: Constant
-            type_: Boolean
-            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:
-                  - "true"
-                  - span:
-                      line_start: 4
-                      line_stop: 4
-                      col_start: 21
-                      col_stop: 25
-                      path: ""
-                      content: "constant a: bool  = true;                 "
-            span:
-              line_start: 4
-              line_stop: 4
-              col_start: 13
-              col_stop: 17
-              path: ""
-              content: "constant a: bool  = true;                 "
-          - mode: Constant
-            type_:
-              IntegerType: U8
-            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:
-                  - "2"
-                  - span:
-                      line_start: 5
-                      line_stop: 5
-                      col_start: 21
-                      col_stop: 22
-                      path: ""
-                      content: "constant b: u8    = 2;                    "
-            span:
-              line_start: 5
-              line_stop: 5
-              col_start: 13
-              col_stop: 15
-              path: ""
-              content: "constant b: u8    = 2;                    "
-          - mode: Constant
-            type_: Field
-            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:
-                  - "0"
-                  - span:
-                      line_start: 6
-                      line_stop: 6
-                      col_start: 21
-                      col_stop: 22
-                      path: ""
-                      content: "constant c: field = 0;                    "
-            span:
-              line_start: 6
-              line_stop: 6
-              col_start: 13
-              col_stop: 18
-              path: ""
-              content: "constant c: field = 0;                    "
-          - mode: Constant
-            type_: 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:
-                  Tuple:
-                    x:
-                      Number:
-                        - "0"
-                        - span:
-                            line_start: 7
-                            line_stop: 7
-                            col_start: 22
-                            col_stop: 23
-                            path: ""
-                            content: "constant d: group = (0, 1)group;          "
-                    y:
-                      Number:
-                        - "1"
-                        - span:
-                            line_start: 7
-                            line_stop: 7
-                            col_start: 25
-                            col_stop: 26
-                            path: ""
-                            content: "constant d: group = (0, 1)group;          "
-                    span:
-                      line_start: 7
-                      line_stop: 7
-                      col_start: 22
-                      col_stop: 32
-                      path: ""
-                      content: "constant d: group = (0, 1)group;          "
-            span:
-              line_start: 7
-              line_stop: 7
-              col_start: 13
-              col_stop: 18
-              path: ""
-              content: "constant d: group = (0, 1)group;          "
-          - mode: Constant
-            type_: Address
-            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:
-                  - aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8
-                  - span:
-                      line_start: 8
-                      line_stop: 8
-                      col_start: 23
-                      col_stop: 86
-                      path: ""
-                      content: "constant e: address = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;"
-            span:
-              line_start: 8
-              line_stop: 8
-              col_start: 13
-              col_stop: 20
-              path: ""
-              content: "constant e: address = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;"
-        span:
-          line_start: 3
-          line_stop: 3
-          col_start: 2
-          col_stop: 6
-          path: ""
-          content: "[main]"
-      - name: registers
-        definitions:
-          - mode: Private
-            type_: Boolean
-            name: "{\"name\":\"r0\",\"span\":\"{\\\"line_start\\\":11,\\\"line_stop\\\":11,\\\"col_start\\\":1,\\\"col_stop\\\":3,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"r0: bool  = true;                 \\\"}\"}"
-            value:
-              Value:
-                Boolean:
-                  - "true"
-                  - span:
-                      line_start: 11
-                      line_stop: 11
-                      col_start: 13
-                      col_stop: 17
-                      path: ""
-                      content: "r0: bool  = true;                 "
-            span:
-              line_start: 11
-              line_stop: 11
-              col_start: 5
-              col_stop: 9
-              path: ""
-              content: "r0: bool  = true;                 "
-          - mode: Private
-            type_:
-              IntegerType: U8
-            name: "{\"name\":\"r1\",\"span\":\"{\\\"line_start\\\":12,\\\"line_stop\\\":12,\\\"col_start\\\":1,\\\"col_stop\\\":3,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"r1: u8    = 2;                    \\\"}\"}"
-            value:
-              Value:
-                Implicit:
-                  - "2"
-                  - span:
-                      line_start: 12
-                      line_stop: 12
-                      col_start: 13
-                      col_stop: 14
-                      path: ""
-                      content: "r1: u8    = 2;                    "
-            span:
-              line_start: 12
-              line_stop: 12
-              col_start: 5
-              col_stop: 7
-              path: ""
-              content: "r1: u8    = 2;                    "
-          - mode: Private
-            type_: Field
-            name: "{\"name\":\"r2\",\"span\":\"{\\\"line_start\\\":13,\\\"line_stop\\\":13,\\\"col_start\\\":1,\\\"col_stop\\\":3,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"r2: field = 0;                    \\\"}\"}"
-            value:
-              Value:
-                Implicit:
-                  - "0"
-                  - span:
-                      line_start: 13
-                      line_stop: 13
-                      col_start: 13
-                      col_stop: 14
-                      path: ""
-                      content: "r2: field = 0;                    "
-            span:
-              line_start: 13
-              line_stop: 13
-              col_start: 5
-              col_stop: 10
-              path: ""
-              content: "r2: field = 0;                    "
-          - mode: Private
-            type_: Group
-            name: "{\"name\":\"r3\",\"span\":\"{\\\"line_start\\\":14,\\\"line_stop\\\":14,\\\"col_start\\\":1,\\\"col_stop\\\":3,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"r3: group = (0, 1)group;          \\\"}\"}"
-            value:
-              Value:
-                Group:
-                  Tuple:
-                    x:
-                      Number:
-                        - "0"
-                        - span:
-                            line_start: 14
-                            line_stop: 14
-                            col_start: 14
-                            col_stop: 15
-                            path: ""
-                            content: "r3: group = (0, 1)group;          "
-                    y:
-                      Number:
-                        - "1"
-                        - span:
-                            line_start: 14
-                            line_stop: 14
-                            col_start: 17
-                            col_stop: 18
-                            path: ""
-                            content: "r3: group = (0, 1)group;          "
-                    span:
-                      line_start: 14
-                      line_stop: 14
-                      col_start: 14
-                      col_stop: 24
-                      path: ""
-                      content: "r3: group = (0, 1)group;          "
-            span:
-              line_start: 14
-              line_stop: 14
-              col_start: 5
-              col_stop: 10
-              path: ""
-              content: "r3: group = (0, 1)group;          "
-          - mode: Private
-            type_: Address
-            name: "{\"name\":\"r4\",\"span\":\"{\\\"line_start\\\":15,\\\"line_stop\\\":15,\\\"col_start\\\":1,\\\"col_stop\\\":3,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"r4: address = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;\\\"}\"}"
-            value:
-              Value:
-                Address:
-                  - aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8
-                  - span:
-                      line_start: 15
-                      line_stop: 15
-                      col_start: 15
-                      col_stop: 78
-                      path: ""
-                      content: "r4: address = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;"
-            span:
-              line_start: 15
-              line_stop: 15
-              col_start: 5
-              col_stop: 12
-              path: ""
-              content: "r4: address = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;"
-        span:
-          line_start: 10
-          line_stop: 10
-          col_start: 2
-          col_stop: 11
-          path: ""
-          content: "[registers]"
+  - "Error [EPAR0370042]: `constant` is preferred over `const` for function parameters to indicate a R1CS constant.\n    --> test:4:1\n     |\n   4 | const a: bool  = true;\n     | ^^^^^\nError [EPAR0370042]: `constant` is preferred over `const` for function parameters to indicate a R1CS constant.\n    --> test:5:1\n     |\n   5 | const b: u8    = 2;\n     | ^^^^^\nError [EPAR0370042]: `constant` is preferred over `const` for function parameters to indicate a R1CS constant.\n    --> test:6:1\n     |\n   6 | const c: field = 0;\n     | ^^^^^\nError [EPAR0370042]: `constant` is preferred over `const` for function parameters to indicate a R1CS constant.\n    --> test:7:1\n     |\n   7 | const d: group = (0, 1)group;\n     | ^^^^^\nError [EPAR0370042]: `constant` is preferred over `const` for function parameters to indicate a R1CS constant.\n    --> test:8:1\n     |\n   8 | const e: address = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;\n     | ^^^^^"
diff --git a/tests/expectations/parser/parser/inputs/input_constant.leo.out b/tests/expectations/parser/parser/inputs/input_constant.leo.out
new file mode 100644
index 0000000000..a206272bc7
--- /dev/null
+++ b/tests/expectations/parser/parser/inputs/input_constant.leo.out
@@ -0,0 +1,275 @@
+---
+namespace: Input
+expectation: Pass
+outputs:
+  - sections:
+      - name: main
+        definitions:
+          - mode: Constant
+            type_: Boolean
+            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:
+                  - "true"
+                  - span:
+                      line_start: 4
+                      line_stop: 4
+                      col_start: 21
+                      col_stop: 25
+                      path: ""
+                      content: "constant a: bool  = true;"
+            span:
+              line_start: 4
+              line_stop: 4
+              col_start: 13
+              col_stop: 17
+              path: ""
+              content: "constant a: bool  = true;"
+          - mode: Constant
+            type_:
+              IntegerType: U8
+            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:
+                  - "2"
+                  - span:
+                      line_start: 5
+                      line_stop: 5
+                      col_start: 21
+                      col_stop: 22
+                      path: ""
+                      content: "constant b: u8    = 2;"
+            span:
+              line_start: 5
+              line_stop: 5
+              col_start: 13
+              col_stop: 15
+              path: ""
+              content: "constant b: u8    = 2;"
+          - mode: Constant
+            type_: Field
+            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:
+                  - "0"
+                  - span:
+                      line_start: 6
+                      line_stop: 6
+                      col_start: 21
+                      col_stop: 22
+                      path: ""
+                      content: "constant c: field = 0;"
+            span:
+              line_start: 6
+              line_stop: 6
+              col_start: 13
+              col_stop: 18
+              path: ""
+              content: "constant c: field = 0;"
+          - mode: Constant
+            type_: 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:
+                  Tuple:
+                    x:
+                      Number:
+                        - "0"
+                        - span:
+                            line_start: 7
+                            line_stop: 7
+                            col_start: 22
+                            col_stop: 23
+                            path: ""
+                            content: "constant d: group = (0, 1)group;"
+                    y:
+                      Number:
+                        - "1"
+                        - span:
+                            line_start: 7
+                            line_stop: 7
+                            col_start: 25
+                            col_stop: 26
+                            path: ""
+                            content: "constant d: group = (0, 1)group;"
+                    span:
+                      line_start: 7
+                      line_stop: 7
+                      col_start: 22
+                      col_stop: 32
+                      path: ""
+                      content: "constant d: group = (0, 1)group;"
+            span:
+              line_start: 7
+              line_stop: 7
+              col_start: 13
+              col_stop: 18
+              path: ""
+              content: "constant d: group = (0, 1)group;"
+          - mode: Constant
+            type_: Address
+            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:
+                  - aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8
+                  - span:
+                      line_start: 8
+                      line_stop: 8
+                      col_start: 23
+                      col_stop: 86
+                      path: ""
+                      content: "constant e: address = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;"
+            span:
+              line_start: 8
+              line_stop: 8
+              col_start: 13
+              col_stop: 20
+              path: ""
+              content: "constant e: address = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;"
+        span:
+          line_start: 3
+          line_stop: 3
+          col_start: 2
+          col_stop: 6
+          path: ""
+          content: "[main]"
+      - name: registers
+        definitions:
+          - mode: Private
+            type_: Boolean
+            name: "{\"name\":\"r0\",\"span\":\"{\\\"line_start\\\":11,\\\"line_stop\\\":11,\\\"col_start\\\":1,\\\"col_stop\\\":3,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"r0: bool  = true;\\\"}\"}"
+            value:
+              Value:
+                Boolean:
+                  - "true"
+                  - span:
+                      line_start: 11
+                      line_stop: 11
+                      col_start: 13
+                      col_stop: 17
+                      path: ""
+                      content: "r0: bool  = true;"
+            span:
+              line_start: 11
+              line_stop: 11
+              col_start: 5
+              col_stop: 9
+              path: ""
+              content: "r0: bool  = true;"
+          - mode: Private
+            type_:
+              IntegerType: U8
+            name: "{\"name\":\"r1\",\"span\":\"{\\\"line_start\\\":12,\\\"line_stop\\\":12,\\\"col_start\\\":1,\\\"col_stop\\\":3,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"r1: u8    = 2;\\\"}\"}"
+            value:
+              Value:
+                Implicit:
+                  - "2"
+                  - span:
+                      line_start: 12
+                      line_stop: 12
+                      col_start: 13
+                      col_stop: 14
+                      path: ""
+                      content: "r1: u8    = 2;"
+            span:
+              line_start: 12
+              line_stop: 12
+              col_start: 5
+              col_stop: 7
+              path: ""
+              content: "r1: u8    = 2;"
+          - mode: Private
+            type_: Field
+            name: "{\"name\":\"r2\",\"span\":\"{\\\"line_start\\\":13,\\\"line_stop\\\":13,\\\"col_start\\\":1,\\\"col_stop\\\":3,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"r2: field = 0;\\\"}\"}"
+            value:
+              Value:
+                Implicit:
+                  - "0"
+                  - span:
+                      line_start: 13
+                      line_stop: 13
+                      col_start: 13
+                      col_stop: 14
+                      path: ""
+                      content: "r2: field = 0;"
+            span:
+              line_start: 13
+              line_stop: 13
+              col_start: 5
+              col_stop: 10
+              path: ""
+              content: "r2: field = 0;"
+          - mode: Private
+            type_: Group
+            name: "{\"name\":\"r3\",\"span\":\"{\\\"line_start\\\":14,\\\"line_stop\\\":14,\\\"col_start\\\":1,\\\"col_stop\\\":3,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"r3: group = (0, 1)group;\\\"}\"}"
+            value:
+              Value:
+                Group:
+                  Tuple:
+                    x:
+                      Number:
+                        - "0"
+                        - span:
+                            line_start: 14
+                            line_stop: 14
+                            col_start: 14
+                            col_stop: 15
+                            path: ""
+                            content: "r3: group = (0, 1)group;"
+                    y:
+                      Number:
+                        - "1"
+                        - span:
+                            line_start: 14
+                            line_stop: 14
+                            col_start: 17
+                            col_stop: 18
+                            path: ""
+                            content: "r3: group = (0, 1)group;"
+                    span:
+                      line_start: 14
+                      line_stop: 14
+                      col_start: 14
+                      col_stop: 24
+                      path: ""
+                      content: "r3: group = (0, 1)group;"
+            span:
+              line_start: 14
+              line_stop: 14
+              col_start: 5
+              col_stop: 10
+              path: ""
+              content: "r3: group = (0, 1)group;"
+          - mode: Private
+            type_: Address
+            name: "{\"name\":\"r4\",\"span\":\"{\\\"line_start\\\":15,\\\"line_stop\\\":15,\\\"col_start\\\":1,\\\"col_stop\\\":3,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"r4: address = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;\\\"}\"}"
+            value:
+              Value:
+                Address:
+                  - aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8
+                  - span:
+                      line_start: 15
+                      line_stop: 15
+                      col_start: 15
+                      col_stop: 78
+                      path: ""
+                      content: "r4: address = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;"
+            span:
+              line_start: 15
+              line_stop: 15
+              col_start: 5
+              col_stop: 12
+              path: ""
+              content: "r4: address = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;"
+        span:
+          line_start: 10
+          line_stop: 10
+          col_start: 2
+          col_stop: 11
+          path: ""
+          content: "[registers]"
diff --git a/tests/expectations/parser/parser/inputs/input_constant_public_fail.leo.out b/tests/expectations/parser/parser/inputs/input_constant_public_fail.leo.out
new file mode 100644
index 0000000000..f618c2ebbb
--- /dev/null
+++ b/tests/expectations/parser/parser/inputs/input_constant_public_fail.leo.out
@@ -0,0 +1,5 @@
+---
+namespace: Input
+expectation: Fail
+outputs:
+  - "Error [EPAR0370009]: unexpected string: expected 'ident', got 'public'\n    --> test:4:10\n     |\n   4 | constant public a: bool  = true;                 \n     |          ^^^^^^"
diff --git a/tests/expectations/parser/parser/inputs/input_public_const_fail.leo.out b/tests/expectations/parser/parser/inputs/input_public_const_fail.leo.out
index 2060e85c72..720d0d41dc 100644
--- a/tests/expectations/parser/parser/inputs/input_public_const_fail.leo.out
+++ b/tests/expectations/parser/parser/inputs/input_public_const_fail.leo.out
@@ -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 constant 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     | ^^^^^^^^^^^^^^^"
diff --git a/tests/expectations/parser/parser/inputs/input_public_constant_fail.leo.out b/tests/expectations/parser/parser/inputs/input_public_constant_fail.leo.out
new file mode 100644
index 0000000000..720d0d41dc
--- /dev/null
+++ b/tests/expectations/parser/parser/inputs/input_public_constant_fail.leo.out
@@ -0,0 +1,5 @@
+---
+namespace: Input
+expectation: Fail
+outputs:
+  - "Error [EPAR0370041]: A parameter cannot be both public and const.\n    --> test:4:1\n     |\n   4 | public constant a: bool  = true;\n     | ^^^^^^^^^^^^^^^"
diff --git a/tests/parser/inputs/input_const.leo b/tests/parser/inputs/input_const.leo
index 5a72f3f754..bd7c15d93d 100644
--- a/tests/parser/inputs/input_const.leo
+++ b/tests/parser/inputs/input_const.leo
@@ -1,18 +1,18 @@
 /*
 namespace: Input
-expectation: Pass
+expectation: Fail
 */
 
 [main]
-constant a: bool  = true;                 
-constant b: u8    = 2;                    
-constant c: field = 0;                    
-constant d: group = (0, 1)group;          
-constant e: address = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;
+const a: bool  = true;
+const b: u8    = 2;
+const c: field = 0;
+const d: group = (0, 1)group;
+const e: address = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;
 
 [registers]
-r0: bool  = true;                 
-r1: u8    = 2;                    
-r2: field = 0;                    
-r3: group = (0, 1)group;          
+r0: bool  = true;
+r1: u8    = 2;
+r2: field = 0;
+r3: group = (0, 1)group;
 r4: address = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;
diff --git a/tests/parser/inputs/input_constant.leo b/tests/parser/inputs/input_constant.leo
new file mode 100644
index 0000000000..c14e72a52b
--- /dev/null
+++ b/tests/parser/inputs/input_constant.leo
@@ -0,0 +1,18 @@
+/*
+namespace: Input
+expectation: Pass
+*/
+
+[main]
+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;
+r1: u8    = 2;
+r2: field = 0;
+r3: group = (0, 1)group;
+r4: address = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;
diff --git a/tests/parser/inputs/input_const_public_fail.leo b/tests/parser/inputs/input_constant_public_fail.leo
similarity index 100%
rename from tests/parser/inputs/input_const_public_fail.leo
rename to tests/parser/inputs/input_constant_public_fail.leo
diff --git a/tests/parser/inputs/input_public_const_fail.leo b/tests/parser/inputs/input_public_const_fail.leo
deleted file mode 100644
index bce42f3e53..0000000000
--- a/tests/parser/inputs/input_public_const_fail.leo
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-namespace: Input
-expectation: Fail
-*/
-
-[main]
-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;                 
-r1: u8    = 2;                    
-r2: field = 0;                    
-r3: group = (0, 1)group;          
-r4: address = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;
-
diff --git a/tests/parser/inputs/input_public_constant_fail.leo b/tests/parser/inputs/input_public_constant_fail.leo
new file mode 100644
index 0000000000..94325d2ef4
--- /dev/null
+++ b/tests/parser/inputs/input_public_constant_fail.leo
@@ -0,0 +1,19 @@
+/*
+namespace: Input
+expectation: Fail
+*/
+
+[main]
+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;
+r1: u8    = 2;
+r2: field = 0;
+r3: group = (0, 1)group;
+r4: address = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;
+

From 168080942b42fe86c8cff0a5973c62e16e03707b Mon Sep 17 00:00:00 2001
From: gluax <16431709+gluax@users.noreply.github.com>
Date: Tue, 12 Apr 2022 11:52:12 -0700
Subject: [PATCH 4/6] better match pattern for catching more error situations

---
 compiler/parser/src/parser/file.rs |  25 ++++++++++++++++---------
 docs/grammar/README.md             | Bin 46382 -> 46406 bytes
 docs/grammar/abnf-grammar.txt      |   2 +-
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/compiler/parser/src/parser/file.rs b/compiler/parser/src/parser/file.rs
index 33cbf9e0d2..842f97b258 100644
--- a/compiler/parser/src/parser/file.rs
+++ b/compiler/parser/src/parser/file.rs
@@ -70,19 +70,26 @@ impl ParserContext<'_> {
         let const_ = self.eat(Token::Const);
 
         if const_.is_some() {
-            dbg!(&const_.as_ref().unwrap().span);
             self.emit_err(ParserError::const_parameter_or_input(&const_.as_ref().unwrap().span));
         }
 
-        match (public, constant) {
-            (None, Some(_)) => Ok(ParamMode::Constant),
-            (None, None) if const_.is_some() => Ok(ParamMode::Constant),
-            (None, None) => Ok(ParamMode::Private),
-            (Some(p), None) if const_.is_some() => {
-                Err(ParserError::inputs_multiple_variable_types_specified(&(p.span + const_.unwrap().span)).into())
+        match (public, constant, const_) {
+            (None, Some(_), None) => Ok(ParamMode::Constant),
+            (None, None, Some(_)) => Ok(ParamMode::Constant),
+            (None, None, None) => Ok(ParamMode::Private),
+            (Some(_), None, None) => Ok(ParamMode::Public),
+            (Some(p), None, Some(c)) => {
+                Err(ParserError::inputs_multiple_variable_types_specified(&(p.span + c.span)).into())
+            }
+            (None, Some(c), Some(co)) => {
+                Err(ParserError::inputs_multiple_variable_types_specified(&(c.span + co.span)).into())
+            }
+            (Some(p), Some(c), None) => {
+                Err(ParserError::inputs_multiple_variable_types_specified(&(p.span + c.span)).into())
+            }
+            (Some(p), Some(c), Some(co)) => {
+                Err(ParserError::inputs_multiple_variable_types_specified(&(p.span + c.span + co.span)).into())
             }
-            (Some(_), None) => Ok(ParamMode::Public),
-            (Some(p), Some(c)) => Err(ParserError::inputs_multiple_variable_types_specified(&(p.span + c.span)).into()),
         }
     }
 
diff --git a/docs/grammar/README.md b/docs/grammar/README.md
index 891e76c7fdb2e39c30e5085ef5457567207b7d92..5da5bbee20584cf0b129f9acc2fa7dd6ca8cb3b9 100644
GIT binary patch
delta 18
acmZ4Yis{%ZrVTEuCabLy+3c|D9TxyvBnbBa

delta 28
mcmV+%0OSA0>H@Cn0<c7?0bP?JZ5fj=nG}<rTp+Wms+<bB#|%vX

diff --git a/docs/grammar/abnf-grammar.txt b/docs/grammar/abnf-grammar.txt
index 5c409d61dc..380517a6a8 100644
--- a/docs/grammar/abnf-grammar.txt
+++ b/docs/grammar/abnf-grammar.txt
@@ -318,7 +318,7 @@ function-declaration = %s"function" identifier
 
 function-parameters = function-parameter *( "," function-parameter ) [ "," ]
 
-function-parameter = [ %s"public" / %s"constant" ] identifier ":" type
+function-parameter = [ %s"public" / %s"constant" / %s"const" ] identifier ":" type
 
 declaration = function-declaration
 

From 198ceee5368b6d85877a115aa27ebc005085d1ff Mon Sep 17 00:00:00 2001
From: gluax <16431709+gluax@users.noreply.github.com>
Date: Tue, 12 Apr 2022 12:22:52 -0700
Subject: [PATCH 5/6] fix token and constant pairing

---
 compiler/parser/src/tokenizer/token.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/parser/src/tokenizer/token.rs b/compiler/parser/src/tokenizer/token.rs
index 9d4164363a..e01607471d 100644
--- a/compiler/parser/src/tokenizer/token.rs
+++ b/compiler/parser/src/tokenizer/token.rs
@@ -182,7 +182,7 @@ impl Token {
             Token::Char => sym::char,
             Token::Console => sym::console,
             Token::Const => sym::Const,
-            Token::Constant => sym::Const,
+            Token::Constant => sym::Constant,
             Token::Else => sym::Else,
             Token::False => sym::False,
             Token::Field => sym::field,

From ba993b3a839012751074134038fbc0bdfd9f430d Mon Sep 17 00:00:00 2001
From: gluax <16431709+gluax@users.noreply.github.com>
Date: Tue, 12 Apr 2022 13:13:02 -0700
Subject: [PATCH 6/6] match pattern cleanup

---
 compiler/parser/src/parser/file.rs | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/compiler/parser/src/parser/file.rs b/compiler/parser/src/parser/file.rs
index 842f97b258..d7d43ab0b5 100644
--- a/compiler/parser/src/parser/file.rs
+++ b/compiler/parser/src/parser/file.rs
@@ -78,17 +78,11 @@ impl ParserContext<'_> {
             (None, None, Some(_)) => Ok(ParamMode::Constant),
             (None, None, None) => Ok(ParamMode::Private),
             (Some(_), None, None) => Ok(ParamMode::Public),
-            (Some(p), None, Some(c)) => {
-                Err(ParserError::inputs_multiple_variable_types_specified(&(p.span + c.span)).into())
+            (Some(m1), Some(m2), None) | (Some(m1), None, Some(m2)) | (None, Some(m1), Some(m2)) => {
+                Err(ParserError::inputs_multiple_variable_types_specified(&(m1.span + m2.span)).into())
             }
-            (None, Some(c), Some(co)) => {
-                Err(ParserError::inputs_multiple_variable_types_specified(&(c.span + co.span)).into())
-            }
-            (Some(p), Some(c), None) => {
-                Err(ParserError::inputs_multiple_variable_types_specified(&(p.span + c.span)).into())
-            }
-            (Some(p), Some(c), Some(co)) => {
-                Err(ParserError::inputs_multiple_variable_types_specified(&(p.span + c.span + co.span)).into())
+            (Some(m1), Some(m2), Some(m3)) => {
+                Err(ParserError::inputs_multiple_variable_types_specified(&(m1.span + m2.span + m3.span)).into())
             }
         }
     }