utPLSQL
diff --git a/‎source/core/annotations/ut_annotations.pkb‎
Lines changed: 8 additions & 4 deletions b/‎source/core/annotations/ut_annotations.pkb‎
Lines changed: 8 additions & 4 deletions
diff --git a/‎source/core/annotations/ut_annotations.pks‎
Lines changed: 4 additions & 2 deletions b/‎source/core/annotations/ut_annotations.pks‎
Lines changed: 4 additions & 2 deletions
@@ -146,12 +146,13 @@ create or replace package body ut_annotations as
       end;
   end;
 
-  function get_procedure_annotations(a_source clob, a_comments tt_comment_list) return tt_procedure_annotations is
+  function get_procedure_list(a_source clob, a_comments tt_comment_list) return tt_procedure_list is
     l_proc_comments         varchar2(32767);
     l_proc_name             t_annotation_name;
     l_annot_proc_ind        number;
     l_annot_proc_block      varchar2(32767);
     l_procedure_annotations tt_procedure_annotations;
+    l_procedure_list        tt_procedure_list;
   begin
     -- loop through procedures and functions of the package and get all the comment blocks just before it's declaration
     l_annot_proc_ind := 1;
@@ -183,15 +184,18 @@ create or replace package body ut_annotations as
                                            ,subexpression => 5));
 
       -- parse the comment block for the syntactically correct annotations and store them as an array
-      l_procedure_annotations(l_proc_name) := get_annotations(l_proc_comments, a_comments);
+      l_procedure_annotations.name := l_proc_name;
+      l_procedure_annotations.annotations := get_annotations(l_proc_comments, a_comments);
+      
+      l_procedure_list(l_procedure_list.count+1) := l_procedure_annotations;
 
       --l_annot_proc_ind := l_annot_proc_ind + length(l_annot_proc_block);
       l_annot_proc_ind := regexp_instr(srcstr     => a_source
                                       ,pattern    => ';'
                                       ,occurrence => 1
                                       ,position   => l_annot_proc_ind + length(l_annot_proc_block));
     end loop;
-    return l_procedure_annotations;
+    return l_procedure_list;
   end;
 
   function extract_and_replace_comments(a_source in out nocopy clob) return tt_comment_list is
@@ -307,7 +311,7 @@ create or replace package body ut_annotations as
 
     l_annotated_pkg.package_annotations  := get_package_annotations(l_source, l_comments);
 
-    l_annotated_pkg.procedure_annotations := get_procedure_annotations(l_source, l_comments);
+    l_annotated_pkg.procedure_annotations := get_procedure_list(l_source, l_comments);
 
     -- printing out parsed structure for debugging
     $if $$ut_trace $then
 
@@ -39,15 +39,17 @@ create or replace package ut_annotations authid definer as
     type: tt_procedure_annotations
     a list of tt_annotations index by the procedure name
   */
-  type tt_procedure_annotations is table of tt_annotations index by t_procedure_name;
+  type tt_procedure_annotations is record(name t_procedure_name, annotations tt_annotations);
+  
+  type tt_procedure_list is table of tt_procedure_annotations index by pls_integer;
 
   /*
     type: typ_annotated_package
     a structure containing a list of package level annotations and a list of procedure level annotations
 
   */
   type typ_annotated_package is record(
-     procedure_annotations  tt_procedure_annotations
+     procedure_annotations  tt_procedure_list
     ,package_annotations    tt_annotations);
 
   /*