Merge branch 'gh/issue42' into 'master'

Fix handling of cursor tag of dimension 1 and length 1.

Closes #3

See merge request eng/toolchain/templates-parser!4

Author: TurboGit

regtests/tests/0142_cursor_tag_len_1/cursor_tag_l1.gpr

@@ -0,0 +1,13 @@
+with "templates_parser";
+
+project Cursor_Tag_L1 is
+
+  for Languages use ("Ada");
+
+  for Source_Dirs use ("src");
+  for Object_Dir use "obj";
+  for Exec_Dir use "bin";
+
+  for Main use ("main.adb");
+
+end Cursor_Tag_L1;

regtests/tests/0142_cursor_tag_len_1/src/cursor_l1-cursors.adb

@@ -0,0 +1,39 @@
+
+package body Cursor_L1.Cursors is
+
+   ---------------
+   -- Dimension --
+   ---------------
+
+   function Dimension
+     (Cursor_Tag : not null access Cursor_Type;
+      Var_Name   : String) return Natural is
+   begin
+      return 1;
+   end Dimension;
+
+   ------------
+   -- Length --
+   ------------
+
+   function Length
+     (Cursor_Tag : not null access Cursor_Type;
+      Var_Name   : String;
+      Path       : Templates_Parser.Dynamic.Path) return Natural is
+   begin
+      return Natural (Values.Length);
+   end Length;
+
+   -----------
+   -- Value --
+   -----------
+
+   function Value
+     (Cursor_Tag : not null access Cursor_Type;
+      Var_Name   : String;
+      Path       : Templates_Parser.Dynamic.Path) return String is
+   begin
+      return Values.Element (Path(1))'Image;
+   end Value;
+
+end Cursor_L1.Cursors;

regtests/tests/0142_cursor_tag_len_1/src/cursor_l1-cursors.ads

@@ -0,0 +1,45 @@
+
+with Ada.Containers.Vectors;
+
+with Templates_Parser;
+
+package Cursor_L1.Cursors is
+
+   package Values_Container is new
+     Ada.Containers.Vectors (Index_Type   => Positive,
+                             Element_Type => Natural);
+
+   Values : Values_Container.Vector;
+
+
+   type Cursor_Type is new Templates_Parser.Dynamic.Cursor_Tag with null record;
+
+   ---------------
+   -- Dimension --
+   ---------------
+
+   function Dimension
+     (Cursor_Tag : not null access Cursor_Type;
+      Var_Name   : String) return Natural;
+
+   ------------
+   -- Length --
+   ------------
+
+   function Length
+     (Cursor_Tag : not null access Cursor_Type;
+      Var_Name   : String;
+      Path       : Templates_Parser.Dynamic.Path) return Natural;
+
+   -----------
+   -- Value --
+   -----------
+
+   function Value
+     (Cursor_Tag : not null access Cursor_Type;
+      Var_Name   : String;
+      Path       : Templates_Parser.Dynamic.Path) return String;
+
+   Handler : aliased Cursor_L1.Cursors.Cursor_Type;
+
+end Cursor_L1.Cursors;

regtests/tests/0142_cursor_tag_len_1/src/cursor_l1.ads

@@ -0,0 +1,2 @@
+package Cursor_L1 is
+end Cursor_L1;

regtests/tests/0142_cursor_tag_len_1/src/main.adb

@@ -0,0 +1,35 @@
+
+with Ada.Command_Line;
+with Ada.Exceptions;
+with Ada.Text_IO;
+
+with Templates_Parser;
+
+with Cursor_L1.Cursors;
+
+procedure Main is
+   use Ada;
+
+   N   : constant Natural :=
+           Natural'Value (Ada.Command_Line.Argument (1));
+   Set : Templates_Parser.Translate_Set;
+begin
+   for Index in 1 .. N loop
+      Cursor_L1.Cursors.Values.Append (Index);
+   end loop;
+
+   Text_IO.Put_Line ("N:" & Natural'Image (N));
+
+   declare
+      Content : constant String :=
+        Templates_Parser.Parse
+          (Filename     => "tmplt/cl1.tmplt",
+           Translations => Set,
+           Cursor_Tag   => Cursor_L1.Cursors.Handler'Access);
+   begin
+      Text_IO.Put_Line (Content);
+   end;
+exception
+   when E : others =>
+      Text_IO.Put_Line ("(FF)" & Ada.Exceptions.Exception_Information (E));
+end Main;

regtests/tests/0142_cursor_tag_len_1/test.out

@@ -0,0 +1,14 @@
+N: 5
+     1  2  3  4  5
+
+     1
+     2
+     3
+     4
+     5
+
+N: 1
+     1
+
+     1
+

regtests/tests/0142_cursor_tag_len_1/test.py

@@ -0,0 +1,5 @@
+from test_support import *
+
+gprbuild('cursor_tag_l1')
+run(['bin/main', '5'])
+run(['bin/main', '1'])

regtests/tests/0142_cursor_tag_len_1/test.yaml

@@ -0,0 +1 @@
+# Needed even if empty, checked by the testsuite driver

regtests/tests/0142_cursor_tag_len_1/tmplt/cl1.tmplt

@@ -0,0 +1,6 @@
+    @_CURSOR_@
+
+@@TABLE@@
+    @_CURSOR_@
+@@END_TABLE@@
+

src/templates_parser.adb

@@ -5044,8 +5044,8 @@ package body Templates_Parser is
                                    (Cursor_Tag, Name, Path => (1 => 1));
 
                                  if D = 1 and then L1 = 1 then
-                                    --  Not a composite tag
-                                    return 0;
+                                    --  Not a composite tag, but a standard tag
+                                    return 1;
 
                                  elsif K = 1 then
                                     return L1;