Optimized EnumSet::count() and EnumSet::getOrdinals()

marc-mabe · marc-mabe · commit 9f4026719865 · 2017-07-17T23:21:11.000+02:00
diff --git a/src/EnumSet.php b/src/EnumSet.php
@@ -184,8 +184,9 @@ public function count()
                 continue; // fast skip null byte
             }
 
+            $ord = ord($this->bitset[$bytePos]);
             for ($bitPos = 0; $bitPos < 8; ++$bitPos) {
-                if ((ord($this->bitset[$bytePos]) & (1 << $bitPos)) !== 0) {
+                if ($ord & (1 << $bitPos)) {
                     ++$count;
                 }
             }
@@ -347,8 +348,9 @@ public function getOrdinals()
                 continue; // fast skip null byte
             }
 
+            $ord = ord($this->bitset[$bytePos]);
             for ($bitPos = 0; $bitPos < 8; ++$bitPos) {
-                if ((ord($this->bitset[$bytePos]) & (1 << $bitPos)) !== 0) {
+                if ($ord & (1 << $bitPos)) {
                     $ordinals[] = $bytePos * 8 + $bitPos;
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -184,8 +184,9 @@ public function count()`
`184`	`184`	`continue; // fast skip null byte`
`185`	`185`	`}`
`186`	`186`
	`187`	`+ $ord = ord($this->bitset[$bytePos]);`
`187`	`188`	`for ($bitPos = 0; $bitPos < 8; ++$bitPos) {`
`188`		`- if ((ord($this->bitset[$bytePos]) & (1 << $bitPos)) !== 0) {`
	`189`	`+ if ($ord & (1 << $bitPos)) {`
`189`	`190`	`++$count;`
`190`	`191`	`}`
`191`	`192`	`}`
`@@ -347,8 +348,9 @@ public function getOrdinals()`
`347`	`348`	`continue; // fast skip null byte`
`348`	`349`	`}`
`349`	`350`
	`351`	`+ $ord = ord($this->bitset[$bytePos]);`
`350`	`352`	`for ($bitPos = 0; $bitPos < 8; ++$bitPos) {`
`351`		`- if ((ord($this->bitset[$bytePos]) & (1 << $bitPos)) !== 0) {`
	`353`	`+ if ($ord & (1 << $bitPos)) {`
`352`	`354`	`$ordinals[] = $bytePos * 8 + $bitPos;`
`353`	`355`	`}`
`354`	`356`	`}`