Don't bother testing if all flags are the same

rakudo · Mar 9, 2016 · 59adbef · 59adbef
1 parent 4f5831f
commit 59adbef
Showing 1 changed file with 44 additions and 40 deletions.
diff --git a/src/core/Parameter.pm b/src/core/Parameter.pm
@@ -169,46 +169,50 @@ my class Parameter { # declared in BOOTSTRAP
         if $!nominal_type.ACCEPTS(nqp::getattr(o,Parameter,'$!nominal_type')) {
             my $oflags := nqp::getattr(o,Parameter,'$!flags');
 
-            # here not defined only, or both defined only
-            return False
-              unless nqp::isle_i(
-                nqp::bitand_i($!flags,$SIG_ELEM_DEFINED_ONLY),
-                nqp::bitand_i($oflags,$SIG_ELEM_DEFINED_ONLY))
-
-            # here not undefined only, or both undefined only
-              && nqp::isle_i(
-                nqp::bitand_i($!flags,$SIG_ELEM_UNDEFINED_ONLY),
-                nqp::bitand_i($oflags,$SIG_ELEM_UNDEFINED_ONLY))
-
-            # here is rw, or both is rw
-              && nqp::isle_i(
-                nqp::bitand_i($!flags,$SIG_ELEM_IS_RW),
-                nqp::bitand_i($oflags,$SIG_ELEM_IS_RW))
-
-            # other is optional, or both are optional
-              && nqp::isle_i(
-                nqp::bitand_i($oflags,$SIG_ELEM_IS_OPTIONAL),
-                nqp::bitand_i($!flags,$SIG_ELEM_IS_OPTIONAL))
-
-            # other is slurpy positional, or both are slurpy positional
-              && nqp::isle_i(
-                nqp::bitand_i($oflags,$SIG_ELEM_SLURPY_POS),
-                nqp::bitand_i($!flags,$SIG_ELEM_SLURPY_POS))
-
-            # other is slurpy named, or both are slurpy named
-              && nqp::isle_i(
-                nqp::bitand_i($oflags,$SIG_ELEM_SLURPY_NAMED),
-                nqp::bitand_i($!flags,$SIG_ELEM_SLURPY_NAMED))
-
-            # other is slurpy one arg, or both are slurpy one arg
-              && nqp::isle_i(
-                nqp::bitand_i($oflags,$SIG_ELEM_SLURPY_ONEARG),
-                nqp::bitand_i($!flags,$SIG_ELEM_SLURPY_ONEARG))
-
-            # here is part of MMD, or both are part of MMD
-              && nqp::isle_i(
-                nqp::bitand_i($!flags,$SIG_ELEM_MULTI_INVOCANT),
-                nqp::bitand_i($oflags,$SIG_ELEM_MULTI_INVOCANT));
+            # flags are not same, so we need to look more in depth
+            if nqp::isne_i($!flags,$oflags) {
+
+                # here not defined only, or both defined only
+                return False
+                  unless nqp::isle_i(
+                    nqp::bitand_i($!flags,$SIG_ELEM_DEFINED_ONLY),
+                    nqp::bitand_i($oflags,$SIG_ELEM_DEFINED_ONLY))
+
+                # here not undefined only, or both undefined only
+                  && nqp::isle_i(
+                    nqp::bitand_i($!flags,$SIG_ELEM_UNDEFINED_ONLY),
+                    nqp::bitand_i($oflags,$SIG_ELEM_UNDEFINED_ONLY))
+
+                # here is rw, or both is rw
+                  && nqp::isle_i(
+                    nqp::bitand_i($!flags,$SIG_ELEM_IS_RW),
+                    nqp::bitand_i($oflags,$SIG_ELEM_IS_RW))
+
+                # other is optional, or both are optional
+                  && nqp::isle_i(
+                    nqp::bitand_i($oflags,$SIG_ELEM_IS_OPTIONAL),
+                    nqp::bitand_i($!flags,$SIG_ELEM_IS_OPTIONAL))
+
+                # other is slurpy positional, or both are slurpy positional
+                  && nqp::isle_i(
+                    nqp::bitand_i($oflags,$SIG_ELEM_SLURPY_POS),
+                    nqp::bitand_i($!flags,$SIG_ELEM_SLURPY_POS))
+
+                # other is slurpy named, or both are slurpy named
+                  && nqp::isle_i(
+                    nqp::bitand_i($oflags,$SIG_ELEM_SLURPY_NAMED),
+                    nqp::bitand_i($!flags,$SIG_ELEM_SLURPY_NAMED))
+
+                # other is slurpy one arg, or both are slurpy one arg
+                  && nqp::isle_i(
+                    nqp::bitand_i($oflags,$SIG_ELEM_SLURPY_ONEARG),
+                    nqp::bitand_i($!flags,$SIG_ELEM_SLURPY_ONEARG))
+
+                # here is part of MMD, or both are part of MMD
+                  && nqp::isle_i(
+                    nqp::bitand_i($!flags,$SIG_ELEM_MULTI_INVOCANT),
+                    nqp::bitand_i($oflags,$SIG_ELEM_MULTI_INVOCANT));
+            }
         }
 
         # nominal type not same