Perlito5 - improve error handling at compilation-time

fglock · Aug 30, 2012 · 2ffd277 · 2ffd277
1 parent 5ec800c
commit 2ffd277
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 2 deletions.
diff --git a/perlito5.pl b/perlito5.pl
@@ -5461,6 +5461,9 @@ sub Perlito5::Grammar::Use::expand_use {
     if (((($module_name eq 'strict') || ($module_name eq 'warnings')) || ($module_name eq 'feature'))) {
         return ()
     };
+    if (exists($Perlito_internal_module{$module_name})) {
+        ($module_name = $Perlito_internal_module{$module_name})
+    };
     ((my  $filename) = modulename_to_filename($module_name));
     if ((filename_lookup($filename) eq 'done')) {
         return ()
@@ -10230,7 +10233,16 @@ package Perlito5::Runtime;
         else {
             (my  $comp_units);
             if ($expand_use) {
-                ($comp_units = Perlito5::Grammar::Use::add_comp_unit(Perlito5::Match::flat($m)))
+                (my  $ok);
+                                    (do {
+                        ($comp_units = Perlito5::Grammar::Use::add_comp_unit(Perlito5::Match::flat($m)));
+                        ($ok = 1)
+                    });
+                if (!($ok)) {
+                    ((my  $error) = (${'@'} || 'Unknown error loading a module'));
+                    warn($error);
+                    exit(255)
+                }
             }
             else {
                 ($comp_units = Perlito5::Match::flat($m))

diff --git a/src5/lib/Perlito5/Grammar/Use.pm b/src5/lib/Perlito5/Grammar/Use.pm
@@ -164,6 +164,10 @@ sub expand_use {
         if $module_name eq 'strict'
         || $module_name eq 'warnings'
         || $module_name eq 'feature';
+
+    $module_name = $Perlito_internal_module{$module_name}
+        if exists $Perlito_internal_module{$module_name};
+
     my $filename = modulename_to_filename($module_name);
 
     return 

diff --git a/src5/util/perlito5.pl b/src5/util/perlito5.pl
@@ -185,7 +185,17 @@ package Perlito;
         else {
             my $comp_units;
             if ($expand_use) {
-                $comp_units = Perlito5::Grammar::Use::add_comp_unit(Perlito5::Match::flat($m))
+                my $ok;
+                eval {
+                    $comp_units = Perlito5::Grammar::Use::add_comp_unit(Perlito5::Match::flat($m));
+                    $ok = 1;
+                };
+                if ( !$ok ) {
+                    my $error = $@
+                        || "Unknown error loading a module";
+                    warn $error;
+                    exit(255);
+                }
             }
             else {
                 $comp_units = Perlito5::Match::flat($m);