This is an automated email from the ASF dual-hosted git repository.
tkobayas pushed a commit to branch dev-new-parser
in repository https://gitbox.apache.org/repos/asf/incubator-kie-drools.git
The following commit(s) were added to refs/heads/dev-new-parser by this push:
new d1d0982aed Preserve whitespace in accumulate/result (#5889)
d1d0982aed is described below
commit d1d0982aedd4f40742e2a4c24c1972c5987a3c49
Author: Jiří Locker <[email protected]>
AuthorDate: Tue May 7 04:42:01 2024 +0200
Preserve whitespace in accumulate/result (#5889)
---
.../drl/parser/antlr4/MiscDRLParserTest.java | 22 +++++++++++-----------
.../drools/drl/parser/antlr4/DRLVisitorImpl.java | 2 +-
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git
a/drools-drl/drools-drl-parser-tests/src/test/java/org/drools/drl/parser/antlr4/MiscDRLParserTest.java
b/drools-drl/drools-drl-parser-tests/src/test/java/org/drools/drl/parser/antlr4/MiscDRLParserTest.java
index 4964f77457..ffc1eeac06 100644
---
a/drools-drl/drools-drl-parser-tests/src/test/java/org/drools/drl/parser/antlr4/MiscDRLParserTest.java
+++
b/drools-drl/drools-drl-parser-tests/src/test/java/org/drools/drl/parser/antlr4/MiscDRLParserTest.java
@@ -2165,10 +2165,10 @@ class MiscDRLParserTest {
final PatternDescr outPattern = (PatternDescr)
rule.getLhs().getDescrs().get( 0 );
final AccumulateDescr accum = (AccumulateDescr) outPattern.getSource();
- assertThat(accum.getInitCode()).isEqualToIgnoringWhitespace( "int x =
0 ;");
- assertThat(accum.getActionCode()).isEqualToIgnoringWhitespace( "x++;");
+ assertThat(accum.getInitCode()).isEqualTo( "int x = 0;");
+ assertThat(accum.getActionCode()).isEqualTo( "x++;");
assertThat(accum.getReverseCode()).isNull();
- assertThat(accum.getResultCode()).isEqualToIgnoringWhitespace( "new
Integer(x)");
+ assertThat(accum.getResultCode()).isEqualTo( "new Integer(x)");
assertThat(accum.isExternalFunction()).isFalse();
@@ -2187,10 +2187,10 @@ class MiscDRLParserTest {
final PatternDescr outPattern = (PatternDescr)
rule.getLhs().getDescrs().get( 0 );
final AccumulateDescr accum = (AccumulateDescr) outPattern.getSource();
- assertThat(outPattern.getIdentifier()).isEqualToIgnoringWhitespace(
"$counter");
- assertThat(accum.getInitCode()).isEqualToIgnoringWhitespace( "int x =
0 ;");
- assertThat(accum.getActionCode()).isEqualToIgnoringWhitespace( "x++;");
- assertThat(accum.getResultCode()).isEqualToIgnoringWhitespace( "new
Integer(x)");
+ assertThat(outPattern.getIdentifier()).isEqualTo( "$counter");
+ assertThat(accum.getInitCode()).isEqualTo( "int x = 0;");
+ assertThat(accum.getActionCode()).isEqualTo( "x++;");
+ assertThat(accum.getResultCode()).isEqualTo( "new Integer(x)");
final PatternDescr pattern = (PatternDescr) accum.getInputPattern();
assertThat(pattern.getObjectType()).isEqualTo("Person");
@@ -2218,10 +2218,10 @@ class MiscDRLParserTest {
final PatternDescr outPattern = (PatternDescr)
rule.getLhs().getDescrs().get( 0 );
final AccumulateDescr accum = (AccumulateDescr) outPattern.getSource();
- assertThat(outPattern.getIdentifier()).isEqualToIgnoringWhitespace(
"$counter");
- assertThat(accum.getInitCode()).isEqualToIgnoringWhitespace( "int x =
0");
- assertThat(accum.getActionCode()).isEqualToIgnoringWhitespace( "x++");
- assertThat(accum.getResultCode()).isEqualToIgnoringWhitespace( "new
Integer(x)");
+ assertThat(outPattern.getIdentifier()).isEqualTo( "$counter");
+ assertThat(accum.getInitCode()).isEqualTo( "int x = 0");
+ assertThat(accum.getActionCode()).isEqualTo( "x++");
+ assertThat(accum.getResultCode()).isEqualTo( "new Integer(x)");
final PatternDescr pattern = (PatternDescr) accum.getInputPattern();
assertThat(pattern.getObjectType()).isEqualTo("Person");
diff --git
a/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/antlr4/DRLVisitorImpl.java
b/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/antlr4/DRLVisitorImpl.java
index 143e0a2da8..52b93f0af7 100644
---
a/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/antlr4/DRLVisitorImpl.java
+++
b/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/antlr4/DRLVisitorImpl.java
@@ -792,7 +792,7 @@ public class DRLVisitorImpl extends
DRLParserBaseVisitor<Object> {
if (ctx.DRL_REVERSE() != null) {
accumulateDescr.setReverseCode(getTextPreservingWhitespace(ctx.reverseBlockStatements));
}
- accumulateDescr.setResultCode(ctx.expression().getText());
+
accumulateDescr.setResultCode(getTextPreservingWhitespace(ctx.expression()));
} else {
// accumulate function
accumulateDescr.addFunction(visitAccumulateFunction(ctx.accumulateFunction()));
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
