Fixup

Author: danog

src/TL_filerefs.tl

@@ -1,62 +1,62 @@
 // Root
-fileReferenceOrigins#8260b721 db_schema:string ctxs:Vector<Origin> = FileReferenceOrigins;;
+fileReferenceOrigins#8260b721 db_schema:string ctxs:Vector<Origin> = FileReferenceOrigins;
 
-origin#72cc7c04 flags:# predicate:string is_constructor:flags.0?true action:ActionOp needs_parent:flags.3?string parent_is_constructor:flags.4?true = origin;;
+origin#72cc7c04 flags:# predicate:string is_constructor:flags.0?true action:ActionOp needs_parent:flags.3?string parent_is_constructor:flags.4?true = origin;
 
 // For string => TypedOp dictionaries
-typedOpArg#3a2930c2 key:string value:TypedOp = TypedOpArg;;
+typedOpArg#3a2930c2 key:string value:TypedOp = TypedOpArg;
 
 // Actions
-callOp#59aef5ce method:string args:Vector<TypedOpArg> stored_constructor:string = ActionOp;;
-getMessageOp#4f27329e flags:# peer:TypedOp id:TypedOp from_scheduled:flags.0?TypedOp stored_constructor:string = ActionOp;;
-noOp#c4d8df73 why:string = ActionOp;;
+callOp#59aef5ce method:string args:Vector<TypedOpArg> stored_constructor:string = ActionOp;
+getMessageOp#4f27329e flags:# peer:TypedOp id:TypedOp from_scheduled:flags.0?TypedOp stored_constructor:string = ActionOp;
+noOp#c4d8df73 why:string = ActionOp;
 
 // Field extraction path
-paramNotFlag#acd9d5cf = ParamFlag;;
-paramIsFlagAbortIfEmpty#f8fe9fee = ParamFlag;;
-paramIsFlagFallback#202b77a1 fallback:TypedOp = ParamFlag;;
-paramIsFlagPassthrough#1dc6e17d = ParamFlag;;
+paramNotFlag#acd9d5cf = ParamFlag;
+paramIsFlagAbortIfEmpty#f8fe9fee = ParamFlag;
+paramIsFlagFallback#202b77a1 fallback:TypedOp = ParamFlag;
+paramIsFlagPassthrough#1dc6e17d = ParamFlag;
 
-pathPart#7b8b07d4 flags:# constructor:string param:string flag:ParamFlag = PathPart;;
+pathPart#7b8b07d4 flags:# constructor:string param:string flag:ParamFlag = PathPart;
 
-path#0c3586a2 parts:Vector<PathPart> = Path;;
-pathParent#58f13684 parts:Vector<PathPart> = Path;;
+path#0c3586a2 parts:Vector<PathPart> = Path;
+pathParent#58f13684 parts:Vector<PathPart> = Path;
 
 // Extractor+storer
-extractAndStore#72069549 from:Path to:string = FieldExtractor;;
+extractAndStore#72069549 from:Path to:string = FieldExtractor;
 
-extractInputStickerSetFromDocumentAttributesAndStore#369d8d14 from:Path to:string = FieldExtractor;;
-extractInputStickerSetFromStickerSetAndStore#c167d470 from:Path to:string = FieldExtractor;;
+extractInputStickerSetFromDocumentAttributesAndStore#369d8d14 from:Path to:string = FieldExtractor;
+extractInputStickerSetFromStickerSetAndStore#c167d470 from:Path to:string = FieldExtractor;
 
-extractPeerIdFromPeerAndStore#7d33019c from:Path to:string = FieldExtractor;;
-extractPeerIdFromInputPeerAndStore#a51acfb4 from:Path to:string = FieldExtractor;;
+extractPeerIdFromPeerAndStore#7d33019c from:Path to:string = FieldExtractor;
+extractPeerIdFromInputPeerAndStore#a51acfb4 from:Path to:string = FieldExtractor;
 
