Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-3149 Adding proper literal support for number operators ('-' and '+') to ANTLR parser and UI highlighting 

This closes #1298
This commit is contained in:
jpercivall 2016-12-05 12:37:52 -05:00 committed by Matt Burgess
parent 2b6d6c25d8
commit 7633fe35c1
3 changed files with 48 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nifi-commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/AttributeExpressionLexer.g
View File

@ -77,12 +77,13 @@ COLON : ':';
COMMA : ','; COMMA : ',';
DOT : '.'; DOT : '.';
SEMICOLON : ';'; SEMICOLON : ';';
WHOLE_NUMBER : ('0'..'9')+; WHOLE_NUMBER : OP? ('0'..'9')+;
DECIMAL : ('0'..'9')+ '.' ('0'..'9')* EXP? DECIMAL : OP? ('0'..'9')+ '.' ('0'..'9')* EXP?
| '.' ('0'..'9')+ EXP? | OP? '.' ('0'..'9')+ EXP?
| ('0'..'9')+ EXP; | OP? ('0'..'9')+ EXP;
fragment OP: ('+'|'-');
fragment EXP : ('e'|'E') ('+'|'-')? ('0'..'9')+ ; fragment EXP : ('e'|'E') ('+'|'-')? ('0'..'9')+ ;
TRUE : 'true'; TRUE : 'true';

68
nifi-commons/nifi-expression-language/src/test/java/org/apache/nifi/attribute/expression/language/TestQuery.java
View File

