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

test/run.lua

@@ -3,24 +3,38 @@ local anselme = require("anselme")
 local ser = require("test.ser")
 local inspect = require("test.inspect")
 
-local function format_text(t, prefix)
-	prefix = prefix or " "
+local function format_text(t)
 	local r = ""
 	for _, l in ipairs(t) do
-		r = r .. prefix
+		-- format tags display
 		local tags = ""
 		for k, v in pairs(l.tags) do
 			tags = tags .. ("[%q]=%q"):format(k, v)
 		end
+		-- build text
 		if tags ~= "" then
-			r = r .. ("[%s]%s"):format(tags, l.data)
+			r = r .. ("[%s]%s"):format(tags, l.text)
 		else
-			r = r .. l.data
+			r = r .. l.text
 		end
 	end
 	return r
 end
 
+--- remove unneeded things from a result table (namely private fields)
+local function strip(t, visited)
+	visited = visited or {}
+	for k, v in pairs(t) do
+		if type(k) == "string" and k:match("^_") then
+			t[k] = nil
+		end
+		if type(v) == "table" and not visited[v] then
+			visited[v] = true
+			strip(v, visited)
+		end
+	end
+end
+
 local function compare(a, b)
 	if type(a) == "table" and type(b) == "table" then
 		for k, v in pairs(a) do
@@ -63,14 +77,25 @@ while i <= #arg do
 	end
 end
 
--- list tests
-local files = {}
-for item in lfs.dir("test/tests/") do
-	if item:match("%.ans$") and item:match(args.filter or "") then
-		table.insert(files, "test/tests/"..item)
-	end
+if args.help then
+	print("Anselme test runner. Usage:")
+	print("  no arguments: perform included test suite")
+	print("  --script filename: test a script interactively")
+	print("  --game directory: test a game interactively")
+	print("  --help: display this message")
+	print("")
+	print("For test suite mode:")
+	print("  --filter pattern: only perform tests matching pattern")
+	print("  --write-all: rewrite all expected test results with current output")
+	print("  --write-new: write expected test results with current output for test that do not already have a saved expected output")
+	print("  --write-error: rewrite expected test results with current output for test with invalid output")
+	print("  --silent: silent output")
+	print("")
+	print("For script or game mode:")
+	print("  --lang code: load a language file")
+	print("  --save: print VM state at the end of the script")
+	os.exit()
 end
-table.sort(files)
 
 -- test script
 if args.script or args.game then
@@ -99,7 +124,9 @@ if args.script or args.game then
 				if t == "text" then
 					print(format_text(d))
 				elseif t == "choice" then
-					print(format_text(d, "\n> "))
+					for j, choice in ipairs(d) do
+						print(j.."> "..format_text(choice))
+					end
 					istate:choose(io.read())
 				elseif t == "error" then
 					print(t, d)
@@ -114,8 +141,19 @@ if args.script or args.game then
 	if args.save then
 		print(inspect(vm:save()))
 	end
--- run tests
+
+-- test mode
 else
+	-- list tests
+	local files = {}
+	for item in lfs.dir("test/tests/") do
+		if item:match("%.ans$") and item:match(args.filter or "") then
+			table.insert(files, "test/tests/"..item)
+		end
+	end
+	table.sort(files)
+
+	-- run tests
 	local total, success = #files, 0
 	for _, file in ipairs(files) do
 		local filebase = file:match("^(.*)%.ans$")
@@ -176,6 +214,8 @@ else
 			table.insert(result, { "error", err })
 		end
 
+		strip(result)
+
 		if args["write-all"] then
 			write_result(filebase, result)
 		else
@@ -190,6 +230,11 @@ else
 						print(inspect(output))
 						print("")
 					end
+					if args["write-error"] then
+						write_result(filebase, result)
+						print("Rewritten result file for "..filebase)
+						success = success + 1
+					end
 				else
 					success = success + 1
 				end
@@ -208,7 +253,7 @@ else
 			end
 		end
 	end
-	if args.write then
+	if args["write-all"] then
 		print("Wrote test results.")
 	else
 		print(("%s/%s tests success."):format(success, total))

test/tests/argument alias.lua

@@ -1,14 +1,22 @@
 local _={}
-_[5]={}
-_[4]={data="bibi = bibi",tags=_[5]}
-_[3]={_[4]}
+_[7]={}
+_[6]={tags=_[7],text="bibi"}
+_[5]={tags=_[7],text=" = "}
+_[4]={tags=_[7],text="bibi"}
+_[3]={_[4],_[5],_[6]}
 _[2]={"return"}
 _[1]={"text",_[3]}
 return {_[1],_[2]}
 --[[
 { "text", { {
-      data = "bibi = bibi",
-      tags = {}
+      tags = <1>{},
+      text = "bibi"
+    }, {
+      tags = <table 1>,
+      text = " = "
+    }, {
+      tags = <table 1>,
+      text = "bibi"
     } } }
 { "return" }
 ]]--

test/tests/binary operator overload.lua

@@ -2,9 +2,9 @@ local _={}
 _[13]={}
 _[12]={}
 _[11]={}
-_[10]={data="generic minus",tags=_[13]}
-_[9]={data="heh minus lol",tags=_[12]}
-_[8]={data="-3",tags=_[11]}
+_[10]={tags=_[13],text="generic minus"}
+_[9]={tags=_[12],text="heh minus lol"}
+_[8]={tags=_[11],text="-3"}
 _[7]={_[10]}
 _[6]={_[9]}
 _[5]={_[8]}
@@ -15,16 +15,16 @@ _[1]={"text",_[5]}
 return {_[1],_[2],_[3],_[4]}
 --[[
 { "text", { {
-      data = "-3",
-      tags = {}
+      tags = {},
+      text = "-3"
     } } }
 { "text", { {
-      data = "heh minus lol",
-      tags = {}
+      tags = {},
+      text = "heh minus lol"
     } } }
 { "text", { {
-      data = "generic minus",
-      tags = {}
+      tags = {},
+      text = "generic minus"
     } } }
 { "return" }
 ]]--

test/tests/checkpoint change.ans

@@ -0,0 +1,33 @@
+$ f
+	x
+	§ p
+		a
+
+		§ q
+			b
+
+		c
+
+	d
+
+From start:
+~ f
+
+From p checkpoint:
+~ f
+
+From q checkpoint:
+~ f
+
+From q checkpoint again:
+~ f
+
+Force p checkpoint:
+~ f.p()
+
+From q again:
+~ f
+
+Go to p again by setting checkpoint manually:
+~ f.checkpoint := "p"
+~ f

test/tests/checkpoint change.lua

@@ -0,0 +1,193 @@
+local _={}
+_[91]={}
+_[90]={}
+_[89]={}
+_[88]={}
+_[87]={}
+_[86]={}
+_[85]={}
+_[84]={}
+_[83]={}
+_[82]={}
+_[81]={}
+_[80]={}
+_[79]={}
+_[78]={}
+_[77]={}
+_[76]={}
+_[75]={}
+_[74]={}
+_[73]={}
+_[72]={}
+_[71]={}
+_[70]={}
+_[69]={}
+_[68]={}
+_[67]={}
+_[66]={}
+_[65]={tags=_[91],text="d"}
+_[64]={tags=_[90],text="c"}
+_[63]={tags=_[89],text="a"}
+_[62]={tags=_[88],text="Go to p again by setting checkpoint manually:"}
+_[61]={tags=_[87],text="d"}
+_[60]={tags=_[86],text="c"}
+_[59]={tags=_[85],text="b"}
+_[58]={tags=_[84],text="From q again:"}
+_[57]={tags=_[83],text="c"}
+_[56]={tags=_[82],text="a"}
+_[55]={tags=_[81],text="Force p checkpoint:"}
+_[54]={tags=_[80],text="d"}
+_[53]={tags=_[79],text="c"}
+_[52]={tags=_[78],text="b"}
+_[51]={tags=_[77],text="From q checkpoint again:"}
+_[50]={tags=_[76],text="d"}
+_[49]={tags=_[75],text="c"}
+_[48]={tags=_[74],text="b"}
+_[47]={tags=_[73],text="From q checkpoint:"}
+_[46]={tags=_[72],text="d"}
+_[45]={tags=_[71],text="c"}
+_[44]={tags=_[70],text="a"}
+_[43]={tags=_[69],text="From p checkpoint:"}
+_[42]={tags=_[68],text="d"}
+_[41]={tags=_[67],text="x"}
+_[40]={tags=_[66],text="From start:"}
+_[39]={_[65]}
+_[38]={_[64]}
+_[37]={_[62],_[63]}
+_[36]={_[61]}
+_[35]={_[60]}
+_[34]={_[58],_[59]}
+_[33]={_[57]}
+_[32]={_[55],_[56]}
+_[31]={_[54]}
+_[30]={_[53]}
+_[29]={_[51],_[52]}
+_[28]={_[50]}
+_[27]={_[49]}
+_[26]={_[47],_[48]}
+_[25]={_[46]}
+_[24]={_[45]}
+_[23]={_[43],_[44]}
+_[22]={_[42]}
+_[21]={_[40],_[41]}
+_[20]={"return"}
+_[19]={"text",_[39]}
+_[18]={"text",_[38]}
+_[17]={"text",_[37]}
+_[16]={"text",_[36]}
+_[15]={"text",_[35]}
+_[14]={"text",_[34]}
+_[13]={"text",_[33]}
+_[12]={"text",_[32]}
+_[11]={"text",_[31]}
+_[10]={"text",_[30]}
+_[9]={"text",_[29]}
+_[8]={"text",_[28]}
+_[7]={"text",_[27]}
+_[6]={"text",_[26]}
+_[5]={"text",_[25]}
+_[4]={"text",_[24]}
+_[3]={"text",_[23]}
+_[2]={"text",_[22]}
+_[1]={"text",_[21]}
+return {_[1],_[2],_[3],_[4],_[5],_[6],_[7],_[8],_[9],_[10],_[11],_[12],_[13],_[14],_[15],_[16],_[17],_[18],_[19],_[20]}
+--[[
+{ "text", { {
+      tags = {},
+      text = "From start:"
+    }, {
+      tags = {},
+      text = "x"
+    } } }
+{ "text", { {
+      tags = {},
+      text = "d"
+    } } }
+{ "text", { {
+      tags = {},
+      text = "From p checkpoint:"
+    }, {
+      tags = {},
+      text = "a"
+    } } }
+{ "text", { {
+      tags = {},
+      text = "c"
+    } } }
+{ "text", { {
+      tags = {},
+      text = "d"
+    } } }
+{ "text", { {
+      tags = {},
+      text = "From q checkpoint:"
+    }, {
+      tags = {},
+      text = "b"
+    } } }
+{ "text", { {
+      tags = {},
+      text = "c"
+    } } }
+{ "text", { {
+      tags = {},
+      text = "d"
+    } } }
+{ "text", { {
+      tags = {},
+      text = "From q checkpoint again:"
+    }, {
+      tags = {},
+      text = "b"
+    } } }
+{ "text", { {
+      tags = {},
+      text = "c"
+    } } }
+{ "text", { {
+      tags = {},
+      text = "d"
+    } } }
+{ "text", { {
+      tags = {},
+      text = "Force p checkpoint:"
+    }, {
+      tags = {},
+      text = "a"
+    } } }
+{ "text", { {
+      tags = {},
+      text = "c"
+    } } }
+{ "text", { {
+      tags = {},
+      text = "From q again:"
+    }, {
+      tags = {},
+      text = "b"
+    } } }
+{ "text", { {
+      tags = {},
+      text = "c"
+    } } }
+{ "text", { {
+      tags = {},
+      text = "d"
+    } } }
+{ "text", { {
+      tags = {},
+      text = "Go to p again by setting checkpoint manually:"
+    }, {
+      tags = {},
+      text = "a"
+    } } }
+{ "text", { {
+      tags = {},
+      text = "c"
+    } } }
+{ "text", { {
+      tags = {},
+      text = "d"
+    } } }
+{ "return" }
+]]--

test/tests/checkpoint reached seen.lua

@@ -1,19 +1,23 @@
 local _={}
+_[25]={}
+_[24]={}
+_[23]={}
+_[22]={}
 _[21]={}
-_[20]={}
-_[19]={}
-_[18]={}
-_[17]={}
-_[16]={data="Reached: 2",tags=_[21]}
-_[15]={data="Seen: 1",tags=_[20]}
-_[14]={data="seen!",tags=_[19]}
-_[13]={data="Reached: 1",tags=_[18]}
-_[12]={data="Seen: 0",tags=_[17]}
-_[11]={_[16]}
-_[10]={_[15]}
-_[9]={_[14]}
-_[8]={_[13]}
-_[7]={_[12]}
+_[20]={tags=_[25],text="2"}
+_[19]={tags=_[25],text="Reached: "}
+_[18]={tags=_[24],text="1"}
+_[17]={tags=_[24],text="Seen: "}
+_[16]={tags=_[23],text="seen!"}
+_[15]={tags=_[22],text="1"}
+_[14]={tags=_[22],text="Reached: "}
+_[13]={tags=_[21],text="0"}
+_[12]={tags=_[21],text="Seen: "}
+_[11]={_[19],_[20]}
+_[10]={_[17],_[18]}
+_[9]={_[16]}
+_[8]={_[14],_[15]}
+_[7]={_[12],_[13]}
 _[6]={"return"}
 _[5]={"text",_[11]}
 _[4]={"text",_[10]}
@@ -23,24 +27,36 @@ _[1]={"text",_[7]}
 return {_[1],_[2],_[3],_[4],_[5],_[6]}
 --[[
 { "text", { {
-      data = "Seen: 0",
-      tags = {}
+      tags = <1>{},
+      text = "Seen: "
+    }, {
+      tags = <table 1>,
+      text = "0"
     } } }
 { "text", { {
-      data = "Reached: 1",
-      tags = {}
+      tags = <1>{},
+      text = "Reached: "
+    }, {
+      tags = <table 1>,
+      text = "1"
     } } }
 { "text", { {
-      data = "seen!",
-      tags = {}
+      tags = {},
+      text = "seen!"
     } } }
 { "text", { {
-      data = "Seen: 1",
-      tags = {}
+      tags = <1>{},
+      text = "Seen: "
+    }, {
+      tags = <table 1>,
+      text = "1"
     } } }
 { "text", { {
-      data = "Reached: 2",
-      tags = {}
+      tags = <1>{},
+      text = "Reached: "
+    }, {
+      tags = <table 1>,
+      text = "2"
     } } }
 { "return" }
 ]]--

test/tests/choice block.lua

@@ -1,16 +1,18 @@
 local _={}
+_[23]={}
+_[22]={}
 _[21]={}
-_[20]={}
-_[19]={}
+_[20]={tags=_[23],text="oh"}
+_[19]={tags=_[21],text="ho"}
 _[18]={}
-_[17]={}
-_[16]={}
-_[15]={data="plop",tags=_[21]}
-_[14]={data="oh",tags=_[20]}
-_[13]={data="ho",tags=_[19]}
-_[12]={data="ok",tags=_[18]}
-_[11]={data="ne",tags=_[17]}
-_[10]={data="ye",tags=_[16]}
+_[17]={tags=_[18],text="ne"}
+_[16]={tags=_[22],text="ye"}
+_[15]={tags=_[21],text="plop"}
+_[14]={_[20]}
+_[13]={_[19]}
+_[12]={tags=_[18],text="ok"}
+_[11]={_[17]}
+_[10]={_[16]}
 _[9]={_[15]}
 _[8]={_[13],_[14]}
 _[7]={_[12]}
@@ -22,27 +24,27 @@ _[2]={"text",_[7]}
 _[1]={"choice",_[6]}
 return {_[1],_[2],_[3],_[4],_[5]}
 --[[
-{ "choice", { {
-      data = "ye",
-      tags = {}
-    }, {
-      data = "ne",
-      tags = {}
-    } } }
+{ "choice", { { {
+        tags = {},
+        text = "ye"
+      } }, { {
+        tags = {},
+        text = "ne"
+      } } } }
 { "text", { {
-      data = "ok",
-      tags = {}
-    } } }
-{ "choice", { {
-      data = "ho",
-      tags = {}
-    }, {
-      data = "oh",
-      tags = {}
+      tags = {},
+      text = "ok"
     } } }
+{ "choice", { { {
+        tags = {},
+        text = "ho"
+      } }, { {
+        tags = {},
+        text = "oh"
+      } } } }
 { "text", { {
-      data = "plop",
-      tags = {}
+      tags = {},
+      text = "plop"
     } } }
 { "return" }
 ]]--

test/tests/choice function.lua

@@ -1,14 +1,17 @@
 local _={}
+_[18]={}
+_[17]={}
+_[16]={}
 _[15]={}
