Small fix

danog · danog · commit 244c31669706 · 2025-07-20T19:05:48.000+02:00
diff --git a/tools/gen_filerefmap.php b/tools/gen_filerefmap.php
@@ -361,55 +361,59 @@
     $stackTypes = [$type => true];
     $recurse(
         static function (array $stack) use ($locations, $TL, $tmp, &$validated, $storyMethods, $starMethods): void {
-            foreach ([false, true] as $ignoreFlagged) {
-                $slice = [];
-                $hadAll = true;
-                $hadAny = false;
-                $top = end($stack)[0];
-                for ($x = count($stack)-1; $x >= 0; $x--) {
-                    $pair = $stack[$x];
-                    foreach ($locations[$pair[0]] ?? [] as $op) {
-                        $normalized = $op->normalize($slice, $pair[0], $ignoreFlagged);
-                        if ($normalized === null) {
-                            $hadAll = false;
-                            continue;
-                        }
-                        $hadAny = true;
-                        $normalized->build(new TLContext($TL, $tmp, $top));
-                        $validated[$pair[0]][spl_object_id($op)] = $op;
+            $slice = [];
+            $hadAny = false;
+            $skippedDueToFlags = [];
+            $top = end($stack)[0];
+            for ($x = count($stack)-1; $x >= 0; $x--) {
+                $pair = $stack[$x];
+                foreach ($locations[$pair[0]] ?? [] as $op) {
+                    $normalized = $op->normalize($slice, $pair[0], false);
+                    if ($normalized === null) {
+                        continue;
+                    }
+                    $hadAny = true;
+                    $normalized->build(new TLContext($TL, $tmp, $top));
+                    $validated[$pair[0]][spl_object_id($op)] = $op;
+
+                    $normalized = $op->normalize($slice, $pair[0], true);
+                    if ($normalized === null) {
+                        $skippedDueToFlags []= $op;
+                        continue;
                     }
-                    $slice[] = $pair;
-                }
-                if (!$ignoreFlagged && !$hadAny) {
-                    throw new AssertionError("Uncovered path: " . json_encode($stack));
                 }
-                if ($ignoreFlagged && !$hadAll) {
-                    if ($top === 'updateStory'
-                        || $top === 'peerStories'
-                        // The two above always have the story peer flag set.
+                $slice[] = $pair;
+            }
+            if (!$hadAny) {
+                throw new AssertionError("Uncovered path: " . json_encode($stack));
+            }
+            if ($skippedDueToFlags) {
+                if ($top === 'updateStory'
+                    || $top === 'peerStories'
+                    // The two above always have the story peer flag set.
 
-                        || isset($storyMethods[$top])
-                        || isset($starMethods[$top])
+                    || isset($storyMethods[$top])
+                    || isset($starMethods[$top])
 
-                        // The two above always have the story peer/all star flags set.
+                    // The two above always have the story peer/all star flags set.
 
-                        || $top === 'messages.getFullChat'
-                        || $top === 'channels.getFullChannel'
-                        || $top === 'users.getFullUser'
-                        // The two above are related to botInfo, ignore as we already store a context for the chat info.
+                    || $top === 'messages.getFullChat'
+                    || $top === 'channels.getFullChannel'
+                    || $top === 'users.getFullUser'
+                    // The two above are related to botInfo, ignore as we already store a context for the chat info.
+                ) {
+                    return;
+                }
+                foreach ($slice as [$cons]) {
+                    if ($cons === 'webPageAttributeStory'
+                        || $cons === 'foundStory'
+                        || $cons === 'publicForwardStory'
                     ) {
-                        continue;
-                    }
-                    foreach ($slice as [$cons]) {
-                        if ($cons === 'webPageAttributeStory'
-                            || $cons === 'foundStory'
-                            || $cons === 'publicForwardStory'
-                        ) {
-                            continue 2;
-                        }
+                        return;
                     }
-                    throw new AssertionError("Uncovered path (didn't have at least one unflagged context): " . json_encode($stack));
                 }
+                var_dump($skippedDueToFlags);
+                throw new AssertionError("Uncovered path (didn't have at least one unflagged context): " . json_encode($stack));
             }
         },
         $type,
