Change Tcl error parsing for new format

Author: Anne-Gert Bultena

MYMETA.json

@@ -0,0 +1,49 @@
+{
+   "abstract" : "Yet another Tk interface",
+   "author" : [
+      "Gisle Aas <gisle@activestate.com>"
+   ],
+   "dynamic_config" : 0,
+   "generated_by" : "ExtUtils::MakeMaker version 7.34, CPAN::Meta::Converter version 2.150010",
+   "license" : [
+      "perl_5"
+   ],
+   "meta-spec" : {
+      "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
+      "version" : 2
+   },
+   "name" : "Tkx",
+   "no_index" : {
+      "directory" : [
+         "t",
+         "inc"
+      ]
+   },
+   "prereqs" : {
+      "build" : {
+         "requires" : {
+            "ExtUtils::MakeMaker" : "0"
+         }
+      },
+      "configure" : {
+         "requires" : {
+            "ExtUtils::MakeMaker" : "0"
+         }
+      },
+      "runtime" : {
+         "requires" : {
+            "Tcl" : "1",
+            "perl" : "5.008"
+         }
+      }
+   },
+   "release_status" : "stable",
+   "resources" : {
+      "repository" : {
+         "url" : "http://github.com/gisle/tkx/"
+      },
+      "x_MailingList" : "mailto:tcltk@perl.org"
+   },
+   "version" : "1.09",
+   "x_serialization_backend" : "JSON::PP version 4.02"
+}

MYMETA.yml

@@ -0,0 +1,27 @@
+---
+abstract: 'Yet another Tk interface'
+author:
+  - 'Gisle Aas <gisle@activestate.com>'
+build_requires:
+  ExtUtils::MakeMaker: '0'
+configure_requires:
+  ExtUtils::MakeMaker: '0'
+dynamic_config: 0
+generated_by: 'ExtUtils::MakeMaker version 7.34, CPAN::Meta::Converter version 2.150010'
+license: perl
+meta-spec:
+  url: http://module-build.sourceforge.net/META-spec-v1.4.html
+  version: '1.4'
+name: Tkx
+no_index:
+  directory:
+    - t
+    - inc
+requires:
+  Tcl: '1'
+  perl: '5.008'
+resources:
+  MailingList: mailto:tcltk@perl.org
+  repository: http://github.com/gisle/tkx/
+version: '1.09'
+x_serialization_backend: 'CPAN::Meta::YAML version 0.018'

lib/Tkx.pm

@@ -331,14 +331,15 @@ sub call {
     }
 
     # report exception relative to the non-Tkx caller
-    if (!ref($@) && $@ =~ s/( at .*[\\\/](Tkx|Tcl)\.pm line \d+\.\s*\z)//) {
+    if (!ref($@) && $@ =~ s/^(Tcl error '?)?(.*?)('? at .*[\\\/](Tkx|Tcl)\.pm line \d+\.\s*\z)//s) {
+	   my $error = $2;
            my $i = 1;
            my($pkg, $file, $line);
            while (($pkg, $file, $line) = caller($i)) {
                last if $pkg !~ /^Tkx(::|$)/;
                $i++;
            };
-           $@ .= " at $file line $line.\n";
+           $@ = "$error at $file line $line.\n";
     }
     die $@;
 }