From 7b13ba58e45ac9c8211a6e3bc2a5936dfa1de1f1 Mon Sep 17 00:00:00 2001
From: Alessandro Coglio <coglio@kestrel.edu>
Date: Mon, 21 Mar 2022 17:41:41 -0700
Subject: [PATCH 1/2] [ABNF] Re-classify function call expressions.

This mirrors, in pre-testnet3, the change in PR #1699 in testnet3.

Since in pre-testnet3 we have fewer kinds expressions, the category of postfix
expressions disappears altogether with this re-classification.
---
 docs/grammar/README.md        | 24 ++++++------------------
 docs/grammar/abnf-grammar.txt |  6 ++----
 2 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/docs/grammar/README.md b/docs/grammar/README.md
index b2226f3fb3..c617d5a1e5 100644
--- a/docs/grammar/README.md
+++ b/docs/grammar/README.md
@@ -210,14 +210,8 @@ starting with a letter.
 It must not be a keyword or a boolean literal,
 and it must not be or start with `aleo1`;
 these are extra-grammatical requirements, indicated in the comment.
-<a name="identifier"></a>
-```abnf
 identifier = letter *( letter / decimal-digit / "_" )
              ; but not a keyword or a boolean literal or aleo1...
-```
-
-Go to: _[letter](#user-content-letter)_;
-
 
 <a name="numeral"></a>
 ```abnf
@@ -485,6 +479,7 @@ scalar-type =  boolean-type / arithmetic-type / address-type / character-type
 
 Go to: _[address-type](#user-content-address-type), [arithmetic-type](#user-content-arithmetic-type), [boolean-type](#user-content-boolean-type), [character-type](#user-content-character-type)_;
 
+
 <a name="type"></a>
 ```abnf
 type = scalar-type
@@ -530,9 +525,10 @@ Go to: _[affine-group-literal](#user-content-affine-group-literal), [product-gro
 primary-expression = identifier
                    / literal
                    / "(" expression ")"
+                   / identifier function-arguments
 ```
 
-Go to: _[expression](#user-content-expression), [identifier](#user-content-identifier), [literal](#user-content-literal)_;
+Go to: _[expression](#user-content-expression), [function-arguments](#user-content-function-arguments), [identifier](#user-content-identifier), [literal](#user-content-literal)_;
 
 
 <a name="function-arguments"></a>
@@ -543,23 +539,14 @@ function-arguments = "(" [ expression *( "," expression ) [ "," ] ] ")"
 Go to: _[expression](#user-content-expression)_;
 
 
-<a name="postfix-expression"></a>
-```abnf
-postfix-expression = primary-expression
-                   / identifier function-arguments
-```
-
-Go to: _[function-arguments](#user-content-function-arguments), [identifier](#user-content-identifier), [primary-expression](#user-content-primary-expression)_;
-
-
 <a name="unary-expression"></a>
 ```abnf
-unary-expression = postfix-expression
+unary-expression = primary-expression
                  / "!" unary-expression
                  / "-" unary-expression
 ```
 
-Go to: _[postfix-expression](#user-content-postfix-expression), [unary-expression](#user-content-unary-expression)_;
+Go to: _[primary-expression](#user-content-primary-expression), [unary-expression](#user-content-unary-expression)_;
 
 
 <a name="exponential-expression"></a>
@@ -787,6 +774,7 @@ print-call = print-function print-arguments
 
 Go to: _[print-arguments](#user-content-print-arguments), [print-function](#user-content-print-function)_;
 
+
 <a name="function-declaration"></a>
 ```abnf
 function-declaration = %s"function" identifier
diff --git a/docs/grammar/abnf-grammar.txt b/docs/grammar/abnf-grammar.txt
index 490bc9e945..11df03c35e 100644
--- a/docs/grammar/abnf-grammar.txt
+++ b/docs/grammar/abnf-grammar.txt
@@ -228,13 +228,11 @@ group-literal = product-group-literal / affine-group-literal
 primary-expression = identifier
                    / literal
                    / "(" expression ")"
+                   / identifier function-arguments
 
 function-arguments = "(" [ expression *( "," expression ) [ "," ] ] ")"
 
-postfix-expression = primary-expression
-                   / identifier function-arguments
-
-unary-expression = postfix-expression
+unary-expression = primary-expression
                  / "!" unary-expression
                  / "-" unary-expression
 

From e3f87ad3227848efaa787616118af258efef20b4 Mon Sep 17 00:00:00 2001
From: Alessandro Coglio <coglio@kestrel.edu>
Date: Mon, 21 Mar 2022 17:49:38 -0700
Subject: [PATCH 2/2] [ABNF] Remove some stray documentation comments.

Documentation comments were all removed from this grammar file, as readers of
this file in this branch are already familiar with Leo.
---
 docs/grammar/README.md        | 12 ++++++------
 docs/grammar/abnf-grammar.txt |  6 ------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/docs/grammar/README.md b/docs/grammar/README.md
index c617d5a1e5..1e10756188 100644
--- a/docs/grammar/README.md
+++ b/docs/grammar/README.md
@@ -204,14 +204,14 @@ hexadecimal-digit = decimal-digit / "a" / "b" / "c" / "d" / "e" / "f"
 Go to: _[decimal-digit](#user-content-decimal-digit)_;
 
 
-An identifier is a non-empty sequence of
-letters, (decimal) digits, and underscores,
-starting with a letter.
-It must not be a keyword or a boolean literal,
-and it must not be or start with `aleo1`;
-these are extra-grammatical requirements, indicated in the comment.
+<a name="identifier"></a>
+```abnf
 identifier = letter *( letter / decimal-digit / "_" )
              ; but not a keyword or a boolean literal or aleo1...
+```
+
+Go to: _[letter](#user-content-letter)_;
+
 
 <a name="numeral"></a>
 ```abnf
diff --git a/docs/grammar/abnf-grammar.txt b/docs/grammar/abnf-grammar.txt
index 11df03c35e..21830a6f50 100644
--- a/docs/grammar/abnf-grammar.txt
+++ b/docs/grammar/abnf-grammar.txt
@@ -100,12 +100,6 @@ octal-digit = %x30-37   ; 0-7
 
 hexadecimal-digit = decimal-digit / "a" / "b" / "c" / "d" / "e" / "f"
 
-; An identifier is a non-empty sequence of
-; letters, (decimal) digits, and underscores,
-; starting with a letter.
-; It must not be a keyword or a boolean literal,
-; and it must not be or start with `aleo1`;
-; these are extra-grammatical requirements, indicated in the comment.
 identifier = letter *( letter / decimal-digit / "_" )
              ; but not a keyword or a boolean literal or aleo1...