Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Grammar cleanup #1008

Merged
merged 3 commits into from
Mar 8, 2022
Merged

Grammar cleanup #1008

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6d241ed
delete unused grammar rules
cmnrd Mar 8, 2022
b407fe4
mutations and reactions should use the same triggers, effects and sou…
cmnrd Mar 8, 2022
204e80f
delete more unused rules
cmnrd Mar 8, 2022
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
58 changes: 6 additions & 52 deletions org.lflang/src/org/lflang/LinguaFranca.xtext
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,17 +70,6 @@ ReactorDecl: Reactor | ImportedReactor;

ImportedReactor: reactorClass=[Reactor] ('as' name=ID)?;

//Import:
// 'import' ((importedNamespace=QualifiedNameWithWildcard ('as' alias=ID)?) | importURI=STRING) ';'
//;


QualifiedName:
ID ('.' ID)*;

QualifiedNameWithWildcard:
QualifiedName '.*'?;

/**
* Declaration of a reactor class.
*/
Expand Down Expand Up @@ -223,9 +212,9 @@ STP:

Mutation:
('mutation')
('(' (triggers+=[Trigger] (',' triggers+=[Trigger])*)? ')')?
(sources+=[Input] (',' sources+=[Input])*)?
('->' effects+=[Effect] (',' effects+=[Effect])*)?
('(' (triggers+=TriggerRef (',' triggers+=TriggerRef)*)? ')')?
(sources+=VarRef (',' sources+=VarRef)*)?
('->' effects+=[VarRef] (',' effects+=[VarRef])*)?
code=Code;

Preamble:
Expand Down Expand Up @@ -270,7 +259,7 @@ KeyValuePair:

Array: // todo allow empty array in grammar, replace with validator error
'[' elements+=Element (',' (elements+=Element))* ','? ']';

Element:
keyvalue=KeyValuePairs
| array=Array
Expand All @@ -286,11 +275,6 @@ TypedVariable:
Variable:
TypedVariable | Timer | Mode;

Trigger:
Action | Input;

Effect:
Action | Output;
VarRef:
variable=[Variable] | container=[Instantiation] '.' variable=[Variable]
| interleaved?='interleaved' '(' (variable=[Variable] | container=[Instantiation] '.' variable=[Variable]) ')'
Expand All @@ -311,36 +295,15 @@ Assignment:
* Parameter declaration with optional type and mandatory initialization.
*/
Parameter:
name=ID (':' (type=Type))?
// FIXME: rename Value to Expr
name=ID (':' (type=Type))?
((parens+='(' (init+=Value (',' init+=Value)*)? parens+=')')
| (braces+='{' (init+=Value (',' init+=Value)*)? braces+='}')
)?
;

Sum :
terms+=Difference ('+' terms+=Difference)*;

Difference:
terms+=Product ('-' terms +=Product)*;

Product:
terms+=Quotient ('*' terms+=Quotient)*;

Quotient:
terms+=Expr ('/' terms += Expr)*;

Expr :
Value | '(' Sum ')';

// Time is either a reference to a parameter or an integer value,
// a number followed by a unit specification (unless the value is zero).
// If it is a constant, the validator should check that if the value
// is non-zero, it is accompanied by a unit.
Value:
(parameter=[Parameter] | time=Time | literal=Literal | code=Code);


Time:
(interval=INT unit=TimeUnit)
;
Expand Down Expand Up @@ -397,11 +360,6 @@ DottedName:
(ID (('.'|'::') ID)*)
;


Generic:
'<' (DottedName (',' DottedName)*) '>'
;

SignedInt:
INT | NEGINT
;
Expand Down Expand Up @@ -484,10 +442,6 @@ Code:
{Code} '{=' body=Body '=}'
;

// The following cannot be terminal because it overlaps ID.
//Path:
// ID ('.' ID)*;

FSName:
(ID | '.' | '_')+
;
Expand Down Expand Up @@ -554,4 +508,4 @@ Token:
'@' |
// Single quotes
"'"
;
;