From 24dec0b179f6eba6d055b33faf478d202bfb11ba Mon Sep 17 00:00:00 2001 From: phil Date: Mon, 7 Aug 2017 17:23:44 +0000 Subject: Import libxo-0.8.4 from HEAD into stable/11 Submitted by: phil --- contrib/libxo/tests/core/saved/test_01.E.out | 286 +++++++++--------- contrib/libxo/tests/core/saved/test_01.H.out | 4 +- contrib/libxo/tests/core/saved/test_01.HIPx.out | 30 ++ contrib/libxo/tests/core/saved/test_01.HP.out | 30 ++ contrib/libxo/tests/core/saved/test_01.J.out | 2 +- contrib/libxo/tests/core/saved/test_01.JP.out | 12 + contrib/libxo/tests/core/saved/test_01.T.out | 5 + contrib/libxo/tests/core/saved/test_01.X.out | 2 +- contrib/libxo/tests/core/saved/test_01.XP.out | 12 + contrib/libxo/tests/core/saved/test_02.E.out | 136 ++++----- contrib/libxo/tests/core/saved/test_02.J.out | 2 +- contrib/libxo/tests/core/saved/test_02.JP.out | 4 +- contrib/libxo/tests/core/saved/test_02.X.out | 2 +- contrib/libxo/tests/core/saved/test_02.XP.out | 2 +- contrib/libxo/tests/core/saved/test_03.E.out | 68 ++--- contrib/libxo/tests/core/saved/test_04.E.out | 44 +-- contrib/libxo/tests/core/saved/test_05.E.out | 192 ++++++------ contrib/libxo/tests/core/saved/test_06.E.out | 44 +-- contrib/libxo/tests/core/saved/test_07.E.out | 152 +++++----- contrib/libxo/tests/core/saved/test_08.E.out | 372 ++++++++++++------------ contrib/libxo/tests/core/saved/test_09.E.out | 80 ++--- contrib/libxo/tests/core/saved/test_10.E.out | 252 ++++++++-------- contrib/libxo/tests/core/saved/test_10.X.out | 2 +- contrib/libxo/tests/core/saved/test_10.XP.out | 2 +- contrib/libxo/tests/core/saved/test_11.E.out | 16 +- contrib/libxo/tests/core/saved/test_11.HIPx.out | 8 +- contrib/libxo/tests/core/saved/test_11.X.out | 2 +- contrib/libxo/tests/core/saved/test_11.XP.out | 2 +- contrib/libxo/tests/core/saved/test_12.E.out | 180 ++++++------ contrib/libxo/tests/core/saved/test_12.H.out | 2 +- contrib/libxo/tests/core/saved/test_12.HIPx.out | 89 +++--- contrib/libxo/tests/core/saved/test_12.HP.out | 89 +++--- contrib/libxo/tests/core/saved/test_12.J.out | 2 +- contrib/libxo/tests/core/saved/test_12.JP.out | 2 + contrib/libxo/tests/core/saved/test_12.T.out | 42 +-- contrib/libxo/tests/core/saved/test_12.X.out | 2 +- contrib/libxo/tests/core/saved/test_12.XP.out | 2 + 37 files changed, 1149 insertions(+), 1026 deletions(-) (limited to 'contrib/libxo/tests/core/saved') diff --git a/contrib/libxo/tests/core/saved/test_01.E.out b/contrib/libxo/tests/core/saved/test_01.E.out index de23baa..a4ed657 100644 --- a/contrib/libxo/tests/core/saved/test_01.E.out +++ b/contrib/libxo/tests/core/saved/test_01.E.out @@ -1,137 +1,149 @@ -op create: [] [] -op open_container: [top] [] -op string: [host] [my-box] -op string: [domain] [example.com] -op string: [host] [my-box] -op string: [domain] [example.com] -op string: [label] [value] -op string: [max-chaos] [very] -op content: [min-chaos] [42] -op string: [some-chaos] [[42]] -op string: [host] [my-box] -op string: [domain] [example.com] -op attr: [test] [value] -op open_container: [data] [] -op open_list: [item] [] -op attr: [test2] [value2] -op open_instance: [item] [] -op attr: [test3] [value3] -op string: [sku] [GRO-000-415] -op string: [name] [gum] -op content: [sold] [1412] -op content: [in-stock] [54] -op content: [on-order] [10] -op close_instance: [item] [] -op open_instance: [item] [] -op attr: [test3] [value3] -op string: [sku] [HRD-000-212] -op string: [name] [rope] -op content: [sold] [85] -op content: [in-stock] [4] -op content: [on-order] [2] -op close_instance: [item] [] -op open_instance: [item] [] -op attr: [test3] [value3] -op string: [sku] [HRD-000-517] -op string: [name] [ladder] -op content: [sold] [0] -op content: [in-stock] [2] -op content: [on-order] [1] -op close_instance: [item] [] -op open_instance: [item] [] -op attr: [test3] [value3] -op string: [sku] [HRD-000-632] -op string: [name] [bolt] -op content: [sold] [4123] -op content: [in-stock] [144] -op content: [on-order] [42] -op close_instance: [item] [] -op open_instance: [item] [] -op attr: [test3] [value3] -op string: [sku] [GRO-000-2331] -op string: [name] [water] -op content: [sold] [17] -op content: [in-stock] [14] -op content: [on-order] [2] -op close_instance: [item] [] -op close_list: [item] [] -op close_container: [data] [] -op open_container: [data2] [] -op open_list: [item] [] -op open_instance: [item] [] -op string: [sku] [GRO-000-415] -op string: [name] [gum] -op content: [sold] [1412.0] -op content: [in-stock] [54] -op content: [on-order] [10] -op close_instance: [item] [] -op open_instance: [item] [] -op string: [sku] [HRD-000-212] -op string: [name] [rope] -op content: [sold] [85.0] -op content: [in-stock] [4] -op content: [on-order] [2] -op close_instance: [item] [] -op open_instance: [item] [] -op string: [sku] [HRD-000-517] -op string: [name] [ladder] -op content: [sold] [0] -op content: [in-stock] [2] -op content: [on-order] [1] -op close_instance: [item] [] -op open_instance: [item] [] -op string: [sku] [HRD-000-632] -op string: [name] [bolt] -op content: [sold] [4123.0] -op content: [in-stock] [144] -op content: [on-order] [42] -op close_instance: [item] [] -op open_instance: [item] [] -op string: [sku] [GRO-000-2331] -op string: [name] [water] -op content: [sold] [17.0] -op content: [in-stock] [14] -op content: [on-order] [2] -op close_instance: [item] [] -op close_list: [item] [] -op close_container: [data2] [] -op open_container: [data3] [] -op open_list: [item] [] -op open_instance: [item] [] -op string: [sku] [GRO-000-533] -op string: [name] [fish] -op content: [sold] [1321.0] -op content: [in-stock] [45] -op content: [on-order] [1] -op close_instance: [item] [] -op close_list: [item] [] -op close_container: [data3] [] -op open_container: [data4] [] -op open_list: [item] [] -op attr: [test4] [value4] -op string: [item] [gum] -op attr: [test4] [value4] -op string: [item] [rope] -op attr: [test4] [value4] -op string: [item] [ladder] -op attr: [test4] [value4] -op string: [item] [bolt] -op attr: [test4] [value4] -op string: [item] [water] -op close_list: [item] [] -op close_container: [data4] [] -op content: [cost] [425] -op content: [cost] [455] -op string: [mode] [mode] -op string: [mode_octal] [octal] -op string: [links] [links] -op string: [user] [user] -op string: [group] [group] -op string: [mode] [/some/file] -op content: [mode_octal] [640] -op content: [links] [1] -op string: [user] [user] -op string: [group] [group] -op close_container: [top] [] -op finish: [] [] -op flush: [] [] +op create: [] [] [0] +op open_container: [top] [] [0x810] +op content: [address] [0x0] [0] +op content: [port] [1] [0] +op content: [address] [0x0] [0] +op content: [port] [1] [0] +op content: [address] [0x0] [0] +op content: [port] [1] [0] +op content: [used-percent] [12] [0] +op content: [kve_start] [0xdeadbeef] [0x8] +op content: [kve_end] [0xcabb1e] [0x8] +op string: [host] [my-box] [0x200000] +op string: [domain] [example.com] [0x200000] +op string: [host] [my-box] [0x200008] +op string: [domain] [example.com] [0x200000] +op string: [label] [value] [0x200000] +op string: [max-chaos] [very] [0x1000] +op content: [min-chaos] [42] [0] +op string: [some-chaos] [[42]] [0] +op string: [host] [my-box] [0] +op string: [domain] [example.com] [0] +op attr: [test] [value] [0] +op open_container: [data] [] [0x810] +op open_list: [item] [] [0] +op attr: [test2] [value2] [0] +op open_instance: [item] [] [0x810] +op attr: [test3] [value3] [0] +op string: [sku] [GRO-000-415] [0x98] +op string: [name] [gum] [0x80] +op content: [sold] [1412] [0x20] +op content: [in-stock] [54] [0] +op content: [on-order] [10] [0] +op close_instance: [item] [] [0] +op open_instance: [item] [] [0x810] +op attr: [test3] [value3] [0] +op string: [sku] [HRD-000-212] [0x98] +op string: [name] [rope] [0x80] +op content: [sold] [85] [0x20] +op content: [in-stock] [4] [0] +op content: [on-order] [2] [0] +op close_instance: [item] [] [0] +op open_instance: [item] [] [0x810] +op attr: [test3] [value3] [0] +op string: [sku] [HRD-000-517] [0x98] +op string: [name] [ladder] [0x80] +op content: [sold] [0] [0x20] +op content: [in-stock] [2] [0] +op content: [on-order] [1] [0] +op close_instance: [item] [] [0] +op open_instance: [item] [] [0x810] +op attr: [test3] [value3] [0] +op string: [sku] [HRD-000-632] [0x98] +op string: [name] [bolt] [0x80] +op content: [sold] [4123] [0x20] +op content: [in-stock] [144] [0] +op content: [on-order] [42] [0] +op close_instance: [item] [] [0] +op open_instance: [item] [] [0x810] +op attr: [test3] [value3] [0] +op string: [sku] [GRO-000-2331] [0x98] +op string: [name] [water] [0x80] +op content: [sold] [17] [0x20] +op content: [in-stock] [14] [0] +op content: [on-order] [2] [0] +op close_instance: [item] [] [0] +op close_list: [item] [] [0] +op close_container: [data] [] [0] +op open_container: [data2] [] [0x810] +op open_list: [item] [] [0] +op open_instance: [item] [] [0x810] +op string: [sku] [GRO-000-415] [0x98] +op string: [name] [gum] [0x80] +op content: [sold] [1412.0] [0x20] +op content: [in-stock] [54] [0] +op content: [on-order] [10] [0] +op close_instance: [item] [] [0] +op open_instance: [item] [] [0x810] +op string: [sku] [HRD-000-212] [0x98] +op string: [name] [rope] [0x80] +op content: [sold] [85.0] [0x20] +op content: [in-stock] [4] [0] +op content: [on-order] [2] [0] +op close_instance: [item] [] [0] +op open_instance: [item] [] [0x810] +op string: [sku] [HRD-000-517] [0x98] +op string: [name] [ladder] [0x80] +op content: [sold] [0] [0x20] +op content: [in-stock] [2] [0] +op content: [on-order] [1] [0] +op close_instance: [item] [] [0] +op open_instance: [item] [] [0x810] +op string: [sku] [HRD-000-632] [0x98] +op string: [name] [bolt] [0x80] +op content: [sold] [4123.0] [0x20] +op content: [in-stock] [144] [0] +op content: [on-order] [42] [0] +op close_instance: [item] [] [0] +op open_instance: [item] [] [0x810] +op string: [sku] [GRO-000-2331] [0x98] +op string: [name] [water] [0x80] +op content: [sold] [17.0] [0x20] +op content: [in-stock] [14] [0] +op content: [on-order] [2] [0] +op close_instance: [item] [] [0] +op close_list: [item] [] [0] +op close_container: [data2] [] [0] +op open_container: [data3] [] [0x810] +op open_list: [item] [] [0] +op open_instance: [item] [] [0x810] +op string: [sku] [GRO-000-533] [0x98] +op string: [name] [fish] [0x80] +op content: [sold] [1321.0] [0x20] +op content: [in-stock] [45] [0] +op content: [on-order] [1] [0] +op close_instance: [item] [] [0] +op close_list: [item] [] [0] +op close_container: [data3] [] [0] +op open_container: [data4] [] [0x810] +op open_list: [item] [] [0] +op attr: [test4] [value4] [0] +op string: [item] [gum] [0x2000] +op attr: [test4] [value4] [0] +op string: [item] [rope] [0x2000] +op attr: [test4] [value4] [0] +op string: [item] [ladder] [0x2000] +op attr: [test4] [value4] [0] +op string: [item] [bolt] [0x2000] +op attr: [test4] [value4] [0] +op string: [item] [water] [0x2000] +op close_list: [item] [] [0] +op close_container: [data4] [] [0] +op content: [cost] [425] [0] +op content: [cost] [455] [0] +op string: [mode] [mode] [0x8] +op string: [mode_octal] [octal] [0x8] +op string: [links] [links] [0x1000] +op string: [user] [user] [0x1000] +op string: [group] [group] [0x1000] +op string: [pre] [that] [0x8] +op content: [links] [3] [0x1000] +op string: [post] [this] [0x1000] +op string: [mode] [/some/file] [0x1000] +op content: [mode_octal] [640] [0x8] +op content: [links] [1] [0x1000] +op string: [user] [user] [0x1000] +op string: [group] [group] [0x1000] +op close_container: [top] [] [0] +op finish: [] [] [0] +op flush: [] [] [0] diff --git a/contrib/libxo/tests/core/saved/test_01.H.out b/contrib/libxo/tests/core/saved/test_01.H.out index 7c0b3de..ebe75e6 100644 --- a/contrib/libxo/tests/core/saved/test_01.H.out +++ b/contrib/libxo/tests/core/saved/test_01.H.out @@ -1,2 +1,2 @@ -
testing argument modifier
my-box
.
example.com
...
testing argument modifier with encoding to
.
example.com
...
Label text
value
very
42
42 -
Connecting to
my-box
.
example.com
...
Item
Total Sold
In Stock
On Order
SKU
gum
1412
54
10
GRO-000-415
rope
85
4
2
HRD-000-212
ladder
0
2
1
HRD-000-517
bolt
4123
144
42
HRD-000-632
water
17
14
2
GRO-000-2331
Item
'
gum
':
Total sold
:
1412.0
In stock
:
54
On order
:
10
SKU
:
GRO-000-415
Item
'
rope
':
Total sold
:
85.0
In stock
:
4
On order
:
2
SKU
:
HRD-000-212
Item
'
ladder
':
Total sold
:
0
In stock
:
2
On order
:
1
SKU
:
HRD-000-517
Item
'
bolt
':
Total sold
:
4123.0
In stock
:
144
On order
:
42
SKU
:
HRD-000-632
Item
'
water
':
Total sold
:
17.0
In stock
:
14
On order
:
2
SKU
:
GRO-000-2331
Item
'
fish
':
Total sold
:
1321.0
In stock
:
45
On order
:
1
SKU
:
GRO-000-533
Item
:
gum
Item
:
rope
Item
:
ladder
Item
:
bolt
Item
:
water
X
X
X
X
X
X
X
X
X
X
Cost
:
425
X
X
Cost
:
455
links
user
group
/some/file
1
user
group
\ No newline at end of file +
anchor
0x0
..
1
anchor
0x0
..
1
anchor
0x0
..
1
df
12
%
testing argument modifier
my-box
.
example.com
...
testing argument modifier with encoding to
.
example.com
...
Label text
value
very
42
42 +
Connecting to
my-box
.
example.com
...
Item
Total Sold
In Stock
On Order
SKU
gum
1412
54
10
GRO-000-415
rope
85
4
2
HRD-000-212
ladder
0
2
1
HRD-000-517
bolt
4123
144
42
HRD-000-632
water
17
14
2
GRO-000-2331
Item
'
gum
':
Total sold
:
1412.0
In stock
:
54
On order
:
10
SKU
:
GRO-000-415
Item
'
rope
':
Total sold
:
85.0
In stock
:
4
On order
:
2
SKU
:
HRD-000-212
Item
'
ladder
':
Total sold
:
0
In stock
:
2
On order
:
1
SKU
:
HRD-000-517
Item
'
bolt
':
Total sold
:
4123.0
In stock
:
144
On order
:
42
SKU
:
HRD-000-632
Item
'
water
':
Total sold
:
17.0
In stock
:
14
On order
:
2
SKU
:
GRO-000-2331
Item
'
fish
':
Total sold
:
1321.0
In stock
:
45
On order
:
1
SKU
:
GRO-000-533
Item
:
gum
Item
:
rope
Item
:
ladder
Item
:
bolt
Item
:
water
X
X
X
X
X
X
X
X
X
X
Cost
:
425
X
X
Cost
:
455
links
user
group
3
this
/some/file
1
user
group
\ No newline at end of file diff --git a/contrib/libxo/tests/core/saved/test_01.HIPx.out b/contrib/libxo/tests/core/saved/test_01.HIPx.out index f6c7290..d96b855 100644 --- a/contrib/libxo/tests/core/saved/test_01.HIPx.out +++ b/contrib/libxo/tests/core/saved/test_01.HIPx.out @@ -1,4 +1,30 @@
+
anchor
+
+
0x0
+
..
+
1
+
+
+
anchor
+
+
0x0
+
..
+
1
+
+
+
anchor
+
+
0x0
+
..
+
1
+
+
+
df
+
12
+
%
+
+
testing argument modifier
my-box
.
@@ -333,6 +359,10 @@
+
3
+
this
+
+
/some/file
1
diff --git a/contrib/libxo/tests/core/saved/test_01.HP.out b/contrib/libxo/tests/core/saved/test_01.HP.out index 0fdcbd1..3253aa0 100644 --- a/contrib/libxo/tests/core/saved/test_01.HP.out +++ b/contrib/libxo/tests/core/saved/test_01.HP.out @@ -1,4 +1,30 @@
+
anchor
+
+
0x0
+
..
+
1
+
+
+
anchor
+
+
0x0
+
..
+
1
+
+
+
anchor
+
+
0x0
+
..
+
1
+
+
+
df
+
12
+
%
+
+
testing argument modifier
my-box
.
@@ -333,6 +359,10 @@
+
3
+
this
+
+
/some/file
1
diff --git a/contrib/libxo/tests/core/saved/test_01.J.out b/contrib/libxo/tests/core/saved/test_01.J.out index 3fc12a1..ad73058 100644 --- a/contrib/libxo/tests/core/saved/test_01.J.out +++ b/contrib/libxo/tests/core/saved/test_01.J.out @@ -1,2 +1,2 @@ -{"top": {"host":"my-box","domain":"example.com","host":"my-box","domain":"example.com","label":"value","max-chaos":"very","min-chaos":42,"some-chaos":"[42]","host":"my-box","domain":"example.com", "data": {"item": [{"sku":"GRO-000-415","name":"gum","sold":1412,"in-stock":54,"on-order":10}, {"sku":"HRD-000-212","name":"rope","sold":85,"in-stock":4,"on-order":2}, {"sku":"HRD-000-517","name":"ladder","sold":0,"in-stock":2,"on-order":1}, {"sku":"HRD-000-632","name":"bolt","sold":4123,"in-stock":144,"on-order":42}, {"sku":"GRO-000-2331","name":"water","sold":17,"in-stock":14,"on-order":2}]}, "data2": {"item": [{"sku":"GRO-000-415","name":"gum","sold":1412.0,"in-stock":54,"on-order":10}, {"sku":"HRD-000-212","name":"rope","sold":85.0,"in-stock":4,"on-order":2}, {"sku":"HRD-000-517","name":"ladder","sold":0,"in-stock":2,"on-order":1}, {"sku":"HRD-000-632","name":"bolt","sold":4123.0,"in-stock":144,"on-order":42}, {"sku":"GRO-000-2331","name":"water","sold":17.0,"in-stock":14,"on-order":2}]}, "data3": {"item": [{"sku":"GRO-000-533","name":"fish","sold":1321.0,"in-stock":45,"on-order":1}]}, "data4": {"item": ["gum","rope","ladder","bolt","water"]},"cost":425,"cost":455,"mode":"mode","mode_octal":"octal","links":"links","user":"user","group":"group","mode":"/some/file","mode_octal":640,"links":1,"user":"user","group":"group"} +{"top": {"address":"0x0","port":1,"address":"0x0","port":1,"address":"0x0","port":1,"used-percent":12,"kve_start":"0xdeadbeef","kve_end":"0xcabb1e","host":"my-box","domain":"example.com","host":"my-box","domain":"example.com","label":"value","max-chaos":"very","min-chaos":42,"some-chaos":"[42]","host":"my-box","domain":"example.com", "data": {"item": [{"sku":"GRO-000-415","name":"gum","sold":1412,"in-stock":54,"on-order":10}, {"sku":"HRD-000-212","name":"rope","sold":85,"in-stock":4,"on-order":2}, {"sku":"HRD-000-517","name":"ladder","sold":0,"in-stock":2,"on-order":1}, {"sku":"HRD-000-632","name":"bolt","sold":4123,"in-stock":144,"on-order":42}, {"sku":"GRO-000-2331","name":"water","sold":17,"in-stock":14,"on-order":2}]}, "data2": {"item": [{"sku":"GRO-000-415","name":"gum","sold":1412.0,"in-stock":54,"on-order":10}, {"sku":"HRD-000-212","name":"rope","sold":85.0,"in-stock":4,"on-order":2}, {"sku":"HRD-000-517","name":"ladder","sold":0,"in-stock":2,"on-order":1}, {"sku":"HRD-000-632","name":"bolt","sold":4123.0,"in-stock":144,"on-order":42}, {"sku":"GRO-000-2331","name":"water","sold":17.0,"in-stock":14,"on-order":2}]}, "data3": {"item": [{"sku":"GRO-000-533","name":"fish","sold":1321.0,"in-stock":45,"on-order":1}]}, "data4": {"item": ["gum","rope","ladder","bolt","water"]},"cost":425,"cost":455,"mode":"mode","mode_octal":"octal","links":"links","user":"user","group":"group","pre":"that","links":3,"post":"this","mode":"/some/file","mode_octal":640,"links":1,"user":"user","group":"group"} } diff --git a/contrib/libxo/tests/core/saved/test_01.JP.out b/contrib/libxo/tests/core/saved/test_01.JP.out index 2c7397f..6aeef16 100644 --- a/contrib/libxo/tests/core/saved/test_01.JP.out +++ b/contrib/libxo/tests/core/saved/test_01.JP.out @@ -1,5 +1,14 @@ { "top": { + "address": "0x0", + "port": 1, + "address": "0x0", + "port": 1, + "address": "0x0", + "port": 1, + "used-percent": 12, + "kve_start": "0xdeadbeef", + "kve_end": "0xcabb1e", "host": "my-box", "domain": "example.com", "host": "my-box", @@ -115,6 +124,9 @@ "links": "links", "user": "user", "group": "group", + "pre": "that", + "links": 3, + "post": "this", "mode": "/some/file", "mode_octal": 640, "links": 1, diff --git a/contrib/libxo/tests/core/saved/test_01.T.out b/contrib/libxo/tests/core/saved/test_01.T.out index 71cd130..d454270 100644 --- a/contrib/libxo/tests/core/saved/test_01.T.out +++ b/contrib/libxo/tests/core/saved/test_01.T.out @@ -1,3 +1,7 @@ +anchor 0x0..1 +anchor 0x0..1 +anchor 0x0..1 +df 12% testing argument modifier my-box.example.com... testing argument modifier with encoding to .example.com... Label text value @@ -50,4 +54,5 @@ XXXXXXXX X XCost: 425 X XCost: 455 links user group +3 this /some/file 1 user group diff --git a/contrib/libxo/tests/core/saved/test_01.X.out b/contrib/libxo/tests/core/saved/test_01.X.out index da80e68..226a4a4 100644 --- a/contrib/libxo/tests/core/saved/test_01.X.out +++ b/contrib/libxo/tests/core/saved/test_01.X.out @@ -1 +1 @@ -my-boxexample.commy-boxexample.comvery42[42]my-boxexample.comGRO-000-415gum14125410HRD-000-212rope8542HRD-000-517ladder021HRD-000-632bolt412314442GRO-000-2331water17142GRO-000-415gum1412.05410HRD-000-212rope85.042HRD-000-517ladder021HRD-000-632bolt4123.014442GRO-000-2331water17.0142GRO-000-533fish1321.0451gumropeladderboltwater425455modeoctallinksusergroup/some/file6401usergroup \ No newline at end of file +
0x0
1
0x0
1
0x0
1120xdeadbeef0xcabb1emy-boxexample.commy-boxexample.comvery42[42]my-boxexample.comGRO-000-415gum14125410HRD-000-212rope8542HRD-000-517ladder021HRD-000-632bolt412314442GRO-000-2331water17142GRO-000-415gum1412.05410HRD-000-212rope85.042HRD-000-517ladder021HRD-000-632bolt4123.014442GRO-000-2331water17.0142GRO-000-533fish1321.0451gumropeladderboltwater425455modeoctallinksusergroup
that
3this/some/file6401usergroup \ No newline at end of file diff --git a/contrib/libxo/tests/core/saved/test_01.XP.out b/contrib/libxo/tests/core/saved/test_01.XP.out index c331dce..1e1be56 100644 --- a/contrib/libxo/tests/core/saved/test_01.XP.out +++ b/contrib/libxo/tests/core/saved/test_01.XP.out @@ -1,4 +1,13 @@ +
0x0
+ 1 +
0x0
+ 1 +
0x0
+ 1 + 12 + 0xdeadbeef + 0xcabb1e my-box example.com my-box @@ -106,6 +115,9 @@ links user group + 
that
+ 3 + this /some/file 640 1 diff --git a/contrib/libxo/tests/core/saved/test_02.E.out b/contrib/libxo/tests/core/saved/test_02.E.out index 9e1ec96..6cc40e4 100644 --- a/contrib/libxo/tests/core/saved/test_02.E.out +++ b/contrib/libxo/tests/core/saved/test_02.E.out @@ -1,68 +1,68 @@ -op create: [] [] -op open_container: [top] [] -op open_container: [data] [] -op string: [what] [braces] -op string: [length] [abcdef] -op content: [fd] [-1] -op string: [error] [Bad file descriptor] -op string: [test] [good] -op content: [fd] [-1] -op string: [error] [Bad fi] -op string: [test] [good] -op content: [lines] [20] -op content: [words] [30] -op content: [characters] [40] -op open_leaf_list: [bytes] [] -op content: [bytes] [0] -op content: [bytes] [1] -op content: [bytes] [2] -op content: [bytes] [3] -op content: [bytes] [4] -op close_leaf_list: [bytes] [] -op content: [mbuf-current] [10] -op content: [mbuf-cache] [20] -op content: [mbuf-total] [30] -op content: [distance] [50] -op string: [location] [Boston] -op content: [memory] [64] -op content: [total] [640] -op content: [memory] [64] -op content: [total] [640] -op content: [ten] [10] -op content: [eleven] [11] -op content: [unknown] [1010] -op content: [unknown] [1010] -op content: [min] [15] -op content: [cur] [20] -op content: [max] [30] -op content: [min] [15] -op content: [cur] [20] -op content: [max] [125] -op content: [min] [15] -op content: [cur] [20] -op content: [max] [125] -op content: [min] [15] -op content: [cur] [20] -op content: [max] [125] -op content: [val1] [21] -op content: [val2] [58368] -op content: [val3] [100663296] -op content: [val4] [44470272] -op content: [val5] [1342172800] -op open_list: [flag] [] -op string: [flag] [one] -op string: [flag] [two] -op string: [flag] [three] -op close_list: [flag] [] -op content: [works] [null] -op content: [empty-tag] [true] -op string: [t1] [1000] -op string: [t2] [test5000] -op string: [t3] [ten-longx] -op string: [t4] [xtest] -op content: [count] [10] -op content: [test] [4] -op close_container: [data] [] -op close_container: [top] [] -op finish: [] [] -op flush: [] [] +op create: [] [] [0] +op open_container: [top] [] [0x40010] +op open_container: [data] [] [0x40010] +op string: [what] [braces] [0] +op string: [length] [abcdef] [0] +op content: [fd] [-1] [0] +op string: [error] [Bad file descriptor] [0] +op string: [test] [good] [0] +op content: [fd] [-1] [0] +op string: [error] [Bad fi] [0] +op string: [test] [good] [0] +op content: [lines] [20] [0] +op content: [words] [30] [0] +op content: [characters] [40] [0] +op open_leaf_list: [bytes] [] [0] +op content: [bytes] [0] [0x2004] +op content: [bytes] [1] [0x2004] +op content: [bytes] [2] [0x2004] +op content: [bytes] [3] [0x2004] +op content: [bytes] [4] [0x2004] +op close_leaf_list: [bytes] [] [0] +op content: [mbuf-current] [10] [0] +op content: [mbuf-cache] [20] [0] +op content: [mbuf-total] [30] [0] +op content: [distance] [50] [0] +op string: [location] [Boston] [0] +op content: [memory] [64] [0] +op content: [total] [640] [0] +op content: [memory] [64] [0] +op content: [total] [640] [0] +op content: [ten] [10] [0] +op content: [eleven] [11] [0] +op content: [unknown] [1010] [0] +op content: [unknown] [1010] [0] +op content: [min] [15] [0x20] +op content: [cur] [20] [0x20] +op content: [max] [125] [0] +op content: [min] [15] [0] +op content: [cur] [20] [0] +op content: [max] [125] [0] +op content: [min] [15] [0x20] +op content: [cur] [20] [0x20] +op content: [max] [125] [0x20] +op content: [min] [15] [0] +op content: [cur] [20] [0] +op content: [max] [125] [0] +op content: [val1] [21] [0x8000] +op content: [val2] [58368] [0x18000] +op content: [val3] [100663296] [0x28000] +op content: [val4] [44470272] [0x48000] +op content: [val5] [1342172800] [0x28000] +op open_list: [flag] [] [0] +op string: [flag] [one] [0x2010] +op string: [flag] [two] [0x2010] +op string: [flag] [three] [0x2010] +op close_list: [flag] [] [0] +op content: [works] [null] [0x20] +op content: [empty-tag] [true] [0x8] +op string: [t1] [1000] [0x1010] +op string: [t2] [test5000] [0x1010] +op string: [t3] [ten-longx] [0x1010] +op string: [t4] [xtest] [0x1010] +op content: [count] [10] [0] +op content: [test] [4] [0] +op close_container: [data] [] [0] +op close_container: [top] [] [0] +op finish: [] [] [0] +op flush: [] [] [0] diff --git a/contrib/libxo/tests/core/saved/test_02.J.out b/contrib/libxo/tests/core/saved/test_02.J.out index 5578389..cafe771 100644 --- a/contrib/libxo/tests/core/saved/test_02.J.out +++ b/contrib/libxo/tests/core/saved/test_02.J.out @@ -1,2 +1,2 @@ -{"top": {"data": {"what":"braces","length":"abcdef","fd":-1,"error":"Bad file descriptor","test":"good","fd":-1,"error":"Bad fi","test":"good","lines":20,"words":30,"characters":40, "bytes": [0,1,2,3,4],"mbuf-current":10,"mbuf-cache":20,"mbuf-total":30,"distance":50,"location":"Boston","memory":64,"total":640,"memory":64,"total":640,"ten":10,"eleven":11,"unknown":1010,"unknown":1010,"min":15,"cur":20,"max":30,"min":15,"cur":20,"max":125,"min":15,"cur":20,"max":125,"min":15,"cur":20,"max":125,"val1":21,"val2":58368,"val3":100663296,"val4":44470272,"val5":1342172800, "flag": ["one","two","three"],"works":null,"empty-tag":true,"t1":"1000","t2":"test5000","t3":"ten-longx","t4":"xtest", "__error": {"message":"this is an error"}, "__error": {"message":"two more errors"}, "__warning": {"message":this is an warning}, "__warning": {"message":"two more warnings"},"count":10,"test":4, "error": {"message":"Shut 'er down, Clancey! She's a-pumpin' mud! <>!,\"!<>\n"}}} +{"top": {"data": {"what":"braces","length":"abcdef","fd":-1,"error":"Bad file descriptor","test":"good","fd":-1,"error":"Bad fi","test":"good","lines":20,"words":30,"characters":40, "bytes": [0,1,2,3,4],"mbuf-current":10,"mbuf-cache":20,"mbuf-total":30,"distance":50,"location":"Boston","memory":64,"total":640,"memory":64,"total":640,"ten":10,"eleven":11,"unknown":1010,"unknown":1010,"min":15,"cur":20,"max":125,"min":15,"cur":20,"max":125,"min":15,"cur":20,"max":125,"min":15,"cur":20,"max":125,"val1":21,"val2":58368,"val3":100663296,"val4":44470272,"val5":1342172800, "flag": ["one","two","three"],"works":null,"empty-tag":true,"t1":"1000","t2":"test5000","t3":"ten-longx","t4":"xtest", "__error": {"message":"this is an error"}, "__error": {"message":"two more errors"}, "__warning": {"message":"this is an warning"}, "__warning": {"message":"two more warnings"},"count":10,"test":4, "error": {"message":"Shut 'er down, Clancey! She's a-pumpin' mud! <>!,\"!<>\n"}}} } diff --git a/contrib/libxo/tests/core/saved/test_02.JP.out b/contrib/libxo/tests/core/saved/test_02.JP.out index fd910aa..9e40703 100644 --- a/contrib/libxo/tests/core/saved/test_02.JP.out +++ b/contrib/libxo/tests/core/saved/test_02.JP.out @@ -34,7 +34,7 @@ "unknown": 1010, "min": 15, "cur": 20, - "max": 30, + "max": 125, "min": 15, "cur": 20, "max": 125, @@ -67,7 +67,7 @@ "message": "two more errors" }, "__warning": { - "message": this is an warning + "message": "this is an warning" }, "__warning": { "message": "two more warnings" diff --git a/contrib/libxo/tests/core/saved/test_02.X.out b/contrib/libxo/tests/core/saved/test_02.X.out index 30421ea..49e9355 100644 --- a/contrib/libxo/tests/core/saved/test_02.X.out +++ b/contrib/libxo/tests/core/saved/test_02.X.out @@ -2,6 +2,6 @@ abcdef: Bad file descriptor improper use of profanity; ten yard penalty; first down abcdef-1Bad file descriptorgood-1Bad figoodimproper use of profanity; ten yard penalty; first down -2030400123410203050Boston64640646401011101010101520301520125152012515201252158368100663296444702721342172800onetwothreenull1000test5000ten-longxxtest<__error>this is an error<__error>two more errors<__warning>this is an warning<__warning>two more warnings104improper use of profanity; ten yard penalty; first down +2030400123410203050Boston646406464010111010101015201251520125152012515201252158368100663296444702721342172800onetwothreenull1000test5000ten-longxxtest<__error>this is an error<__error>two more errors<__warning>this is an warning<__warning>two more warnings104improper use of profanity; ten yard penalty; first down Shut 'er down, Clancey! She's a-pumpin' mud! <>!,"!<> \ No newline at end of file diff --git a/contrib/libxo/tests/core/saved/test_02.XP.out b/contrib/libxo/tests/core/saved/test_02.XP.out index e70e6ef..e5172d3 100644 --- a/contrib/libxo/tests/core/saved/test_02.XP.out +++ b/contrib/libxo/tests/core/saved/test_02.XP.out @@ -39,7 +39,7 @@ 1010 15 20 - 30 + 125 15 20 125 diff --git a/contrib/libxo/tests/core/saved/test_03.E.out b/contrib/libxo/tests/core/saved/test_03.E.out index c68081f..21bf7d2 100644 --- a/contrib/libxo/tests/core/saved/test_03.E.out +++ b/contrib/libxo/tests/core/saved/test_03.E.out @@ -1,34 +1,34 @@ -op create: [] [] -op open_container: [employees] [] -op open_list: [employee] [] -op close_list: [employee] [] -op string: [extra] [] -op open_list: [memory] [] -op open_instance: [memory] [] -op string: [type] [name] -op content: [in-use] [12345] -op content: [memory-use] [54321] -op string: [high-use] [-] -op content: [requests] [32145] -op close_instance: [memory] [] -op close_list: [memory] [] -op open_list: [employee] [] -op open_instance: [employee] [] -op string: [first-name] [Terry] -op string: [last-name] [Jones] -op content: [department] [660] -op close_instance: [employee] [] -op open_instance: [employee] [] -op string: [first-name] [Leslie] -op string: [last-name] [Patterson] -op content: [department] [341] -op close_instance: [employee] [] -op open_instance: [employee] [] -op string: [first-name] [Ashley] -op string: [last-name] [Smith] -op content: [department] [1440] -op close_instance: [employee] [] -op close_list: [employee] [] -op close_container: [employees] [] -op finish: [] [] -op flush: [] [] +op create: [] [] [0] +op open_container: [employees] [] [0x10] +op open_list: [employee] [] [0] +op close_list: [employee] [] [0] +op string: [extra] [] [0] +op open_list: [memory] [] [0] +op open_instance: [memory] [] [0x10] +op string: [type] [name] [0x80] +op content: [in-use] [12345] [0] +op content: [memory-use] [54321] [0] +op string: [high-use] [-] [0] +op content: [requests] [32145] [0] +op close_instance: [memory] [] [0] +op close_list: [memory] [] [0] +op open_list: [employee] [] [0] +op open_instance: [employee] [] [0x10] +op string: [first-name] [Terry] [0] +op string: [last-name] [Jones] [0] +op content: [department] [660] [0] +op close_instance: [employee] [] [0] +op open_instance: [employee] [] [0x10] +op string: [first-name] [Leslie] [0] +op string: [last-name] [Patterson] [0] +op content: [department] [341] [0] +op close_instance: [employee] [] [0] +op open_instance: [employee] [] [0x10] +op string: [first-name] [Ashley] [0] +op string: [last-name] [Smith] [0] +op content: [department] [1440] [0] +op close_instance: [employee] [] [0] +op close_list: [employee] [] [0] +op close_container: [employees] [] [0] +op finish: [] [] [0] +op flush: [] [] [0] diff --git a/contrib/libxo/tests/core/saved/test_04.E.out b/contrib/libxo/tests/core/saved/test_04.E.out index 3965783..cfb751d 100644 --- a/contrib/libxo/tests/core/saved/test_04.E.out +++ b/contrib/libxo/tests/core/saved/test_04.E.out @@ -1,22 +1,22 @@ -op create: [] [] -op open_container: [employees] [] -op open_list: [employee] [] -op open_instance: [employee] [] -op string: [first-name] [Terry] -op string: [last-name] [Jones] -op content: [department] [660] -op close_instance: [employee] [] -op open_instance: [employee] [] -op string: [first-name] [Leslie] -op string: [last-name] [Patterson] -op content: [department] [341] -op close_instance: [employee] [] -op open_instance: [employee] [] -op string: [first-name] [Ashley] -op string: [last-name] [Smith] -op content: [department] [1440] -op close_instance: [employee] [] -op close_list: [employee] [] -op close_container: [employees] [] -op finish: [] [] -op flush: [] [] +op create: [] [] [0] +op open_container: [employees] [] [0x10] +op open_list: [employee] [] [0] +op open_instance: [employee] [] [0x10] +op string: [first-name] [Terry] [0] +op string: [last-name] [Jones] [0] +op content: [department] [660] [0] +op close_instance: [employee] [] [0] +op open_instance: [employee] [] [0x10] +op string: [first-name] [Leslie] [0] +op string: [last-name] [Patterson] [0] +op content: [department] [341] [0] +op close_instance: [employee] [] [0] +op open_instance: [employee] [] [0x10] +op string: [first-name] [Ashley] [0] +op string: [last-name] [Smith] [0] +op content: [department] [1440] [0] +op close_instance: [employee] [] [0] +op close_list: [employee] [] [0] +op close_container: [employees] [] [0] +op finish: [] [] [0] +op flush: [] [] [0] diff --git a/contrib/libxo/tests/core/saved/test_05.E.out b/contrib/libxo/tests/core/saved/test_05.E.out index 0ca15f4..8e8fcfe 100644 --- a/contrib/libxo/tests/core/saved/test_05.E.out +++ b/contrib/libxo/tests/core/saved/test_05.E.out @@ -1,96 +1,96 @@ -op create: [] [] -op open_container: [indian-languages] [] -op string: [gurmukhi] [ਲਹੌਰ ਪਾਕਿਸਤਾਨੀ ਪੰਜਾਬ ਦੀ ਰਾਜਧਾਨੀ ਹੈ । ਲੋਕ ਗਿਣਤੀ ਦੇ ਨਾਲ ਕਰਾਚੀ ਤੋਂ ਬਾਅਦ ਲਹੌਰ ਦੂਜਾ ਸਭ ਤੋਂ ਵੱਡਾ ਸ਼ਹਿਰ ਹੈ । ਲਹੌਰ ਪਾਕਿਸਤਾਨ ਦਾ ਸਿਆਸੀ, ਰਹਤਲੀ ਤੇ ਪੜ੍ਹਾਈ ਦਾ ਗੜ੍ਹ ਹੈ ਅਤੇ ਇਸ ਲਈ ਇਹਨੂੰ ਪਾਕਿਸਤਾਨ ਦਾ ਦਿਲ ਵੀ ਕਿਹਾ ਜਾਂਦਾ ਹੈ । ਲਹੌਰ ਦਰਿਆ-ਏ-ਰਾਵੀ ਦੇ ਕੰਢੇ ਤੇ ਵਸਦਾ ਹੈ ਤੇ ਇਸਦੀ ਲੋਕ ਗਿਣਤੀ ਇੱਕ ਕਰੋੜ ਦੇ ਨੇੜੇ ਹੈ ।] -op string: [shahmukhi] [لہور پاکستانی پنجاب دا دارالحکومت اے۔ لوک گنتی دے نال کراچی توں بعد لہور دوجا سبھ توں وڈا شہر اے۔ لہور پاکستان دا سیاسی، رہتلی تے پڑھائی دا گڑھ اے تے اس لئی ایھنوں پاکستان دا دل وی کیھا جاندا اے۔ لہور دریاۓ راوی دے کنڈھے تے وسدا اے اسدی لوک گنتی اک کروڑ دے نیڑے اے ۔] -op string: [tranliteration] [lahor pākistān panjāb dā dārul hakūmat ē. lōk giṇtī dē nāḷ karācī tō᷈ bāad lahor dūjā sab tō᷈ vaḍḍā shahr ē. lahor pākistān dā siāsī, rahtalī tē paṛā̀ī dā gā́ṛ ē tē is laī ihnū᷈ pākistān dā dil vī kehā jāndā ē. lahor dariāē rāvī dē kanḍē tē vasdā ē. isdī lōk giṇtī ikk karōṛ dē nēṛē ē.] -op close_container: [indian-languages] [] -op open_container: [employees] [] -op open_leaf_list: [wc] [] -op string: [wc] [෴ - 0xdf4 - 1] -op string: [wc] [ණ - 0xdab - 1] -op string: [wc] [් - 0xdca - 0] -op string: [wc] [ණ - 0xdab - 1] -op string: [wc] [្ - 0x17d2 - 0] -op string: [wc] [෴ - 0xdf4 - 1] -op string: [wc] [1 - 0x31 - 1] -op string: [wc] [͏ - 0x34f - 0] -op string: [wc] [2 - 0x32 - 1] -op string: [wc] [⃝ - 0x20dd - 0] -op close_leaf_list: [wc] [] -op string: [fancy] [1͏2⃝] -op string: [v1] [γιγνώσκειν] -op string: [v2] [ὦ ἄνδρες ᾿Αθηναῖοι] -op string: [v1] [ახლავე გაიაროთ რეგისტრაცია] -op string: [v2] [Unicode-ის მეათე საერთაშორისო] -op content: [width] [55] -op string: [sinhala] [෴ණ්ණ෴] -op content: [width] [4] -op string: [sinhala] [෴] -op content: [width] [1] -op string: [sinhala] [෴ණ්ණ෴෴ණ්ණ෴] -op content: [width] [8] -op string: [not-sinhala] [123456] -op string: [tag] [ර්‍ඝ] -op content: [width] [2] -op open_list: [employee] [] -op open_instance: [employee] [] -op string: [first-name] [Jim] -op string: [nic-name] ["რეგტ"] -op string: [last-name] [გთხოვთ ახ] -op content: [department] [431] -op content: [percent-time] [90] -op attr: [full-time] [honest & for true] -op string: [benefits] [full] -op close_instance: [employee] [] -op open_instance: [employee] [] -op string: [first-name] [Terry] -op string: [nic-name] ["boldbold-ultripleinv-ulunderlineplainGRO-000-415gum14125410HRD-000-212rope8542HRD-000-517ladder021HRD-000-632bolt412314442GRO-000-2331water17142GRO-000-415gum1412.05410HRD-000-212rope85.042HRD-000-517ladder021HRD-000-632bolt4123.014442GRO-000-2331water17.0142GRO-000-533fish1321.0451gumropeladderboltwater425455 \ No newline at end of file +boldbold-ultripleinv-ulunderlineplainGRO-000-415gum14125410HRD-000-212rope8542HRD-000-517ladder021HRD-000-632bolt412314442GRO-000-2331water17142GRO-000-415gum1412.05410HRD-000-212rope85.042HRD-000-517ladder021HRD-000-632bolt4123.014442GRO-000-2331water17.0142GRO-000-533fish1321.0451gumropeladderboltwater425455 \ No newline at end of file diff --git a/contrib/libxo/tests/core/saved/test_10.XP.out b/contrib/libxo/tests/core/saved/test_10.XP.out index 33c88d9..ec1aa93 100644 --- a/contrib/libxo/tests/core/saved/test_10.XP.out +++ b/contrib/libxo/tests/core/saved/test_10.XP.out @@ -1,4 +1,4 @@ - + bold bold-ul diff --git a/contrib/libxo/tests/core/saved/test_11.E.out b/contrib/libxo/tests/core/saved/test_11.E.out index 9fd70fa..76b8f21 100644 --- a/contrib/libxo/tests/core/saved/test_11.E.out +++ b/contrib/libxo/tests/core/saved/test_11.E.out @@ -1,26 +1,22 @@ -op create: [] [] -op version: [] [3.1.4] -op open_container: [top] [] -op create: [] [] +op create: [] [] [0] +op version: [] [3.1.4] [0] +op open_container: [top] [] [0x10] {{<14>1 2015-06-23T13:47:09.123-0500 worker-host test-program 222 animal-status [animal-status@42 animal="snake" state="loose"] The snake is loose}} {{test-program: }} {{The snake is loose}} -op create: [] [] {{<22>1 2015-06-23T13:47:09.123-0500 worker-host test-program 222 animal-consumed [animal-consumed@42 animal="snake" pet="hamster"] My snake ate your hamster}} {{test-program: }} {{My snake ate your hamster}} -op create: [] [] {{<29>1 2015-06-23T13:47:09.123-0500 worker-host test-program 222 animal-talk [animal-talk@42 count="1" animal="owl" quote="\"e=m\\c[2\]\""] 1 owl said "e=m\c[2]"}} {{test-program: }} {{1 owl said "e=m\c[2]"}} -op create: [] [] {{<165>1 2015-06-23T13:47:09.123-0500 worker-host test-program 222 ID47 [ID47@32473 iut="3" event-source="application" event-id="1011"] An application 1011 log entry}} {{test-program: }} {{An application 1011 log entry}} -op close_container: [top] [] -op finish: [] [] -op flush: [] [] +op close_container: [top] [] [0] +op finish: [] [] [0] +op flush: [] [] [0] diff --git a/contrib/libxo/tests/core/saved/test_11.HIPx.out b/contrib/libxo/tests/core/saved/test_11.HIPx.out index 8b726f4..0786c34 100644 --- a/contrib/libxo/tests/core/saved/test_11.HIPx.out +++ b/contrib/libxo/tests/core/saved/test_11.HIPx.out @@ -1,16 +1,16 @@ -{{<14>1 2015-06-23T13:47:09.123-0500 worker-host test-program 222 animal-status [animal-status@42 animal="" state=""] The snake is loose}} +{{<14>1 2015-06-23T13:47:09.123-0500 worker-host test-program 222 animal-status [animal-status@42 animal="snake" state="loose"] The snake is loose}} {{test-program: }} {{The snake is loose}} -{{<22>1 2015-06-23T13:47:09.123-0500 worker-host test-program 222 animal-consumed [animal-consumed@42 animal="" pet=""] My snake ate your hamster}} +{{<22>1 2015-06-23T13:47:09.123-0500 worker-host test-program 222 animal-consumed [animal-consumed@42 animal="snake" pet="hamster"] My snake ate your hamster}} {{test-program: }} {{My snake ate your hamster}} -{{<29>1 2015-06-23T13:47:09.123-0500 worker-host test-program 222 animal-talk [animal-talk@42 count="" animal="" quote=""] 1 owl said "e=m\c[2]"}} +{{<29>1 2015-06-23T13:47:09.123-0500 worker-host test-program 222 animal-talk [animal-talk@42 count="1" animal="owl" quote="\"e=m\\c[2\]\""] 1 owl said "e=m\c[2]"}} {{test-program: }} {{1 owl said "e=m\c[2]"}} -{{<165>1 2015-06-23T13:47:09.123-0500 worker-host test-program 222 ID47 [ID47@32473 iut="" event-source="" event-id=""] An application 1011 log entry}} +{{<165>1 2015-06-23T13:47:09.123-0500 worker-host test-program 222 ID47 [ID47@32473 iut="3" event-source="application" event-id="1011"] An application 1011 log entry}} {{test-program: }} {{An application 1011 log entry}} diff --git a/contrib/libxo/tests/core/saved/test_11.X.out b/contrib/libxo/tests/core/saved/test_11.X.out index bb73a42..5c279b7 100644 --- a/contrib/libxo/tests/core/saved/test_11.X.out +++ b/contrib/libxo/tests/core/saved/test_11.X.out @@ -14,4 +14,4 @@ {{test-program: }} {{An application 1011 log entry}} - \ No newline at end of file + \ No newline at end of file diff --git a/contrib/libxo/tests/core/saved/test_11.XP.out b/contrib/libxo/tests/core/saved/test_11.XP.out index 46b5dd0..0276561 100644 --- a/contrib/libxo/tests/core/saved/test_11.XP.out +++ b/contrib/libxo/tests/core/saved/test_11.XP.out @@ -14,5 +14,5 @@ {{test-program: }} {{An application 1011 log entry}} - + diff --git a/contrib/libxo/tests/core/saved/test_12.E.out b/contrib/libxo/tests/core/saved/test_12.E.out index 1c899a1..a831f5c 100644 --- a/contrib/libxo/tests/core/saved/test_12.E.out +++ b/contrib/libxo/tests/core/saved/test_12.E.out @@ -1,89 +1,91 @@ -op create: [] [] -op open_container: [top] [] -op open_container: [data] [] -op open_list: [thing] [] -op open_instance: [thing] [] -op string: [name] [thing] -op string: [color] [green] -op content: [time] [2:15] -op string: [hand] [left] -op string: [color] [blue] -op content: [time] [3:45] -op close_instance: [thing] [] -op open_instance: [thing] [] -op string: [name] [thing] -op string: [color] [green] -op content: [time] [2:15] -op string: [hand] [left] -op string: [color] [blue] -op content: [time] [3:45] -op close_instance: [thing] [] -op open_instance: [thing] [] -op string: [name] [thing] -op string: [color] [green] -op content: [time] [2:15] -op string: [hand] [left] -op string: [color] [blue] -op content: [time] [3:45] -op close_instance: [thing] [] -op open_instance: [thing] [] -op string: [name] [thing] -op string: [color] [green] -op content: [time] [2:15] -op string: [hand] [left] -op string: [color] [blue] -op content: [time] [3:45] -op close_instance: [thing] [] -op open_instance: [thing] [] -op string: [name] [thing] -op string: [color] [green] -op content: [time] [2:15] -op string: [hand] [left] -op string: [color] [blue] -op content: [time] [3:45] -op close_instance: [thing] [] -op open_instance: [thing] [] -op string: [name] [thing] -op string: [color] [green] -op content: [time] [2:15] -op string: [hand] [left] -op string: [color] [blue] -op content: [time] [3:45] -op close_instance: [thing] [] -op open_instance: [thing] [] -op string: [name] [thing] -op string: [color] [green] -op content: [time] [2:15] -op string: [hand] [left] -op string: [color] [blue] -op content: [time] [3:45] -op close_instance: [thing] [] -op open_instance: [thing] [] -op string: [name] [thing] -op string: [color] [green] -op content: [time] [2:15] -op string: [hand] [left] -op string: [color] [blue] -op content: [time] [3:45] -op close_instance: [thing] [] -op open_instance: [thing] [] -op string: [name] [thing] -op string: [color] [green] -op content: [time] [2:15] -op string: [hand] [left] -op string: [color] [blue] -op content: [time] [3:45] -op close_instance: [thing] [] -op open_instance: [thing] [] -op string: [name] [thing] -op string: [color] [green] -op content: [time] [2:15] -op string: [hand] [left] -op string: [color] [blue] -op content: [time] [3:45] -op close_instance: [thing] [] -op close_list: [thing] [] -op close_container: [data] [] -op close_container: [top] [] -op finish: [] [] -op flush: [] [] +op create: [] [] [0] +op open_container: [top] [] [0x4040010] +op open_container: [data] [] [0x4040010] +op string: [animal] [fish] [0] +op string: [animal] [fish] [0] +op open_list: [thing] [] [0] +op open_instance: [thing] [] [0x4040010] +op string: [name] [thing] [0x80] +op string: [color] [green] [0] +op content: [time] [2:15] [0] +op string: [hand] [left] [0] +op string: [color] [blue] [0] +op content: [time] [3:45] [0] +op close_instance: [thing] [] [0] +op open_instance: [thing] [] [0x4040010] +op string: [name] [thing] [0x80] +op string: [color] [green] [0] +op content: [time] [2:15] [0] +op string: [hand] [left] [0] +op string: [color] [blue] [0] +op content: [time] [3:45] [0] +op close_instance: [thing] [] [0] +op open_instance: [thing] [] [0x4040010] +op string: [name] [thing] [0x80] +op string: [color] [green] [0] +op content: [time] [2:15] [0] +op string: [hand] [left] [0] +op string: [color] [blue] [0] +op content: [time] [3:45] [0] +op close_instance: [thing] [] [0] +op open_instance: [thing] [] [0x4040010] +op string: [name] [thing] [0x80] +op string: [color] [green] [0] +op content: [time] [2:15] [0] +op string: [hand] [left] [0] +op string: [color] [blue] [0] +op content: [time] [3:45] [0] +op close_instance: [thing] [] [0] +op open_instance: [thing] [] [0x4040010] +op string: [name] [thing] [0x80] +op string: [color] [green] [0] +op content: [time] [2:15] [0] +op string: [hand] [left] [0] +op string: [color] [blue] [0] +op content: [time] [3:45] [0] +op close_instance: [thing] [] [0] +op open_instance: [thing] [] [0x4040010] +op string: [name] [thing] [0x80] +op string: [color] [green] [0] +op content: [time] [2:15] [0] +op string: [hand] [left] [0] +op string: [color] [blue] [0] +op content: [time] [3:45] [0] +op close_instance: [thing] [] [0] +op open_instance: [thing] [] [0x4040010] +op string: [name] [thing] [0x80] +op string: [color] [green] [0] +op content: [time] [2:15] [0] +op string: [hand] [left] [0] +op string: [color] [blue] [0] +op content: [time] [3:45] [0] +op close_instance: [thing] [] [0] +op open_instance: [thing] [] [0x4040010] +op string: [name] [thing] [0x80] +op string: [color] [green] [0] +op content: [time] [2:15] [0] +op string: [hand] [left] [0] +op string: [color] [blue] [0] +op content: [time] [3:45] [0] +op close_instance: [thing] [] [0] +op open_instance: [thing] [] [0x4040010] +op string: [name] [thing] [0x80] +op string: [color] [green] [0] +op content: [time] [2:15] [0] +op string: [hand] [left] [0] +op string: [color] [blue] [0] +op content: [time] [3:45] [0] +op close_instance: [thing] [] [0] +op open_instance: [thing] [] [0x4040010] +op string: [name] [thing] [0x80] +op string: [color] [green] [0] +op content: [time] [2:15] [0] +op string: [hand] [left] [0] +op string: [color] [blue] [0] +op content: [time] [3:45] [0] +op close_instance: [thing] [] [0] +op close_list: [thing] [] [0] +op close_container: [data] [] [0] +op close_container: [top] [] [0] +op finish: [] [] [0] +op flush: [] [] [0] diff --git a/contrib/libxo/tests/core/saved/test_12.H.out b/contrib/libxo/tests/core/saved/test_12.H.out index 5cbac17..2bd9a44 100644 --- a/contrib/libxo/tests/core/saved/test_12.H.out +++ b/contrib/libxo/tests/core/saved/test_12.H.out @@ -1 +1 @@ -
The
thing
is
green
til
02:15
My
left
hand is
blue
til
03:45
The
thing
is
green
til
02:15
My
left
hand is
blue
til
03:45
The
thing
is
green
til
02:15
My
left
hand is
blue
til
03:45
The
thing
is
green
til
02:15
My
left
hand is
blue
til
03:45
The
thing
is
green
til
02:15
My
left
hand is
blue
til
03:45
The
thing
is
green
til
02:15
My
left
hand is
blue
til
03:45
The
thing
is
green
til
02:15
My
left
hand is
blue
til
03:45
The
thing
is
green
til
02:15
My
left
hand is
blue
til
03:45
The
thing
is
green
til
02:15
My
left
hand is
blue
til
03:45
The
thing
is
green
til
02:15
My
left
hand is
blue
til
03:45
\ No newline at end of file +
Merry XMas!!
One
fish
, Two
fish
The
thing
is
green
til
02:15
My
left
hand is
blue
til
03:45
The
thing
is
green
til
02:15
My
left
hand is
blue
til
03:45
The
thing
is
green
til
02:15
My
left
hand is
blue
til
03:45
The
thing
is
green
til
02:15
My
left
hand is
blue
til
03:45
The
thing
is
green
til
02:15
My
left
hand is
blue
til
03:45
The
thing
is
green
til
02:15
My
left
hand is
blue
til
03:45
The
thing
is
green
til
02:15
My
left
hand is
blue
til
03:45
The
thing
is
green
til
02:15
My
left
hand is
blue
til
03:45
The
thing
is
green
til
02:15
My
left
hand is
blue
til
03:45
The
thing
is
green
til
02:15
My
left
hand is
blue
til
03:45
\ No newline at end of file diff --git a/contrib/libxo/tests/core/saved/test_12.HIPx.out b/contrib/libxo/tests/core/saved/test_12.HIPx.out index 9b5fea1..dab1975 100644 --- a/contrib/libxo/tests/core/saved/test_12.HIPx.out +++ b/contrib/libxo/tests/core/saved/test_12.HIPx.out @@ -1,160 +1,169 @@
+
Merry XMas!!
+
+
+
One
+
fish
+
, Two
+
fish
+
+
The
-
thing
+
thing
is
-
green
+
green
til
02:15
My
-
left
+
left
hand is
-
blue
+
blue
til
03:45
The
-
thing
+
thing
is
-
green
+
green
til
02:15
My
-
left
+
left
hand is
-
blue
+
blue
til
03:45
The
-
thing
+
thing
is
-
green
+
green
til
02:15
My
-
left
+
left
hand is
-
blue
+
blue
til
03:45
The
-
thing
+
thing
is
-
green
+
green
til
02:15
My
-
left
+
left
hand is
-
blue
+
blue
til
03:45
The
-
thing
+
thing
is
-
green
+
green
til
02:15
My
-
left
+
left
hand is
-
blue
+
blue
til
03:45
The
-
thing
+
thing
is
-
green
+
green
til
02:15
My
-
left
+
left
hand is
-
blue
+
blue
til
03:45
The
-
thing
+
thing
is
-
green
+
green
til
02:15
My
-
left
+
left
hand is
-
blue
+
blue
til
03:45
The
-
thing
+
thing
is
-
green
+
green
til
02:15
My
-
left
+
left
hand is
-
blue
+
blue
til
03:45
The
-
thing
+
thing
is
-
green
+
green
til
02:15
My
-
left
+
left
hand is
-
blue
+
blue
til
03:45
The
-
thing
+
thing
is
-
green
+
green
til
02:15
My
-
left
+
left
hand is
-
blue
+
blue
til
03:45
diff --git a/contrib/libxo/tests/core/saved/test_12.HP.out b/contrib/libxo/tests/core/saved/test_12.HP.out index 1e0e923..54e3dfb 100644 --- a/contrib/libxo/tests/core/saved/test_12.HP.out +++ b/contrib/libxo/tests/core/saved/test_12.HP.out @@ -1,160 +1,169 @@
+
Merry XMas!!
+
+
+
One
+
fish
+
, Two
+
fish
+
+
The
-
thing
+
thing
is
-
green
+
green
til
02:15
My
-
left
+
left
hand is
-
blue
+
blue
til
03:45
The
-
thing
+
thing
is
-
green
+
green
til
02:15
My
-
left
+
left
hand is
-
blue
+
blue
til
03:45
The
-
thing
+
thing
is
-
green
+
green
til
02:15
My
-
left
+
left
hand is
-
blue
+
blue
til
03:45
The
-
thing
+
thing
is
-
green
+
green
til
02:15
My
-
left
+
left
hand is
-
blue
+
blue
til
03:45
The
-
thing
+
thing
is
-
green
+
green
til
02:15
My
-
left
+
left
hand is
-
blue
+
blue
til
03:45
The
-
thing
+
thing
is
-
green
+
green
til
02:15
My
-
left
+
left
hand is
-
blue
+
blue
til
03:45
The
-
thing
+
thing
is
-
green
+
green
til
02:15
My
-
left
+
left
hand is
-
blue
+
blue
til
03:45
The
-
thing
+
thing
is
-
green
+
green
til
02:15
My
-
left
+
left
hand is
-
blue
+
blue
til
03:45
The
-
thing
+
thing
is
-
green
+
green
til
02:15
My
-
left
+
left
hand is
-
blue
+
blue
til
03:45
The
-
thing
+
thing
is
-
green
+
green
til
02:15
My
-
left
+
left
hand is
-
blue
+
blue
til
03:45
diff --git a/contrib/libxo/tests/core/saved/test_12.J.out b/contrib/libxo/tests/core/saved/test_12.J.out index 118bb76..7cfee6d 100644 --- a/contrib/libxo/tests/core/saved/test_12.J.out +++ b/contrib/libxo/tests/core/saved/test_12.J.out @@ -1,2 +1,2 @@ -{"top": {"data": {"thing": [{"name":"thing","color":"green","time":2:15,"hand":"left","color":"blue","time":3:45}, {"name":"thing","color":"green","time":2:15,"hand":"left","color":"blue","time":3:45}, {"name":"thing","color":"green","time":2:15,"hand":"left","color":"blue","time":3:45}, {"name":"thing","color":"green","time":2:15,"hand":"left","color":"blue","time":3:45}, {"name":"thing","color":"green","time":2:15,"hand":"left","color":"blue","time":3:45}, {"name":"thing","color":"green","time":2:15,"hand":"left","color":"blue","time":3:45}, {"name":"thing","color":"green","time":2:15,"hand":"left","color":"blue","time":3:45}, {"name":"thing","color":"green","time":2:15,"hand":"left","color":"blue","time":3:45}, {"name":"thing","color":"green","time":2:15,"hand":"left","color":"blue","time":3:45}, {"name":"thing","color":"green","time":2:15,"hand":"left","color":"blue","time":3:45}]}} +{"top": {"data": {"animal":"fish","animal":"fish", "thing": [{"name":"thing","color":"green","time":2:15,"hand":"left","color":"blue","time":3:45}, {"name":"thing","color":"green","time":2:15,"hand":"left","color":"blue","time":3:45}, {"name":"thing","color":"green","time":2:15,"hand":"left","color":"blue","time":3:45}, {"name":"thing","color":"green","time":2:15,"hand":"left","color":"blue","time":3:45}, {"name":"thing","color":"green","time":2:15,"hand":"left","color":"blue","time":3:45}, {"name":"thing","color":"green","time":2:15,"hand":"left","color":"blue","time":3:45}, {"name":"thing","color":"green","time":2:15,"hand":"left","color":"blue","time":3:45}, {"name":"thing","color":"green","time":2:15,"hand":"left","color":"blue","time":3:45}, {"name":"thing","color":"green","time":2:15,"hand":"left","color":"blue","time":3:45}, {"name":"thing","color":"green","time":2:15,"hand":"left","color":"blue","time":3:45}]}} } diff --git a/contrib/libxo/tests/core/saved/test_12.JP.out b/contrib/libxo/tests/core/saved/test_12.JP.out index 3e15e0d..f76ede1 100644 --- a/contrib/libxo/tests/core/saved/test_12.JP.out +++ b/contrib/libxo/tests/core/saved/test_12.JP.out @@ -1,6 +1,8 @@ { "top": { "data": { + "animal": "fish", + "animal": "fish", "thing": [ { "name": "thing", diff --git a/contrib/libxo/tests/core/saved/test_12.T.out b/contrib/libxo/tests/core/saved/test_12.T.out index 6f777c7..83a96a1 100644 --- a/contrib/libxo/tests/core/saved/test_12.T.out +++ b/contrib/libxo/tests/core/saved/test_12.T.out @@ -1,20 +1,22 @@ -The thing is green til 02:15 -My left hand is blue til 03:45 -The thing is green til 02:15 -My left hand is blue til 03:45 -The thing is green til 02:15 -My left hand is blue til 03:45 -The thing is green til 02:15 -My left hand is blue til 03:45 -The thing is green til 02:15 -My left hand is blue til 03:45 -The thing is green til 02:15 -My left hand is blue til 03:45 -The thing is green til 02:15 -My left hand is blue til 03:45 -The thing is green til 02:15 -My left hand is blue til 03:45 -The thing is green til 02:15 -My left hand is blue til 03:45 -The thing is green til 02:15 -My left hand is blue til 03:45 +Merry XMas!! +One fish, Two fish +The thing is green til 02:15 +My left hand is blue til 03:45 +The thing is green til 02:15 +My left hand is blue til 03:45 +The thing is green til 02:15 +My left hand is blue til 03:45 +The thing is green til 02:15 +My left hand is blue til 03:45 +The thing is green til 02:15 +My left hand is blue til 03:45 +The thing is green til 02:15 +My left hand is blue til 03:45 +The thing is green til 02:15 +My left hand is blue til 03:45 +The thing is green til 02:15 +My left hand is blue til 03:45 +The thing is green til 02:15 +My left hand is blue til 03:45 +The thing is green til 02:15 +My left hand is blue til 03:45 diff --git a/contrib/libxo/tests/core/saved/test_12.X.out b/contrib/libxo/tests/core/saved/test_12.X.out index ed2d8e4..28a30f7 100644 --- a/contrib/libxo/tests/core/saved/test_12.X.out +++ b/contrib/libxo/tests/core/saved/test_12.X.out @@ -1 +1 @@ -thinggreenleftbluethinggreenleftbluethinggreenleftbluethinggreenleftbluethinggreenleftbluethinggreenleftbluethinggreenleftbluethinggreenleftbluethinggreenleftbluethinggreenleftblue \ No newline at end of file +fishfishthinggreenleftbluethinggreenleftbluethinggreenleftbluethinggreenleftbluethinggreenleftbluethinggreenleftbluethinggreenleftbluethinggreenleftbluethinggreenleftbluethinggreenleftblue \ No newline at end of file diff --git a/contrib/libxo/tests/core/saved/test_12.XP.out b/contrib/libxo/tests/core/saved/test_12.XP.out index 73eec4c..37ef1bd 100644 --- a/contrib/libxo/tests/core/saved/test_12.XP.out +++ b/contrib/libxo/tests/core/saved/test_12.XP.out @@ -1,5 +1,7 @@ + fish + fish thing green -- cgit v1.1