@ -1063,7 +1063,13 @@ public class TestQuery {
verifyEquals("${literal(\"5.5\")}", attributes, "5.5"); verifyEquals("${literal(\"5.5\")}", attributes, "5.5");
verifyEquals("${literal(5.5):toNumber()}", attributes, 5L); verifyEquals("${literal(5.5):toNumber()}", attributes, 5L);
verifyEquals("${literal(-5.5):toNumber()}", attributes, -5L);
verifyEquals("${literal(+5.5):toNumber()}", attributes, 5L);
verifyEquals("${literal(5.5):toDecimal()}", attributes, 5.5D); verifyEquals("${literal(5.5):toDecimal()}", attributes, 5.5D);
verifyEquals("${literal(-5.5):toDecimal()}", attributes, -5.5D);
verifyEquals("${literal(+5.5):toDecimal()}", attributes, 5.5D);
verifyEquals("${literal('0xF.Fp10'):toDecimal()}", attributes, 0xF.Fp10D); verifyEquals("${literal('0xF.Fp10'):toDecimal()}", attributes, 0xF.Fp10D);
verifyEquals("${literal('0x1234567890ABCDEF'):toNumber()}", attributes, 0x1234567890ABCDEFL); verifyEquals("${literal('0x1234567890ABCDEF'):toNumber()}", attributes, 0x1234567890ABCDEFL);
@ -1079,49 +1085,49 @@ public class TestQuery {
// Test decimal format X.X // Test decimal format X.X
verifyEquals("${literal(5.5):toDecimal()}", attributes, 5.5D); verifyEquals("${literal(5.5):toDecimal()}", attributes, 5.5D);
verifyEquals("${literal('-12.5'):toDecimal()}", attributes, -12.5D); verifyEquals("${literal(-12.5):toDecimal()}", attributes, -12.5D);
verifyEquals("${literal('+12.5'):toDecimal()}", attributes, 12.5D); verifyEquals("${literal(+12.5):toDecimal()}", attributes, 12.5D);
// Test decimal format X.XEX with positive exponent // Test decimal format X.XEX with positive exponent
verifyEquals("${literal('-12.5E2'):toDecimal()}", attributes, -12.5E2D); verifyEquals("${literal(-12.5E2):toDecimal()}", attributes, -12.5E2D);
verifyEquals("${literal('-12.5e2'):toDecimal()}", attributes, -12.5e2D); verifyEquals("${literal(-12.5e2):toDecimal()}", attributes, -12.5e2D);
verifyEquals("${literal('-12.5e+2'):toDecimal()}", attributes, -12.5e+2D); verifyEquals("${literal(-12.5e+2):toDecimal()}", attributes, -12.5e+2D);
verifyEquals("${literal('12.5E+2'):toDecimal()}", attributes, 12.5E+2D); verifyEquals("${literal(12.5E+2):toDecimal()}", attributes, 12.5E+2D);
verifyEquals("${literal('+12.5e+2'):toDecimal()}", attributes, +12.5e+2D); verifyEquals("${literal(+12.5e+2):toDecimal()}", attributes, +12.5e+2D);
verifyEquals("${literal('+12.5E2'):toDecimal()}", attributes, +12.5E2D); verifyEquals("${literal(+12.5E2):toDecimal()}", attributes, +12.5E2D);
verifyEquals("${literal('-12.5e2'):toDecimal()}", attributes, -12.5e2D); verifyEquals("${literal(-12.5e2):toDecimal()}", attributes, -12.5e2D);
verifyEquals("${literal('12.5E2'):toDecimal()}", attributes, 12.5E2D); verifyEquals("${literal(12.5E2):toDecimal()}", attributes, 12.5E2D);
verifyEquals("${literal('+12.5e2'):toDecimal()}", attributes, +12.5e2D); verifyEquals("${literal(+12.5e2):toDecimal()}", attributes, +12.5e2D);
// Test decimal format X.XEX with negative exponent // Test decimal format X.XEX with negative exponent
verifyEquals("${literal('-12.5E-2'):toDecimal()}", attributes, -12.5E-2D); verifyEquals("${literal(-12.5E-2):toDecimal()}", attributes, -12.5E-2D);
verifyEquals("${literal('12.5E-2'):toDecimal()}", attributes, 12.5E-2D); verifyEquals("${literal(12.5E-2):toDecimal()}", attributes, 12.5E-2D);
verifyEquals("${literal('+12.5e-2'):toDecimal()}", attributes, +12.5e-2D); verifyEquals("${literal(+12.5e-2):toDecimal()}", attributes, +12.5e-2D);
// Test decimal format .X // Test decimal format .X
verifyEquals("${literal('.5'):toDecimal()}", attributes, .5D); verifyEquals("${literal(.5):toDecimal()}", attributes, .5D);
verifyEquals("${literal('.5'):toDecimal()}", attributes, .5D); verifyEquals("${literal(.5):toDecimal()}", attributes, .5D);
verifyEquals("${literal('-.5'):toDecimal()}", attributes, -0.5D); verifyEquals("${literal(-.5):toDecimal()}", attributes, -0.5D);
verifyEquals("${literal('+.5'):toDecimal()}", attributes, .5D); verifyEquals("${literal(+.5):toDecimal()}", attributes, .5D);
// Test decimal format .XEX with positive exponent // Test decimal format .XEX with positive exponent
verifyEquals("${literal('-.5E2'):toDecimal()}", attributes, -.5E2D); verifyEquals("${literal(-.5E2):toDecimal()}", attributes, -.5E2D);
verifyEquals("${literal('-.5E2'):toDecimal()}", attributes, -.5E2D); verifyEquals("${literal(-.5E2):toDecimal()}", attributes, -.5E2D);
verifyEquals("${literal('-.5e+2'):toDecimal()}", attributes, -.5e+2D); verifyEquals("${literal(-.5e+2):toDecimal()}", attributes, -.5e+2D);
verifyEquals("${literal('.5E+2'):toDecimal()}", attributes, .5E+2D); verifyEquals("${literal(.5E+2):toDecimal()}", attributes, .5E+2D);
verifyEquals("${literal('+.5e+2'):toDecimal()}", attributes, +.5e+2D); verifyEquals("${literal(+.5e+2):toDecimal()}", attributes, +.5e+2D);
verifyEquals("${literal('+.5E2'):toDecimal()}", attributes, +.5E2D); verifyEquals("${literal(+.5E2):toDecimal()}", attributes, +.5E2D);
verifyEquals("${literal('-.5e2'):toDecimal()}", attributes, -.5e2D); verifyEquals("${literal(-.5e2):toDecimal()}", attributes, -.5e2D);
verifyEquals("${literal('.5E2'):toDecimal()}", attributes, .5E2D); verifyEquals("${literal(.5E2):toDecimal()}", attributes, .5E2D);
verifyEquals("${literal('+.5e2'):toDecimal()}", attributes, +.5e2D); verifyEquals("${literal(+.5e2):toDecimal()}", attributes, +.5e2D);
// Test decimal format .XEX with negative exponent // Test decimal format .XEX with negative exponent
verifyEquals("${literal('-.5E-2'):toDecimal()}", attributes, -.5E-2D); verifyEquals("${literal(-.5E-2):toDecimal()}", attributes, -.5E-2D);
verifyEquals("${literal('.5e-2'):toDecimal()}", attributes, .5e-2D); verifyEquals("${literal(.5e-2):toDecimal()}", attributes, .5e-2D);
verifyEquals("${literal('+.5E-2'):toDecimal()}", attributes, +.5E-2D); verifyEquals("${literal(+.5E-2):toDecimal()}", attributes, +.5E-2D);
// Verify allowed values // Verify allowed values
verifyEquals("${literal('9876543210.0123456789e123'):toDecimal()}", attributes, 9876543210.0123456789e123D); verifyEquals("${literal(9876543210.0123456789e123):toDecimal()}", attributes, 9876543210.0123456789e123D);
verifyEmpty("${literal('A.1e123'):toDecimal()}", attributes); verifyEmpty("${literal('A.1e123'):toDecimal()}", attributes);
verifyEmpty("${literal('0.Ae123'):toDecimal()}", attributes); verifyEmpty("${literal('0.Ae123'):toDecimal()}", attributes);

11
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/nfeditor/languages/nfel.js vendored
View File

@ -662,16 +662,17 @@ nf.nfel = (function() {
} }
return argumentStringResult; return argumentStringResult;
} else if (stream.match(/^(([0-9]+\.[0-9]*)([eE][+-]?([0-9])+)?)|((\.[0-9]+)([eE][+-]?([0-9])+)?)|(([0-9]+)([eE][+-]?([0-9])+))/)) { } else if (stream.match(/^[-\+]?((([0-9]+\.[0-9]*)([eE][+-]?([0-9])+)?)|((\.[0-9]+)([eE][+-]?([0-9])+)?)|(([0-9]+)([eE][+-]?([0-9])+)))/)) {
// ------------- // -------------
// Decimal value // Decimal value
// ------------- // -------------
// This matches the following ANTLR spec for deciamls // This matches the following ANTLR spec for deciamls
// //
// DECIMAL : ('0'..'9')+ '.' ('0'..'9')* EXP? ^([0-9]+\.[0-9]*)([eE][+-]?([0-9])+)? // DECIMAL : OP? ('0'..'9')+ '.' ('0'..'9')* EXP? ^([0-9]+\.[0-9]*)([eE][+-]?([0-9])+)?
// | '.' ('0'..'9')+ EXP? // | OP? '.' ('0'..'9')+ EXP?
// | ('0'..'9')+ EXP; // | OP? ('0'..'9')+ EXP;
// //
// fragment OP: ('+'|'-');
// fragment EXP : ('e'|'E') ('+'|'-')? ('0'..'9')+ ; // fragment EXP : ('e'|'E') ('+'|'-')? ('0'..'9')+ ;
// change context back to arguments // change context back to arguments
@ -679,7 +680,7 @@ nf.nfel = (function() {
// style for decimal (use same as number) // style for decimal (use same as number)
return 'number'; return 'number';
} else if (stream.match(/^-?[0-9]+/)) { } else if (stream.match(/^[-\+]?[0-9]+/)) {
// ------------- // -------------
// integer value // integer value
// ------------- // -------------