Merging upstream version 2.40.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

70 files changed, 544 insertions, 10 deletions

diff --git a/tests/expected/libsmartcols/continuous-json b/tests/expected/libsmartcols/continuous-json
new file mode 100644
index 0000000..e8ba584
--- /dev/null
+++ b/tests/expected/libsmartcols/continuous-json
@@ -0,0 +1,40 @@
+{
+   "count": "0",
+   "text": "text0"
+}
+{
+   "count": "1",
+   "text": "text1"
+}
+{
+   "count": "2",
+   "text": "text2"
+}
+{
+   "count": "3",
+   "text": "text3"
+}
+{
+   "count": "4",
+   "text": "text4"
+}
+{
+   "count": "5",
+   "text": "text5"
+}
+{
+   "count": "6",
+   "text": "text6"
+}
+{
+   "count": "7",
+   "text": "text7"
+}
+{
+   "count": "8",
+   "text": "text8"
+}
+{
+   "count": "9",
+   "text": "text9"
+}
diff --git a/tests/expected/libsmartcols/filter b/tests/expected/libsmartcols/filter
new file mode 100644
index 0000000..4155aa3
--- /dev/null
+++ b/tests/expected/libsmartcols/filter
@@ -0,0 +1 @@
+...done.
diff --git a/tests/expected/libsmartcols/filter-bool-and b/tests/expected/libsmartcols/filter-bool-and
new file mode 100644
index 0000000..136149c
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-bool-and
@@ -0,0 +1,7 @@
+expr: BOOL && NAME
+
+NAME BOOL
+bbb     1
+ee   true
+hhh  TRUE
+jj      1
diff --git a/tests/expected/libsmartcols/filter-bool-as-string b/tests/expected/libsmartcols/filter-bool-as-string
new file mode 100644
index 0000000..213ce58
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-bool-as-string
@@ -0,0 +1,2 @@
+expr: BOOL == "0"
+
diff --git a/tests/expected/libsmartcols/filter-bool-as-string2 b/tests/expected/libsmartcols/filter-bool-as-string2
new file mode 100644
index 0000000..c4ddd20
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-bool-as-string2
@@ -0,0 +1,2 @@
+expr: BOOL == "1"
+
diff --git a/tests/expected/libsmartcols/filter-bool-eq-false b/tests/expected/libsmartcols/filter-bool-eq-false
new file mode 100644
index 0000000..8454205
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-bool-eq-false
@@ -0,0 +1,8 @@
+expr: BOOL == FALSE
+
+NAME    BOOL
+aaaa       0
+dddddd     0
+ffff   false
+gggggg FALSE
+iiiiii     0
diff --git a/tests/expected/libsmartcols/filter-bool-eq-false2 b/tests/expected/libsmartcols/filter-bool-eq-false2
new file mode 100644
index 0000000..d0d19ff
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-bool-eq-false2
@@ -0,0 +1,8 @@
+expr: BOOL == false
+
+NAME    BOOL
+aaaa       0
+dddddd     0
+ffff   false
+gggggg FALSE
+iiiiii     0
diff --git a/tests/expected/libsmartcols/filter-bool-eq-false3 b/tests/expected/libsmartcols/filter-bool-eq-false3
new file mode 100644
index 0000000..605bc93
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-bool-eq-false3
@@ -0,0 +1,9 @@
+expr: BOOL == 0
+
+NAME    BOOL
+aaaa       0
+ccccc  
+dddddd     0
+ffff   false
+gggggg FALSE
+iiiiii     0
diff --git a/tests/expected/libsmartcols/filter-bool-eq-true b/tests/expected/libsmartcols/filter-bool-eq-true
new file mode 100644
index 0000000..d2d9199
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-bool-eq-true
@@ -0,0 +1,7 @@
+expr: BOOL == TRUE
+
+NAME BOOL
+bbb     1
+ee   true
+hhh  TRUE
+jj      1
diff --git a/tests/expected/libsmartcols/filter-bool-eq-true2 b/tests/expected/libsmartcols/filter-bool-eq-true2
new file mode 100644
index 0000000..12dedc2
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-bool-eq-true2
@@ -0,0 +1,7 @@
+expr: BOOL == true
+
+NAME BOOL
+bbb     1
+ee   true
+hhh  TRUE
+jj      1
diff --git a/tests/expected/libsmartcols/filter-bool-eq-true3 b/tests/expected/libsmartcols/filter-bool-eq-true3
new file mode 100644
index 0000000..801ee24
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-bool-eq-true3
@@ -0,0 +1,7 @@
+expr: BOOL == 1
+
+NAME BOOL
+bbb     1
+ee   true
+hhh  TRUE
+jj      1
diff --git a/tests/expected/libsmartcols/filter-bool-is b/tests/expected/libsmartcols/filter-bool-is
new file mode 100644
index 0000000..1e8b359
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-bool-is
@@ -0,0 +1,7 @@
+expr: BOOL
+
+NAME BOOL
+bbb     1
+ee   true
+hhh  TRUE
+jj      1
diff --git a/tests/expected/libsmartcols/filter-bool-ne b/tests/expected/libsmartcols/filter-bool-ne
new file mode 100644
index 0000000..6491fad
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-bool-ne
@@ -0,0 +1,7 @@
+expr: BOOL != false
+
+NAME BOOL
+bbb     1
+ee   true
+hhh  TRUE
+jj      1
diff --git a/tests/expected/libsmartcols/filter-bool-ne2 b/tests/expected/libsmartcols/filter-bool-ne2
new file mode 100644
index 0000000..9fc6844
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-bool-ne2
@@ -0,0 +1,8 @@
+expr: BOOL != true
+
+NAME    BOOL
+aaaa       0
+dddddd     0
+ffff   false
+gggggg FALSE
+iiiiii     0
diff --git a/tests/expected/libsmartcols/filter-bool-neg b/tests/expected/libsmartcols/filter-bool-neg
new file mode 100644
index 0000000..9311918
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-bool-neg
@@ -0,0 +1,9 @@
+expr: !BOOL
+
+NAME    BOOL
+aaaa       0
+ccccc  
+dddddd     0
+ffff   false
+gggggg FALSE
+iiiiii     0
diff --git a/tests/expected/libsmartcols/filter-bool-or b/tests/expected/libsmartcols/filter-bool-or
new file mode 100644
index 0000000..506242c
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-bool-or
@@ -0,0 +1,13 @@
+expr: BOOL || NAME
+
+NAME    BOOL
+aaaa       0
+bbb        1
+ccccc  
+dddddd     0
+ee      true
+ffff   false
+gggggg FALSE
+hhh     TRUE
+iiiiii     0
+jj         1
diff --git a/tests/expected/libsmartcols/filter-broken-bad-column b/tests/expected/libsmartcols/filter-broken-bad-column
new file mode 100644
index 0000000..484d84a
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-broken-bad-column
@@ -0,0 +1,4 @@
+expr: XXX == 100
+
+sample-scols-fromfile: unknown column 'XXX' in filter
+sample-scols-fromfile: failed to initialize filter
diff --git a/tests/expected/libsmartcols/filter-broken-bad-float b/tests/expected/libsmartcols/filter-broken-bad-float
new file mode 100644
index 0000000..bc11bbc
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-broken-bad-float
@@ -0,0 +1,3 @@
+expr: NUM == 100 . 5
+
+sample-scols-fromfile: failed to parse filter: <bison syntax error message removed>
diff --git a/tests/expected/libsmartcols/filter-broken-bad-number b/tests/expected/libsmartcols/filter-broken-bad-number
new file mode 100644
index 0000000..d7d5e70
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-broken-bad-number
@@ -0,0 +1,3 @@
+expr: NUM == 1y0
+
+sample-scols-fromfile: failed to parse filter: <bison syntax error message removed>
diff --git a/tests/expected/libsmartcols/filter-broken-bad-oper b/tests/expected/libsmartcols/filter-broken-bad-oper
new file mode 100644
index 0000000..f0600ca
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-broken-bad-oper
@@ -0,0 +1,3 @@
+expr: NUM ** 100
+
+sample-scols-fromfile: failed to parse filter: <bison syntax error message removed>
diff --git a/tests/expected/libsmartcols/filter-broken-bad-oper2 b/tests/expected/libsmartcols/filter-broken-bad-oper2
new file mode 100644
index 0000000..69e62a2
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-broken-bad-oper2
@@ -0,0 +1,3 @@
+expr: NUM = 100
+
+sample-scols-fromfile: failed to parse filter: <bison syntax error message removed>
diff --git a/tests/expected/libsmartcols/filter-broken-no-close b/tests/expected/libsmartcols/filter-broken-no-close
new file mode 100644
index 0000000..9298977
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-broken-no-close
@@ -0,0 +1,3 @@
+expr: (NUM == 100
+
+sample-scols-fromfile: failed to parse filter: <bison syntax error message removed>
diff --git a/tests/expected/libsmartcols/filter-broken-no-column b/tests/expected/libsmartcols/filter-broken-no-column
new file mode 100644
index 0000000..db17bca
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-broken-no-column
@@ -0,0 +1,3 @@
+expr:  == 100
+
+sample-scols-fromfile: failed to parse filter: <bison syntax error message removed>
diff --git a/tests/expected/libsmartcols/filter-broken-no-param b/tests/expected/libsmartcols/filter-broken-no-param
new file mode 100644
index 0000000..50f18ea
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-broken-no-param
@@ -0,0 +1,3 @@
+expr: NUM == 
+
+sample-scols-fromfile: failed to parse filter: <bison syntax error message removed>
diff --git a/tests/expected/libsmartcols/filter-broken-no-start b/tests/expected/libsmartcols/filter-broken-no-start
new file mode 100644
index 0000000..227c027
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-broken-no-start
@@ -0,0 +1,3 @@
+expr: NUM == 100)
+
+sample-scols-fromfile: failed to parse filter: <bison syntax error message removed>
diff --git a/tests/expected/libsmartcols/filter-float-and b/tests/expected/libsmartcols/filter-float-and
new file mode 100644
index 0000000..dd733fb
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-float-and
@@ -0,0 +1,12 @@
+expr: NUM && NAME
+
+NAME         NUM
+bbb          100
+ccccc      100.5
+dddddd      99.9
+ee           411
+ffff        5111
+gggggg 678993321
+hhh      7666666
+iiiiii      8000
+jj        8000.5
diff --git a/tests/expected/libsmartcols/filter-float-as-string b/tests/expected/libsmartcols/filter-float-as-string
new file mode 100644
index 0000000..5e2d9eb
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-float-as-string
@@ -0,0 +1,4 @@
+expr: NUM == "100"
+
+NAME NUM
+bbb  100
diff --git a/tests/expected/libsmartcols/filter-float-as-string2 b/tests/expected/libsmartcols/filter-float-as-string2
new file mode 100644
index 0000000..a829b9c
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-float-as-string2
@@ -0,0 +1,4 @@
+expr: NUM == "100.5"
+
+NAME    NUM
+ccccc 100.5
diff --git a/tests/expected/libsmartcols/filter-float-eq b/tests/expected/libsmartcols/filter-float-eq
new file mode 100644
index 0000000..e6e1451
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-float-eq
@@ -0,0 +1,4 @@
+expr: NUM == 100
+
+NAME NUM
+bbb  100
diff --git a/tests/expected/libsmartcols/filter-float-eq2 b/tests/expected/libsmartcols/filter-float-eq2
new file mode 100644
index 0000000..71e27e2
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-float-eq2
@@ -0,0 +1,4 @@
+expr: NUM == 100.5
+
+NAME    NUM
+ccccc 100.5
diff --git a/tests/expected/libsmartcols/filter-float-ge b/tests/expected/libsmartcols/filter-float-ge
new file mode 100644
index 0000000..ca892d2
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-float-ge
@@ -0,0 +1,11 @@
+expr: NUM >= 100
+
+NAME         NUM
+bbb          100
+ccccc      100.5
+ee           411
+ffff        5111
+gggggg 678993321
+hhh      7666666
+iiiiii      8000
+jj        8000.5
diff --git a/tests/expected/libsmartcols/filter-float-ge2 b/tests/expected/libsmartcols/filter-float-ge2
new file mode 100644
index 0000000..c089fed
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-float-ge2
@@ -0,0 +1,10 @@
+expr: NUM >= 100.5
+
+NAME         NUM
+ccccc      100.5
+ee           411
+ffff        5111
+gggggg 678993321
+hhh      7666666
+iiiiii      8000
+jj        8000.5
diff --git a/tests/expected/libsmartcols/filter-float-gt b/tests/expected/libsmartcols/filter-float-gt
new file mode 100644
index 0000000..283f13d
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-float-gt
@@ -0,0 +1,6 @@
+expr: NUM > 8000
+
+NAME         NUM
+gggggg 678993321
+hhh      7666666
+jj        8000.5
diff --git a/tests/expected/libsmartcols/filter-float-gt2 b/tests/expected/libsmartcols/filter-float-gt2
new file mode 100644
index 0000000..bd54c05
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-float-gt2
@@ -0,0 +1,5 @@
+expr: NUM > 8000.5
+
+NAME         NUM
+gggggg 678993321
+hhh      7666666
diff --git a/tests/expected/libsmartcols/filter-float-is b/tests/expected/libsmartcols/filter-float-is
new file mode 100644
index 0000000..79e30ba
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-float-is
@@ -0,0 +1,12 @@
+expr: NUM
+
+NAME         NUM
+bbb          100
+ccccc      100.5
+dddddd      99.9
+ee           411
+ffff        5111
+gggggg 678993321
+hhh      7666666
+iiiiii      8000
+jj        8000.5
diff --git a/tests/expected/libsmartcols/filter-float-le b/tests/expected/libsmartcols/filter-float-le
new file mode 100644
index 0000000..6954d68
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-float-le
@@ -0,0 +1,6 @@
+expr: NUM <= 100
+
+NAME    NUM
+aaaa      0
+bbb     100
+dddddd 99.9
diff --git a/tests/expected/libsmartcols/filter-float-le2 b/tests/expected/libsmartcols/filter-float-le2
new file mode 100644
index 0000000..c8693cc
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-float-le2
@@ -0,0 +1,7 @@
+expr: NUM <= 100.5
+
+NAME     NUM
+aaaa       0
+bbb      100
+ccccc  100.5
+dddddd  99.9
diff --git a/tests/expected/libsmartcols/filter-float-lt b/tests/expected/libsmartcols/filter-float-lt
new file mode 100644
index 0000000..ac67cd7
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-float-lt
@@ -0,0 +1,5 @@
+expr: NUM < 100
+
+NAME    NUM
+aaaa      0
+dddddd 99.9
diff --git a/tests/expected/libsmartcols/filter-float-lt2 b/tests/expected/libsmartcols/filter-float-lt2
new file mode 100644
index 0000000..0c26b03
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-float-lt2
@@ -0,0 +1,6 @@
+expr: NUM < 100.5
+
+NAME    NUM
+aaaa      0
+bbb     100
+dddddd 99.9
diff --git a/tests/expected/libsmartcols/filter-float-ne b/tests/expected/libsmartcols/filter-float-ne
new file mode 100644
index 0000000..b16c48e
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-float-ne
@@ -0,0 +1,12 @@
+expr: NUM != 100
+
+NAME         NUM
+aaaa           0
+ccccc      100.5
+dddddd      99.9
+ee           411
+ffff        5111
+gggggg 678993321
+hhh      7666666
+iiiiii      8000
+jj        8000.5
diff --git a/tests/expected/libsmartcols/filter-float-ne2 b/tests/expected/libsmartcols/filter-float-ne2
new file mode 100644
index 0000000..3d55387
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-float-ne2
@@ -0,0 +1,12 @@
+expr: NUM != 100.5
+
+NAME         NUM
+aaaa           0
+bbb          100
+dddddd      99.9
+ee           411
+ffff        5111
+gggggg 678993321
+hhh      7666666
+iiiiii      8000
+jj        8000.5
diff --git a/tests/expected/libsmartcols/filter-float-neg b/tests/expected/libsmartcols/filter-float-neg
new file mode 100644
index 0000000..647af52
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-float-neg
@@ -0,0 +1,4 @@
+expr: !NUM
+
+NAME NUM
+aaaa   0
diff --git a/tests/expected/libsmartcols/filter-float-or b/tests/expected/libsmartcols/filter-float-or
new file mode 100644
index 0000000..40f2291
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-float-or
@@ -0,0 +1,13 @@
+expr: NUM || NAME
+
+NAME         NUM
+aaaa           0
+bbb          100
+ccccc      100.5
+dddddd      99.9
+ee           411
+ffff        5111
+gggggg 678993321
+hhh      7666666
+iiiiii      8000
+jj        8000.5
diff --git a/tests/expected/libsmartcols/filter-number-and b/tests/expected/libsmartcols/filter-number-and
new file mode 100644
index 0000000..be82bf5
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-number-and
@@ -0,0 +1,12 @@
+expr: NUM && NAME
+
+NAME         NUM
+bbb          100
+ccccc         21
+dddddd         3
+ee           411
+ffff        5111
+gggggg 678993321
+hhh      7666666
+iiiiii      8765
+jj        987456
diff --git a/tests/expected/libsmartcols/filter-number-and-or b/tests/expected/libsmartcols/filter-number-and-or
new file mode 100644
index 0000000..79ee4cb
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-number-and-or
@@ -0,0 +1,7 @@
+expr: (NUM >= 3 && NUM <= 100) || NUM == 0
+
+NAME   NUM
+aaaa     0
+bbb    100
+ccccc   21
+dddddd   3
diff --git a/tests/expected/libsmartcols/filter-number-as-string b/tests/expected/libsmartcols/filter-number-as-string
new file mode 100644
index 0000000..5e2d9eb
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-number-as-string
@@ -0,0 +1,4 @@
+expr: NUM == "100"
+
+NAME NUM
+bbb  100
diff --git a/tests/expected/libsmartcols/filter-number-eq b/tests/expected/libsmartcols/filter-number-eq
new file mode 100644
index 0000000..e6e1451
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-number-eq
@@ -0,0 +1,4 @@
+expr: NUM == 100
+
+NAME NUM
+bbb  100
diff --git a/tests/expected/libsmartcols/filter-number-expr-and-expr b/tests/expected/libsmartcols/filter-number-expr-and-expr
new file mode 100644
index 0000000..5bc6b37
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-number-expr-and-expr
@@ -0,0 +1,7 @@
+expr: NUM > 10 && NUM < 8000
+
+NAME   NUM
+bbb    100
+ccccc   21
+ee     411
+ffff  5111
diff --git a/tests/expected/libsmartcols/filter-number-expr-or-expr b/tests/expected/libsmartcols/filter-number-expr-or-expr
new file mode 100644
index 0000000..2e3f83b
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-number-expr-or-expr
@@ -0,0 +1,5 @@
+expr: NUM == 3 || NUM == 100
+
+NAME   NUM
+bbb    100
+dddddd   3
diff --git a/tests/expected/libsmartcols/filter-number-ge b/tests/expected/libsmartcols/filter-number-ge
new file mode 100644
index 0000000..23899e5
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-number-ge
@@ -0,0 +1,10 @@
+expr: NUM >= 100
+
+NAME         NUM
+bbb          100
+ee           411
+ffff        5111
+gggggg 678993321
+hhh      7666666
+iiiiii      8765
+jj        987456
diff --git a/tests/expected/libsmartcols/filter-number-gt b/tests/expected/libsmartcols/filter-number-gt
new file mode 100644
index 0000000..6668cd4
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-number-gt
@@ -0,0 +1,7 @@
+expr: NUM > 8000
+
+NAME         NUM
+gggggg 678993321
+hhh      7666666
+iiiiii      8765
+jj        987456
diff --git a/tests/expected/libsmartcols/filter-number-is b/tests/expected/libsmartcols/filter-number-is
new file mode 100644
index 0000000..85dd344
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-number-is
@@ -0,0 +1,12 @@
+expr: NUM
+
+NAME         NUM
+bbb          100
+ccccc         21
+dddddd         3
+ee           411
+ffff        5111
+gggggg 678993321
+hhh      7666666
+iiiiii      8765
+jj        987456
diff --git a/tests/expected/libsmartcols/filter-number-le b/tests/expected/libsmartcols/filter-number-le
new file mode 100644
index 0000000..f2d7521
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-number-le
@@ -0,0 +1,7 @@
+expr: NUM <= 100
+
+NAME   NUM
+aaaa     0
+bbb    100
+ccccc   21
+dddddd   3
diff --git a/tests/expected/libsmartcols/filter-number-lt b/tests/expected/libsmartcols/filter-number-lt
new file mode 100644
index 0000000..b0784db
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-number-lt
@@ -0,0 +1,6 @@
+expr: NUM < 100
+
+NAME   NUM
+aaaa     0
+ccccc   21
+dddddd   3
diff --git a/tests/expected/libsmartcols/filter-number-ne b/tests/expected/libsmartcols/filter-number-ne
new file mode 100644
index 0000000..c2ee709
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-number-ne
@@ -0,0 +1,12 @@
+expr: NUM != 100
+
+NAME         NUM
+aaaa           0
+ccccc         21
+dddddd         3
+ee           411
+ffff        5111
+gggggg 678993321
+hhh      7666666
+iiiiii      8765
+jj        987456
diff --git a/tests/expected/libsmartcols/filter-number-neg b/tests/expected/libsmartcols/filter-number-neg
new file mode 100644
index 0000000..647af52
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-number-neg
@@ -0,0 +1,4 @@
+expr: !NUM
+
+NAME NUM
+aaaa   0
diff --git a/tests/expected/libsmartcols/filter-number-or b/tests/expected/libsmartcols/filter-number-or
new file mode 100644
index 0000000..8a32fac
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-number-or
@@ -0,0 +1,13 @@
+expr: NUM || NAME
+
+NAME         NUM
+aaaa           0
+bbb          100
+ccccc         21
+dddddd         3
+ee           411
+ffff        5111
+gggggg 678993321
+hhh      7666666
+iiiiii      8765
+jj        987456
diff --git a/tests/expected/libsmartcols/filter-string-eq b/tests/expected/libsmartcols/filter-string-eq
new file mode 100644
index 0000000..ac96885
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-string-eq
@@ -0,0 +1,4 @@
+expr: NAME == "bbb"
+
+NAME
+bbb
diff --git a/tests/expected/libsmartcols/filter-string-ge b/tests/expected/libsmartcols/filter-string-ge
new file mode 100644
index 0000000..4e2d7de
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-string-ge
@@ -0,0 +1,12 @@
+expr: NAME >= "bbb"
+
+NAME
+bbb
+ccccc
+dddddd
+ee
+ffff
+gggggg
+hhh
+iiiiii
+jj
diff --git a/tests/expected/libsmartcols/filter-string-gt b/tests/expected/libsmartcols/filter-string-gt
new file mode 100644
index 0000000..b33b8ac
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-string-gt
@@ -0,0 +1,11 @@
+expr: NAME > "bbb"
+
+NAME
+ccccc
+dddddd
+ee
+ffff
+gggggg
+hhh
+iiiiii
+jj
diff --git a/tests/expected/libsmartcols/filter-string-is b/tests/expected/libsmartcols/filter-string-is
new file mode 100644
index 0000000..c4d8245
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-string-is
@@ -0,0 +1,13 @@
+expr: NAME
+
+NAME
+aaaa
+bbb
+ccccc
+dddddd
+ee
+ffff
+gggggg
+hhh
+iiiiii
+jj
diff --git a/tests/expected/libsmartcols/filter-string-le b/tests/expected/libsmartcols/filter-string-le
new file mode 100644
index 0000000..3fea9f1
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-string-le
@@ -0,0 +1,5 @@
+expr: NAME <= "bbb"
+
+NAME
+aaaa
+bbb
diff --git a/tests/expected/libsmartcols/filter-string-lt b/tests/expected/libsmartcols/filter-string-lt
new file mode 100644
index 0000000..f60cb56
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-string-lt
@@ -0,0 +1,4 @@
+expr: NAME < "bbb"
+
+NAME
+aaaa
diff --git a/tests/expected/libsmartcols/filter-string-ne b/tests/expected/libsmartcols/filter-string-ne
new file mode 100644
index 0000000..d69f05b
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-string-ne
@@ -0,0 +1,12 @@
+expr: NAME != "bbb"
+
+NAME
+aaaa
+ccccc
+dddddd
+ee
+ffff
+gggggg
+hhh
+iiiiii
+jj
diff --git a/tests/expected/libsmartcols/filter-string-neg b/tests/expected/libsmartcols/filter-string-neg
new file mode 100644
index 0000000..bd5a0dd
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-string-neg
@@ -0,0 +1,2 @@
+expr: !NAME
+
diff --git a/tests/expected/libsmartcols/filter-string-nreg b/tests/expected/libsmartcols/filter-string-nreg
new file mode 100644
index 0000000..e85030e
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-string-nreg
@@ -0,0 +1,12 @@
+expr: NAME !~ "aaa.*"
+
+NAME
+bbb
+ccccc
+dddddd
+ee
+ffff
+gggggg
+hhh
+iiiiii
+jj
diff --git a/tests/expected/libsmartcols/filter-string-reg b/tests/expected/libsmartcols/filter-string-reg
new file mode 100644
index 0000000..3c32c01
--- /dev/null
+++ b/tests/expected/libsmartcols/filter-string-reg
@@ -0,0 +1,4 @@
+expr: NAME =~ "aaa.*"
+
+NAME
+aaaa
diff --git a/tests/expected/libsmartcols/fromfile-tree-json b/tests/expected/libsmartcols/fromfile-tree-json
index 3d65183..aada9f0 100644
--- a/tests/expected/libsmartcols/fromfile-tree-json
+++ b/tests/expected/libsmartcols/fromfile-tree-json
@@ -2,56 +2,56 @@
    "testtable": [
       {
          "tree": "aaaa",
-         "id": "1",
+         "id": 1,
          "parent": "0",
          "strings": "qqqqqqqqqqqqqqqqqX",
          "children": [
             {
                "tree": "bbb",
-               "id": "2",
+               "id": 2,
                "parent": "1",
                "strings": "dddddddddddddX",
                "children": [
                   {
                      "tree": "ee",
-                     "id": "5",
+                     "id": 5,
                      "parent": "2",
                      "strings": "ddddddddddddddddddddddddddX"
                   },{
                      "tree": "ffff",
-                     "id": "6",
+                     "id": 6,
                      "parent": "2",
                      "strings": "jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjX"
                   }
                ]
             },{
                "tree": "ccccc",
-               "id": "3",
+               "id": 3,
                "parent": "1",
                "strings": "ffffffffffffffffffffffffffffffffffffffffX",
                "children": [
                   {
                      "tree": "gggggg",
-                     "id": "7",
+                     "id": 7,
                      "parent": "3",
                      "strings": "mmmmmmmmmmmmmmmmmmmX",
                      "children": [
                         {
                            "tree": "hhh",
-                           "id": "8",
+                           "id": 8,
                            "parent": "7",
                            "strings": "lllllllllllllllllllllllllllllllllllllX",
                            "children": [
                               {
                                  "tree": "iiiiii",
-                                 "id": "9",
+                                 "id": 9,
                                  "parent": "8",
                                  "strings": "yyyyyyyyyyyyyyyyyyyyyyyyyyyyX"
                               }
                            ]
                         },{
                            "tree": "jj",
-                           "id": "10",
+                           "id": 10,
                            "parent": "7",
                            "strings": "pppppppppX"
                         }
@@ -60,7 +60,7 @@
                ]
             },{
                "tree": "dddddd",
-               "id": "4",
+               "id": 4,
                "parent": "1",
                "strings": "ssssssssssX"
             }
diff --git a/tests/expected/libsmartcols/fromfile-wrapzero b/tests/expected/libsmartcols/fromfile-wrapzero
new file mode 100644
index 0000000..11370ff
--- /dev/null
+++ b/tests/expected/libsmartcols/fromfile-wrapzero
@@ -0,0 +1,19 @@
+NAME         NUM WRAPZERO
+aaaa           0 aaa
+bbb          100 bbbbb
+ccccc         21 cccc
+                 CCCC
+dddddd         3 dddddddd
+                 DDDD
+                 DD
+ee           411 hello
+                 baby
+ffff        5111 aaa
+                 bbb
+                 ccc
+                 ddd
+gggggg 678993321 eee
+hhh      7666666 fffff
+iiiiii      8765 g
+                 hhhhh
+jj        987456 ppppppppp
diff --git a/tests/expected/libsmartcols/fromfile-wrapzero-tree b/tests/expected/libsmartcols/fromfile-wrapzero-tree
new file mode 100644
index 0000000..552470d
--- /dev/null
+++ b/tests/expected/libsmartcols/fromfile-wrapzero-tree
@@ -0,0 +1,19 @@
+TREE           ID PARENT WRAPZERO
+aaaa            1      0 aaa
+|-bbb           2      1 bbbbb
+| |-ee          5      2 hello
+| |                      baby
+| `-ffff        6      2 aaa
+|                        bbb
+|                        ccc
+|                        ddd
+|-ccccc         3      1 cccc
+| |                      CCCC
+| `-gggggg      7      3 eee
+|   |-hhh       8      7 fffff
+|   | `-iiiiii  9      8 g
+|   |                    hhhhh
+|   `-jj       10      7 ppppppppp
+`-dddddd        4      1 dddddddd
+                         DDDD
+                         DD