handle mis-mangled top-level variables

Author: plicease

.github/workflows/linux.yml

@@ -24,7 +24,6 @@ jobs:
           - "5.26"
           - "5.24"
           - "5.22"
-          - "5.20"
 
     env:
       CIP_TAG: ${{ matrix.cip_tag }}

Changes

@@ -1,6 +1,9 @@
 Revision history for {{$dist->name}}},
 
 {{$NEXT}}
+  - Fixup top-level variables that are incorrectly mangled (gh#8, gh#9)
+  - Remove test dependency on YAML (gh#9)
+  - Drop support for Perl 5.20 (gh#9)
 
 0.01      2020-06-28 16:01:29 -0600
   - initial version

lib/Clang/CastXML.pm

@@ -1,7 +1,7 @@
 package Clang::CastXML;
 
 use Moo;
-use 5.020;
+use 5.022;
 use experimental qw( signatures );
 use Ref::Util qw( is_blessed_ref is_ref );
 use Clang::CastXML::Container;

lib/Clang/CastXML/Container.pm

@@ -1,7 +1,7 @@
 package Clang::CastXML::Container;
 
 use Moo;
-use 5.020;
+use 5.022;
 use experimental qw( signatures );
 use XML::Parser;
 use Clang::CastXML::Exception::ParseException;
@@ -104,7 +104,7 @@ sub to_href ($self)
 
         # Fixups
         delete $attrs{location}; # redundant
-        if($element eq 'Function')
+        if($element =~ /^(Function|Variable)$/n)
         {
           # TODO: This works for current Clang (probably).  If we need to
           # support other compiles, like Visual C++ this computed

lib/Clang/CastXML/Exception.pm

@@ -1,7 +1,7 @@
 package Clang::CastXML::Exception;
 
 use Moo;
-use 5.020;
+use 5.022;
 use experimental qw( signatures );
 use overload
   '""' => sub { shift->to_string . "\n" },

lib/Clang/CastXML/Exception/ParseException.pm

@@ -1,7 +1,7 @@
 package Clang::CastXML::Exception::ParseException;
 
 use Moo;
-use 5.020;
+use 5.022;
 use experimental qw( signatures );
 
 # ABSTRACT: Exception for when XML parsing fails

lib/Clang/CastXML/Exception/ProcessException.pm

@@ -1,7 +1,7 @@
 package Clang::CastXML::Exception::ProcessException;
 
 use Moo;
-use 5.020;
+use 5.022;
 use experimental qw( signatures );
 
 # ABSTRACT: Exception for when the CastXML process fails

lib/Clang/CastXML/Exception/ProcessException/BadCastXMLVersionException.pm

@@ -1,7 +1,7 @@
 package Clang::CastXML::Exception::ProcessException::BadCastXMLVersionException;
 
 use Moo;
-use 5.020;
+use 5.022;
 use experimental qw( signatures );
 
 # ABSTRACT: Exception for when we can't find the CastXML version

lib/Clang/CastXML/Exception/ProcessException/IntrospectException.pm

@@ -1,7 +1,7 @@
 package Clang::CastXML::Exception::ProcessException::IntrospectException;
 
 use Moo;
-use 5.020;
+use 5.022;
 use experimental qw( signatures );
 
 # ABSTRACT: Exception for when castxml fails introspection

lib/Clang/CastXML/Exception/UsageException.pm

@@ -1,7 +1,7 @@
 package Clang::CastXML::Exception::UsageException;
 
 use Moo;
-use 5.020;
+use 5.022;
 use experimental qw( signatures );
 
 # ABSTRACT: Exception for when the Clang::CastXML is fed rubbish

lib/Clang/CastXML/Find.pm

@@ -2,7 +2,7 @@ package Clang::CastXML::Find;
 
 use strict;
 use warnings;
-use 5.020;
+use 5.022;
 use experimental qw( signatures );
 use File::Which ();
 use Carp ();

lib/Clang/CastXML/Wrapper.pm

@@ -1,7 +1,7 @@
 package Clang::CastXML::Wrapper;
 
 use Moo;
-use 5.020;
+use 5.022;
 use experimental qw( signatures );
 use Capture::Tiny ();
 use Clang::CastXML::Wrapper::Result;

lib/Clang/CastXML/Wrapper/Result.pm

@@ -1,7 +1,7 @@
 package Clang::CastXML::Wrapper::Result;
 
 use Moo;
-use 5.020;
+use 5.022;
 use experimental qw( signatures );
 
 # ABSTRACT: The result of a Clang::CastXML::Wrapper run

t/00_diag.t

@@ -22,7 +22,6 @@ $modules{$_} = $_ for qw(
   Test::XML
   Throwable
   XML::Parser
-  YAML
 );
 
 

t/clang_castxml.t

@@ -2,6 +2,7 @@ use Test2::V0 -no_srand => 1;
 use Clang::CastXML;
 use Path::Tiny qw( path );
 use Test::XML;
+use 5.022;
 
 subtest basic => sub {
 

t/clang_castxml_container.t

@@ -2,6 +2,7 @@ use Test2::V0 -no_srand => 1;
 use Clang::CastXML;
 use Path::Tiny qw( path );
 use Test::XML;
+use 5.022;
 use experimental qw( postderef );
 
 subtest 'basic' => sub {
@@ -47,8 +48,40 @@ subtest 'basic' => sub {
     },
     'work around name mangle bug',
   );
-  use YAML ();
-  note YAML::Dump(\%func);
+
+};
+
+subtest 'top-level variables' => sub {
+
+  is(
+    { map { $_->{name} => $_ } grep { $_->{_class} eq 'Variable' } Clang::CastXML->new->introspect(q{
+      int foo;
+      extern "C" int bar;
+      namespace ns {
+        int baz;
+        extern "C" int frooble;
+      }
+    })->to_href->{inner}->@*},
+    hash {
+      field foo => hash {
+        field mangled => DNE();
+        etc;
+      };
+      field bar => hash {
+        field mangled => DNE();
+        etc;
+      };
+      field baz => hash {
+        field mangled => T();
+        etc;
+      };
+      field frooble => hash {
+        field mangled => DNE();
+        etc;
+      };
+      etc;
+    }
+  );
 
 };
 

t/clang_castxml_exception.t

@@ -1,5 +1,5 @@
 use Test2::V0 -no_srand => 1;
-use 5.020;
+use 5.022;
 use experimental qw( signatures );
 use Clang::CastXML::Exception;
 

t/clang_castxml_find.t

@@ -2,6 +2,7 @@ use Test2::V0 -no_srand => 1;
 use Clang::CastXML::Find;
 use Path::Tiny qw( path );
 use Env qw( @PATH );
+use 5.022;
 
 BEGIN { $ENV{DEVEL_HIDE_VERBOSE} = 0 }
 

t/clang_castxml_wrapper.t

@@ -1,5 +1,6 @@
 use Test2::V0 -no_srand => 1;
 use Clang::CastXML::Wrapper;
+use 5.022;
 
 subtest basic => sub {
 

t/clang_castxml_wrapper_result.t

@@ -1,5 +1,6 @@
 use Test2::V0 -no_srand => 1;
 use Clang::CastXML::Wrapper::Result;
+use 5.022;
 
 is(
   Clang::CastXML::Wrapper::Result->new(