-_[14]={}
-_[13]={}
-_[12]={}
-_[11]={}
-_[10]={data="ok",tags=_[15]}
-_[9]={data="neol",tags=_[14]}
-_[8]={data="oh",tags=_[13]}
-_[7]={data="neol",tags=_[12]}
-_[6]={data="ho",tags=_[11]}
+_[14]={tags=_[18],text="neol"}
+_[13]={tags=_[15],text="oh"}
+_[12]={tags=_[17],text="neol"}
+_[11]={tags=_[16],text="ho"}
+_[10]={tags=_[15],text="ok"}
+_[9]={_[14]}
+_[8]={_[13]}
+_[7]={_[12]}
+_[6]={_[11]}
 _[5]={_[10]}
 _[4]={_[6],_[7],_[8],_[9]}
 _[3]={"return"}
@@ -16,22 +19,22 @@ _[2]={"text",_[5]}
 _[1]={"choice",_[4]}
 return {_[1],_[2],_[3]}
 --[[
-{ "choice", { {
-      data = "ho",
-      tags = {}
-    }, {
-      data = "neol",
-      tags = {}
-    }, {
-      data = "oh",
-      tags = {}
-    }, {
-      data = "neol",
-      tags = {}
-    } } }
+{ "choice", { { {
+        tags = {},
+        text = "ho"
+      } }, { {
+        tags = {},
+        text = "neol"
+      } }, { {
+        tags = {},
+        text = "oh"
+      } }, { {
+        tags = {},
+        text = "neol"
+      } } } }
 { "text", { {
-      data = "ok",
-      tags = {}
+      tags = {},
+      text = "ok"
     } } }
 { "return" }
 ]]--

test/tests/choice line interpolation with choice event.ans

@@ -0,0 +1,10 @@
+~ choose(1)
+> Press {jump button} to jump.
+	ok
+> No
+	ko
+
+$ jump button
+	A # 1
+	> Suprise choice!
+	@"JOIN"

test/tests/choice line interpolation with choice event.lua

@@ -0,0 +1,47 @@
+local _={}
+_[19]={}
+_[18]={}
+_[17]={1}
+_[16]={}
+_[15]={text="No",tags=_[19]}
+_[14]={text=" to jump.",tags=_[16]}
+_[13]={text="JOIN",tags=_[16]}
+_[12]={text="Suprise choice!",tags=_[18]}
+_[11]={text="A",tags=_[17]}
+_[10]={text="Press ",tags=_[16]}
+_[9]={text="ok",tags=_[16]}
+_[8]={_[15]}
+_[7]={_[12],_[13],_[14]}
+_[6]={_[10],_[11]}
+_[5]={_[9]}
+_[4]={_[6],_[7],_[8]}
+_[3]={"return"}
+_[2]={"text",_[5]}
+_[1]={"choice",_[4]}
+return {_[1],_[2],_[3]}
+--[[
+{ "choice", { { {
+        tags = <1>{},
+        text = "Press "
+      }, {
+        tags = { 1 },
+        text = "A"
+      } }, { {
+        tags = {},
+        text = "Suprise choice!"
+      }, {
+        tags = <table 1>,
+        text = "JOIN"
+      }, {
+        tags = <table 1>,
+        text = " to jump."
+      } }, { {
+        tags = {},
+        text = "No"
+      } } } }
+{ "text", { {
+      tags = {},
+      text = "ok"
+    } } }
+{ "return" }
+]]--

test/tests/choice line interpolation with event flush.ans

@@ -0,0 +1,11 @@
+~ choose(1)
+> Press {jump button} to jump.
+	ok
+	~ choose(1)
+> No
+	ko
+
+$ jump button
+	A # 1
+
+	@"SPLIT"

test/tests/choice line interpolation with event flush.lua

@@ -0,0 +1,55 @@
+local _={}
+_[22]={}
+_[21]={1}
+_[20]={tags=_[22],text="No"}
+_[19]={text=" to jump."}
+_[18]={text="SPLIT"}
+_[17]={}
+_[16]={tags=_[21],text="A"}
+_[15]={tags=_[17],text="Press "}
+_[14]={tags=_[17],text="ok"}
+_[13]={_[20]}
+_[12]={_[18],_[19]}
+_[11]={tags=_[17],text="ok"}
+_[10]={_[15],_[16]}
+_[9]={_[14]}
+_[8]={_[12],_[13]}
+_[7]={_[11]}
+_[6]={_[10]}
+_[5]={"return"}
+_[4]={"text",_[9]}
+_[3]={"choice",_[8]}
+_[2]={"text",_[7]}
+_[1]={"choice",_[6]}
+_[0]={_[1],_[2],_[3],_[4],_[5]}
+_[18].tags=_[17]
+_[19].tags=_[17]
+return _[0]
+--[[
+{ "choice", { { {
+        tags = {},
+        text = "Press "
+      }, {
+        tags = { 1 },
+        text = "A"
+      } } } }
+{ "text", { {
+      tags = {},
+      text = "ok"
+    } } }
+{ "choice", { { {
+        tags = <1>{},
+        text = "SPLIT"
+      }, {
+        tags = <table 1>,
+        text = " to jump."
+      } }, { {
+        tags = {},
+        text = "No"
+      } } } }
+{ "text", { {
+      tags = {},
+      text = "ok"
+    } } }
+{ "return" }
+]]--

test/tests/choice line interpolation with text event.ans

@@ -0,0 +1,18 @@
+> Press {jump button} to jump.
+	ok
+> No
+	ko
+~ choose(1)
+
+$ jump button
+	A # 1
+
+> Other
+	ko
+> Use {move axis} to move.
+	ok
+~ choose(2)
+
+$ move axis
+	left # 1
+	@" joystick"

test/tests/choice line interpolation with text event.lua

@@ -0,0 +1,72 @@
+local _={}
+_[30]={1}
+_[29]={}
+_[28]={}
+_[27]={1}
+_[26]={}
+_[25]={tags=_[26],text=" to move."}
+_[24]={tags=_[26],text=" joystick"}
+_[23]={tags=_[30],text="left"}
+_[22]={tags=_[26],text="Use "}
+_[21]={tags=_[29],text="Other"}
+_[20]={}
+_[19]={tags=_[28],text="No"}
+_[18]={tags=_[20],text=" to jump."}
+_[17]={tags=_[27],text="A"}
+_[16]={tags=_[20],text="Press "}
+_[15]={tags=_[26],text="ok"}
+_[14]={_[22],_[23],_[24],_[25]}
+_[13]={_[21]}
+_[12]={tags=_[20],text="ok"}
+_[11]={_[19]}
+_[10]={_[16],_[17],_[18]}
+_[9]={_[15]}
+_[8]={_[13],_[14]}
+_[7]={_[12]}
+_[6]={_[10],_[11]}
+_[5]={"return"}
+_[4]={"text",_[9]}
+_[3]={"choice",_[8]}
+_[2]={"text",_[7]}
+_[1]={"choice",_[6]}
+return {_[1],_[2],_[3],_[4],_[5]}
+--[[
+{ "choice", { { {
+        tags = <1>{},
+        text = "Press "
+      }, {
+        tags = { 1 },
+        text = "A"
+      }, {
+        tags = <table 1>,
+        text = " to jump."
+      } }, { {
+        tags = {},
+        text = "No"
+      } } } }
+{ "text", { {
+      tags = {},
+      text = "ok"
+    } } }
+{ "choice", { { {
+        tags = {},
+        text = "Other"
+      } }, { {
+        tags = <1>{},
+        text = "Use "
+      }, {
+        tags = { 1 },
+        text = "left"
+      }, {
+        tags = <table 1>,
+        text = " joystick"
+      }, {
+        tags = <table 1>,
+        text = " to move."
+      } } } }
+{ "text", { {
+      tags = {},
+      text = "ok"
+    } } }
+{ "return" }
+]]--

test/tests/choice preserve tags.lua

@@ -1,17 +1,21 @@
 local _={}
-_[26]={}
-_[25]={k="v"}
-_[24]={42,k="v"}
-_[23]={}
-_[22]={42}
-_[21]={data="f",tags=_[26]}
-_[20]={data="e",tags=_[25]}
-_[19]={data="b",tags=_[24]}
-_[18]={data="d",tags=_[25]}
-_[17]={data="a",tags=_[24]}
-_[16]={data="b",tags=_[22]}
-_[15]={data="c",tags=_[23]}
-_[14]={data="a",tags=_[22]}
+_[30]={}
+_[29]={}
+_[28]={k="v"}
+_[27]={42,k="v"}
+_[26]={tags=_[28],text="d"}
+_[25]={tags=_[27],text="a"}
+_[24]={42}
+_[23]={tags=_[30],text="c"}
+_[22]={tags=_[24],text="a"}
+_[21]={tags=_[29],text="f"}
+_[20]={tags=_[28],text="e"}
+_[19]={tags=_[27],text="b"}
+_[18]={_[26]}
+_[17]={_[25]}
+_[16]={tags=_[24],text="b"}
+_[15]={_[23]}
+_[14]={_[22]}
 _[13]={_[21]}
 _[12]={_[20]}
 _[11]={_[19]}
