Skip to content

Adjustments to new LFSC grammar. #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alex-ozdemir wants to merge 3 commits into
base: Version_1.5
Choose a base branch
from
Open

Adjustments to new LFSC grammar. #53

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
957f4b2
modify LFSC 1.5 grammar to what rlfsc's "sugar" branch currently impl…
alex-ozdemir Dec 8, 2020
a834b33
Update 'assuming' form
alex-ozdemir Dec 9, 2020
eeae386
Post-discussion changes:
alex-ozdemir Dec 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions doc/lfsc1_5.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,10 @@ command
| '(' 'run' code ')'
| '(' 'program' iden '(' typed_par+ ')' type code ')'
// Extension /////////////////////////////////
| '(' 'declare-type' iden '(' type* ')' ')'
| '(' 'declare-rule' iden ( ntype | vtype )+ type ')' ')'
| '(' 'declare-type' iden decl_list ')'
| '(' 'declare-rule' iden decl_list type ')'
| '(' 'define-const' iden decl_list term ')'
| '(' 'check-assuming' decl_list type term ')'
//////////////////////////////////////////////
;
// (declare-type c (τ₁ ⋯ τᵢ)) with i > 0
Expand All @@ -33,6 +35,8 @@ command
// is equivalent to
// (declare r (-> r ν₁ ⋯ νᵢ τ))

decl_list : '(' (ntype | vtype)* ')';

iden : ID ;

kind
Expand Down Expand Up @@ -78,7 +82,7 @@ ntype
// (^ c t)

// Extension /////////////////////
vtype : '(' 'var' iden ntype ')' ;
vtype : '(' ':' iden ntype ')' ;
//////////////////////////////////

type
Expand All @@ -89,7 +93,7 @@ type
| '(' '!' iden ntype type ')'
// Extension ///////////////////////////////
| '(' 'Forall' iden ntype type ')'
| '(' '->' ( ntype | vtype )+ type ')'
| '(' '->' decl_list type ')'
////////////////////////////////////////////
;
// (Forall ξ τ₁ τ₂)
Expand Down Expand Up @@ -117,14 +121,13 @@ term
| rat_const
| '(' term term+ ')'
| '(' '\\' iden term ')'
| '(' '@' iden term ')'
| '(' '@' iden term term ')'

@alex-ozdemir alex-ozdemir Dec 9, 2020

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think was just a typo.

| '(' ':' type term ')'
// Deprecated
| '(' '%' iden type term ')'
// Extensions ///////////////////
| '(' 'lam' iden term ')'
| '(' 'let' iden term term ')'
| '(' 'proved-by' type term ')'
| '(' 'assuming' vtype+ term ')'
;
//////////////////////////////////
// (lam ξ t)
Expand Down Expand Up @@ -167,4 +170,4 @@ code
INT : [0-9]+ ;
RAT : ('0' | [1-9][0-9]*) '/' [1-9][0-9]* ;
ID : [a-zA-Z~!@$%^&*_\-+=<>.?/][a-zA-Z0-9~!@$%^&*_\-+=<>.?/]* ;
KW : ':'[a-zA-Z0-9~!@$%^&*_\-+=<>.?/]* ;
KW : ':'[a-zA-Z0-9~!@$%^&*_\-+=<>.?/]* ;