Changes done for v1.1.6.

Author: Senthil Nathan

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changes
 
+## v1.1.6
+* Sep/20/2023
+* Made a major redesign to evaluate multi-level nested subexpressions.
+* Made plenty of code changes in the expression validation and evaluation sections.
+* Added many new trace points to follow the code execution path when troubleshooting.
+* Added 14 new multi-level nested subexpression test cases in FunctionalTests.spl.
+
 ## v1.1.5
 * Jan/10/2023
 * Added inline to the C++ function get_tuple_schema_and_attribute_info.

README.md

@@ -240,25 +240,25 @@ This toolkit came into existence for a specific need with which a large enterpri
 
 5. It allows a rule expression that can refer to boolean, integer, float, string, set, list, map and other nested tuple attributes. In addition to having many built-in data types inside a collection, it allows list of TUPLE by having user defined custom tuple data types inside a list.
 
-6. It allows certain level of subexpression chaining in a rule.
+6. It allows certain level of subexpression chaining i.e. nesting in a rule.
 
-   a. It supports zero or single or multilevel parenthesis in a given rule.
+   a. It supports zero or single-level or multi-level parenthesis in a given rule.
 
-   b. Via multilevel parenthesis, it allows for evaluating nested rules.
+   b. Via multi-level parenthesis, it allows for evaluating nested rules.
 
    c. Within a given subexpression, one must use the same logical operators.
 
    d. Zero parenthesis is used in this example rule:
 
    a == 'hi' && b contains 'xyz' && g[4] > 6.7 && id % 8 == 3
 
-   e. Single level parenthesis is used within each subexpression in the following example rules:
+   e. Single-level parenthesis is used within each subexpression in the following example rules:
 
    (a == 'hi') && (b contains 'xyz' || g[4] > 6.7 || id % 8 == 3)
 
    (a == "hi") && (b contains "xyz") && (g[4] > 6.7) && (id % 8 == 3)
 
-   f. Multilevel parenthesis is used in the following example rules that are nested:
+   f. Multi-level parenthesis is used in the following example rules that are made of single-level nested subexpressions:
 
    (a == "hi") && ((b contains "xyz" || g[4] > 6.7) && id % 8 == 3)
 
@@ -272,6 +272,14 @@ This toolkit came into existence for a specific need with which a large enterpri
 
    (((a == 'hi') || (x <= 5) || (t == 3.14) || (p > 7)) && ((j == 3) && (y < 1) && (r == 9)) && s endsWith 'Nation')
 
+   g. Multi-level nested subexpressions are used in the following example rules to make them deeply nested.
+   
+   ((a.transport.plane.airliner equalsCI 'bOeInG') && (a.transport.cars.autoMaker equalsCI 'Enzo Ferrari')) && (((testId equalsCI 'Happy Path') && (a.rack.hw.vendor equalsCI 'Intel')) || (((a.transport.plane.airliner equalsCI 'bOeInG') || (testId equalsCI 'Happy Path')) && (a.transport.cars.autoMaker equalsCI 'Enzo Ferrari')))
+
+   (a.transport.plane.airliner equalsCI 'bOeInG' && a.transport.cars.autoMaker equalsCI 'Enzo Ferrari') && ((testId equalsCI 'Happy Path' && a.rack.hw.vendor equalsCI 'Intel') || ((a.transport.plane.airliner equalsCI 'bOeInG2' || testId equalsCI 'Happy Path') && (a.transport.cars.autoMaker equalsCI 'Enzo Ferrari') && (a.transport.plane.airliner equalsCI 'bOeInG')) || (testId equalsCI 'Happy Path' && testId equalsCI 'Happy Path') || (testId equalsCI 'Happy Path7' && testId equalsCI 'Happy Path')) && (testId equalsCI 'Happy Path')
+
+   (a.transport.plane.airliner equalsCI 'bOeInG' && (a.transport.cars.autoMaker equalsCI 'Enzo Ferrari' || (testId equalsCI 'Happy Path' || a.rack.hw.vendor equalsCI 'Intel2'))) && ((testId equalsCI 'Happy Path' && a.rack.hw.vendor equalsCI 'Intel') || ((a.transport.plane.airliner equalsCI 'bOeInG2' || testId equalsCI 'Happy Path') && (a.transport.cars.autoMaker equalsCI 'Enzo Ferrari') && (a.transport.plane.airliner equalsCI 'bOeInG')) || (testId equalsCI 'Happy Path' && testId equalsCI 'Happy Path') || (testId equalsCI 'Happy Path7' && testId equalsCI 'Happy Path')) && (testId equalsCI 'Happy Path')
+
 ## Source code
 The complete C++ logic for the **eval_predicate** function is available in the [eval_predicate.h](impl/include/eval_predicate.h) file of this repository.
 

com.ibm.streamsx.eval_predicate/EvalPredicateExample.spl

@@ -8,7 +8,7 @@
 /*
 ==================================================================
 First created on: Mar/05/2021
-Last modified on: Jan/07/2023
+Last modified on: Sep/20/2023
 
 This is an example application that shows how to use the
 eval_predicate function to evaluate an SPL expression a.k.a