Handle events in text interpolation; capture text events in choice lines; improve test script

test/tests/lazy boolean operators.lua

@@ -1,4 +1,12 @@
 local _={}
+_[65]={}
+_[64]={}
+_[63]={}
+_[62]={}
+_[61]={}
+_[60]={}
+_[59]={}
+_[58]={}
 _[57]={}
 _[56]={}
 _[55]={}
@@ -11,42 +19,42 @@ _[49]={}
 _[48]={}
 _[47]={}
 _[46]={}
-_[45]={}
-_[44]={}
-_[43]={}
-_[42]={}
-_[41]={}
-_[40]={}
-_[39]={}
-_[38]={}
-_[37]={data="0 = b b 0",tags=_[57]}
-_[36]={data="b",tags=_[56]}
-_[35]={data="b",tags=_[55]}
-_[34]={data="1 = a 1",tags=_[54]}
-_[33]={data="a",tags=_[53]}
-_[32]={data="1 = b a 1",tags=_[52]}
-_[31]={data="a",tags=_[51]}
-_[30]={data="b",tags=_[50]}
-_[29]={data="1 = a 1",tags=_[49]}
-_[28]={data="a",tags=_[48]}
-_[27]={data="0 = b 0",tags=_[47]}
-_[26]={data="b",tags=_[46]}
-_[25]={data="1 = a a 1",tags=_[45]}
-_[24]={data="a",tags=_[44]}
-_[23]={data="a",tags=_[43]}
-_[22]={data="0 = b 0",tags=_[42]}
-_[21]={data="b",tags=_[41]}
-_[20]={data="0 = a b 0",tags=_[40]}
-_[19]={data="b",tags=_[39]}
-_[18]={data="a",tags=_[38]}
-_[17]={_[35],_[36],_[37]}
-_[16]={_[33],_[34]}
-_[15]={_[30],_[31],_[32]}
-_[14]={_[28],_[29]}
-_[13]={_[26],_[27]}
-_[12]={_[23],_[24],_[25]}
-_[11]={_[21],_[22]}
-_[10]={_[18],_[19],_[20]}
+_[45]={tags=_[65],text=" = b b 0"}
+_[44]={tags=_[65],text="0"}
+_[43]={tags=_[64],text="b"}
+_[42]={tags=_[63],text="b"}
+_[41]={tags=_[62],text=" = a 1"}
+_[40]={tags=_[62],text="1"}
+_[39]={tags=_[61],text="a"}
+_[38]={tags=_[60],text=" = b a 1"}
+_[37]={tags=_[60],text="1"}
+_[36]={tags=_[59],text="a"}
+_[35]={tags=_[58],text="b"}
+_[34]={tags=_[57],text=" = a 1"}
+_[33]={tags=_[57],text="1"}
+_[32]={tags=_[56],text="a"}
+_[31]={tags=_[55],text=" = b 0"}
+_[30]={tags=_[55],text="0"}
+_[29]={tags=_[54],text="b"}
+_[28]={tags=_[53],text=" = a a 1"}
+_[27]={tags=_[53],text="1"}
+_[26]={tags=_[52],text="a"}
+_[25]={tags=_[51],text="a"}
+_[24]={tags=_[50],text=" = b 0"}
+_[23]={tags=_[50],text="0"}
+_[22]={tags=_[49],text="b"}
+_[21]={tags=_[48],text=" = a b 0"}
+_[20]={tags=_[48],text="0"}
+_[19]={tags=_[47],text="b"}
+_[18]={tags=_[46],text="a"}
+_[17]={_[42],_[43],_[44],_[45]}
+_[16]={_[39],_[40],_[41]}
+_[15]={_[35],_[36],_[37],_[38]}
+_[14]={_[32],_[33],_[34]}
+_[13]={_[29],_[30],_[31]}
+_[12]={_[25],_[26],_[27],_[28]}
+_[11]={_[22],_[23],_[24]}
+_[10]={_[18],_[19],_[20],_[21]}
 _[9]={"return"}
 _[8]={"text",_[17]}
 _[7]={"text",_[16]}
@@ -59,72 +67,96 @@ _[1]={"text",_[10]}
 return {_[1],_[2],_[3],_[4],_[5],_[6],_[7],_[8],_[9]}
 --[[
 { "text", { {
-      data = "a",
-      tags = {}
+      tags = {},
+      text = "a"
     }, {
-      data = "b",
-      tags = {}
+      tags = {},
+      text = "b"
     }, {
-      data = "0 = a b 0",
-      tags = {}
+      tags = <1>{},
+      text = "0"
+    }, {
+      tags = <table 1>,
+      text = " = a b 0"
     } } }
 { "text", { {
-      data = "b",
-      tags = {}
+      tags = {},
+      text = "b"
     }, {
-      data = "0 = b 0",
-      tags = {}
+      tags = <1>{},
+      text = "0"
+    }, {
+      tags = <table 1>,
+      text = " = b 0"
     } } }
 { "text", { {
-      data = "a",
-      tags = {}
+      tags = {},
+      text = "a"
     }, {
-      data = "a",
-      tags = {}
+      tags = {},
+      text = "a"
     }, {
-      data = "1 = a a 1",
-      tags = {}
+      tags = <1>{},
+      text = "1"
+    }, {
+      tags = <table 1>,
+      text = " = a a 1"
     } } }
 { "text", { {
-      data = "b",
-      tags = {}
+      tags = {},
+      text = "b"
     }, {
-      data = "0 = b 0",
-      tags = {}
+      tags = <1>{},
+      text = "0"
+    }, {
+      tags = <table 1>,
+      text = " = b 0"
     } } }
 { "text", { {
-      data = "a",
-      tags = {}
+      tags = {},
+      text = "a"
     }, {
-      data = "1 = a 1",
-      tags = {}
+      tags = <1>{},
+      text = "1"
+    }, {
+      tags = <table 1>,
+      text = " = a 1"
     } } }
 { "text", { {
-      data = "b",
-      tags = {}
+      tags = {},
+      text = "b"
     }, {
-      data = "a",
-      tags = {}
+      tags = {},
+      text = "a"
     }, {
-      data = "1 = b a 1",
-      tags = {}
+      tags = <1>{},
+      text = "1"
+    }, {
+      tags = <table 1>,
+      text = " = b a 1"
     } } }
 { "text", { {
-      data = "a",
-      tags = {}
+      tags = {},
+      text = "a"
     }, {
-      data = "1 = a 1",
-      tags = {}
+      tags = <1>{},
+      text = "1"
+    }, {
+      tags = <table 1>,
+      text = " = a 1"
     } } }
 { "text", { {
-      data = "b",
-      tags = {}
+      tags = {},
+      text = "b"
     }, {
-      data = "b",
-      tags = {}
+      tags = {},
+      text = "b"
     }, {
-      data = "0 = b b 0",
-      tags = {}
+      tags = <1>{},
+      text = "0"
+    }, {
+      tags = <table 1>,
+      text = " = b b 0"
     } } }
 { "return" }
 ]]--