Changing to use Dijkstra algorithm to parse infix notation into postf…

…ix ( Reverse Polish Notation). This allows us to more flexibility of using boolean expressions and not limited to flaky regex.
utPLSQL · jgebal · Apr 28, 2023 · Mar 28, 2023 · Mar 28, 2023 · Mar 29, 2023
commit 20e317742e00f5299b2abd2675160d4b2cc38b86
diff --git a/source/api/ut_runner.pkb b/source/api/ut_runner.pkb
@@ -95,10 +95,6 @@ create or replace package body ut_runner is
     ut_event_manager.trigger_event(ut_event_manager.gc_initialize);
     ut_event_manager.trigger_event(ut_event_manager.gc_debug, ut_run_info());
 
-    if ut_utils.valid_tag_expression(l_tags) = 0 then
-      raise_application_error(ut_utils.gc_invalid_tag_expression, 'Invalid Tag expression');
-    end if;
-
     if a_random_test_order_seed is not null then
       l_random_test_order_seed  := a_random_test_order_seed;
     elsif a_random_test_order then

diff --git a/source/core/types/ut_stack.tpb b/source/core/types/ut_stack.tpb
@@ -0,0 +1,58 @@
+create or replace type body ut_stack as
+ /*
+  utPLSQL - Version 3
+  Copyright 2016 - 2021 utPLSQL Project
+
+  Licensed under the Apache License, Version 2.0 (the "License"):
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  */
+
+  constructor function ut_stack( self in out nocopy ut_stack) return self as result is
+  begin
+    self.tokens := ut_varchar2_list();
+    self.top := 0;
+    return;
+  end ut_stack;
+
+  member function peek(self in out nocopy ut_stack) return varchar2 is
+    l_token varchar2(32767);
+  begin
+    if self.tokens.count =0 or self.tokens is null then
+      l_token := null;
+    else
+      l_token := self.tokens(self.tokens.last);
+    end if;
+    return l_token;
+  end;
+
+  member procedure push(self in out nocopy ut_stack, a_token varchar2) is
+  begin
+    self.tokens.extend;
+    self.tokens(self.tokens.last) := a_token;
+    self.top := self.tokens.count;
+  end push;
+
+  member procedure pop(self in out nocopy ut_stack,a_cnt in integer default 1) is
+  begin
+    self.tokens.trim(a_cnt);
+    self.top := self.tokens.count;
+  end pop;
+
+  member function pop(self in out nocopy ut_stack) return varchar2 is
+    l_token varchar2(32767) := self.tokens(self.tokens.last);
+  begin
+    self.pop();
+    return l_token;
+  end;
+end;  
+/
+
diff --git a/source/core/types/ut_stack.tps b/source/core/types/ut_stack.tps
@@ -0,0 +1,26 @@
+create or replace type ut_stack as object (
+  top integer,
+  tokens ut_varchar2_list,
+  /*
+  utPLSQL - Version 3
+  Copyright 2016 - 2021 utPLSQL Project
+
+  Licensed under the Apache License, Version 2.0 (the "License"):
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  */
+  constructor function ut_stack( self in out nocopy ut_stack) return self as result,
+  member function peek(self in out nocopy ut_stack) return varchar2,
+  member procedure push(self in out nocopy ut_stack, a_token varchar2),
+  member procedure pop(self in out nocopy ut_stack,a_cnt in integer default 1),
+  member function pop(self in out nocopy ut_stack) return varchar2
+)
+
diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb
@@ -234,11 +234,11 @@ create or replace package body ut_suite_cache_manager is
   function replace_legacy_tag_notation(a_tags varchar2
   ) return varchar2 is
     l_tags ut_varchar2_list := ut_utils.string_to_table(a_tags,',');
-    l_tags_include varchar2(2000);
-    l_tags_exclude varchar2(2000);
+    l_tags_include varchar2(4000);
+    l_tags_exclude varchar2(4000);
     l_return_tag varchar2(4000);
   begin
-    select listagg( t.column_value,' | ')
+    select listagg( t.column_value,'|')
       within group( order by column_value) 
     into l_tags_include
     from table(l_tags) t
@@ -268,15 +268,14 @@ create or replace package body ut_suite_cache_manager is
     if instr(l_tags,',') > 0 or instr(l_tags,'-') > 0 then
       l_tags := replace(replace_legacy_tag_notation(l_tags),' ');
     end if;
-    l_tags := REGEXP_REPLACE(l_tags, 
-                      '(\(|\)|\||\!|\&)?([^|&!-()]+)(\(|\)|\||\!|\&)?', 
-                      q'[\1q'<\2>' member of tags\3]');    
-    --replace operands to XPath
+    l_tags := ut_utils.convert_postfix_to_infix_where_sql(ut_utils.shunt_logical_expression(l_tags));
     l_tags := REPLACE(l_tags, '|',' or ');
-    l_tags := REPLACE(l_tags , '&',' and ');
-    l_tags := REGEXP_REPLACE(l_tags,q'[(\!)(q'<[^|&!]+?>')( member of tags)]','\2 not \3');
-    l_tags := '('||l_tags||')';
-    return l_tags;       
+    l_tags := REPLACE(l_tags ,'&',' and ');
+    l_tags := REPLACE(l_tags ,'!','not');
+    return l_tags; 
+  exception 
+    when ut_utils.ex_invalid_tag_expression then
+    raise_application_error(ut_utils.gc_invalid_tag_expression, 'Invalid Tag expression');    
   end;  
 
   /*