@@ -27,43 +31,43 @@ _[2]={"text",_[9]}
 _[1]={"choice",_[8]}
 return {_[1],_[2],_[3],_[4],_[5],_[6],_[7]}
 --[[
-{ "choice", { {
-      data = "a",
-      tags = { 42 }
-    }, {
-      data = "c",
-      tags = {}
-    } } }
+{ "choice", { { {
+        tags = { 42 },
+        text = "a"
+      } }, { {
+        tags = {},
+        text = "c"
+      } } } }
 { "text", { {
-      data = "b",
-      tags = { 42 }
+      tags = { 42 },
+      text = "b"
     } } }
-{ "choice", { {
-      data = "a",
+{ "choice", { { {
+        tags = { 42,
+          k = "v"
+        },
+        text = "a"
+      } }, { {
+        tags = {
+          k = "v"
+        },
+        text = "d"
+      } } } }
+{ "text", { {
       tags = { 42,
         k = "v"
-      }
-    }, {
-      data = "d",
+      },
+      text = "b"
+    } } }
+{ "text", { {
       tags = {
         k = "v"
-      }
+      },
+      text = "e"
     } } }
 { "text", { {
-      data = "b",
-      tags = { 42,
-        k = "v"
-      }
-    } } }
-{ "text", { {
-      data = "e",
-      tags = {
-        k = "v"
-      }
-    } } }
-{ "text", { {
-      data = "f",
-      tags = {}
+      tags = {},
+      text = "f"
     } } }
 { "return" }
 ]]--

test/tests/choice simple.lua

@@ -1,10 +1,11 @@
 local _={}
+_[12]={}
 _[11]={}
-_[10]={}
-_[9]={}
-_[8]={data="ok",tags=_[11]}
-_[7]={data="ne",tags=_[10]}
-_[6]={data="ye",tags=_[9]}
+_[10]={tags=_[11],text="ne"}
+_[9]={tags=_[12],text="ye"}
+_[8]={tags=_[11],text="ok"}
+_[7]={_[10]}
+_[6]={_[9]}
 _[5]={_[8]}
 _[4]={_[6],_[7]}
 _[3]={"return"}
@@ -12,16 +13,16 @@ _[2]={"text",_[5]}
 _[1]={"choice",_[4]}
 return {_[1],_[2],_[3]}
 --[[
-{ "choice", { {
-      data = "ye",
-      tags = {}
-    }, {
-      data = "ne",
-      tags = {}
-    } } }
+{ "choice", { { {
+        tags = {},
+        text = "ye"
+      } }, { {
+        tags = {},
+        text = "ne"
+      } } } }
 { "text", { {
-      data = "ok",
-      tags = {}
+      tags = {},
+      text = "ok"
     } } }
 { "return" }
 ]]--

test/tests/commit.lua

@@ -1,16 +1,20 @@
 local _={}
-_[17]={}
-_[16]={}
-_[15]={}
-_[14]={}
-_[13]={data="parallel: 2",tags=_[17]}
-_[12]={data="after: 2",tags=_[16]}
-_[11]={data="parallel: 5",tags=_[15]}
-_[10]={data="before: 2",tags=_[14]}
-_[9]={_[13]}
-_[8]={_[12]}
-_[7]={_[11]}
-_[6]={_[10]}
+_[21]={}
+_[20]={}
+_[19]={}
+_[18]={}
+_[17]={tags=_[21],text="2"}
+_[16]={tags=_[21],text="parallel: "}
+_[15]={tags=_[20],text="2"}
+_[14]={tags=_[20],text="after: "}
+_[13]={tags=_[19],text="5"}
+_[12]={tags=_[19],text="parallel: "}
+_[11]={tags=_[18],text="2"}
+_[10]={tags=_[18],text="before: "}
+_[9]={_[16],_[17]}
+_[8]={_[14],_[15]}
+_[7]={_[12],_[13]}
+_[6]={_[10],_[11]}
 _[5]={"return"}
 _[4]={"text",_[9]}
 _[3]={"text",_[8]}
@@ -19,20 +23,32 @@ _[1]={"text",_[6]}
 return {_[1],_[2],_[3],_[4],_[5]}
 --[[
 { "text", { {
-      data = "before: 2",
-      tags = {}
+      tags = <1>{},
+      text = "before: "
+    }, {
+      tags = <table 1>,
+      text = "2"
     } } }
 { "text", { {
-      data = "parallel: 5",
-      tags = {}
+      tags = <1>{},
+      text = "parallel: "
+    }, {
+      tags = <table 1>,
+      text = "5"
     } } }
 { "text", { {
-      data = "after: 2",
-      tags = {}
+      tags = <1>{},
+      text = "after: "
+    }, {
+      tags = <table 1>,
+      text = "2"
     } } }
 { "text", { {
-      data = "parallel: 2",
-      tags = {}
+      tags = <1>{},
+      text = "parallel: "
+    }, {
+      tags = <table 1>,
+      text = "2"
     } } }
 { "return" }
 ]]--

test/tests/condition decorator.lua

@@ -1,19 +1,19 @@
 local _={}
 _[7]={}
 _[6]={}
-_[5]={data="ok bis",tags=_[7]}
-_[4]={data="ok",tags=_[6]}
+_[5]={tags=_[7],text="ok bis"}
+_[4]={tags=_[6],text="ok"}
 _[3]={_[4],_[5]}
 _[2]={"return"}
 _[1]={"text",_[3]}
 return {_[1],_[2]}
 --[[
 { "text", { {
-      data = "ok",
-      tags = {}
+      tags = {},
+      text = "ok"
     }, {
-      data = "ok bis",
-      tags = {}
+      tags = {},
+      text = "ok bis"
     } } }
 { "return" }
 ]]--

test/tests/condition else false.lua

@@ -1,14 +1,14 @@
 local _={}
 _[5]={}
-_[4]={data="ok",tags=_[5]}
+_[4]={tags=_[5],text="ok"}
 _[3]={_[4]}
 _[2]={"return"}
 _[1]={"text",_[3]}
 return {_[1],_[2]}
 --[[
 { "text", { {
-      data = "ok",
-      tags = {}
+      tags = {},
+      text = "ok"
     } } }
 { "return" }
 ]]--

test/tests/condition else true.lua

@@ -1,14 +1,14 @@
 local _={}
 _[5]={}
-_[4]={data="ok",tags=_[5]}
+_[4]={tags=_[5],text="ok"}
 _[3]={_[4]}
 _[2]={"return"}
 _[1]={"text",_[3]}
 return {_[1],_[2]}
 --[[
 { "text", { {
-      data = "ok",
-      tags = {}
+      tags = {},
+      text = "ok"
     } } }
 { "return" }
 ]]--

test/tests/condition elseif false.lua

@@ -1,14 +1,14 @@
 local _={}
 _[5]={}
-_[4]={data="ok",tags=_[5]}
+_[4]={tags=_[5],text="ok"}
 _[3]={_[4]}
 _[2]={"return"}
 _[1]={"text",_[3]}
 return {_[1],_[2]}
 --[[
 { "text", { {
-      data = "ok",
-      tags = {}
+      tags = {},
+      text = "ok"
     } } }
 { "return" }
 ]]--

test/tests/condition elseif true.lua

@@ -1,14 +1,14 @@
 local _={}
 _[5]={}
-_[4]={data="ok",tags=_[5]}
+_[4]={tags=_[5],text="ok"}
 _[3]={_[4]}
 _[2]={"return"}
 _[1]={"text",_[3]}
 return {_[1],_[2]}
 --[[
 { "text", { {
-      data = "ok",
-      tags = {}
+      tags = {},
+      text = "ok"
     } } }
 { "return" }
 ]]--

test/tests/condition true.lua

@@ -1,14 +1,14 @@
 local _={}
 _[5]={}
-_[4]={data="ok",tags=_[5]}
+_[4]={tags=_[5],text="ok"}
 _[3]={_[4]}
 _[2]={"return"}
 _[1]={"text",_[3]}
 return {_[1],_[2]}
 --[[
 { "text", { {
-      data = "ok",
-      tags = {}
+      tags = {},
+      text = "ok"
     } } }
 { "return" }
 ]]--

test/tests/custom event.lua

@@ -1,8 +1,8 @@
 local _={}
 _[8]={}
 _[7]={}
-_[6]={data="ho",tags=_[8]}
-_[5]={data="ah",tags=_[7]}
+_[6]={tags=_[8],text="ho"}
+_[5]={tags=_[7],text="ah"}
 _[4]={_[5],_[6]}
 _[3]={"return"}
 _[2]={"text",_[4]}
@@ -11,11 +11,11 @@ return {_[1],_[2],_[3]}
 --[[
 { "wait", 5 }
 { "text", { {
-      data = "ah",
-      tags = {}
+      tags = {},
+      text = "ah"
     }, {
-      data = "ho",
-      tags = {}
+      tags = {},
+      text = "ho"
     } } }
 { "return" }
 ]]--

test/tests/custom text formatting.lua

@@ -1,14 +1,14 @@
 local _={}
 _[5]={}
-_[4]={data="Name: Darmanin\nAge: 38",tags=_[5]}
+_[4]={tags=_[5],text="Name: Darmanin\nAge: 38"}
 _[3]={_[4]}
 _[2]={"return"}
 _[1]={"text",_[3]}
 return {_[1],_[2]}
 --[[
 { "text", { {
-      data = "Name: Darmanin\nAge: 38",
-      tags = {}
+      tags = {},
+      text = "Name: Darmanin\nAge: 38"
     } } }
 { "return" }
 ]]--

test/tests/equality operator.lua

@@ -1,28 +1,36 @@
 local _={}
-_[33]={}
-_[32]={}
-_[31]={}
-_[30]={}
-_[29]={}
-_[28]={}
-_[27]={}
-_[26]={}
-_[25]={data="1 = 1",tags=_[33]}
-_[24]={data="0 = 0",tags=_[32]}
-_[23]={data="0 = 0",tags=_[31]}
-_[22]={data="0 = 0",tags=_[30]}
-_[21]={data="0 = 0",tags=_[29]}
-_[20]={data="1 = 1",tags=_[28]}
-_[19]={data="0 = 0",tags=_[27]}
-_[18]={data="0 = 0",tags=_[26]}
-_[17]={_[25]}
-_[16]={_[24]}
-_[15]={_[23]}
-_[14]={_[22]}
-_[13]={_[21]}
-_[12]={_[20]}
-_[11]={_[19]}
-_[10]={_[18]}
+_[41]={}
+_[40]={}
+_[39]={}
+_[38]={}
+_[37]={}
+_[36]={}
+_[35]={}
+_[34]={}
+_[33]={tags=_[41],text="1"}
+_[32]={tags=_[41],text="1 = "}
+_[31]={tags=_[40],text="0"}
+_[30]={tags=_[40],text="0 = "}
+_[29]={tags=_[39],text="0"}
+_[28]={tags=_[39],text="0 = "}
+_[27]={tags=_[38],text="0"}
+_[26]={tags=_[38],text="0 = "}
+_[25]={tags=_[37],text="0"}
+_[24]={tags=_[37],text="0 = "}
+_[23]={tags=_[36],text="1"}
+_[22]={tags=_[36],text="1 = "}
+_[21]={tags=_[35],text="0"}
+_[20]={tags=_[35],text="0 = "}
+_[19]={tags=_[34],text="0"}
+_[18]={tags=_[34],text="0 = "}
+_[17]={_[32],_[33]}
+_[16]={_[30],_[31]}
+_[15]={_[28],_[29]}
+_[14]={_[26],_[27]}
+_[13]={_[24],_[25]}
+_[12]={_[22],_[23]}
+_[11]={_[20],_[21]}
+_[10]={_[18],_[19]}
 _[9]={"return"}
 _[8]={"text",_[17]}
 _[7]={"text",_[16]}
@@ -35,36 +43,60 @@ _[1]={"text",_[10]}
 return {_[1],_[2],_[3],_[4],_[5],_[6],_[7],_[8],_[9]}
 --[[
 { "text", { {
-      data = "0 = 0",
-      tags = {}
+      tags = <1>{},
+      text = "0 = "
+    }, {
+      tags = <table 1>,
+      text = "0"
     } } }
 { "text", { {
-      data = "0 = 0",
-      tags = {}
+      tags = <1>{},
+      text = "0 = "
+    }, {
+      tags = <table 1>,
+      text = "0"
     } } }
 { "text", { {
-      data = "1 = 1",
-      tags = {}
+      tags = <1>{},
+      text = "1 = "
+    }, {
+      tags = <table 1>,
+      text = "1"
     } } }
 { "text", { {
-      data = "0 = 0",
-      tags = {}
+      tags = <1>{},
+      text = "0 = "
+    }, {
+      tags = <table 1>,
+      text = "0"
     } } }
 { "text", { {
-      data = "0 = 0",
-      tags = {}
+      tags = <1>{},
+      text = "0 = "
+    }, {
+      tags = <table 1>,
+      text = "0"
     } } }
 { "text", { {
-      data = "0 = 0",
-      tags = {}
+      tags = <1>{},
+      text = "0 = "
+    }, {
+      tags = <table 1>,
+      text = "0"
     } } }
 { "text", { {
-      data = "0 = 0",
-      tags = {}
+      tags = <1>{},
+      text = "0 = "
+    }, {
+      tags = <table 1>,
+      text = "0"
     } } }
 { "text", { {
-      data = "1 = 1",
-      tags = {}
+      tags = <1>{},
+      text = "1 = "
+    }, {
+      tags = <table 1>,
+      text = "1"
     } } }
 { "return" }
 ]]--

test/tests/flush.lua

@@ -1,12 +1,14 @@
 local _={}
-_[17]={}
+_[19]={}
+_[18]={}
+_[17]={tags=_[19],text="d"}
 _[16]={}
-_[15]={}
+_[15]={tags=_[18],text="b"}
 _[14]={}
-_[13]={data="d",tags=_[17]}
-_[12]={data="c",tags=_[16]}
-_[11]={data="b",tags=_[15]}
-_[10]={data="a",tags=_[14]}
+_[13]={_[17]}
+_[12]={tags=_[16],text="c"}
+_[11]={_[15]}
+_[10]={tags=_[14],text="a"}
 _[9]={_[13]}
 _[8]={_[12]}
 _[7]={_[11]}
@@ -19,20 +21,20 @@ _[1]={"text",_[6]}
 return {_[1],_[2],_[3],_[4],_[5]}
 --[[
 { "text", { {
-      data = "a",
-      tags = {}
-    } } }
-{ "choice", { {
-      data = "b",
-      tags = {}
+      tags = {},
+      text = "a"
     } } }
+{ "choice", { { {
+        tags = {},
+        text = "b"
+      } } } }
 { "text", { {
-      data = "c",
-      tags = {}
-    } } }
-{ "choice", { {
-      data = "d",
-      tags = {}
+      tags = {},
+      text = "c"
     } } }
+{ "choice", { { {
+        tags = {},
+        text = "d"
+      } } } }
 { "return" }
 ]]--

test/tests/function alias.lua

@@ -1,22 +1,38 @@
 local _={}
-_[9]={}
-_[8]={}
-_[7]={data="ye = ye",tags=_[9]}
-_[6]={data="ok = ok",tags=_[8]}
-_[5]={_[7]}
-_[4]={_[6]}
+_[13]={}
+_[12]={}
+_[11]={tags=_[13],text="ye"}
+_[10]={tags=_[13],text=" = "}
+_[9]={tags=_[13],text="ye"}
+_[8]={tags=_[12],text="ok"}
+_[7]={tags=_[12],text=" = "}
+_[6]={tags=_[12],text="ok"}
+_[5]={_[9],_[10],_[11]}
+_[4]={_[6],_[7],_[8]}
 _[3]={"return"}
 _[2]={"text",_[5]}
 _[1]={"text",_[4]}
 return {_[1],_[2],_[3]}
 --[[
 { "text", { {
-      data = "ok = ok",
-      tags = {}
+      tags = <1>{},
+      text = "ok"
+    }, {
+      tags = <table 1>,
+      text = " = "
+    }, {
+      tags = <table 1>,
+      text = "ok"
     } } }
 { "text", { {
-      data = "ye = ye",
-      tags = {}
+      tags = <1>{},
+      text = "ye"
+    }, {
+      tags = <table 1>,
+      text = " = "
+    }, {
+      tags = <table 1>,
+      text = "ye"
     } } }
 { "return" }
 ]]--

test/tests/function arg vararg.lua

@@ -1,19 +1,19 @@
 local _={}
 _[7]={}
 _[6]={}
-_[5]={data="[o, k]",tags=_[7]}
-_[4]={data="ok",tags=_[6]}
+_[5]={tags=_[7],text="[o, k]"}
+_[4]={tags=_[6],text="ok"}
 _[3]={_[4],_[5]}
 _[2]={"return"}
 _[1]={"text",_[3]}
 return {_[1],_[2]}
 --[[
 { "text", { {
-      data = "ok",
-      tags = {}
+      tags = {},
+      text = "ok"
     }, {
-      data = "[o, k]",
-      tags = {}
+      tags = {},
+      text = "[o, k]"
     } } }
 { "return" }
 ]]--

test/tests/function arg.lua

@@ -1,14 +1,14 @@
 local _={}
 _[5]={}
-_[4]={data="ok",tags=_[5]}
+_[4]={tags=_[5],text="ok"}
 _[3]={_[4]}
 _[2]={"return"}
 _[1]={"text",_[3]}
 return {_[1],_[2]}
 --[[
 { "text", { {
-      data = "ok",
-      tags = {}
+      tags = {},
+      text = "ok"
     } } }
 { "return" }
 ]]--

test/tests/function args vararg empty.lua

@@ -1,19 +1,23 @@
 local _={}
+_[8]={}
 _[7]={}
-_[6]={}
-_[5]={data="[]",tags=_[7]}
-_[4]={data="ok",tags=_[6]}
-_[3]={_[4],_[5]}
+_[6]={tags=_[8],text="[]"}
+_[5]={tags=_[7],text="k"}
+_[4]={tags=_[7],text="o"}
+_[3]={_[4],_[5],_[6]}
 _[2]={"return"}
 _[1]={"text",_[3]}
 return {_[1],_[2]}
 --[[
 { "text", { {
-      data = "ok",
-      tags = {}
+      tags = <1>{},
+      text = "o"
     }, {
-      data = "[]",
-      tags = {}
+      tags = <table 1>,
+      text = "k"
+    }, {
+      tags = {},
+      text = "[]"
     } } }
 { "return" }
 ]]--

test/tests/function args vararg.lua

@@ -1,19 +1,23 @@
 local _={}
+_[8]={}
 _[7]={}
-_[6]={}
-_[5]={data="[o, k]",tags=_[7]}
-_[4]={data="ok",tags=_[6]}
-_[3]={_[4],_[5]}
+_[6]={tags=_[8],text="[o, k]"}
+_[5]={tags=_[7],text="k"}
+_[4]={tags=_[7],text="o"}
+_[3]={_[4],_[5],_[6]}
 _[2]={"return"}
 _[1]={"text",_[3]}
 return {_[1],_[2]}
 --[[
 { "text", { {
-      data = "ok",
-      tags = {}
+      tags = <1>{},
+      text = "o"
     }, {
-      data = "[o, k]",
-      tags = {}
+      tags = <table 1>,
+      text = "k"
+    }, {
+      tags = {},
+      text = "[o, k]"
     } } }
 { "return" }
 ]]--

test/tests/function args.lua

@@ -1,14 +1,18 @@
 local _={}
-_[5]={}
-_[4]={data="ok",tags=_[5]}
-_[3]={_[4]}
+_[6]={}
+_[5]={tags=_[6],text="k"}
+_[4]={tags=_[6],text="o"}
+_[3]={_[4],_[5]}
 _[2]={"return"}
 _[1]={"text",_[3]}
 return {_[1],_[2]}
 --[[
 { "text", { {
-      data = "ok",
-      tags = {}
+      tags = <1>{},
+      text = "o"
+    }, {
+      tags = <table 1>,
+      text = "k"
     } } }
 { "return" }
 ]]--

test/tests/function assignement.lua

@@ -1,18 +1,20 @@
 local _={}
+_[23]={}
+_[22]={}
 _[21]={}
 _[20]={}
 _[19]={}
-_[18]={}
-_[17]={}
-_[16]={data="3",tags=_[21]}
-_[15]={data="v2=ok",tags=_[20]}
-_[14]={data="50",tags=_[19]}
-_[13]={data="v=50",tags=_[18]}
-_[12]={data="5",tags=_[17]}
-_[11]={_[16]}
-_[10]={_[15]}
-_[9]={_[14]}
-_[8]={_[13]}
+_[18]={tags=_[23],text="3"}
+_[17]={tags=_[22],text="ok"}
+_[16]={tags=_[22],text="v2="}
+_[15]={tags=_[21],text="50"}
+_[14]={tags=_[20],text="50"}
+_[13]={tags=_[20],text="v="}
+_[12]={tags=_[19],text="5"}
+_[11]={_[18]}
+_[10]={_[16],_[17]}
+_[9]={_[15]}
+_[8]={_[13],_[14]}
 _[7]={_[12]}
 _[6]={"return"}
 _[5]={"text",_[11]}
@@ -23,24 +25,30 @@ _[1]={"text",_[7]}
 return {_[1],_[2],_[3],_[4],_[5],_[6]}
 --[[
 { "text", { {
-      data = "5",
-      tags = {}
+      tags = {},
+      text = "5"
     } } }
 { "text", { {
-      data = "v=50",
-      tags = {}
+      tags = <1>{},
+      text = "v="
+    }, {
+      tags = <table 1>,
+      text = "50"
     } } }
 { "text", { {
-      data = "50",
-      tags = {}
+      tags = {},
+      text = "50"
     } } }
 { "text", { {
-      data = "v2=ok",
-      tags = {}
+      tags = <1>{},
+      text = "v2="
+    }, {
+      tags = <table 1>,
+      text = "ok"
     } } }
 { "text", { {
-      data = "3",
-      tags = {}
+      tags = {},
+      text = "3"
     } } }
 { "return" }
 ]]--

test/tests/function custom type dispatch error.lua

@@ -1,13 +1,16 @@
 local _={}
-_[13]={}
-_[12]={}
-_[11]={}
-_[10]={data="idk::esperanto::name::string is english or generic",tags=_[13]}
-_[9]={data="pierre::french::name::string is french",tags=_[12]}
-_[8]={data="bob::name::string is english or generic",tags=_[11]}
-_[7]={_[10]}
-_[6]={_[9]}
-_[5]={_[8]}
+_[16]={}
+_[15]={}
+_[14]={}
+_[13]={tags=_[16],text=" is english or generic"}
+_[12]={tags=_[16],text="idk::esperanto::name::string"}
+_[11]={tags=_[15],text=" is french"}
+_[10]={tags=_[15],text="pierre::french::name::string"}
+_[9]={tags=_[14],text=" is english or generic"}
+_[8]={tags=_[14],text="bob::name::string"}
+_[7]={_[12],_[13]}
+_[6]={_[10],_[11]}
+_[5]={_[8],_[9]}
 _[4]={"error","no compatible function found for call to a(number); potential candidates were:\n\9function custom type dispatch error.a(name::string) (at test/tests/function custom type dispatch error.ans:5): argument name is not of expected type string\n\9function custom type dispatch error.a(name:nom::french name) (at test/tests/function custom type dispatch error.ans:8): argument name is not of expected type french::name::string; at test/tests/function custom type dispatch error.ans:17"}
 _[3]={"text",_[7]}
 _[2]={"text",_[6]}
@@ -15,16 +18,25 @@ _[1]={"text",_[5]}
 return {_[1],_[2],_[3],_[4]}
 --[[
 { "text", { {
-      data = "bob::name::string is english or generic",
-      tags = {}
+      tags = <1>{},
+      text = "bob::name::string"
+    }, {
+      tags = <table 1>,
+      text = " is english or generic"
     } } }
 { "text", { {
-      data = "pierre::french::name::string is french",
-      tags = {}
+      tags = <1>{},
+      text = "pierre::french::name::string"
+    }, {
+      tags = <table 1>,
+      text = " is french"
     } } }
 { "text", { {
-      data = "idk::esperanto::name::string is english or generic",
-      tags = {}
+      tags = <1>{},
+      text = "idk::esperanto::name::string"
+    }, {
+      tags = <table 1>,
+      text = " is english or generic"
     } } }
 { "error", "no compatible function found for call to a(number); potential candidates were:\n\tfunction custom type dispatch error.a(name::string) (at test/tests/function custom type dispatch error.ans:5): argument name is not of expected type string\n\tfunction custom type dispatch error.a(name:nom::french name) (at test/tests/function custom type dispatch error.ans:8): argument name is not of expected type french::name::string; at test/tests/function custom type dispatch error.ans:17" }
 ]]--

test/tests/function custom type dispatch.lua

@@ -1,13 +1,16 @@
 local _={}
-_[13]={}
-_[12]={}
-_[11]={}
-_[10]={data="idk::esperanto::name::string is english or generic",tags=_[13]}
-_[9]={data="pierre::french::name::string is french",tags=_[12]}
-_[8]={data="bob::name::string is english or generic",tags=_[11]}
-_[7]={_[10]}
-_[6]={_[9]}
-_[5]={_[8]}
+_[16]={}
+_[15]={}
+_[14]={}
+_[13]={tags=_[16],text=" is english or generic"}
+_[12]={tags=_[16],text="idk::esperanto::name::string"}
+_[11]={tags=_[15],text=" is french"}
+_[10]={tags=_[15],text="pierre::french::name::string"}
+_[9]={tags=_[14],text=" is english or generic"}
+_[8]={tags=_[14],text="bob::name::string"}
+_[7]={_[12],_[13]}
+_[6]={_[10],_[11]}
+_[5]={_[8],_[9]}
 _[4]={"return"}
 _[3]={"text",_[7]}
 _[2]={"text",_[6]}
@@ -15,16 +18,25 @@ _[1]={"text",_[5]}
 return {_[1],_[2],_[3],_[4]}
 --[[
 { "text", { {
-      data = "bob::name::string is english or generic",
-      tags = {}
+      tags = <1>{},
+      text = "bob::name::string"
+    }, {
+      tags = <table 1>,
+      text = " is english or generic"
     } } }
 { "text", { {
-      data = "pierre::french::name::string is french",
-      tags = {}
+      tags = <1>{},
+      text = "pierre::french::name::string"
+    }, {
+      tags = <table 1>,
+      text = " is french"
     } } }
 { "text", { {
-      data = "idk::esperanto::name::string is english or generic",
-      tags = {}
+      tags = <1>{},
+      text = "idk::esperanto::name::string"
+    }, {
+      tags = <table 1>,
+      text = " is english or generic"
     } } }
 { "return" }
 ]]--

test/tests/function cycle.lua

@@ -4,11 +4,11 @@ _[20]={}
 _[19]={}
 _[18]={}
 _[17]={}
-_[16]={data="b",tags=_[21]}
-_[15]={data="a",tags=_[20]}
-_[14]={data="c",tags=_[19]}
-_[13]={data="b",tags=_[18]}
-_[12]={data="a",tags=_[17]}
+_[16]={tags=_[21],text="b"}
+_[15]={tags=_[20],text="a"}
+_[14]={tags=_[19],text="c"}
+_[13]={tags=_[18],text="b"}
+_[12]={tags=_[17],text="a"}
 _[11]={_[16]}
 _[10]={_[15]}
 _[9]={_[14]}
@@ -23,24 +23,24 @@ _[1]={"text",_[7]}
 return {_[1],_[2],_[3],_[4],_[5],_[6]}
 --[[
 { "text", { {
-      data = "a",
-      tags = {}
+      tags = {},
+      text = "a"
     } } }
 { "text", { {
-      data = "b",
-      tags = {}
+      tags = {},
+      text = "b"
     } } }
 { "text", { {
-      data = "c",
-      tags = {}
+      tags = {},
+      text = "c"
     } } }
 { "text", { {
-      data = "a",
-      tags = {}
+      tags = {},
+      text = "a"
     } } }
 { "text", { {
-      data = "b",
-      tags = {}
+      tags = {},
+      text = "b"
     } } }
 { "return" }
 ]]--

test/tests/function decorator scope explicit call.lua

@@ -1,22 +1,30 @@
 local _={}
-_[9]={}
-_[8]={}
-_[7]={data="a.\240\159\145\129\239\184\143: 1",tags=_[9]}
-_[6]={data="a.\240\159\145\129\239\184\143: 0",tags=_[8]}
-_[5]={_[7]}
-_[4]={_[6]}
+_[11]={}
+_[10]={}
+_[9]={tags=_[11],text="1"}
+_[8]={tags=_[11],text="a.\240\159\145\129\239\184\143: "}
+_[7]={tags=_[10],text="0"}
+_[6]={tags=_[10],text="a.\240\159\145\129\239\184\143: "}
+_[5]={_[8],_[9]}
+_[4]={_[6],_[7]}
 _[3]={"return"}
 _[2]={"text",_[5]}
 _[1]={"text",_[4]}
 return {_[1],_[2],_[3]}
 --[[
 { "text", { {
-      data = "a.👁️: 0",
-      tags = {}
+      tags = <1>{},
+      text = "a.👁️: "
+    }, {
+      tags = <table 1>,
+      text = "0"
     } } }
 { "text", { {
-      data = "a.👁️: 1",
-      tags = {}
+      tags = <1>{},
+      text = "a.👁️: "
+    }, {
+      tags = <table 1>,
+      text = "1"
     } } }
 { "return" }
 ]]--

test/tests/function decorator scope implicit call.lua

@@ -1,37 +1,45 @@
 local _={}
+_[17]={}
+_[16]={}
 _[15]={}
 _[14]={}
 _[13]={}
-_[12]={}
-_[11]={}
-_[10]={data="ok",tags=_[15]}
-_[9]={data="a.\240\159\145\129\239\184\143: 1",tags=_[14]}
-_[8]={data="ko",tags=_[13]}
-_[7]={data="In function:",tags=_[12]}
-_[6]={data="a.\240\159\145\129\239\184\143: 0",tags=_[11]}
-_[5]={_[7],_[8],_[9],_[10]}
-_[4]={_[6]}
+_[12]={tags=_[17],text="ok"}
+_[11]={tags=_[16],text="1"}
+_[10]={tags=_[16],text="a.\240\159\145\129\239\184\143: "}
+_[9]={tags=_[15],text="ko"}
+_[8]={tags=_[14],text="In function:"}
+_[7]={tags=_[13],text="0"}
+_[6]={tags=_[13],text="a.\240\159\145\129\239\184\143: "}
+_[5]={_[8],_[9],_[10],_[11],_[12]}
+_[4]={_[6],_[7]}
 _[3]={"return"}
 _[2]={"text",_[5]}
 _[1]={"text",_[4]}
 return {_[1],_[2],_[3]}
 --[[
 { "text", { {
-      data = "a.👁️: 0",
-      tags = {}
+      tags = <1>{},
+      text = "a.👁️: "
+    }, {
+      tags = <table 1>,
+      text = "0"
     } } }
 { "text", { {
-      data = "In function:",
-      tags = {}
+      tags = {},
+      text = "In function:"
     }, {
-      data = "ko",
-      tags = {}
+      tags = {},
+      text = "ko"
     }, {
-      data = "a.👁️: 1",
-      tags = {}
+      tags = <1>{},
+      text = "a.👁️: "
     }, {
-      data = "ok",
-      tags = {}
+      tags = <table 1>,
+      text = "1"
+    }, {
+      tags = {},
+      text = "ok"
     } } }
 { "return" }
 ]]--

test/tests/function decorator scope.lua

@@ -1,14 +1,18 @@
 local _={}
-_[5]={}
-_[4]={data="a.\240\159\145\129\239\184\143: 0",tags=_[5]}
-_[3]={_[4]}
+_[6]={}
+_[5]={tags=_[6],text="0"}
+_[4]={tags=_[6],text="a.\240\159\145\129\239\184\143: "}
+_[3]={_[4],_[5]}
 _[2]={"return"}
 _[1]={"text",_[3]}
 return {_[1],_[2]}
 --[[
 { "text", { {
-      data = "a.👁️: 0",
-      tags = {}
+      tags = <1>{},
+      text = "a.👁️: "
+    }, {
+      tags = <table 1>,
+      text = "0"
     } } }
 { "return" }
 ]]--

test/tests/function name dispatch.lua

@@ -1,8 +1,8 @@
 local _={}
 _[9]={}
 _[8]={}
-_[7]={data="x",tags=_[9]}
-_[6]={data="a",tags=_[8]}
+_[7]={tags=_[9],text="x"}
+_[6]={tags=_[8],text="a"}
 _[5]={_[7]}
 _[4]={_[6]}
 _[3]={"return"}
@@ -11,12 +11,12 @@ _[1]={"text",_[4]}
 return {_[1],_[2],_[3]}
 --[[
 { "text", { {
-      data = "a",
-      tags = {}
+      tags = {},
+      text = "a"
     } } }
 { "text", { {
-      data = "x",
-      tags = {}
+      tags = {},
+      text = "x"
     } } }
 { "return" }
 ]]--

test/tests/function next.lua

@@ -4,11 +4,11 @@ _[20]={}
 _[19]={}
 _[18]={}
 _[17]={}
-_[16]={data="c",tags=_[21]}
-_[15]={data="c",tags=_[20]}
-_[14]={data="c",tags=_[19]}
-_[13]={data="b",tags=_[18]}
-_[12]={data="a",tags=_[17]}
+_[16]={tags=_[21],text="c"}
+_[15]={tags=_[20],text="c"}
+_[14]={tags=_[19],text="c"}
+_[13]={tags=_[18],text="b"}
+_[12]={tags=_[17],text="a"}
 _[11]={_[16]}
 _[10]={_[15]}
 _[9]={_[14]}
@@ -23,24 +23,24 @@ _[1]={"text",_[7]}
 return {_[1],_[2],_[3],_[4],_[5],_[6]}
 --[[
 { "text", { {
-      data = "a",
-      tags = {}
+      tags = {},
+      text = "a"
     } } }
 { "text", { {
-      data = "b",
-      tags = {}
+      tags = {},
+      text = "b"
     } } }
 { "text", { {
-      data = "c",
-      tags = {}
+      tags = {},
+      text = "c"
     } } }
 { "text", { {
-      data = "c",
-      tags = {}
+      tags = {},
+      text = "c"
     } } }
 { "text", { {
-      data = "c",
-      tags = {}
+      tags = {},
+      text = "c"
     } } }
 { "return" }
 ]]--

test/tests/function random.lua

@@ -4,11 +4,11 @@ _[20]={}
 _[19]={}
 _[18]={}
 _[17]={}
-_[16]={data="a",tags=_[21]}
-_[15]={data="a",tags=_[20]}
-_[14]={data="b",tags=_[19]}
-_[13]={data="a",tags=_[18]}
-_[12]={data="b",tags=_[17]}
+_[16]={tags=_[21],text="a"}
+_[15]={tags=_[20],text="a"}
+_[14]={tags=_[19],text="b"}
+_[13]={tags=_[18],text="a"}
+_[12]={tags=_[17],text="b"}
 _[11]={_[16]}
 _[10]={_[15]}
 _[9]={_[14]}
@@ -23,24 +23,24 @@ _[1]={"text",_[7]}
 return {_[1],_[2],_[3],_[4],_[5],_[6]}
 --[[
 { "text", { {
-      data = "b",
-      tags = {}
+      tags = {},
+      text = "b"
     } } }
 { "text", { {
-      data = "a",
-      tags = {}
+      tags = {},
+      text = "a"
     } } }
 { "text", { {
-      data = "b",
-      tags = {}
+      tags = {},
+      text = "b"
     } } }
 { "text", { {
-      data = "a",
-      tags = {}
+      tags = {},
+      text = "a"
     } } }
 { "text", { {
-      data = "a",
-      tags = {}
+      tags = {},
+      text = "a"
     } } }
 { "return" }
 ]]--

test/tests/function return exit function nested.lua

@@ -1,19 +1,19 @@
 local _={}
 _[7]={}
 _[6]={}
-_[5]={data="2",tags=_[7]}
-_[4]={data="5",tags=_[6]}
+_[5]={tags=_[7],text="2"}
+_[4]={tags=_[6],text="5"}
 _[3]={_[4],_[5]}
 _[2]={"return"}
 _[1]={"text",_[3]}
 return {_[1],_[2]}
 --[[
 { "text", { {
-      data = "5",
-      tags = {}
+      tags = {},
+      text = "5"
     }, {
-      data = "2",
-      tags = {}
+      tags = {},
+      text = "2"
     } } }
 { "return" }
 ]]--

test/tests/function return exit function.lua

@@ -1,14 +1,14 @@
 local _={}
 _[5]={}
-_[4]={data="5",tags=_[5]}
+_[4]={tags=_[5],text="5"}
 _[3]={_[4]}
 _[2]={"return"}
 _[1]={"text",_[3]}
 return {_[1],_[2]}
 --[[
 { "text", { {
-      data = "5",
-      tags = {}
+      tags = {},
+      text = "5"
     } } }
 { "return" }
 ]]--

test/tests/function return nested.lua

@@ -1,19 +1,19 @@
 local _={}
 _[7]={}
 _[6]={}
-_[5]={data="2",tags=_[7]}
-_[4]={data="5",tags=_[6]}
+_[5]={tags=_[7],text="2"}
+_[4]={tags=_[6],text="5"}
 _[3]={_[4],_[5]}
 _[2]={"return"}
 _[1]={"text",_[3]}
 return {_[1],_[2]}
 --[[
 { "text", { {
-      data = "5",
-      tags = {}
+      tags = {},
+      text = "5"
     }, {
-      data = "2",
-      tags = {}
+      tags = {},
+      text = "2"
     } } }
 { "return" }
 ]]--

test/tests/function return.lua

@@ -1,14 +1,14 @@
 local _={}
 _[5]={}
-_[4]={data="5",tags=_[5]}
+_[4]={tags=_[5],text="5"}
 _[3]={_[4]}
 _[2]={"return"}
 _[1]={"text",_[3]}
 return {_[1],_[2]}
 --[[
 { "text", { {
-      data = "5",
-      tags = {}
+      tags = {},
+      text = "5"
     } } }
 { "return" }
 ]]--

test/tests/function scope.lua

@@ -1,14 +1,18 @@
 local _={}
-_[5]={}
-_[4]={data="a: 5",tags=_[5]}
-_[3]={_[4]}
+_[6]={}
+_[5]={tags=_[6],text="5"}
+_[4]={tags=_[6],text="a: "}
+_[3]={_[4],_[5]}
 _[2]={"return"}
 _[1]={"text",_[3]}
 return {_[1],_[2]}
 --[[
 { "text", { {
-      data = "a: 5",
-      tags = {}
+      tags = <1>{},
+      text = "a: "
+    }, {
+      tags = <table 1>,
+      text = "5"
     } } }
 { "return" }
 ]]--

test/tests/function selection.lua

@@ -1,8 +1,8 @@
 local _={}
 _[9]={}
 _[8]={}
-_[7]={data="4",tags=_[9]}
-_[6]={data="plopheh",tags=_[8]}
+_[7]={tags=_[9],text="4"}
+_[6]={tags=_[8],text="plopheh"}
 _[5]={_[7]}
 _[4]={_[6]}
 _[3]={"return"}
@@ -11,12 +11,12 @@ _[1]={"text",_[4]}
 return {_[1],_[2],_[3]}
 --[[
 { "text", { {
-      data = "plopheh",
-      tags = {}
+      tags = {},
+      text = "plopheh"
     } } }
 { "text", { {
-      data = "4",
-      tags = {}
+      tags = {},
+      text = "4"
     } } }
 { "return" }
 ]]--

test/tests/function separate variable from variants.lua

@@ -1,14 +1,18 @@
 local _={}
-_[5]={}
-_[4]={data="2 = 2",tags=_[5]}
-_[3]={_[4]}
+_[6]={}
+_[5]={tags=_[6],text=" = 2"}
+_[4]={tags=_[6],text="2"}
+_[3]={_[4],_[5]}
 _[2]={"return"}
 _[1]={"text",_[3]}
 return {_[1],_[2]}
 --[[
 { "text", { {
-      data = "2 = 2",
-      tags = {}
+      tags = <1>{},
+      text = "2"
+    }, {
+      tags = <table 1>,
+      text = " = 2"
     } } }
 { "return" }
 ]]--

test/tests/function type dispatch with default.lua

@@ -10,17 +10,17 @@ _[24]={}
 _[23]={}
 _[22]={}
 _[21]={}
-_[20]={data="gn",tags=_[31]}
-_[19]={data="gs",tags=_[30]}
-_[18]={data="gn",tags=_[29]}
-_[17]={data="gs",tags=_[28]}
-_[16]={data="gn",tags=_[27]}
-_[15]={data="gs",tags=_[26]}
-_[14]={data="gn",tags=_[25]}
-_[13]={data="gs",tags=_[24]}
-_[12]={data="a",tags=_[23]}
-_[11]={data="x",tags=_[22]}
-_[10]={data="a",tags=_[21]}
+_[20]={tags=_[31],text="gn"}
+_[19]={tags=_[30],text="gs"}
+_[18]={tags=_[29],text="gn"}
+_[17]={tags=_[28],text="gs"}
+_[16]={tags=_[27],text="gn"}
+_[15]={tags=_[26],text="gs"}
+_[14]={tags=_[25],text="gn"}
+_[13]={tags=_[24],text="gs"}
+_[12]={tags=_[23],text="a"}
+_[11]={tags=_[22],text="x"}
+_[10]={tags=_[21],text="a"}
 _[9]={_[13],_[14],_[15],_[16],_[17],_[18],_[19],_[20]}
 _[8]={_[12]}
 _[7]={_[11]}
@@ -33,41 +33,41 @@ _[1]={"text",_[6]}
 return {_[1],_[2],_[3],_[4],_[5]}
 --[[
 { "text", { {
-      data = "a",
-      tags = {}
+      tags = {},
+      text = "a"
     } } }
 { "text", { {
-      data = "x",
-      tags = {}
+      tags = {},
+      text = "x"
     } } }
 { "text", { {
-      data = "a",
-      tags = {}
+      tags = {},
+      text = "a"
     } } }
 { "text", { {
-      data = "gs",
-      tags = {}
+      tags = {},
+      text = "gs"
     }, {
-      data = "gn",
-      tags = {}
+      tags = {},
+      text = "gn"
     }, {
-      data = "gs",
-      tags = {}
+      tags = {},
+      text = "gs"
     }, {
-      data = "gn",
-      tags = {}
+      tags = {},
+      text = "gn"
     }, {
-      data = "gs",
-      tags = {}
+      tags = {},
+      text = "gs"
     }, {
-      data = "gn",
-      tags = {}
+      tags = {},
+      text = "gn"
     }, {
-      data = "gs",
-      tags = {}
+      tags = {},
+      text = "gs"
     }, {
-      data = "gn",
-      tags = {}
+      tags = {},
+      text = "gn"
     } } }
 { "return" }
 ]]--

test/tests/function type dispatch.lua

@@ -1,8 +1,8 @@
 local _={}
 _[9]={}
 _[8]={}
-_[7]={data="x",tags=_[9]}
-_[6]={data="a",tags=_[8]}
+_[7]={tags=_[9],text="x"}
+_[6]={tags=_[8],text="a"}
 _[5]={_[7]}
 _[4]={_[6]}
 _[3]={"return"}
@@ -11,12 +11,12 @@ _[1]={"text",_[4]}
 return {_[1],_[2],_[3]}
 --[[
 { "text", { {
-      data = "a",
-      tags = {}
+      tags = {},
+      text = "a"
     } } }
 { "text", { {
-      data = "x",
-      tags = {}
+      tags = {},
+      text = "x"
     } } }
 { "return" }
 ]]--

test/tests/function ufcs arg.lua

@@ -1,8 +1,8 @@
 local _={}
 _[9]={}
 _[8]={}
-_[7]={data="ok",tags=_[9]}
-_[6]={data="ok",tags=_[8]}
+_[7]={tags=_[9],text="ok"}
+_[6]={tags=_[8],text="ok"}
 _[5]={_[7]}
 _[4]={_[6]}
 _[3]={"return"}
@@ -11,12 +11,12 @@ _[1]={"text",_[4]}
 return {_[1],_[2],_[3]}
 --[[
 { "text", { {
-      data = "ok",
-      tags = {}
+      tags = {},
+      text = "ok"
     } } }
 { "text", { {
-      data = "ok",
-      tags = {}
+      tags = {},
+      text = "ok"
     } } }
 { "return" }
 ]]--

test/tests/function ufcs args.lua

@@ -1,14 +1,18 @@
 local _={}
-_[5]={}
-_[4]={data="ok",tags=_[5]}
-_[3]={_[4]}
+_[6]={}
+_[5]={tags=_[6],text="k"}
+_[4]={tags=_[6],text="o"}
+_[3]={_[4],_[5]}
 _[2]={"return"}
 _[1]={"text",_[3]}
 return {_[1],_[2]}
 --[[
 { "text", { {
-      data = "ok",
-      tags = {}
+      tags = <1>{},
+      text = "o"
+    }, {
+      tags = <table 1>,
+      text = "k"
     } } }
 { "return" }
 ]]--

test/tests/function vararg empty.lua

@@ -1,14 +1,14 @@
 local _={}
 _[5]={}
-_[4]={data="[]",tags=_[5]}
+_[4]={tags=_[5],text="[]"}
 _[3]={_[4]}
 _[2]={"return"}
 _[1]={"text",_[3]}
 return {_[1],_[2]}
 --[[
 { "text", { {
-      data = "[]",
-      tags = {}
+      tags = {},
+      text = "[]"
     } } }
 { "return" }
 ]]--

test/tests/function vararg.lua

@@ -1,14 +1,14 @@
 local _={}
 _[5]={}
-_[4]={data="[o, k]",tags=_[5]}
+_[4]={tags=_[5],text="[o, k]"}
 _[3]={_[4]}
 _[2]={"return"}
 _[1]={"text",_[3]}
 return {_[1],_[2]}
 --[[
 { "text", { {
-      data = "[o, k]",
-      tags = {}
+      tags = {},
+      text = "[o, k]"
     } } }
 { "return" }
 ]]--

test/tests/function.lua

@@ -1,14 +1,14 @@
 local _={}
 _[5]={}
-_[4]={data="ok",tags=_[5]}
+_[4]={tags=_[5],text="ok"}
 _[3]={_[4]}
 _[2]={"return"}
 _[1]={"text",_[3]}
 return {_[1],_[2]}
 --[[
 { "text", { {
-      data = "ok",
-      tags = {}
+      tags = {},
+      text = "ok"
     } } }
 { "return" }
 ]]--

test/tests/interrupt callback nested paragraph.lua

@@ -1,12 +1,14 @@
 local _={}
+_[14]={}
+_[13]={}
 _[12]={}
-_[11]={}
-_[10]={}
-_[9]={data="no",tags=_[12]}
-_[8]={data="in interrupt: 5",tags=_[11]}
-_[7]={data="before: 2",tags=_[10]}
-_[6]={_[8],_[9]}
-_[5]={_[7]}
+_[11]={tags=_[14],text="no"}
+_[10]={tags=_[13],text="5"}
+_[9]={tags=_[13],text="in interrupt: "}
+_[8]={tags=_[12],text="2"}
+_[7]={tags=_[12],text="before: "}
+_[6]={_[9],_[10],_[11]}
+_[5]={_[7],_[8]}
 _[4]={"return"}
 _[3]={"text",_[6]}
 _[2]={"wait",0}
@@ -14,16 +16,22 @@ _[1]={"text",_[5]}
 return {_[1],_[2],_[3],_[4]}
 --[[
 { "text", { {
-      data = "before: 2",
-      tags = {}
+      tags = <1>{},
+      text = "before: "
+    }, {
+      tags = <table 1>,
+      text = "2"
     } } }
 { "wait", 0 }
 { "text", { {
-      data = "in interrupt: 5",
-      tags = {}
+      tags = <1>{},
+      text = "in interrupt: "
     }, {
-      data = "no",
-      tags = {}
+      tags = <table 1>,
+      text = "5"
+    }, {
+      tags = {},
+      text = "no"
     } } }
 { "return" }
 ]]--

test/tests/interrupt callback nested.lua

@@ -1,10 +1,12 @@
 local _={}
-_[10]={}
-_[9]={}
-_[8]={data="in interrupt: 5",tags=_[10]}
-_[7]={data="before: 2",tags=_[9]}
-_[6]={_[8]}
-_[5]={_[7]}
+_[12]={}
+_[11]={}
+_[10]={tags=_[12],text="5"}
+_[9]={tags=_[12],text="in interrupt: "}
+_[8]={tags=_[11],text="2"}
+_[7]={tags=_[11],text="before: "}
+_[6]={_[9],_[10]}
+_[5]={_[7],_[8]}
 _[4]={"return"}
 _[3]={"text",_[6]}
 _[2]={"wait",0}
@@ -12,13 +14,19 @@ _[1]={"text",_[5]}
 return {_[1],_[2],_[3],_[4]}
 --[[
 { "text", { {
-      data = "before: 2",
-      tags = {}
+      tags = <1>{},
+      text = "before: "
+    }, {
+      tags = <table 1>,
+      text = "2"
     } } }
 { "wait", 0 }
 { "text", { {
-      data = "in interrupt: 5",
-      tags = {}
+      tags = <1>{},
+      text = "in interrupt: "
+    }, {
+      tags = <table 1>,
+      text = "5"
     } } }
 { "return" }
 ]]--

test/tests/interrupt callback.lua

@@ -1,10 +1,12 @@
 local _={}
-_[10]={}
-_[9]={}
-_[8]={data="in interrupt: 5",tags=_[10]}
-_[7]={data="before: 2",tags=_[9]}
-_[6]={_[8]}
-_[5]={_[7]}
+_[12]={}
+_[11]={}
+_[10]={tags=_[12],text="5"}
+_[9]={tags=_[12],text="in interrupt: "}
+_[8]={tags=_[11],text="2"}
+_[7]={tags=_[11],text="before: "}
+_[6]={_[9],_[10]}
+_[5]={_[7],_[8]}
 _[4]={"return"}
 _[3]={"text",_[6]}
 _[2]={"wait",0}
@@ -12,13 +14,19 @@ _[1]={"text",_[5]}
 return {_[1],_[2],_[3],_[4]}
 --[[
 { "text", { {
-      data = "before: 2",
-      tags = {}
+      tags = <1>{},
+      text = "before: "
+    }, {
+      tags = <table 1>,
+      text = "2"
     } } }
 { "wait", 0 }
 { "text", { {
-      data = "in interrupt: 5",
-      tags = {}
+      tags = <1>{},
+      text = "in interrupt: "
+    }, {
+      tags = <table 1>,
+      text = "5"
     } } }
 { "return" }
 ]]--

test/tests/interrupt no callback.lua

@@ -1,15 +1,19 @@
 local _={}
-_[6]={}
-_[5]={data="before: 2",tags=_[6]}
-_[4]={_[5]}
+_[7]={}
+_[6]={tags=_[7],text="2"}
+_[5]={tags=_[7],text="before: "}
+_[4]={_[5],_[6]}
 _[3]={"return",""}
 _[2]={"wait",0}
 _[1]={"text",_[4]}
 return {_[1],_[2],_[3]}
 --[[
 { "text", { {
-      data = "before: 2",
-      tags = {}
+      tags = <1>{},
+      text = "before: "
+    }, {
+      tags = <table 1>,
+      text = "2"
     } } }
 { "wait", 0 }
 { "return", "" }

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" }
 ]]--

test/tests/list assignement.lua

@@ -8,15 +8,15 @@ _[32]={}
 _[31]={}
 _[30]={}
 _[29]={}
-_[28]={data="[3, 2, foo:c, bar:b]",tags=_[37]}
-_[27]={data="c",tags=_[36]}
-_[26]={data="[3, 2, foo:a, bar:b]",tags=_[35]}
-_[25]={data="b",tags=_[34]}
-_[24]={data="[3, 2, foo:a]",tags=_[33]}
-_[23]={data="a",tags=_[32]}
-_[22]={data="[3, 2]",tags=_[31]}
-_[21]={data="3",tags=_[30]}
-_[20]={data="[1, 2]",tags=_[29]}
+_[28]={tags=_[37],text="[3, 2, foo:c, bar:b]"}
+_[27]={tags=_[36],text="c"}
+_[26]={tags=_[35],text="[3, 2, foo:a, bar:b]"}
+_[25]={tags=_[34],text="b"}
+_[24]={tags=_[33],text="[3, 2, foo:a]"}
+_[23]={tags=_[32],text="a"}
+_[22]={tags=_[31],text="[3, 2]"}
+_[21]={tags=_[30],text="3"}
+_[20]={tags=_[29],text="[1, 2]"}
 _[19]={_[28]}
 _[18]={_[27]}
 _[17]={_[26]}
@@ -39,40 +39,40 @@ _[1]={"text",_[11]}
 return {_[1],_[2],_[3],_[4],_[5],_[6],_[7],_[8],_[9],_[10]}
 --[[
 { "text", { {
-      data = "[1, 2]",
-      tags = {}
+      tags = {},
+      text = "[1, 2]"
     } } }
 { "text", { {
-      data = "3",
-      tags = {}
+      tags = {},
+      text = "3"
     } } }
 { "text", { {
-      data = "[3, 2]",
-      tags = {}
+      tags = {},
+      text = "[3, 2]"
     } } }
 { "text", { {
-      data = "a",
-      tags = {}
+      tags = {},
+      text = "a"
     } } }
 { "text", { {
-      data = "[3, 2, foo:a]",
-      tags = {}
+      tags = {},
+      text = "[3, 2, foo:a]"
     } } }
 { "text", { {
-      data = "b",
-      tags = {}
+      tags = {},
+      text = "b"
     } } }
 { "text", { {
-      data = "[3, 2, foo:a, bar:b]",
-      tags = {}
+      tags = {},
+      text = "[3, 2, foo:a, bar:b]"
     } } }
 { "text", { {
-      data = "c",
-      tags = {}
+      tags = {},
+      text = "c"
     } } }
 { "text", { {
-      data = "[3, 2, foo:c, bar:b]",
-      tags = {}
+      tags = {},
+      text = "[3, 2, foo:c, bar:b]"
     } } }
 { "return" }
 ]]--

test/tests/named arguments.lua

@@ -1,14 +1,30 @@
 local _={}
-_[5]={}
-_[4]={data="abc = abc = abc",tags=_[5]}
-_[3]={_[4]}
+_[9]={}
+_[8]={tags=_[9],text="abc"}
+_[7]={tags=_[9],text=" = "}
+_[6]={tags=_[9],text="abc"}
+_[5]={tags=_[9],text=" = "}
+_[4]={tags=_[9],text="abc"}
+_[3]={_[4],_[5],_[6],_[7],_[8]}
 _[2]={"return"}
 _[1]={"text",_[3]}
 return {_[1],_[2]}
 --[[
 { "text", { {
-      data = "abc = abc = abc",
-      tags = {}
+      tags = <1>{},
+      text = "abc"
+    }, {
+      tags = <table 1>,
+      text = " = "
+    }, {
+      tags = <table 1>,
+      text = "abc"
+    }, {
+      tags = <table 1>,
+      text = " = "
+    }, {
+      tags = <table 1>,
+      text = "abc"
     } } }
 { "return" }
 ]]--

test/tests/named varag.lua

@@ -1,14 +1,14 @@
 local _={}
 _[5]={}
-_[4]={data="15",tags=_[5]}
+_[4]={tags=_[5],text="15"}
 _[3]={_[4]}
 _[2]={"return"}
 _[1]={"text",_[3]}
 return {_[1],_[2]}
 --[[
 { "text", { {
-      data = "15",
-      tags = {}
+      tags = {},
+      text = "15"
     } } }
 { "return" }
 ]]--

test/tests/nested conditions.lua

@@ -2,9 +2,9 @@ local _={}
 _[11]={}
 _[10]={}
 _[9]={}
-_[8]={data="da",tags=_[11]}
-_[7]={data="ye",tags=_[10]}
-_[6]={data="yes",tags=_[9]}
+_[8]={tags=_[11],text="da"}
+_[7]={tags=_[10],text="ye"}
+_[6]={tags=_[9],text="yes"}
 _[5]={_[7],_[8]}
 _[4]={_[6]}
 _[3]={"return"}
@@ -13,15 +13,15 @@ _[1]={"text",_[4]}
 return {_[1],_[2],_[3]}
 --[[
 { "text", { {
-      data = "yes",
-      tags = {}
+      tags = {},
+      text = "yes"
     } } }
 { "text", { {
-      data = "ye",
-      tags = {}
+      tags = {},
+      text = "ye"
     }, {
-      data = "da",
-      tags = {}
+      tags = {},
+      text = "da"
     } } }
 { "return" }
 ]]--

test/tests/nested flush.lua

@@ -1,20 +1,22 @@
 local _={}
-_[31]={}
+_[33]={}
+_[32]={}
+_[31]={tags=_[33],text="h"}
 _[30]={}
-_[29]={}
+_[29]={tags=_[32],text="f"}
 _[28]={}
 _[27]={}
 _[26]={}
 _[25]={}
 _[24]={}
-_[23]={data="h",tags=_[31]}
-_[22]={data="g",tags=_[30]}
-_[21]={data="f",tags=_[29]}
-_[20]={data="e",tags=_[28]}
-_[19]={data="d",tags=_[27]}
-_[18]={data="c",tags=_[26]}
-_[17]={data="b",tags=_[25]}
-_[16]={data="a",tags=_[24]}
+_[23]={_[31]}
+_[22]={tags=_[30],text="g"}
+_[21]={_[29]}
+_[20]={tags=_[28],text="e"}
+_[19]={tags=_[27],text="d"}
+_[18]={tags=_[26],text="c"}
+_[17]={tags=_[25],text="b"}
+_[16]={tags=_[24],text="a"}
 _[15]={_[23]}
 _[14]={_[22]}
 _[13]={_[21]}
@@ -33,35 +35,35 @@ _[1]={"text",_[9]}
 return {_[1],_[2],_[3],_[4],_[5],_[6],_[7],_[8]}
 --[[
 { "text", { {
-      data = "a",
-      tags = {}
+      tags = {},
+      text = "a"
     } } }
 { "text", { {
-      data = "b",
-      tags = {}
+      tags = {},
+      text = "b"
     } } }
 { "text", { {
-      data = "c",
-      tags = {}
+      tags = {},
+      text = "c"
     }, {
-      data = "d",
-      tags = {}
+      tags = {},
+      text = "d"
     } } }
 { "text", { {
-      data = "e",
-      tags = {}
-    } } }
-{ "choice", { {
-      data = "f",
-      tags = {}
+      tags = {},
+      text = "e"
     } } }
+{ "choice", { { {
+        tags = {},
+        text = "f"
+      } } } }
 { "text", { {
-      data = "g",
-      tags = {}
-    } } }
-{ "choice", { {
-      data = "h",
-      tags = {}
+      tags = {},
+      text = "g"
     } } }
+{ "choice", { { {
+        tags = {},
+        text = "h"
+      } } } }
 { "return" }
 ]]--

test/tests/optional arguments.lua

@@ -1,14 +1,30 @@
 local _={}
-_[5]={}
-_[4]={data="abc = abc = abc",tags=_[5]}
-_[3]={_[4]}
+_[9]={}
+_[8]={tags=_[9],text="abc"}
+_[7]={tags=_[9],text=" = "}
+_[6]={tags=_[9],text="abc"}
+_[5]={tags=_[9],text=" = "}
+_[4]={tags=_[9],text="abc"}
+_[3]={_[4],_[5],_[6],_[7],_[8]}
 _[2]={"return"}
 _[1]={"text",_[3]}
 return {_[1],_[2]}
 --[[
 { "text", { {
-      data = "abc = abc = abc",
-      tags = {}
+      tags = <1>{},
+      text = "abc"
+    }, {
+      tags = <table 1>,
+      text = " = "
+    }, {
+      tags = <table 1>,
+      text = "abc"
+    }, {
+      tags = <table 1>,
+      text = " = "
+    }, {
+      tags = <table 1>,
+      text = "abc"
     } } }
 { "return" }
 ]]--

test/tests/paragraph alias.lua

@@ -1,14 +1,22 @@
 local _={}
-_[5]={}
-_[4]={data="ok = ok",tags=_[5]}
-_[3]={_[4]}
+_[7]={}
+_[6]={tags=_[7],text="ok"}
+_[5]={tags=_[7],text=" = "}
+_[4]={tags=_[7],text="ok"}
+_[3]={_[4],_[5],_[6]}
 _[2]={"return"}
 _[1]={"text",_[3]}
 return {_[1],_[2]}
 --[[
 { "text", { {
-      data = "ok = ok",
-      tags = {}
+      tags = <1>{},
+      text = "ok"
+    }, {
+      tags = <table 1>,
+      text = " = "
+    }, {
+      tags = <table 1>,
+      text = "ok"
     } } }
 { "return" }
 ]]--

test/tests/paragraph run force.lua

@@ -7,14 +7,14 @@ _[19]={}
 _[18]={}
 _[17]={}
 _[16]={}
-_[15]={data="b",tags=_[23]}
-_[14]={data="x",tags=_[22]}
-_[13]={data="Force no checkpoint:",tags=_[21]}
-_[12]={data="b",tags=_[20]}
-_[11]={data="a",tags=_[19]}
-_[10]={data="From checkpoint:",tags=_[18]}
-_[9]={data="a",tags=_[17]}
-_[8]={data="Force run checkpoint:",tags=_[16]}
+_[15]={tags=_[23],text="b"}
+_[14]={tags=_[22],text="x"}
+_[13]={tags=_[21],text="Force no checkpoint:"}
+_[12]={tags=_[20],text="b"}
+_[11]={tags=_[19],text="a"}
+_[10]={tags=_[18],text="From checkpoint:"}
+_[9]={tags=_[17],text="a"}
+_[8]={tags=_[16],text="Force run checkpoint:"}
 _[7]={_[13],_[14],_[15]}
 _[6]={_[10],_[11],_[12]}
 _[5]={_[8],_[9]}
@@ -25,31 +25,31 @@ _[1]={"text",_[5]}
 return {_[1],_[2],_[3],_[4]}
 --[[
 { "text", { {
-      data = "Force run checkpoint:",
-      tags = {}
+      tags = {},
+      text = "Force run checkpoint:"
     }, {
-      data = "a",
-      tags = {}
+      tags = {},
+      text = "a"
     } } }
 { "text", { {
-      data = "From checkpoint:",
-      tags = {}
+      tags = {},
+      text = "From checkpoint:"
     }, {
-      data = "a",
-      tags = {}
+      tags = {},
+      text = "a"
     }, {
-      data = "b",
-      tags = {}
+      tags = {},
+      text = "b"
     } } }
 { "text", { {
-      data = "Force no checkpoint:",
-      tags = {}
+      tags = {},
+      text = "Force no checkpoint:"
     }, {
-      data = "x",
-      tags = {}
+      tags = {},
+      text = "x"
     }, {
-      data = "b",
-      tags = {}
+      tags = {},
+      text = "b"
     } } }
 { "return" }
 ]]--

test/tests/paragraph run from.lua

@@ -8,15 +8,15 @@ _[20]={}
 _[19]={}
 _[18]={}
 _[17]={}
-_[16]={data="b",tags=_[25]}
-_[15]={data="x",tags=_[24]}
-_[14]={data="Force no checkpoint:",tags=_[23]}
-_[13]={data="b",tags=_[22]}
-_[12]={data="a",tags=_[21]}
-_[11]={data="From checkpoint:",tags=_[20]}
-_[10]={data="b",tags=_[19]}
-_[9]={data="a",tags=_[18]}
-_[8]={data="Force run from checkpoint:",tags=_[17]}
+_[16]={tags=_[25],text="b"}
+_[15]={tags=_[24],text="x"}
+_[14]={tags=_[23],text="Force no checkpoint:"}
+_[13]={tags=_[22],text="b"}
+_[12]={tags=_[21],text="a"}
+_[11]={tags=_[20],text="From checkpoint:"}
+_[10]={tags=_[19],text="b"}
+_[9]={tags=_[18],text="a"}
+_[8]={tags=_[17],text="Force run from checkpoint:"}
 _[7]={_[14],_[15],_[16]}
 _[6]={_[11],_[12],_[13]}
 _[5]={_[8],_[9],_[10]}
@@ -27,34 +27,34 @@ _[1]={"text",_[5]}
 return {_[1],_[2],_[3],_[4]}
 --[[
 { "text", { {
-      data = "Force run from checkpoint:",
-      tags = {}
+      tags = {},
+      text = "Force run from checkpoint:"
     }, {
-      data = "a",
-      tags = {}
+      tags = {},
+      text = "a"
     }, {
-      data = "b",
-      tags = {}
+      tags = {},
+      text = "b"
     } } }
 { "text", { {
-      data = "From checkpoint:",
-      tags = {}
+      tags = {},
+      text = "From checkpoint:"
     }, {
-      data = "a",
-      tags = {}
+      tags = {},
+      text = "a"
     }, {
-      data = "b",
-      tags = {}
+      tags = {},
+      text = "b"
     } } }
 { "text", { {
-      data = "Force no checkpoint:",
-      tags = {}
+      tags = {},
+      text = "Force no checkpoint:"
     }, {
-      data = "x",
-      tags = {}
+      tags = {},
+      text = "x"
     }, {
-      data = "b",
-      tags = {}
+      tags = {},
+      text = "b"
     } } }
 { "return" }
 ]]--

test/tests/paragraph run.lua

@@ -8,15 +8,15 @@ _[20]={}
 _[19]={}
 _[18]={}
 _[17]={}
-_[16]={data="b",tags=_[25]}
-_[15]={data="x",tags=_[24]}
-_[14]={data="Force no checkpoint:",tags=_[23]}
-_[13]={data="b",tags=_[22]}
-_[12]={data="a",tags=_[21]}
-_[11]={data="From checkpoint:",tags=_[20]}
-_[10]={data="b",tags=_[19]}
-_[9]={data="x",tags=_[18]}
-_[8]={data="No checkpoint:",tags=_[17]}
+_[16]={tags=_[25],text="b"}
+_[15]={tags=_[24],text="x"}
+_[14]={tags=_[23],text="Force no checkpoint:"}
+_[13]={tags=_[22],text="b"}
+_[12]={tags=_[21],text="a"}
+_[11]={tags=_[20],text="From checkpoint:"}
+_[10]={tags=_[19],text="b"}
+_[9]={tags=_[18],text="x"}
+_[8]={tags=_[17],text="No checkpoint:"}
 _[7]={_[14],_[15],_[16]}
 _[6]={_[11],_[12],_[13]}
 _[5]={_[8],_[9],_[10]}
@@ -27,34 +27,34 @@ _[1]={"text",_[5]}
 return {_[1],_[2],_[3],_[4]}
 --[[
 { "text", { {
-      data = "No checkpoint:",
-      tags = {}
+      tags = {},
+      text = "No checkpoint:"
     }, {
-      data = "x",
-      tags = {}
+      tags = {},
+      text = "x"
     }, {
-      data = "b",
-      tags = {}
+      tags = {},
+      text = "b"
     } } }
 { "text", { {
-      data = "From checkpoint:",
-      tags = {}
+      tags = {},
+      text = "From checkpoint:"
     }, {
-      data = "a",
-      tags = {}
+      tags = {},
+      text = "a"
     }, {
-      data = "b",
-      tags = {}
+      tags = {},
+      text = "b"
     } } }
 { "text", { {
-      data = "Force no checkpoint:",
-      tags = {}
+      tags = {},
+      text = "Force no checkpoint:"
     }, {
-      data = "x",
-      tags = {}
+      tags = {},
+      text = "x"
     }, {
-      data = "b",
-      tags = {}
+      tags = {},
+      text = "b"
     } } }
 { "return" }
 ]]--

test/tests/paragraph.lua

@@ -1,14 +1,14 @@
 local _={}
 _[5]={}
-_[4]={data="b",tags=_[5]}
+_[4]={tags=_[5],text="b"}
 _[3]={_[4]}
 _[2]={"return"}
 _[1]={"text",_[3]}
 return {_[1],_[2]}
 --[[
 { "text", { {
-      data = "b",
-      tags = {}
+      tags = {},
+      text = "b"
     } } }
 { "return" }
 ]]--

test/tests/resume from nested paragraph.lua

@@ -17,24 +17,24 @@ _[49]={}
 _[48]={}
 _[47]={}
 _[46]={}
-_[45]={data="c",tags=_[63]}
-_[44]={data="a",tags=_[62]}
-_[43]={data="Force p checkpoint:",tags=_[61]}
-_[42]={data="d",tags=_[60]}
-_[41]={data="c",tags=_[59]}
-_[40]={data="b",tags=_[58]}
-_[39]={data="From q checkpoint again:",tags=_[57]}
-_[38]={data="d",tags=_[56]}
-_[37]={data="c",tags=_[55]}
-_[36]={data="b",tags=_[54]}
-_[35]={data="From q checkpoint:",tags=_[53]}
-_[34]={data="d",tags=_[52]}
-_[33]={data="c",tags=_[51]}
-_[32]={data="a",tags=_[50]}
-_[31]={data="From p checkpoint:",tags=_[49]}
-_[30]={data="d",tags=_[48]}
-_[29]={data="x",tags=_[47]}
-_[28]={data="From start:",tags=_[46]}
+_[45]={tags=_[63],text="c"}
+_[44]={tags=_[62],text="a"}
+_[43]={tags=_[61],text="Force p checkpoint:"}
+_[42]={tags=_[60],text="d"}
+_[41]={tags=_[59],text="c"}
+_[40]={tags=_[58],text="b"}
+_[39]={tags=_[57],text="From q checkpoint again:"}
+_[38]={tags=_[56],text="d"}
+_[37]={tags=_[55],text="c"}
+_[36]={tags=_[54],text="b"}
+_[35]={tags=_[53],text="From q checkpoint:"}
+_[34]={tags=_[52],text="d"}
+_[33]={tags=_[51],text="c"}
+_[32]={tags=_[50],text="a"}
+_[31]={tags=_[49],text="From p checkpoint:"}
+_[30]={tags=_[48],text="d"}
+_[29]={tags=_[47],text="x"}
+_[28]={tags=_[46],text="From start:"}
 _[27]={_[45]}
 _[26]={_[43],_[44]}
 _[25]={_[42]}
@@ -65,71 +65,71 @@ _[1]={"text",_[15]}
 return {_[1],_[2],_[3],_[4],_[5],_[6],_[7],_[8],_[9],_[10],_[11],_[12],_[13],_[14]}
 --[[
 { "text", { {
-      data = "From start:",
-      tags = {}
+      tags = {},
+      text = "From start:"
     }, {
-      data = "x",
-      tags = {}
+      tags = {},
+      text = "x"
     } } }
 { "text", { {
-      data = "d",
-      tags = {}
+      tags = {},
+      text = "d"
     } } }
 { "text", { {
-      data = "From p checkpoint:",
-      tags = {}
+      tags = {},
+      text = "From p checkpoint:"
     }, {
-      data = "a",
-      tags = {}
+      tags = {},
+      text = "a"
     } } }
 { "text", { {
-      data = "c",
-      tags = {}
+      tags = {},
+      text = "c"
     } } }
 { "text", { {
-      data = "d",
-      tags = {}
+      tags = {},
+      text = "d"
     } } }
 { "text", { {
-      data = "From q checkpoint:",
-      tags = {}
+      tags = {},
+      text = "From q checkpoint:"
     }, {
-      data = "b",
-      tags = {}
+      tags = {},
+      text = "b"
     } } }
 { "text", { {
-      data = "c",
-      tags = {}
+      tags = {},
+      text = "c"
     } } }
 { "text", { {
-      data = "d",
-      tags = {}
+      tags = {},
+      text = "d"
     } } }
 { "text", { {
-      data = "From q checkpoint again:",
-      tags = {}
+      tags = {},
+      text = "From q checkpoint again:"
     }, {
-      data = "b",
-      tags = {}
+      tags = {},
+      text = "b"
     } } }
 { "text", { {
-      data = "c",
-      tags = {}
+      tags = {},
+      text = "c"
     } } }
 { "text", { {
-      data = "d",
-      tags = {}
+      tags = {},
+      text = "d"
     } } }
 { "text", { {
-      data = "Force p checkpoint:",
-      tags = {}
+      tags = {},
+      text = "Force p checkpoint:"
     }, {
-      data = "a",
-      tags = {}
+      tags = {},
+      text = "a"
     } } }
 { "text", { {
-      data = "c",
-      tags = {}
+      tags = {},
+      text = "c"
     } } }
 { "return" }
 ]]--

test/tests/resume from paragraph restore tags.lua

@@ -2,18 +2,18 @@ local _={}
 _[32]={}
 _[31]={a="a"}
 _[30]={a="a",b="b"}
-_[29]={a="a",b="b",c="c"}
+_[29]={a="a",c="c",b="b"}
 _[28]={}
 _[27]={a="a",b="b"}
 _[26]={a="a"}
-_[25]={data="e",tags=_[32]}
-_[24]={data="d",tags=_[31]}
-_[23]={data="c",tags=_[30]}
-_[22]={data="b",tags=_[29]}
-_[21]={data="e",tags=_[28]}
-_[20]={data="d",tags=_[26]}
-_[19]={data="c",tags=_[27]}
-_[18]={data="a",tags=_[26]}
+_[25]={tags=_[32],text="e"}
+_[24]={tags=_[31],text="d"}
+_[23]={tags=_[30],text="c"}
+_[22]={tags=_[29],text="b"}
+_[21]={tags=_[28],text="e"}
+_[20]={tags=_[26],text="d"}
+_[19]={tags=_[27],text="c"}
+_[18]={tags=_[26],text="a"}
 _[17]={_[25]}
 _[16]={_[24]}
 _[15]={_[23]}
@@ -34,52 +34,52 @@ _[1]={"text",_[10]}
 return {_[1],_[2],_[3],_[4],_[5],_[6],_[7],_[8],_[9]}
 --[[
 { "text", { {
-      data = "a",
       tags = {
         a = "a"
-      }
+      },
+      text = "a"
     } } }
 { "text", { {
-      data = "c",
       tags = {
         a = "a",
         b = "b"
-      }
+      },
+      text = "c"
     } } }
 { "text", { {
-      data = "d",
       tags = {
         a = "a"
-      }
+      },
+      text = "d"
     } } }
 { "text", { {
-      data = "e",
-      tags = {}
+      tags = {},
+      text = "e"
     } } }
 { "text", { {
-      data = "b",
       tags = {
         a = "a",
         b = "b",
         c = "c"
-      }
+      },
+      text = "b"
     } } }
 { "text", { {
-      data = "c",
       tags = {
         a = "a",
         b = "b"
-      }
+      },
+      text = "c"
     } } }
 { "text", { {
-      data = "d",
       tags = {
         a = "a"
-      }
+      },
+      text = "d"
     } } }
 { "text", { {
-      data = "e",
-      tags = {}
+      tags = {},
+      text = "e"
     } } }
 { "return" }
 ]]--