-extractChannelIdFromChannelAndStore#5675bc97 from:Path to:string = FieldExtractor;;
-extractChannelIdFromInputChannelAndStore#b662660e from:Path to:string = FieldExtractor;;
+extractChannelIdFromChannelAndStore#5675bc97 from:Path to:string = FieldExtractor;
+extractChannelIdFromInputChannelAndStore#b662660e from:Path to:string = FieldExtractor;
 
-extractUserIdFromUserAndStore#4778ec63 from:Path to:string = FieldExtractor;;
-extractUserIdFromInputUserAndStore#7720aa2e from:Path to:string = FieldExtractor;;
+extractUserIdFromUserAndStore#4778ec63 from:Path to:string = FieldExtractor;
+extractUserIdFromInputUserAndStore#7720aa2e from:Path to:string = FieldExtractor;
 
 // Typed constructors, the type is specified to simplify codegen,
 // but isn't strictly necessary as it can be inferred from the TypedOpOp.
 // It is fully pre-validated during the generation of the definition file.
-typedOp#705b10ec type:string op:TypedOpOp = TypedOp;;
+typedOp#705b10ec type:string op:TypedOpOp = TypedOp;
 
 // The actual ops
-copyOp#1630c9f5 from:FieldExtractor = TypedOpOp;;
+copyOp#1630c9f5 from:FieldExtractor = TypedOpOp;
 
-getInputChannelByIdOp#3eb8d855 from:FieldExtractor = TypedOpOp;;
-getInputUserByIdOp#a3a4e6c2 from:FieldExtractor = TypedOpOp;;
-getInputPeerByIdOp#acfb2a4a from:FieldExtractor = TypedOpOp;;
+getInputChannelByIdOp#3eb8d855 from:FieldExtractor = TypedOpOp;
+getInputUserByIdOp#a3a4e6c2 from:FieldExtractor = TypedOpOp;
+getInputPeerByIdOp#acfb2a4a from:FieldExtractor = TypedOpOp;
 
 // Literals & constructors (methods not allowed or needed here)
-constructorOp#107f8d8a constructor:string args:Vector<TypedOpArg> = TypedOpOp;;
+constructorOp#107f8d8a constructor:string args:Vector<TypedOpArg> = TypedOpOp;
 
-vectorOp#f8fb8f72 values:Vector<TypedOp> = TypedOpOp;;
+vectorOp#f8fb8f72 values:Vector<TypedOp> = TypedOpOp;
 
-intLiteralOp#cbfabe7c value:int = TypedOpOp;;
-longLiteralOp#d08b8d3a value:long = TypedOpOp;;
-stringLiteralOp#2b56ea8e value:string = TypedOpOp;;
-boolLiteralOp#37e07911 value:Bool = TypedOpOp;;
-doubleLiteralOp#3651e3bf value:double = TypedOpOp;;
-themeFormatLiteralOp#8e4f9208 = TypedOpOp;;
+intLiteralOp#cbfabe7c value:int = TypedOpOp;
+longLiteralOp#d08b8d3a value:long = TypedOpOp;
+stringLiteralOp#2b56ea8e value:string = TypedOpOp;
+boolLiteralOp#37e07911 value:Bool = TypedOpOp;
+doubleLiteralOp#3651e3bf value:double = TypedOpOp;
+themeFormatLiteralOp#8e4f9208 = TypedOpOp;

tools/FileRefExtractor/BuildMode/Ast.php

@@ -59,10 +59,13 @@ public function finalize(string $schemaFile, string $refMapFile, string $dbSchem
     {
         $schema = explode("\n", file_get_contents($schemaFile));
         foreach ($schema as &$line) {
-            $line = trim($line);
+            $line = rtrim(trim($line), ';');
             if (str_starts_with($line, '//') || !$line) {
                 continue;
             }
+            $line = explode(" ", $line, 2);
+            $line[0] = preg_replace('/#.*/', '', $line[0]);
+            $line = implode(" ", $line);
             $id = self::crc($line);
 
             $line = explode(" ", $line, 2);