From 8639de2dee7cd0abfb064d2b75874bde247194c3 Mon Sep 17 00:00:00 2001
From: Wolfgang Maier <maierw@informatik.uni-freiburg.de>
Date: Wed, 26 Aug 2020 14:06:40 +0200
Subject: [PATCH 1/3] Allow unary plus and minus in filtering

---
 tools/stats/filtering.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/stats/filtering.py b/tools/stats/filtering.py
index 17047b6ec6e..9d7fdcc3875 100644
--- a/tools/stats/filtering.py
+++ b/tools/stats/filtering.py
@@ -12,7 +12,8 @@ AST_NODE_TYPE_WHITELIST = [
     'Expr', 'Load', 'Str', 'Num', 'BoolOp', 'Compare', 'And', 'Eq', 'NotEq',
     'Or', 'GtE', 'LtE', 'Lt', 'Gt', 'BinOp', 'Add', 'Div', 'Sub', 'Mult', 'Mod',
     'Pow', 'LShift', 'GShift', 'BitAnd', 'BitOr', 'BitXor', 'UnaryOp', 'Invert',
-    'Not', 'NotIn', 'In', 'Is', 'IsNot', 'List', 'Index', 'Subscript',
+    'Not', 'UAdd', 'USub', 'NotIn', 'In', 'Is', 'IsNot', 'List', 'Index',
+    'Subscript',
     # Further checks
     'Name', 'Call', 'Attribute',
 ]

From e003fbc0813e4e1c3bd913c44ce5d8c2223a95a9 Mon Sep 17 00:00:00 2001
From: Wolfgang Maier <maierw@informatik.uni-freiburg.de>
Date: Wed, 26 Aug 2020 14:17:43 +0200
Subject: [PATCH 2/3] Add doctests for additional allowed types

---
 tools/stats/filtering.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/stats/filtering.py b/tools/stats/filtering.py
index 9d7fdcc3875..5d78ce4ab5a 100644
--- a/tools/stats/filtering.py
+++ b/tools/stats/filtering.py
@@ -74,6 +74,8 @@ def check_expression(text):
     True
     >>> check_expression("c3=='chr1' and c5>5")
     True
+    >>> check_expression("c3=='chr1' and c5>-5 and c5<+5")  # Unary +/-
+    True
     >>> check_expression("c3=='chr1' and d5>5")  # Invalid d5 reference
     False
     >>> check_expression("c3=='chr1' and c5>5 or exec")

From 41c547999ba7f2b98a577bdb017494150027e4a0 Mon Sep 17 00:00:00 2001
From: Wolfgang Maier <maierw@informatik.uni-freiburg.de>
Date: Wed, 26 Aug 2020 15:59:44 +0200
Subject: [PATCH 3/3] Bump tool wrapper version

---
 tools/stats/filtering.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/stats/filtering.xml b/tools/stats/filtering.xml
index 1a20cf40c94..ddf43960279 100644
--- a/tools/stats/filtering.xml
+++ b/tools/stats/filtering.xml
@@ -1,4 +1,4 @@
-<tool id="Filter1" name="Filter" version="1.1.0">
+<tool id="Filter1" name="Filter" version="1.1.1">
   <description>data on any column using simple expressions</description>
   <edam_operations>
     <edam_operation>operation_0335</edam_operation>