test/tests/resume from paragraph with nested choice.lua

@@ -1,71 +1,83 @@
 local _={}
-_[118]={}
+_[130]={}
+_[129]={}
+_[128]={}
+_[127]={}
+_[126]={}
+_[125]={}
+_[124]={}
+_[123]={}
+_[122]={}
+_[121]={}
+_[120]={text="c",tags=_[130]}
+_[119]={text="b",tags=_[129]}
+_[118]={text="a",tags=_[128]}
 _[117]={}
-_[116]={}
-_[115]={}
-_[114]={}
-_[113]={}
+_[116]={text="ab",tags=_[127]}
+_[115]={text="aa",tags=_[117]}
+_[114]={text="ab"}
+_[113]={text="aa"}
 _[112]={}
-_[111]={}
-_[110]={}
-_[109]={}
+_[111]={text="c",tags=_[126]}
+_[110]={text="b",tags=_[125]}
+_[109]={text="a",tags=_[112]}
 _[108]={}
-_[107]={}
+_[107]={text="c",tags=_[108]}
 _[106]={}
 _[105]={}
-_[104]={}
-_[103]={}
+_[104]={text="ab",tags=_[105]}
+_[103]={text="aa",tags=_[124]}
 _[102]={}
-_[101]={}
+_[101]={text="c",tags=_[102]}
 _[100]={}
 _[99]={}
