From 6aaec0be9f566e79c58e8fdf7985ea9e4cd036a3 Mon Sep 17 00:00:00 2001 From: Jocelyn Fiat Date: Mon, 2 Nov 2015 18:10:27 +0100 Subject: [PATCH] Fixed table item computation for ini file, especially with included ini file. --- library/configuration/src/ini_config.e | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/library/configuration/src/ini_config.e b/library/configuration/src/ini_config.e index 56abea5..4922623 100644 --- a/library/configuration/src/ini_config.e +++ b/library/configuration/src/ini_config.e @@ -456,7 +456,17 @@ feature {NONE} -- Implementation sk.left_adjust sk.right_adjust k.keep_head (i - 1) - if attached {STRING_TABLE [STRING_8]} items.item (k) as l_table then + if + a_section_prefix /= Void and then + attached {STRING_TABLE [STRING_8]} items.item (a_section_prefix + {STRING_32} "." + k) as l_table + then + tb := l_table + elseif + attached last_section_name as l_section_prefix and then + attached {STRING_TABLE [STRING_8]} items.item (l_section_prefix + {STRING_32} "." + k) as l_table + then + tb := l_table + elseif attached {STRING_TABLE [STRING_8]} items.item (k) as l_table then tb := l_table else create tb.make (1)