Fixes

Author: AnFunctionArray

faster.regex

@@ -14,7 +14,7 @@
 (?<fasterdecls>(?(?=(?{push2 \@matches, {}})(?<declbod>((?&typeorqualifortypdf)
     |\s*+(struct|union|enum)\s*+(?<identtag>(?&identifierpure))?+\s*+((?&brackets)(?{register_taggable()}))?+)*+
     (?<identoutter>\s*+(?&ptr)*+((?&rndbrcksdecl)|(?<identnormal>(?&identifierpure))(?{register_normal_decl()}))\s*+)
-    (\s*+(?&parens)\s*+)*+((,(?&identoutter)(\s*+(?&parens)\s*+)*+)*+)))(?{dispatch_file_scope_stm()})\g{declbod}|(*F)(?{$recording--; pop2 \@matches})))
+    (\s*+(?&parens)\s*+)*+((,(?&identoutter)(\s*+(?&parens)\s*+)*+)*+)))|(*F)(?{pop2 \@matches})))
 
 (?<rndbrcksdecl>\s*\((?<inparen>(?<inparenin>\s*+(?&ptr)*+\s*+((?<identinside>(?&identifierpure))(?{register_normal_decl()})|(?&rndbrcksdecl))(\s*+(?&parens)\s*+)*+\s*)*+
     ((?&inparenin)(?&inparen))?+)\)\s*)

faster.regex.pl

@@ -1,11 +1,15 @@
 
 sub dispatch_file_scope_stm {
     my $currpos = pos();
-    CORE::print ( $currpos . "__" .$lastpos . "\n" );
-    $q->enqueue([scalar($lastntypedfs), scalar($lastpos), scalar($currpos)]);
+    #CORE::print ( $currpos . "__" .$lastpos . "\n" );
+    $q->enqueue(shared_clone([scalar($lastntypedfs), scalar($lastpos), scalar($currpos)]));
     $lastpos = $currpos;
     if ($typedefs_changed) {
-        $qtypdfs->enqueue(\{ %{$typedefidentifiersvector->[0]} });
+       # eval {#use Data::Dumper;
+        #CORE::print ("sending\n");
+        #CORE::print Dumper(\$typedefidentifiersvector);
+       # };
+        $qtypdfs->enqueue(shared_clone({ %{$typedefidentifiersvector->[0]} }));
         $lastntypedfs = $qtypdfs->pending();#scalar(@{keys %{$typedefidentifiersvector->[0]}});
         undef $typedefs_changed;
     }

parse.pl

@@ -68,7 +68,7 @@
 my sub print2 {CORE::print(@_) if(0)}
 sub print3 {CORE::print(@_) if( 0)}
 my sub Dumper2  {use Data::Dumper; CORE::print(Dumper(@_)) }
-my sub Dumper  {use Data::Dumper; Dumper(@_) if( 1 )}
+my sub Dumper  {use Data::Dumper; Dumper(@_) if( 0 )}
 my sub strftime  {use POSIX; strftime(@_) if( 0 )}
 
 sub push2 {
@@ -758,7 +758,7 @@ sub waitforid {
             $nextpos = scalar($item[2]);
             my $ntyps = scalar($item[0]);
             #lock $typedefidentifiersvector;
-            $typedefidentifiersvector = [$ntyps ? %{$qtypdfs->peek($ntyps - 1)} : {}]; #[{}];
+            $typedefidentifiersvector = [$ntyps ? {%{$qtypdfs->peek($ntyps - 1)}} : {}]; #[{}];
             CORE::print (Dumper(\@{$typedefidentifiersvector}));
             #CORE::print ("$start\n");
 =begin
@@ -989,7 +989,7 @@ sub waitforid {
     push2 \@flags, {"outter"=>undef,"opt"=>undef, "nonbitfl"=>undef};
 
     while($subject =~ m{$initseqlight
-    ;\s*+(?&fasterdecls)|(?&parens)(\s*+(?&brackets)\s*+(?&fasterdecls))?+|(?&brackets)|(?&strunus)}sxxg) {
+    (;|^)(?{dispatch_file_scope_stm()})\s*+(?&fasterdecls)|(?&parens)(\s*+(?&brackets)\s*+(?{dispatch_file_scope_stm()})(?&fasterdecls))?+|(?&brackets)|(?&strunus)}sxxg) {
     }
 
     if(!($subject =~ m{\s*+$}sxxg)) {

typename.regex.pl

@@ -91,7 +91,7 @@ sub regenerate_typedef_regex {
 sub checktypedef2 {
     my $ident = $_[0];
     #use Devel::Peek;
-    # CORE::print ("Dumping typs - $threadid\n");
+    #CORE::print ("Dumping typs - $threadid\n");
    # $silent = 0;
    #CORE::print "dimp\n";
    #use Data::Dumper;
@@ -214,9 +214,9 @@ sub register_decl{
     #$silent = 0;
     #$sielnt = 1;
     my $identifier = $_[0]{'ident'};
-    CORE::print ("register $threadid ". $identifier . "\n");
-    use Data::Dumper;
-    Dumper($_[0]);
+    #CORE::print ("register $threadid ". $identifier . $_[0]{'typedefkey'} . "\n");
+    #use Data::Dumper;
+    #Dumper($_[0]);
     return if not $identifier;
     #$last_object_identifier = $identifier;
     my $priorstate = exists ${$typedefidentifiersvector->[-1]}{$identifier} ? ${$typedefidentifiersvector->[-1]}{$identifier} : -1;