-_[98]={}
-_[97]={}
+_[98]={text="b",tags=_[99]}
+_[97]={text="a",tags=_[123]}
 _[96]={}
-_[95]={}
+_[95]={text="c",tags=_[96]}
 _[94]={}
-_[93]={}
-_[92]={}
+_[93]={text="ab",tags=_[94]}
+_[92]={text="aa",tags=_[122]}
 _[91]={}
-_[90]={}
+_[90]={text="c",tags=_[91]}
 _[89]={}
-_[88]={}
-_[87]={}
-_[86]={data="c",tags=_[118]}
-_[85]={data="b",tags=_[117]}
-_[84]={data="a",tags=_[116]}
-_[83]={data="-> aa",tags=_[115]}
-_[82]={data="ab",tags=_[114]}
-_[81]={data="aa",tags=_[113]}
-_[80]={data="-> aa",tags=_[112]}
-_[79]={data="ab",tags=_[112]}
-_[78]={data="aa",tags=_[112]}
-_[77]={data="-> a",tags=_[112]}
-_[76]={data="c",tags=_[111]}
-_[75]={data="b",tags=_[110]}
-_[74]={data="a",tags=_[109]}
-_[73]={data="-> c",tags=_[108]}
-_[72]={data="c",tags=_[107]}
-_[71]={data="autoflush",tags=_[106]}
-_[70]={data="-> ab",tags=_[105]}
-_[69]={data="ab",tags=_[104]}
-_[68]={data="aa",tags=_[103]}
-_[67]={data="-> c",tags=_[102]}
-_[66]={data="c",tags=_[101]}
-_[65]={data="autoflush",tags=_[100]}
-_[64]={data="-> b",tags=_[99]}
-_[63]={data="b",tags=_[98]}
-_[62]={data="a",tags=_[97]}
-_[61]={data="-> c",tags=_[96]}
-_[60]={data="c",tags=_[95]}
-_[59]={data="-> ab",tags=_[94]}
-_[58]={data="ab",tags=_[93]}
-_[57]={data="aa",tags=_[92]}
-_[56]={data="-> c",tags=_[91]}
-_[55]={data="c",tags=_[90]}
-_[54]={data="-> b",tags=_[89]}
-_[53]={data="b",tags=_[88]}
-_[52]={data="a",tags=_[87]}
+_[88]={text="b",tags=_[89]}
+_[87]={text="a",tags=_[121]}
+_[86]={_[120]}
+_[85]={_[119]}
+_[84]={_[118]}
+_[83]={text="-> aa",tags=_[117]}
+_[82]={_[116]}
+_[81]={_[115]}
+_[80]={text="-> aa",tags=_[112]}
+_[79]={_[114]}
+_[78]={_[113]}
+_[77]={text="-> a",tags=_[112]}
+_[76]={_[111]}
+_[75]={_[110]}
+_[74]={_[109]}
+_[73]={text="-> c",tags=_[108]}
+_[72]={_[107]}
+_[71]={text="autoflush",tags=_[106]}
+_[70]={text="-> ab",tags=_[105]}
+_[69]={_[104]}
+_[68]={_[103]}
+_[67]={text="-> c",tags=_[102]}
+_[66]={_[101]}
+_[65]={text="autoflush",tags=_[100]}
+_[64]={text="-> b",tags=_[99]}
+_[63]={_[98]}
+_[62]={_[97]}
+_[61]={text="-> c",tags=_[96]}
+_[60]={_[95]}
+_[59]={text="-> ab",tags=_[94]}
+_[58]={_[93]}
+_[57]={_[92]}
+_[56]={text="-> c",tags=_[91]}
+_[55]={_[90]}
+_[54]={text="-> b",tags=_[89]}
+_[53]={_[88]}
+_[52]={_[87]}
 _[51]={_[84],_[85],_[86]}
 _[50]={_[83]}
 _[49]={_[81],_[82]}
