Switch to using constructors

danog · danog · commit d580e013779e · 2025-07-24T18:31:24.000+02:00
diff --git a/src/TL_filerefs.tl b/src/TL_filerefs.tl
@@ -11,7 +11,12 @@ callOp method:string args:Vector<TypedOpArg> = ActionOp;
 getMessageOp flags:# peer:TypedOp id:TypedOp from_scheduled:flags.0?TypedOp = ActionOp;
 
 // Field extraction path
-pathPart flags:# constructor:string param:string flag_abort_if_empty:flags.0?true flag_fallback_if_empty:flags.1?TypedOp flag_passthrough:flags.2?true = PathPart;
+paramNotFlag = ParamFlag;
+paramIsFlagAbortIfEmpty = ParamFlag;
+paramIsFlagFallback fallback:TypedOp = ParamFlag;
+paramIsFlagPassthrough = ParamFlag;
+
+pathPart flags:# constructor:string param:string flag:ParamFlag = PathPart;
 
 path parts:Vector<PathPart> = Path;
 pathParent parts:Vector<PathPart> = Path;
diff --git a/src/file_ref_map.dat b/src/file_ref_map.dat
diff --git a/tools/FileRefExtractor/FieldExtractorOp.php b/tools/FileRefExtractor/FieldExtractorOp.php
@@ -63,10 +63,11 @@ final protected function buildPath(TLContext $tl): array
                 '_' => 'pathPart',
                 'constructor' => $part[0],
                 'param' => $part[1],
+                'flag' => ['_' => 'paramNotFlag'],
             ];
             if (isset($part[2])) {
                 if ($part[2] instanceof TypedOp) {
-                    $newPart['flag_fallback_if_empty'] = $part[2]->build($tl);
+                    $newPart['flag'] = ['_' => 'paramIsFlagFallback', 'fallback' => $part[2]->build($tl)];
                 } elseif (\is_int($part[2])) {
                     if ($part[2] & self::FLAG_UNPACK_ARRAY) {
                         if ($tl->buildMode instanceof Ast && !$tl->buildMode->allowUnpacking) {
@@ -75,10 +76,10 @@ final protected function buildPath(TLContext $tl): array
                         $newPart['unpack_vector'] = true;
                     }
                     if ($part[2] & self::FLAG_IF_ABSENT_ABORT) {
-                        $newPart['flag_abort_if_empty'] = true;
+                        $newPart['flag'] = ['_' => 'paramIsFlagAbortIfEmpty'];
                     }
                     if ($part[2] & self::FLAG_PASSTHROUGH) {
-                        $newPart['flag_passthrough'] = true;
+                        $newPart['flag'] = ['_' => 'paramIsFlagPassthrough'];
                     }
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -63,10 +63,11 @@ final protected function buildPath(TLContext $tl): array`
`63`	`63`	`'_' => 'pathPart',`
`64`	`64`	`'constructor' => $part[0],`
`65`	`65`	`'param' => $part[1],`
	`66`	`+ 'flag' => ['_' => 'paramNotFlag'],`
`66`	`67`	`];`
`67`	`68`	`if (isset($part[2])) {`
`68`	`69`	`if ($part[2] instanceof TypedOp) {`
`69`		`- $newPart['flag_fallback_if_empty'] = $part[2]->build($tl);`
	`70`	`+ $newPart['flag'] = ['_' => 'paramIsFlagFallback', 'fallback' => $part[2]->build($tl)];`
`70`	`71`	`} elseif (\is_int($part[2])) {`
`71`	`72`	`if ($part[2] & self::FLAG_UNPACK_ARRAY) {`
`72`	`73`	`if ($tl->buildMode instanceof Ast && !$tl->buildMode->allowUnpacking) {`
`@@ -75,10 +76,10 @@ final protected function buildPath(TLContext $tl): array`
`75`	`76`	`$newPart['unpack_vector'] = true;`
`76`	`77`	`}`
`77`	`78`	`if ($part[2] & self::FLAG_IF_ABSENT_ABORT) {`
`78`		`- $newPart['flag_abort_if_empty'] = true;`
	`79`	`+ $newPart['flag'] = ['_' => 'paramIsFlagAbortIfEmpty'];`
`79`	`80`	`}`
`80`	`81`	`if ($part[2] & self::FLAG_PASSTHROUGH) {`
`81`		`- $newPart['flag_passthrough'] = true;`
	`82`	`+ $newPart['flag'] = ['_' => 'paramIsFlagPassthrough'];`
`82`	`83`	`}`
`83`	`84`	`}`
`84`	`85`	`}`