use only 32-bit sets for ATN

Author: parrt

src/Atn/ATNDeserializer.php

@@ -73,17 +73,7 @@ public function deserialize(array $data): ATN
         $this->readRules($atn);
         $this->readModes($atn);
         $sets = [];
-
-        // First, deserialize sets with 16-bit arguments <= U+FFFF.
-        $this->readSets($sets, function () {
-            return $this->readInt();
-        });
-
-        // Next, deserialize sets with 32-bit arguments <= U+10FFFF.
-        $this->readSets($sets, function () {
-            return $this->readInt32();
-        });
-
+        $this->readSets($sets);
         $this->readEdges($atn, $sets);
         $this->readDecisions($atn);
         $this->readLexerActions($atn);
@@ -250,7 +240,7 @@ private function readModes(ATN $atn): void
     /**
      * @param array<IntervalSet> $sets
      */
-    private function readSets(array &$sets, callable $readUnicode): void
+    private function readSets(array &$sets): void
     {
         $m = $this->readInt();
 
@@ -266,8 +256,8 @@ private function readSets(array &$sets, callable $readUnicode): void
             }
 
             for ($j=0; $j < $n; $j++) {
-                $i1 = $readUnicode();
-                $i2 = $readUnicode();
+                $i1 = $this->readInt();
+                $i2 = $this->readInt();
                 $iset->addRange($i1, $i2);
             }
         }
@@ -608,14 +598,6 @@ private function readInt(): int
         return $this->data[$this->pos++];
     }
 
-    private function readInt32(): int
-    {
-        $low = $this->readInt();
-        $high = $this->readInt();
-
-        return $low | ($high << 16);
-    }
-
     /**
      * @param array<IntervalSet> $sets
      */