@@ -91,7 +103,7 @@ _[30]={_[56]}
 _[29]={_[55]}
 _[28]={_[54]}
 _[27]={_[52],_[53]}
-_[26]={"error","invalid choice"}
+_[26]={"error","invalid choice; in event flush at test/tests/resume from paragraph with nested choice.ans:76"}
 _[25]={"choice",_[51]}
 _[24]={"text",_[50]}
 _[23]={"choice",_[49]}
@@ -117,137 +129,140 @@ _[4]={"text",_[30]}
 _[3]={"choice",_[29]}
 _[2]={"text",_[28]}
 _[1]={"choice",_[27]}
-return {_[1],_[2],_[3],_[4],_[5],_[6],_[7],_[8],_[9],_[10],_[11],_[12],_[13],_[14],_[15],_[16],_[17],_[18],_[19],_[20],_[21],_[22],_[23],_[24],_[25],_[26]}
+_[0]={_[1],_[2],_[3],_[4],_[5],_[6],_[7],_[8],_[9],_[10],_[11],_[12],_[13],_[14],_[15],_[16],_[17],_[18],_[19],_[20],_[21],_[22],_[23],_[24],_[25],_[26]}
+_[113].tags=_[112]
+_[114].tags=_[112]
+return _[0]
 --[[
-{ "choice", { {
-      data = "a",
-      tags = {}
-    }, {
-      data = "b",
-      tags = {}
+{ "choice", { { {
+        tags = {},
+        text = "a"
+      } }, { {
+        tags = {},
+        text = "b"
+      } } } }
+{ "text", { {
+      tags = {},
+      text = "-> b"
+    } } }
+{ "choice", { { {
+        tags = {},
+        text = "c"
+      } } } }
+{ "text", { {
+      tags = {},
+      text = "-> c"
+    } } }
+{ "choice", { { {
+        tags = {},
+        text = "aa"
+      } }, { {
+        tags = {},
+        text = "ab"
+      } } } }
+{ "text", { {
+      tags = {},
+      text = "-> ab"
+    } } }
+{ "choice", { { {
+        tags = {},
+        text = "c"
+      } } } }
+{ "text", { {
+      tags = {},
+      text = "-> c"
+    } } }
+{ "choice", { { {
+        tags = {},
+        text = "a"
+      } }, { {
+        tags = {},
+        text = "b"
+      } } } }
+{ "text", { {
+      tags = {},
+      text = "-> b"
     } } }
 { "text", { {
-      data = "-> b",
-      tags = {}
+      tags = {},
+      text = "autoflush"
     } } }
-{ "choice", { {
-      data = "c",
-      tags = {}
+{ "choice", { { {
+        tags = {},
+        text = "c"
+      } } } }
+{ "text", { {
+      tags = {},
+      text = "-> c"
+    } } }
+{ "choice", { { {
+        tags = {},
+        text = "aa"
+      } }, { {
+        tags = {},
+        text = "ab"
+      } } } }
+{ "text", { {
+      tags = {},
+      text = "-> ab"
     } } }
 { "text", { {
-      data = "-> c",
-      tags = {}
-    } } }
-{ "choice", { {
-      data = "aa",
-      tags = {}
-    }, {
-      data = "ab",
-      tags = {}
+      tags = {},
+      text = "autoflush"
     } } }
+{ "choice", { { {
+        tags = {},
+        text = "c"
+      } } } }
 { "text", { {
-      data = "-> ab",
-      tags = {}
-    } } }
-{ "choice", { {
-      data = "c",
-      tags = {}
+      tags = {},
+      text = "-> c"
     } } }
+{ "choice", { { {
+        tags = {},
+        text = "a"
+      } }, { {
+        tags = {},
+        text = "b"
+      } }, { {
+        tags = {},
+        text = "c"
+      } } } }
 { "text", { {
-      data = "-> c",
-      tags = {}
-    } } }
-{ "choice", { {
-      data = "a",
-      tags = {}
-    }, {
-      data = "b",
-      tags = {}
+      tags = {},
+      text = "-> a"
     } } }
+{ "choice", { { {
+        tags = <1>{},
+        text = "aa"
+      } }, { {
+        tags = <table 1>,
+        text = "ab"
+      } } } }
 { "text", { {
-      data = "-> b",
-      tags = {}
+      tags = {},
+      text = "-> aa"
     } } }
+{ "choice", { { {
+        tags = {},
+        text = "aa"
+      } }, { {
+        tags = {},
+        text = "ab"
+      } } } }
 { "text", { {
-      data = "autoflush",
-      tags = {}
+      tags = {},
+      text = "-> aa"
     } } }
-{ "choice", { {
-      data = "c",
-      tags = {}
-    } } }
-{ "text", { {
-      data = "-> c",
-      tags = {}
-    } } }
-{ "choice", { {
-      data = "aa",
-      tags = {}
-    }, {
-      data = "ab",
-      tags = {}
-    } } }
-{ "text", { {
-      data = "-> ab",
-      tags = {}
-    } } }
-{ "text", { {
-      data = "autoflush",
-      tags = {}
-    } } }
-{ "choice", { {
-      data = "c",
-      tags = {}
-    } } }
-{ "text", { {
-      data = "-> c",
-      tags = {}
-    } } }
-{ "choice", { {
-      data = "a",
-      tags = {}
-    }, {
-      data = "b",
-      tags = {}
-    }, {
-      data = "c",
-      tags = {}
-    } } }
-{ "text", { {
-      data = "-> a",
-      tags = {}
-    } } }
-{ "choice", { {
-      data = "aa",
-      tags = <1>{}
-    }, {
-      data = "ab",
-      tags = <table 1>
-    } } }
-{ "text", { {
-      data = "-> aa",
-      tags = {}
-    } } }
-{ "choice", { {
-      data = "aa",
-      tags = {}
-    }, {
-      data = "ab",
-      tags = {}
-    } } }
-{ "text", { {
-      data = "-> aa",
-      tags = {}
-    } } }
-{ "choice", { {
-      data = "a",
-      tags = {}
-    }, {
-      data = "b",
-      tags = {}
-    }, {
-      data = "c",
-      tags = {}
-    } } }
-{ "error", "invalid choice" }
+{ "choice", { { {
+        tags = {},
+        text = "a"
+      } }, { {
+        tags = {},
+        text = "b"
+      } }, { {
+        tags = {},
+        text = "c"
+      } } } }
+{ "error", "invalid choice; in event flush at test/tests/resume from paragraph with nested choice.ans:76" }
 ]]--

test/tests/resume from paragraph with nested condition.lua

@@ -3,10 +3,10 @@ _[17]={}
 _[16]={}
 _[15]={}
 _[14]={}
-_[13]={data="x",tags=_[17]}
-_[12]={data="y",tags=_[16]}
-_[11]={data="x",tags=_[15]}
-_[10]={data="x",tags=_[14]}
+_[13]={tags=_[17],text="x"}
+_[12]={tags=_[16],text="y"}
+_[11]={tags=_[15],text="x"}
+_[10]={tags=_[14],text="x"}
 _[9]={_[13]}
 _[8]={_[12]}
 _[7]={_[11]}
@@ -19,20 +19,20 @@ _[1]={"text",_[6]}
 return {_[1],_[2],_[3],_[4],_[5]}
 --[[
 { "text", { {
-      data = "x",
-      tags = {}
+      tags = {},
+      text = "x"
     } } }
 { "text", { {
-      data = "x",
-      tags = {}
+      tags = {},
+      text = "x"
     } } }
 { "text", { {
-      data = "y",
-      tags = {}
+      tags = {},
+      text = "y"
     } } }
 { "text", { {
-      data = "x",
-      tags = {}
+      tags = {},
+      text = "x"
     } } }
 { "return" }
 ]]--

test/tests/return in choice.lua

@@ -1,10 +1,10 @@
 local _={}
 _[13]={}
 _[12]={}
-_[11]={}
-_[10]={data="Yes.",tags=_[13]}
-_[9]={data="x",tags=_[12]}
-_[8]={data="a",tags=_[11]}
+_[11]={tags=_[12],text="a"}
+_[10]={tags=_[13],text="Yes."}
+_[9]={tags=_[12],text="x"}
+_[8]={_[11]}
 _[7]={_[10]}
 _[6]={_[9]}
 _[5]={_[8]}
@@ -14,17 +14,17 @@ _[2]={"text",_[6]}
 _[1]={"choice",_[5]}
 return {_[1],_[2],_[3],_[4]}
 --[[
-{ "choice", { {
-      data = "a",
-      tags = {}
+{ "choice", { { {
+        tags = {},
+        text = "a"
+      } } } }
+{ "text", { {
+      tags = {},
+      text = "x"
     } } }
 { "text", { {
-      data = "x",
-      tags = {}
-    } } }
-{ "text", { {
-      data = "Yes.",
-      tags = {}
+      tags = {},
+      text = "Yes."
     } } }
 { "return" }
 ]]--

test/tests/string escaping.lua

@@ -1,16 +1,23 @@
 local _={}
-_[17]={}
-_[16]={}
-_[15]={}
-_[14]={}
-_[13]={data="escaping expressions abc and stuff \\ and quotes \"",tags=_[17]}
-_[12]={data="other codes \n \\ \9",tags=_[16]}
-_[11]={data="quote \"",tags=_[15]}
-_[10]={data="expression a",tags=_[14]}
-_[9]={_[13]}
-_[8]={_[12]}
-_[7]={_[11]}
-_[6]={_[10]}
+_[24]={}
+_[23]={}
+_[22]={}
+_[21]={}
+_[20]={tags=_[24],text="escaping expressions abc and stuff \\ and quotes \""}
+_[19]={tags=_[23],text="\9"}
+_[18]={tags=_[23],text=" "}
+_[17]={tags=_[23],text="\\"}
+_[16]={tags=_[23],text=" "}
+_[15]={tags=_[23],text="\n"}
+_[14]={tags=_[23],text="other codes "}
+_[13]={tags=_[22],text="\""}
+_[12]={tags=_[22],text="quote "}
+_[11]={tags=_[21],text="a"}
+_[10]={tags=_[21],text="expression "}
+_[9]={_[20]}
+_[8]={_[14],_[15],_[16],_[17],_[18],_[19]}
+_[7]={_[12],_[13]}
+_[6]={_[10],_[11]}
 _[5]={"return"}
 _[4]={"text",_[9]}
 _[3]={"text",_[8]}
@@ -19,20 +26,41 @@ _[1]={"text",_[6]}
 return {_[1],_[2],_[3],_[4],_[5]}
 --[[
 { "text", { {
-      data = "expression a",
-      tags = {}
+      tags = <1>{},
+      text = "expression "
+    }, {
+      tags = <table 1>,
+      text = "a"
     } } }
 { "text", { {
-      data = 'quote "',
-      tags = {}
+      tags = <1>{},
+      text = "quote "
+    }, {
+      tags = <table 1>,
+      text = '"'
     } } }
 { "text", { {
-      data = "other codes \n \\ \t",
-      tags = {}
+      tags = <1>{},
+      text = "other codes "
+    }, {
+      tags = <table 1>,
+      text = "\n"
+    }, {
+      tags = <table 1>,
+      text = " "
+    }, {
+      tags = <table 1>,
+      text = "\\"
+    }, {
+      tags = <table 1>,
+      text = " "
+    }, {
+      tags = <table 1>,
+      text = "\t"
     } } }
 { "text", { {
-      data = 'escaping expressions abc and stuff \\ and quotes "',
-      tags = {}
+      tags = {},
+      text = 'escaping expressions abc and stuff \\ and quotes "'
     } } }
 { "return" }
 ]]--

test/tests/tag decorator empty.lua

@@ -1,19 +1,19 @@
 local _={}
 _[7]={1}
 _[6]={1}
-_[5]={data="bar",tags=_[7]}
-_[4]={data="foo",tags=_[6]}
+_[5]={tags=_[7],text="bar"}
+_[4]={tags=_[6],text="foo"}
 _[3]={_[4],_[5]}
 _[2]={"return"}
 _[1]={"text",_[3]}
 return {_[1],_[2]}
 --[[
 { "text", { {
-      data = "foo",
-      tags = { 1 }
+      tags = { 1 },
+      text = "foo"
     }, {
-      data = "bar",
-      tags = { 1 }
+      tags = { 1 },
+      text = "bar"
     } } }
 { "return" }
 ]]--

test/tests/tag decorator nested.lua

@@ -2,21 +2,21 @@ local _={}
 _[8]={2,3}
 _[7]={1,a=_[8]}
 _[6]={1}
-_[5]={data="bar",tags=_[7]}
-_[4]={data="foo",tags=_[6]}
+_[5]={tags=_[7],text="bar"}
+_[4]={tags=_[6],text="foo"}
 _[3]={_[4],_[5]}
 _[2]={"return"}
 _[1]={"text",_[3]}
 return {_[1],_[2]}
 --[[
 { "text", { {
-      data = "foo",
-      tags = { 1 }
+      tags = { 1 },
+      text = "foo"
     }, {
-      data = "bar",
       tags = { 1,
         a = { 2, 3 }
-      }
+      },
+      text = "bar"
     } } }
 { "return" }
 ]]--

test/tests/tag decorator.lua

@@ -2,21 +2,21 @@ local _={}
 _[8]={2,3}
 _[7]={1,a=_[8]}
 _[6]={1}
-_[5]={data="bar",tags=_[7]}
-_[4]={data="foo",tags=_[6]}
+_[5]={tags=_[7],text="bar"}
+_[4]={tags=_[6],text="foo"}
 _[3]={_[4],_[5]}
 _[2]={"return"}
 _[1]={"text",_[3]}
 return {_[1],_[2]}
 --[[
 { "text", { {
-      data = "foo",
-      tags = { 1 }
+      tags = { 1 },
+      text = "foo"
     }, {
-      data = "bar",
       tags = { 1,
         a = { 2, 3 }
-      }
+      },
+      text = "bar"
     } } }
 { "return" }
 ]]--

test/tests/tag empty.lua

@@ -1,19 +1,19 @@
 local _={}
 _[7]={1}
 _[6]={1}
-_[5]={data="bar",tags=_[7]}
-_[4]={data="foo",tags=_[6]}
+_[5]={tags=_[7],text="bar"}
+_[4]={tags=_[6],text="foo"}
 _[3]={_[4],_[5]}
 _[2]={"return"}
 _[1]={"text",_[3]}
 return {_[1],_[2]}
 --[[
 { "text", { {
-      data = "foo",
-      tags = { 1 }
+      tags = { 1 },
+      text = "foo"
     }, {
-      data = "bar",
-      tags = { 1 }
+      tags = { 1 },
+      text = "bar"
     } } }
 { "return" }
 ]]--

test/tests/tag.lua

@@ -2,21 +2,21 @@ local _={}
 _[8]={2,3}
 _[7]={1,a=_[8]}
 _[6]={1}
-_[5]={data="bar",tags=_[7]}
-_[4]={data="foo",tags=_[6]}
+_[5]={tags=_[7],text="bar"}
+_[4]={tags=_[6],text="foo"}
 _[3]={_[4],_[5]}
 _[2]={"return"}
 _[1]={"text",_[3]}
 return {_[1],_[2]}
 --[[
 { "text", { {
-      data = "foo",
-      tags = { 1 }
+      tags = { 1 },
+      text = "foo"
     }, {
-      data = "bar",
       tags = { 1,
         a = { 2, 3 }
-      }
+      },
+      text = "bar"
     } } }
 { "return" }
 ]]--

test/tests/text block.lua

@@ -1,19 +1,19 @@
 local _={}
 _[7]={}
 _[6]={}
-_[5]={data="b c",tags=_[7]}
-_[4]={data="a",tags=_[6]}
+_[5]={tags=_[7],text="b c"}
+_[4]={tags=_[6],text="a"}
 _[3]={_[4],_[5]}
 _[2]={"return"}
 _[1]={"text",_[3]}
 return {_[1],_[2]}
 --[[
 { "text", { {
-      data = "a",
-      tags = {}
+      tags = {},
+      text = "a"
     }, {
-      data = "b c",
-      tags = {}
+      tags = {},
+      text = "b c"
     } } }
 { "return" }
 ]]--

test/tests/text break.lua

@@ -1,8 +1,8 @@
 local _={}
 _[9]={}
 _[8]={}
-_[7]={data="b c",tags=_[9]}
-_[6]={data="a",tags=_[8]}
+_[7]={tags=_[9],text="b c"}
+_[6]={tags=_[8],text="a"}
 _[5]={_[7]}
 _[4]={_[6]}
 _[3]={"return"}
@@ -11,12 +11,12 @@ _[1]={"text",_[4]}
 return {_[1],_[2],_[3]}
 --[[
 { "text", { {
-      data = "a",
-      tags = {}
+      tags = {},
+      text = "a"
     } } }
 { "text", { {
-      data = "b c",
-      tags = {}
+      tags = {},
+      text = "b c"
     } } }
 { "return" }
 ]]--

test/tests/text format.lua

@@ -1,14 +1,18 @@
 local _={}
-_[5]={}
-_[4]={data="a: 5",tags=_[5]}
-_[3]={_[4]}
+_[6]={}
+_[5]={tags=_[6],text="5"}
+_[4]={tags=_[6],text="a: "}
+_[3]={_[4],_[5]}
 _[2]={"return"}
 _[1]={"text",_[3]}
 return {_[1],_[2]}
 --[[
 { "text", { {
-      data = "a: 5",
-      tags = {}
+      tags = <1>{},
+      text = "a: "
+    }, {
+      tags = <table 1>,
+      text = "5"
     } } }
 { "return" }
 ]]--

test/tests/text line interpolation with choice event.ans

@@ -0,0 +1,16 @@
+Press {jump button} to jump.
+
+$ jump button
+	A # 1
+	~ choose(1)
+	> Surprise choice!
+		ok
+
+Use {move axis} to move.
+
+$ move axis
+	left # 1
+	~ choose(1)
+	> Surprise choice!
+		ok2
+	@" joystick"

test/tests/text line interpolation with choice event.lua

@@ -0,0 +1,82 @@
+local _={}
+_[36]={}
+_[35]={tags=_[36],text="Surprise choice!"}
+_[34]={1}
+_[33]={}
+_[32]={}
+_[31]={tags=_[32],text="Surprise choice!"}
+_[30]={1}
+_[29]={}
+_[28]={tags=_[33],text=" to move."}
+_[27]={tags=_[33],text=" joystick"}
+_[26]={tags=_[36],text="ok2"}
+_[25]={_[35]}
+_[24]={tags=_[34],text="left"}
+_[23]={tags=_[33],text="Use "}
+_[22]={tags=_[29],text=" to jump."}
+_[21]={tags=_[32],text="ok"}
+_[20]={_[31]}
+_[19]={tags=_[30],text="A"}
+_[18]={tags=_[29],text="Press "}
+_[17]={_[27],_[28]}
+_[16]={_[26]}
+_[15]={_[25]}
+_[14]={_[23],_[24]}
+_[13]={_[22]}
+_[12]={_[21]}
+_[11]={_[20]}
+_[10]={_[18],_[19]}
+_[9]={"return"}
+_[8]={"text",_[17]}
+_[7]={"text",_[16]}
+_[6]={"choice",_[15]}
+_[5]={"text",_[14]}
+_[4]={"text",_[13]}
+_[3]={"text",_[12]}
+_[2]={"choice",_[11]}
+_[1]={"text",_[10]}
+return {_[1],_[2],_[3],_[4],_[5],_[6],_[7],_[8],_[9]}
+--[[
+{ "text", { {
+      tags = {},
+      text = "Press "
+    }, {
+      tags = { 1 },
+      text = "A"
+    } } }
+{ "choice", { { {
+        tags = {},
+        text = "Surprise choice!"
+      } } } }
+{ "text", { {
+      tags = {},
+      text = "ok"
+    } } }
+{ "text", { {
+      tags = {},
+      text = " to jump."
+    } } }
+{ "text", { {
+      tags = {},
+      text = "Use "
+    }, {
+      tags = { 1 },
+      text = "left"
+    } } }
+{ "choice", { { {
+        tags = {},
+        text = "Surprise choice!"
+      } } } }
+{ "text", { {
+      tags = {},
+      text = "ok2"
+    } } }
+{ "text", { {
+      tags = <1>{},
+      text = " joystick"
+    }, {
+      tags = <table 1>,
+      text = " to move."
+    } } }
+{ "return" }
+]]--

test/tests/text line interpolation with event flush.ans

@@ -0,0 +1,13 @@
+Press {jump button} to jump.
+
+$ jump button
+	A # 1
+
+	@
+
+Use {move axis} to move.
+
+$ move axis
+	left # 1
+
+	@" joystick"

test/tests/text line interpolation with event flush.lua

@@ -0,0 +1,50 @@
+local _={}
+_[20]={1}
+_[19]={}
+_[18]={1}
+_[17]={}
+_[16]={text=" to move.",tags=_[19]}
+_[15]={text=" joystick",tags=_[19]}
+_[14]={text="left",tags=_[20]}
+_[13]={text="Use ",tags=_[19]}
+_[12]={text=" to jump.",tags=_[17]}
+_[11]={text="A",tags=_[18]}
+_[10]={text="Press ",tags=_[17]}
+_[9]={_[15],_[16]}
+_[8]={_[13],_[14]}
+_[7]={_[12]}
+_[6]={_[10],_[11]}
+_[5]={"return"}
+_[4]={"text",_[9]}
+_[3]={"text",_[8]}
+_[2]={"text",_[7]}
+_[1]={"text",_[6]}
+return {_[1],_[2],_[3],_[4],_[5]}
+--[[
+{ "text", { {
+      tags = {},
+      text = "Press "
+    }, {
+      tags = { 1 },
+      text = "A"
+    } } }
+{ "text", { {
+      tags = {},
+      text = " to jump."
+    } } }
+{ "text", { {
+      tags = {},
+      text = "Use "
+    }, {
+      tags = { 1 },
+      text = "left"
+    } } }
+{ "text", { {
+      tags = <1>{},
+      text = " joystick"
+    }, {
+      tags = <table 1>,
+      text = " to move."
+    } } }
+{ "return" }
+]]--

test/tests/text line interpolation with text event.ans

@@ -0,0 +1,10 @@
+Press {jump button} to jump.
+
+$ jump button
+	A # 1
+
+Use {move axis} to move.
+
+$ move axis
+	left # 1
+	@" joystick"

test/tests/text line interpolation with text event.lua

@@ -0,0 +1,44 @@
+local _={}
+_[16]={1}
+_[15]={}
+_[14]={1}
+_[13]={}
+_[12]={tags=_[15],text=" to move."}
+_[11]={tags=_[15],text=" joystick"}
+_[10]={tags=_[16],text="left"}
+_[9]={tags=_[15],text="Use "}
+_[8]={tags=_[13],text=" to jump."}
+_[7]={tags=_[14],text="A"}
+_[6]={tags=_[13],text="Press "}
+_[5]={_[9],_[10],_[11],_[12]}
+_[4]={_[6],_[7],_[8]}
+_[3]={"return"}
+_[2]={"text",_[5]}
+_[1]={"text",_[4]}
+return {_[1],_[2],_[3]}
+--[[
+{ "text", { {
+      tags = <1>{},
+      text = "Press "
+    }, {
+      tags = { 1 },
+      text = "A"
+    }, {
+      tags = <table 1>,
+      text = " to jump."
+    } } }
+{ "text", { {
+      tags = <1>{},
+      text = "Use "
+    }, {
+      tags = { 1 },
+      text = "left"
+    }, {
+      tags = <table 1>,
+      text = " joystick"
+    }, {
+      tags = <table 1>,
+      text = " to move."
+    } } }
+{ "return" }
+]]--

test/tests/text.lua

@@ -1,14 +1,14 @@
 local _={}
 _[5]={}
-_[4]={data="a",tags=_[5]}
+_[4]={tags=_[5],text="a"}
 _[3]={_[4]}
 _[2]={"return"}
 _[1]={"text",_[3]}
 return {_[1],_[2]}
 --[[
 { "text", { {
-      data = "a",
-      tags = {}
+      tags = {},
+      text = "a"
     } } }
 { "return" }
 ]]--

test/tests/unary operator overload.lua

@@ -2,9 +2,9 @@ local _={}
 _[13]={}
 _[12]={}
 _[11]={}
-_[10]={data="generic minus",tags=_[13]}
-_[9]={data="minus lol",tags=_[12]}
-_[8]={data="-5",tags=_[11]}
+_[10]={tags=_[13],text="generic minus"}
+_[9]={tags=_[12],text="minus lol"}
+_[8]={tags=_[11],text="-5"}
 _[7]={_[10]}
 _[6]={_[9]}
 _[5]={_[8]}
@@ -15,16 +15,16 @@ _[1]={"text",_[5]}
 return {_[1],_[2],_[3],_[4]}
 --[[
 { "text", { {
-      data = "-5",
-      tags = {}
+      tags = {},
+      text = "-5"
     } } }
 { "text", { {
-      data = "minus lol",
-      tags = {}
+      tags = {},
+      text = "minus lol"
     } } }
 { "text", { {
-      data = "generic minus",
-      tags = {}
+      tags = {},
+      text = "generic minus"
     } } }
 { "return" }
 ]]--

test/tests/unseen line.lua

@@ -4,31 +4,31 @@ _[12]={}
 _[11]={}
 _[10]={}
 _[9]={}
-_[8]={data="b",tags=_[13]}
-_[7]={data="a",tags=_[12]}
-_[6]={data="b",tags=_[11]}
-_[5]={data="seen only once",tags=_[10]}
-_[4]={data="a",tags=_[9]}
+_[8]={tags=_[13],text="b"}
+_[7]={tags=_[12],text="a"}
+_[6]={tags=_[11],text="b"}
+_[5]={tags=_[10],text="seen only once"}
+_[4]={tags=_[9],text="a"}
 _[3]={_[4],_[5],_[6],_[7],_[8]}
 _[2]={"return"}
 _[1]={"text",_[3]}
 return {_[1],_[2]}
 --[[
 { "text", { {
-      data = "a",
-      tags = {}
+      tags = {},
+      text = "a"
     }, {
-      data = "seen only once",
-      tags = {}
+      tags = {},
+      text = "seen only once"
     }, {
-      data = "b",
-      tags = {}
+      tags = {},
+      text = "b"
     }, {
-      data = "a",
-      tags = {}
+      tags = {},
+      text = "a"
     }, {
-      data = "b",
-      tags = {}
+      tags = {},
+      text = "b"
     } } }
 { "return" }
 ]]--

test/tests/variable alias.lua

@@ -1,14 +1,22 @@
 local _={}
-_[5]={}
-_[4]={data="42 = 42",tags=_[5]}
-_[3]={_[4]}
+_[7]={}
+_[6]={tags=_[7],text="42"}
+_[5]={tags=_[7],text=" = "}
+_[4]={tags=_[7],text="42"}
+_[3]={_[4],_[5],_[6]}
 _[2]={"return"}
 _[1]={"text",_[3]}
 return {_[1],_[2]}
 --[[
 { "text", { {
-      data = "42 = 42",
-      tags = {}
+      tags = <1>{},
+      text = "42"
+    }, {
+      tags = <table 1>,
+      text = " = "
+    }, {
+      tags = <table 1>,
+      text = "42"
     } } }
 { "return" }
 ]]--