diff --git a/.gitignore b/.gitignore
index e684e60d3..ce4278787 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,3 +55,5 @@ trace_data/
**/CMakeDeps.cmake
**/CMakeDeps_win.cmake
**/devcontainer.json
+src/**/*.lexer.cs
+src/**/*.parser.cs
diff --git a/externals b/externals
index 9a41237fc..de4b394a2 160000
--- a/externals
+++ b/externals
@@ -1 +1 @@
-Subproject commit 9a41237fc04479358fa98bfbb4f25438c9dc5b31
+Subproject commit de4b394a2983304d15ca8a297ab8b6916bb0ac35
diff --git a/src/DataStreamSuite/BooleanExpressions/BooleanExpressionSyntax.parser b/src/DataStreamSuite/BooleanExpressions/BooleanExpressionSyntax.parser
new file mode 100644
index 000000000..391a7e1cd
--- /dev/null
+++ b/src/DataStreamSuite/BooleanExpressions/BooleanExpressionSyntax.parser
@@ -0,0 +1,229 @@
+%parser DataStreamExpressionTokens.lexer
+%namespace BCG.Evaluator.BooleanExpression
+
+%left OrOp AndOp XorOp
+%right NotOp
+
+%symbol BooleanProgram {
+ public Definitions definitions;
+ public BooleanExpressionEvaluator eval;
+
+ public BooleanProgram(BooleanExpression expressions) =>
+ eval = expressions.eval;
+
+ public BooleanProgram(Definitions definitions, BooleanExpression expressions) {
+ this.eval = expressions.eval;
+ this.definitions = definitions;
+ }
+}
+
+%symbol BooleanExpression {
+ public BooleanExpressionEvaluator eval;
+}
+
+%symbol SingleDef {
+ public string id;
+ public DefArgList args;
+ public BooleanExpressionEvaluator eval;
+
+ public SingleDef(string id, DefArgList args, BooleanExpression exp) {
+ this.id = id;
+ this.args = args;
+ this.eval = exp.eval;
+ }
+}
+
+%symbol Definitions {
+ public SingleDef def;
+ public Definitions next;
+
+ public Definitions(SingleDef def) =>
+ this.def = def;
+
+ public Definitions(SingleDef def, Definitions next) {
+ this.def = def;
+ this.next = next;
+ }
+}
+
+%symbol DefArgList {
+ public string arg;
+ public DefArgList rest;
+
+ public DefArgList(string arg) =>
+ this.arg = arg;
+
+ public DefArgList(string arg, DefArgList rest) {
+ this.arg = arg;
+ this.rest = rest;
+ }
+}
+
+%node SubExpression : BooleanExpression {
+ public SubExpression (BooleanExpression e) =>
+ eval = e.eval;
+}
+
+%node AndNode : BooleanExpression {
+ public AndNode (BooleanExpression left, BooleanExpression right) =>
+ eval = new BooleanExpressionEvaluator(
+ left.eval, right.eval, new BCG.BooleanEval(BooleanExpressionEvaluator.and));
+}
+
+%node OrNode : BooleanExpression {
+ public OrNode (BooleanExpression left, BooleanExpression right) =>
+ eval = new BooleanExpressionEvaluator(
+ left.eval, right.eval, new BCG.BooleanEval(BooleanExpressionEvaluator.or));
+}
+
+%node XorNode : BooleanExpression {
+ public XorNode (BooleanExpression left, BooleanExpression right) =>
+ eval = new BooleanExpressionEvaluator(
+ left.eval, right.eval, new BCG.BooleanEval(BooleanExpressionEvaluator.xor));
+}
+
+%node NotNode : BooleanExpression {
+ public NotNode (BooleanExpression toperand) =>
+ eval = new BooleanExpressionEvaluator(
+ toperand.eval, new BCG.BooleanEval(BooleanExpressionEvaluator.not));
+}
+
+%node EqualPredicate : BooleanExpression {
+ public EqualPredicate(Value left, Value right) =>
+ eval = new BooleanExpressionEvaluator(
+ left.eval, right.eval, new BCG.BooleanEval(BooleanExpressionEvaluator.equal));
+}
+
+%node SmallerEqualPredicate : BooleanExpression {
+ public SmallerEqualPredicate(Value left, Value right) =>
+ eval = new BooleanExpressionEvaluator(
+ left.eval, right.eval, new BCG.BooleanEval(BooleanExpressionEvaluator.smallerEqual));
+}
+
+%node GreaterEqualPredicate : BooleanExpression {
+ public GreaterEqualPredicate (Value left, Value right) =>
+ eval = new BooleanExpressionEvaluator(
+ left.eval, right.eval, new BCG.BooleanEval(BooleanExpressionEvaluator.greaterEqual));
+}
+
+%node SmallerPredicate : BooleanExpression {
+ public SmallerPredicate (Value left, Value right) =>
+ eval = new BooleanExpressionEvaluator(
+ left.eval, right.eval, new BCG.BooleanEval(BooleanExpressionEvaluator.smaller));
+}
+
+%node GreaterPredicate : BooleanExpression {
+ public GreaterPredicate (Value left, Value right) =>
+ eval = new BooleanExpressionEvaluator(
+ left.eval, right.eval, new BCG.BooleanEval(BooleanExpressionEvaluator.greater));
+}
+
+%node DifferentPredicate : BooleanExpression {
+ public DifferentPredicate (Value left, Value right) =>
+ eval = new BooleanExpressionEvaluator(
+ left.eval, right.eval, new BCG.BooleanEval(BooleanExpressionEvaluator.different));
+}
+
+%node MatchesPredicate : BooleanExpression {
+ public MatchesPredicate (Value left, Value right) =>
+ eval = new BooleanExpressionEvaluator(
+ left.eval, right.eval, new BCG.BooleanEval(BooleanExpressionEvaluator.matches));
+
+}
+
+%node ValuePredicate : BooleanExpression {
+ public ValuePredicate(Value v) =>
+ eval = new BooleanExpressionEvaluator(
+ v.eval, new BCG.BooleanEval(BooleanExpressionEvaluator.booleanValue));
+}
+
+
+%symbol Value {
+ public BooleanExpressionValue eval;
+}
+
+%node ConstantValue : Value {
+ public ConstantValue (object tvalue) =>
+ eval = new BooleanExpressionConstant(tvalue);
+}
+
+%node IdentifierValue : Value {
+ public IdentifierValue (string tidentifier) =>
+ eval = new BooleanExpressionVariable(tidentifier);
+}
+
+%node FunctionValue: Value {
+ public FunctionValue (string tidentifier, ArgumentList args) =>
+ eval = new BooleanExpressionFunction(tidentifier,args == null ? null : args.args);
+}
+
+%symbol ArgumentList {
+ public System.Collections.ArrayList args = new System.Collections.ArrayList();
+
+ public ArgumentList(SingleArgument s) =>
+ args.Add(((Value) s.kids[0]).eval);
+
+ public ArgumentList(ArgumentList a1,SingleArgument s) {
+ if (a1 != null) {
+ args.AddRange(a1.args);
+ }
+ args.AddRange(new ArgumentList(s).args);
+ }
+}
+
+
+BooleanProgram : Definitions BooleanExpression %BooleanProgram($1,$2)
+ | BooleanExpression %BooleanProgram($1) ;
+
+Definitions : SingleDef %Definitions($1)
+| SingleDef Definitions %Definitions($1,$2) ;
+
+SingleDef : Define Identifier OpenParenthesis DefArgList CloseParenthesis BeginDef BooleanExpression EndDef %SingleDef($2.yytext,$4,$7);
+
+DefArgList: %DefArgList(null)
+ | Identifier %DefArgList($1.yytext)
+ | Identifier Comma DefArgList %DefArgList($1.yytext, $3 )
+ ;
+
+
+BooleanExpression : BooleanExpression OrOp BooleanExpression %OrNode($1,$3)
+ | BooleanExpression AndOp BooleanExpression %AndNode($1,$3)
+ | BooleanExpression XorOp BooleanExpression %XorNode($1,$3)
+ | NotOp BooleanExpression %NotNode($2)
+ | OpenParenthesis BooleanExpression CloseParenthesis %SubExpression ($2)
+ | Predicate
+;
+
+
+Predicate : Value EqualsOp Value %EqualPredicate ($1,$3)
+ | Value SmallerEqualOp Value %SmallerEqualPredicate ($1,$3)
+ | Value GreaterEqualOp Value %GreaterEqualPredicate ($1,$3)
+ | Value SmallerOp Value %SmallerPredicate ($1,$3)
+ | Value GreaterOp Value %GreaterPredicate ($1,$3)
+ | Value DifferentOp Value %DifferentPredicate ($1,$3)
+ | Value DifferentOp2 Value %DifferentPredicate ($1,$3)
+ | Value MatchesOp Value %MatchesPredicate ($1,$3)
+ | Value %ValuePredicate($1)
+ ;
+
+Value : Identifier %IdentifierValue($1.yytext)
+ | BooleanConstant %ConstantValue($1.value)
+ | NullConstant %ConstantValue($1.value)
+ | RealConstant %ConstantValue($1.value)
+ | StringConstant %ConstantValue($1.value)
+ | IntegerConstant %ConstantValue($1.value)
+ | DateTimeConstant %ConstantValue($1.value)
+ | FunctionCall
+ ;
+
+FunctionCall: Identifier:n OpenParenthesis ArgumentList:al CloseParenthesis %FunctionValue(n.yytext,al) ;
+
+ArgumentList: %null
+ | SingleArgument %ArgumentList($1)
+ | ArgumentList Comma SingleArgument %ArgumentList($1,$3)
+ ;
+
+SingleArgument: Value
+;
+
+
diff --git a/src/DataStreamSuite/BooleanExpressions/BooleanExpressions.csproj b/src/DataStreamSuite/BooleanExpressions/BooleanExpressions.csproj
new file mode 100644
index 000000000..2d83fbe57
--- /dev/null
+++ b/src/DataStreamSuite/BooleanExpressions/BooleanExpressions.csproj
@@ -0,0 +1,23 @@
+
+
+
+ net7.0
+ enable
+
+
+
+
+
+
+
+
+ $(Externals)\bin\cstools\Tools.dll
+
+
+
+
+
+
+
+
+
diff --git a/src/DataStreamSuite/BooleanExpressions/DataStreamExpressionTokens.lexer b/src/DataStreamSuite/BooleanExpressions/DataStreamExpressionTokens.lexer
new file mode 100644
index 000000000..acb5560a6
--- /dev/null
+++ b/src/DataStreamSuite/BooleanExpressions/DataStreamExpressionTokens.lexer
@@ -0,0 +1,107 @@
+%lexer
+%namespace BCG.Evaluator
+
+// --------------------------------------------------------------------------------
+// .CLR types
+// --------------------------------------------------------------------------------
+'Boolean' %TypeId
+'Byte' %TypeId
+'DateTime' %TypeId
+'SByte' %TypeId
+'Char' %TypeId
+'Decimal' %TypeId
+'Double' %TypeId
+'Single' %TypeId
+'Int32' %TypeId
+'UInt32' %TypeId
+'Int64' %TypeId
+'UInt64' %TypeId
+'Object' %TypeId
+'Int16' %TypeId
+'UInt16' %TypeId
+'String' %TypeId
+
+// -------------------------------------------------------------------------------
+// Literal constants
+//--------------------------------------------------------------------------------
+%define TimeConstant [012]?{Digit}:[0-5]{Digit}:[0-5]{Digit}[ ]('AM'|'PM')
+%define DateConstant ([1-9]|'10'|'11'|'12')\/([1-9]|([1-2][0-9])|'30'|'31')\/{Digit}{Digit}{Digit}*
+
+%token Constant {
+ public object value;
+}
+
+%token BooleanConstant : Constant {}
+%token NullConstant : Constant {}
+%token IntegerConstant : Constant {}
+%token RealConstant : Constant {}
+%token StringConstant : Constant {
+ public void cleanUpString(object st) {
+ var s = (string)st;
+ s = s.Substring(1,s.Length-2);
+ s = s.Replace(@"\'","'");
+ value = s;
+ }
+}
+%token CSStringConstant : Constant {}
+%token DateTimeConstant : Constant {}
+
+\"([^\"\\]*|\\.)*\" %CSStringConstant {string s = yytext; value = s.Substring(1,s.Length-2);}
+\'([^\'\\]*|\\.)*\' %StringConstant {cleanUpString(yytext);}
+'true'|'false' %BooleanConstant {value = Boolean.Parse(yytext);}
+'null' %NullConstant {value = DBNull.Value;}
+-?{Digit}+ %IntegerConstant {value = Int32.Parse(yytext);}
+-?{Digit}+\.{Digit}+ %RealConstant {value = Double.Parse(yytext);}
+({DateConstant}([ ]{TimeConstant})?)|(({DateConstant}[ ])?{TimeConstant}) %DateTimeConstant {value = DateTime.Parse(yytext);}
+
+// --------------------------------------------------------------------------------
+// Relational Operators
+// --------------------------------------------------------------------------------
+'=' %EqualsOp
+'<=' %SmallerEqualOp
+'>=' %GreaterEqualOp
+'<' %SmallerOp
+'>' %GreaterOp
+'<>' %DifferentOp
+'!=' %DifferentOp2
+'~=' %MatchesOp
+
+// --------------------------------------------------------------------------------
+// Logical operators
+// --------------------------------------------------------------------------------
+
+'or' %OrOp
+'and' %AndOp
+'not' %NotOp
+'xor' %XorOp
+
+
+// --------------------------------------------------------------------------------
+// Definitions
+// --------------------------------------------------------------------------------
+'define' %Define
+'{' %BeginDef
+'}' %EndDef
+
+// --------------------------------------------------------------------------------
+// Identifiers
+// --------------------------------------------------------------------------------
+
+{Letter}({Letter}*{Digit}*_*\.*)* %Identifier
+
+// --------------------------------------------------------------------------------
+// Utility tokens
+// --------------------------------------------------------------------------------
+
+\( %OpenParenthesis
+\) %CloseParenthesis
+',' %Comma
+'!' %Not
+':' %MapsTo
+'+' %Ascending
+'-' %Descending
+'/' %IsOfType
+'[' %QuoteOpen
+']' %QuoteClose
+'\/\/'[^\n\r]* ;
+[ \t\r\n] ;
diff --git a/src/DataStreamSuite/BooleanExpressions/src/BooleanExpressionEvaluator.cs b/src/DataStreamSuite/BooleanExpressions/src/BooleanExpressionEvaluator.cs
new file mode 100644
index 000000000..6f087e9d2
--- /dev/null
+++ b/src/DataStreamSuite/BooleanExpressions/src/BooleanExpressionEvaluator.cs
@@ -0,0 +1,289 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+
+namespace BCG
+{
+ public delegate bool BooleanEval(object arg1,
+ object arg2,
+ IDictionary bindings);
+
+ public class BooleanExpressionException : Exception
+ {
+ public BooleanExpressionException(string format, params object[] args)
+ : base(String.Format(format, args))
+ { }
+ }
+
+ public abstract class BooleanExpressionValue
+ {
+ public abstract object getValue(IDictionary bindings);
+ }
+
+ public class BooleanExpressionConstant : BooleanExpressionValue
+ {
+ public BooleanExpressionConstant(object o)
+ { myObj = o; }
+ public override object getValue(IDictionary bindings)
+ { return myObj; }
+ private object myObj;
+ }
+
+ public class BooleanExpressionVariable : BooleanExpressionValue
+ {
+ public BooleanExpressionVariable(string id)
+ { myId = id; }
+
+ public string getId()
+ { return myId; }
+
+ public override object getValue(IDictionary bindings)
+ { return bindings[myId]; }
+ private string myId;
+ }
+
+ public delegate object BEFunction(List