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

[ABNF] Require types to avoid type inference.

Browse Source 
Types are now required in variable and constant declarations (including for loop
variables), and for literals (i.e. there are no longer untyped literals).
This commit is contained in:
Alessandro Coglio 2022-03-05 23:52:34 -08:00
parent 8398b3181e
commit 6cbf206f86
2 changed files with 12 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
docs/grammar/README.md
View File

@ -654,16 +654,6 @@ integer = [ "-" ] natural
Go to: _[natural](#user-content-natural)_; Go to: _[natural](#user-content-natural)_;
An untyped literal is just an integer.
<a name="untyped-literal"></a>
```abnf
untyped-literal = integer
```
Go to: _[integer](#user-content-integer)_;
Unsigned literals are naturals followed by unsigned types. Unsigned literals are naturals followed by unsigned types.
<a name="unsigned-literal"></a> <a name="unsigned-literal"></a>
@ -849,8 +839,7 @@ as defined by the following rule.
<a name="atomic-literal"></a> <a name="atomic-literal"></a>
```abnf ```abnf
atomic-literal = untyped-literal atomic-literal = unsigned-literal
/ unsigned-literal
/ signed-literal / signed-literal
/ field-literal / field-literal
/ product-group-literal / product-group-literal
@ -860,7 +849,7 @@ atomic-literal = untyped-literal
/ string-literal / string-literal
``` ```
Go to: _[address-literal](#user-content-address-literal), [boolean-literal](#user-content-boolean-literal), [character-literal](#user-content-character-literal), [field-literal](#user-content-field-literal), [product-group-literal](#user-content-product-group-literal), [signed-literal](#user-content-signed-literal), [string-literal](#user-content-string-literal), [unsigned-literal](#user-content-unsigned-literal), [untyped-literal](#user-content-untyped-literal)_; Go to: _[address-literal](#user-content-address-literal), [boolean-literal](#user-content-boolean-literal), [character-literal](#user-content-character-literal), [field-literal](#user-content-field-literal), [product-group-literal](#user-content-product-group-literal), [signed-literal](#user-content-signed-literal), [string-literal](#user-content-string-literal), [unsigned-literal](#user-content-unsigned-literal)_;
After defining the (mostly) alphanumeric tokens above, After defining the (mostly) alphanumeric tokens above,
@ -1511,7 +1500,7 @@ and just one initializing expression.
<a name="variable-declaration"></a> <a name="variable-declaration"></a>
```abnf ```abnf
variable-declaration = %s"let" identifier-or-identifiers [ ":" type ] variable-declaration = %s"let" identifier-or-identifiers ":" type
"=" expression ";" "=" expression ";"
``` ```
@ -1520,7 +1509,7 @@ Go to: _[expression](#user-content-expression), [identifier-or-identifiers](#use
<a name="constant-declaration"></a> <a name="constant-declaration"></a>
```abnf ```abnf
constant-declaration = %s"const" identifier-or-identifiers [ ":" type ] constant-declaration = %s"const" identifier-or-identifiers ":" type
"=" expression ";" "=" expression ";"
``` ```
@ -1566,11 +1555,12 @@ The body is a block.
<a name="loop-statement"></a> <a name="loop-statement"></a>
```abnf ```abnf
loop-statement = %s"for" identifier %s"in" expression ".." [ "=" ] expression loop-statement = %s"for" identifier ":" type
%s"in" expression ".." [ "=" ] expression
block block
``` ```
Go to: _[block](#user-content-block), [expression](#user-content-expression), [identifier](#user-content-identifier)_; Go to: _[block](#user-content-block), [expression](#user-content-expression), [identifier](#user-content-identifier), [type](#user-content-type)_;
An assignment statement is straightforward. An assignment statement is straightforward.

14
docs/grammar/abnf-grammar.txt
View File

@ -461,10 +461,6 @@ natural = 1*decimal-digit
integer = [ "-" ] natural integer = [ "-" ] natural
; An untyped literal is just an integer.
untyped-literal = integer
; Unsigned literals are naturals followed by unsigned types. ; Unsigned literals are naturals followed by unsigned types.
unsigned-literal = natural ( %s"u8" / %s"u16" / %s"u32" / %s"u64" / %s"u128" ) unsigned-literal = natural ( %s"u8" / %s"u16" / %s"u32" / %s"u64" / %s"u128" )
@ -552,8 +548,7 @@ string-literal-element = not-double-quote-or-backslash
; (in the sense that they are tokens, without whitespace allowed in them), ; (in the sense that they are tokens, without whitespace allowed in them),
; as defined by the following rule. ; as defined by the following rule.
atomic-literal = untyped-literal atomic-literal = unsigned-literal
/ unsigned-literal
/ signed-literal / signed-literal
/ field-literal / field-literal
/ product-group-literal / product-group-literal
@ -918,10 +913,10 @@ return-statement = %s"return" expression ";"
; in all cases, there is just one optional type ; in all cases, there is just one optional type
; and just one initializing expression. ; and just one initializing expression.
variable-declaration = %s"let" identifier-or-identifiers [ ":" type ] variable-declaration = %s"let" identifier-or-identifiers ":" type
"=" expression ";" "=" expression ";"
constant-declaration = %s"const" identifier-or-identifiers [ ":" type ] constant-declaration = %s"const" identifier-or-identifiers ":" type
"=" expression ";" "=" expression ";"
identifier-or-identifiers = identifier identifier-or-identifiers = identifier
@ -943,7 +938,8 @@ conditional-statement = branch
; that goes from a starting value (inclusive) to an ending value (exclusive). ; that goes from a starting value (inclusive) to an ending value (exclusive).
; The body is a block. ; The body is a block.
loop-statement = %s"for" identifier %s"in" expression ".." [ "=" ] expression loop-statement = %s"for" identifier ":" type
%s"in" expression ".." [ "=" ] expression
block block
; An assignment statement is straightforward. ; An assignment statement is straightforward.