the +STL notation now properly causes CAD::Mesh3D->import() to enable…

…Format('STL')
pryrt · Feb 26, 2019 · 8bfdf6e · 8bfdf6e
1 parent c315a71
commit 8bfdf6e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/lib/CAD/Mesh3D.pm b/lib/CAD/Mesh3D.pm
@@ -58,16 +58,18 @@ our %EXPORT_TAGS = (
 
 sub import
 {
+    my @list = @_;
     my @passthru;
 
     # pass most arguments thru, but if it starts with +, then try to enable that format
-    foreach (@_) {
-        if( /^\+/ ) {
-            s/^\+//;
-            enableFormat($_);
+    foreach my $arg (@list) {
+        next unless defined $arg;
+        if( $arg =~ /^\+/ ) {
+            $arg =~ s/^\+//;
+            enableFormat($arg);
             next;
         }
-        push @passthru, $_;
+        push @passthru, $arg;
     }
     CAD::Mesh3D->export_to_level(1, @passthru);
 }
@@ -350,7 +352,7 @@ sub enableFormat {
     my $formatName = defined $_[0] ? $_[0] : croak "!ERROR! enableFormat(...): requires name of format";
     my $formatModule = defined $_[1] ? $_[1] : "CAD::Mesh3D::$formatName";
     (my $key = $formatModule . '.pm') =~ s{::}{/}g;
-    eval { require $formatModule unless exists $INC{$key}; 1; } or do {
+    eval { require $key unless exists $INC{$key}; 1; } or do {
         local $" = ", ";
         croak "!ERROR! enableFormat( @_ ): \n\tcould not import $formatModule\n\t$@";
     };

diff --git a/t/30-outputStl.t b/t/30-outputStl.t
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 use Test::More tests => 5 + 5*28 + 3;
 
-use CAD::Mesh3D qw(:all);
+use CAD::Mesh3D qw(+STL :all);
 use CAD::Mesh3D::STL qw(outputStl);
 
 my $lft = createVertex(0,0,0);

diff --git a/t/40-format.t b/t/40-format.t
@@ -4,9 +4,7 @@ use warnings;
 use Test::More tests => 21;
 use Test::Exception;
 
-use CAD::Mesh3D qw(:all);
-use CAD::Mesh3D::STL ();
-enableFormat('STL');
+use CAD::Mesh3D qw(+STL :all);
 
 sub test_format {
     my $format = shift;

diff --git a/t/99-fault.t b/t/99-fault.t
@@ -3,10 +3,9 @@ use warnings;
 use Test::More tests => 48;
 use Test::Exception;
 
-use CAD::Mesh3D qw(:all);
+use CAD::Mesh3D qw(+STL :all);
 use CAD::Mesh3D::STL qw(outputStl);
 
-
 ################################################################
 # error handling
 ################################################################