This is an automated email from the ASF dual-hosted git repository.
pkluegl pushed a change to branch
bugfix/161-Right-to-left-wildcard-matches-too-much
in repository https://gitbox.apache.org/repos/asf/uima-ruta.git
from 39d5a8d4 Issue #161: Right to left wildcard matches too much
add 2343d2ea Issue #159: Assignment of composed number expression is broken
add 302688ce Merge pull request #160 from
apache/bugfix/159-Assignment-of-composed-number-expression-is-broken
add a380a668 Merge branch 'main' into
bugfix/161-Right-to-left-wildcard-matches-too-much
No new revisions were added by this update.
Summary of changes:
.../org/apache/uima/ruta/parser/RutaParser.g | 14 +++-
.../uima/ruta/condition/ConditionFactory.java | 4 +-
.../uima/ruta/expression/ExpressionFactory.java | 6 +-
.../ruta/expression/GenericComposedExpression.java | 83 ++++++++++++++++++++++
.../java/org/apache/uima/ruta/utils/UIMAUtils.java | 8 +--
.../uima/ruta/verbalize/ExpressionVerbalizer.java | 14 +++-
.../number/ComposedNumberExpressionTest.java | 6 +-
.../number/NumberExpressionTest.java} | 34 ++++++---
.../ruta/verbalizer/ExpressionVerbalizerTest.java | 73 ++++++++-----------
9 files changed, 172 insertions(+), 70 deletions(-)
create mode 100644
ruta-core/src/main/java/org/apache/uima/ruta/expression/GenericComposedExpression.java
copy
ruta-core/src/test/java/org/apache/uima/ruta/{rule/InvisibleWildcardMatchTest.java
=> expression/number/NumberExpressionTest.java} (51%)
