[api] allow text event data grouping by tag

anselme/ast/Choice.lua

@@ -1,9 +1,17 @@
+local class = require("anselme.lib.class")
 local ast = require("anselme.ast")
 local ArgumentTuple
 local Event = ast.abstract.Event
 
 local operator_priority = require("anselme.common").operator_priority
 
+local ChoiceEventData = class {
+	_selected = nil,
+	choose = function(self, choice)
+		self._selected = choice
+	end
+}
+
 local Choice
 Choice = ast.abstract.Runtime(Event) {
 	type = "choice",
@@ -26,12 +34,7 @@ Choice = ast.abstract.Runtime(Event) {
 	end,
 
 	build_event_data = function(self, state, event_buffer)
-		local l = {
+		local l = ChoiceEventData:new()
-			_selected = nil,
-			choose = function(self, choice)
-				self._selected = choice
-			end
-		}
 		for _, c in event_buffer:iter(state) do
 			table.insert(l, c.text)
 		end

anselme/ast/Text.lua

@@ -1,11 +1,38 @@
+local class = require("anselme.lib.class")
 local ast = require("anselme.ast")
 local Event, Runtime = ast.abstract.Event, ast.abstract.Runtime
 local ArgumentTuple
 
+local to_anselme = require("anselme.common.to_anselme")
+
+local TextEventData
+TextEventData = class {
+	-- returns a list of TextEventData where the first element of each text of each TextEventData has the same value for the tag tag_name
+	group_by = function(self, tag_name)
+		local l = {}
+		local current_group
+		local tag_key = to_anselme(tag_name)
+		local last_value
+		for _, event in ipairs(self) do
+			local list = event.list
+			if #list > 0 then
+				local value = list[1][2]:get_strict(tag_key)
+				if (not current_group) or (last_value == nil and value) or (last_value and value == nil) or (last_value and value and last_value:hash() ~= value:hash()) then -- new group
+					current_group = TextEventData:new()
+					table.insert(l, current_group)
+					last_value = value
+				end
+				table.insert(current_group, event) -- add to current group
+			end
+		end
+		return l
+	end,
+}
+
 local Text = Runtime(Event) {
 	type = "text",
 
-	list = nil, -- { { String, tag Table }, ... }
+	list = nil, -- { { String, tag Struct }, ... }
 
 	init = function(self)
 		self.list = {}
@@ -36,9 +63,13 @@ local Text = Runtime(Event) {
 
 	-- Text comes from TextInterpolation which already evals the contents
 
-	to_event_data = function(self)
+	build_event_data = function(self, state, event_buffer)
-		return self
+		local l = TextEventData:new()
-	end
+		for _, event in event_buffer:iter(state) do
+			table.insert(l, event)
+		end
+		return l
+	end,
 }
 
 package.loaded[...] = Text

anselme/ast/abstract/Event.lua

@@ -7,15 +7,9 @@ return ast.abstract.Node {
 	init = false,
 
 	-- returns value that will be yielded by the whole event buffer data on flush
-	-- by default a list of what is returned by :to_event_data for each event of the buffer
 	build_event_data = function(self, state, event_buffer)
-		local l = {}
+		error("build_event_data not implemented for "..self.type)
-		for _, event in event_buffer:iter(state) do
-			table.insert(l, event:to_event_data(state))
-		end
-		return l
 	end,
-	to_event_data = function(self, state) error("unimplemented") end,
 
 	-- post_flush_callback(self, state, event_buffer, event_data)
 	post_flush_callback = false

anselme/lib/class.lua

@@ -3,7 +3,7 @@
 --
 -- usage:
 --
--- local class = require("anselme.lib.class")
+-- local class = require("class")
 -- local Vehicle = class {
 -- 	type = "vehicle", -- class name, optional
 --
@@ -28,7 +28,7 @@
 -- local car = Car:new("red") -- instancing
 -- print(car:is_stable(), car.color) -- true, "red"
 --
--- the default class returned by require("anselme.lib.class") contains a few other default methods that will be inherited by all subclasses
+-- the default class returned by require("class") contains a few other default methods that will be inherited by all subclasses
 -- see line 99 and further for details & documentation
 --
 -- design philosophy:
@@ -70,9 +70,9 @@ local function add_to_set(set, val)
 end
 
 --# class creation logic #--
-local class_mt
+local new_class, class_mt
 
-local function new_class(...)
+new_class = function(...)
 	local class = {}
 	local include = {...}
 	for i=1, #include do

test/results/text grouping.ans

@@ -0,0 +1,45 @@
+--# run #--
+--- text ---
+| {}"A" |
+| {}"A" |
+| {}"A" |
+--- text ---
+| {"group":1}"B" |
+| {"group":1}"B" |
+| {"group":1}"B" |
+--- text ---
+:: group ::
+| {"group":1}"C" |
+| {"group":1}"C" |
+:: group ::
+| {"group":3}"D" |
+--- text ---
+:: group ::
+| {"group":1}"E" |
+:: group ::
+| {"group":"j"}"F" |
+:: group ::
+| {"group":1}"G" |
+--- text ---
+:: group ::
+| {"group":1}"H" |
+:: group ::
+| {}"I" |
+:: group ::
+| {"group":1}"J" |
+--- text ---
+:: group ::
+| {"group":1}"K" |
+:: group ::
+| {}"L" |
+| {"not group":1}"L" |
+--- text ---
+:: group ::
+| {}"M" |
+:: group ::
+| {"group":"j"}"N" |
+| {"group":"j"}"N" |
+--- return ---
+()
+--# saved #--
+{}

test/run.lua

@@ -33,8 +33,13 @@ local function run_loop(run_state, write_output, interactive)
 		local e, data = run_state:step()
 		write_output("--- "..e.." ---")
 		if e == "text" then
-			for _, l in ipairs(data) do
+			local grouped = data:group_by("group")
-				write_output(l:format(run_state))
+			local groups = #grouped > 1
+			for _, v in ipairs(grouped) do
+				if groups then write_output(":: group ::") end
+				for _, l in ipairs(v) do
+					write_output(l:format(run_state))
+				end
 			end
 		elseif e == "choice" then
 			local choice

test/tests/text grouping.ans

@@ -0,0 +1,39 @@
+| A
+| A
+| A
+
+"group": 1 #
+	| B
+	| B
+	| B
+
+"group": 1 #
+	| C
+"group": 1 #
+	| C
+"group": 3 #
+	| D
+
+"group": 1 #
+	| E
+"group": "j" #
+	| F
+"group": 1 #
+	| G
+
+"group": 1 #
+	| H
+| I
+"group": 1 #
+	| J
+
+"group": 1 #
+	| K
+| L
+"not group": 1 #
+	| L
+
+| M
+"group": "j" #
+	| N
+	| N