Fixed issues with comment-replace in big package specs.

jgebal · jgebal · commit 71d0b7041e0e · 2018-04-14T23:25:27.000+01:00
diff --git a/examples/developer_examples/RunExampleTestAnnotationsParsingTimeHugePackage.sql b/examples/developer_examples/RunExampleTestAnnotationsParsingTimeHugePackage.sql
@@ -1,14 +1,21 @@
 --Shows that even a very large package specification can be parsed quite quickly
 --Clear Screen
-Set Serveroutput On Size Unlimited format truncated
+set serveroutput on
 set echo off
 --install the example unit test packages
 @@tst_pkg_huge.pks
 
 declare
   l_suites ut_suite_items;
+  l_items  ut_suite_items;
 begin
   l_suites := ut_suite_manager.configure_execution_by_path(ut_varchar2_list(USER||'.TST_PKG_HUGE'));
+  l_items := treat(
+      treat( treat( l_suites( 1 ) as ut_logical_suite ).items( 1 ) as ut_logical_suite ).items( 1 )
+      as ut_logical_suite
+  ).items;
+  dbms_output.put_line('Created '||l_items.count||' tests in suite');
+  dbms_output.put_line('  Last test name='||l_items(l_items.last).name);
 end;
 /
 
diff --git a/source/core/annotations/ut_annotation_parser.pkb b/source/core/annotations/ut_annotation_parser.pkb
@@ -130,10 +130,7 @@ create or replace package body ut_annotation_parser as
       -- parse the comment block for the syntactically correct annotations and store them as an array
       add_annotations(a_annotations, l_proc_comments, a_comments, l_proc_name);
 
-      l_annot_proc_ind := regexp_instr(srcstr     => a_source
-                                      ,pattern    => ';'
-                                      ,occurrence => 1
-                                      ,position   => l_annot_proc_ind + length(l_annot_proc_block) );
+      l_annot_proc_ind := instr(a_source, ';', l_annot_proc_ind + length(l_annot_proc_block) );
     end loop;
   end add_procedure_annotations;
 
@@ -197,7 +194,7 @@ create or replace package body ut_annotation_parser as
     l_comment_index    positive;
   begin
 
-    l_source := ut_utils.replace_multiline_comments(l_source);
+     l_source := ut_utils.replace_multiline_comments(l_source);
 
     -- replace all single line comments with {COMMENT#12} element and store it's content for easier processing
     -- this call modifies l_source
diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb
@@ -616,9 +616,9 @@ procedure append_to_clob(a_src_clob in out nocopy clob, a_clob_table t_clob_tab,
         end if;
 
         if l_end = 0 then
-          append_to_clob(l_result, dbms_lob.substr(a_source, l_length-l_offset, l_offset));
+          append_to_clob(l_result, substr(a_source, l_offset, l_length-l_offset));
         else
-          append_to_clob(l_result, dbms_lob.substr(a_source, l_end-l_offset, l_offset));
+          append_to_clob(l_result, substr(a_source, l_offset, l_end-l_offset));
         end if;
       end if;
       l_offset := l_end;
@@ -635,7 +635,7 @@ procedure append_to_clob(a_src_clob in out nocopy clob, a_clob_table t_clob_tab,
         l_escaped_text_start := instr(a_source,q'[q']',l_offset);
       end if;
     end loop;
-    append_to_clob(l_result, dbms_lob.substr(a_source, offset=>l_end));
+    append_to_clob(l_result, substr(a_source, l_end));
     return l_result;
   end;
 
