Persistence filters allow unquoted units (#4681)
* allow filters without quotes around units Signed-off-by: Mark Herwege <mark.herwege@telenet.be>pull/4693/head
parent
a670ddf2ef
commit
69aaf40e0c
|
@ -32,7 +32,7 @@ FilterDetails:
|
|||
;
|
||||
|
||||
ThresholdFilter:
|
||||
'>' (relative?='%')? value=DECIMAL unit=STRING?
|
||||
'>' (relative?='%')? value=DECIMAL unit=(UNIT|STRING)?
|
||||
;
|
||||
|
||||
TimeFilter:
|
||||
|
@ -48,11 +48,11 @@ NotEqualsFilter:
|
|||
;
|
||||
|
||||
IncludeFilter:
|
||||
'[]' lower=DECIMAL upper=DECIMAL unit=STRING?
|
||||
'[]' lower=DECIMAL upper=DECIMAL unit=(UNIT|STRING)?
|
||||
;
|
||||
|
||||
NotIncludeFilter:
|
||||
'][' lower=DECIMAL upper=DECIMAL unit=STRING?
|
||||
'][' lower=DECIMAL upper=DECIMAL unit=(UNIT|STRING)?
|
||||
;
|
||||
|
||||
|
||||
|
@ -92,3 +92,7 @@ AliasConfiguration:
|
|||
DECIMAL returns ecore::EBigDecimal :
|
||||
'-'? INT ('.' INT)?
|
||||
;
|
||||
|
||||
UNIT:
|
||||
(('^' INT)|'²'|'³'|'/'|'*'|'·'|'°'|'µ'|'%'|'‰'|'Ω'|'Å'|'('|')'|ID)+
|
||||
;
|
||||
|
|
Loading…
Reference in New Issue