From 8648bf994fca27e4fbcd65cf712eeb2c7777c580 Mon Sep 17 00:00:00 2001 From: idrissrio Date: Wed, 23 Jul 2025 14:59:22 +0200 Subject: [PATCH 1/6] Java: Add `isImplicitClass` table to keep track of compact source files --- java/ql/lib/config/semmlecode.dbscheme | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/java/ql/lib/config/semmlecode.dbscheme b/java/ql/lib/config/semmlecode.dbscheme index 1b8f5f4c747e..9f6026c40099 100644 --- a/java/ql/lib/config/semmlecode.dbscheme +++ b/java/ql/lib/config/semmlecode.dbscheme @@ -537,6 +537,10 @@ isLocalClassOrInterface( int parent: @localtypedeclstmt ref ); +isImplicitClass( + unique int classid: @classorinterface ref +); + isDefConstr( int constructorid: @constructor ref ); From ad9dc54be553a1beb738043c57eb380805959a9a Mon Sep 17 00:00:00 2001 From: idrissrio Date: Wed, 23 Jul 2025 15:02:06 +0200 Subject: [PATCH 2/6] Java: Add `isImplict` predicate to CompilationUnit and Class --- java/ql/lib/semmle/code/java/CompilationUnit.qll | 8 ++++++++ java/ql/lib/semmle/code/java/Type.qll | 3 +++ 2 files changed, 11 insertions(+) diff --git a/java/ql/lib/semmle/code/java/CompilationUnit.qll b/java/ql/lib/semmle/code/java/CompilationUnit.qll index 546c3d26ea39..5b26828b47c0 100644 --- a/java/ql/lib/semmle/code/java/CompilationUnit.qll +++ b/java/ql/lib/semmle/code/java/CompilationUnit.qll @@ -33,5 +33,13 @@ class CompilationUnit extends Element, File { */ Module getModule() { cumodule(this, result) } + /** + * Holds if this compilation unit represents a compact source file. + * A compact source file contains an implicitly declared top-level class. + */ + predicate isCompactSourceFile() { + exists(Class c | c.getCompilationUnit() = this and c.isImplicit()) + } + override string getAPrimaryQlClass() { result = "CompilationUnit" } } diff --git a/java/ql/lib/semmle/code/java/Type.qll b/java/ql/lib/semmle/code/java/Type.qll index dd646e74285c..f2f37c6621c1 100644 --- a/java/ql/lib/semmle/code/java/Type.qll +++ b/java/ql/lib/semmle/code/java/Type.qll @@ -699,6 +699,9 @@ class Class extends ClassOrInterface { /** Holds if this class is an anonymous class. */ predicate isAnonymous() { isAnonymClass(this.getSourceDeclaration(), _) } + /** Holds if this class is an implicit class (compact source file). */ + predicate isImplicit() { isImplicitClass(this.getSourceDeclaration()) } + /** * Gets an annotation that applies to this class. * From ab2cf131185bf0cdd86ff67ce7a29e9fe1f5fc50 Mon Sep 17 00:00:00 2001 From: idrissrio Date: Wed, 23 Jul 2025 15:00:01 +0200 Subject: [PATCH 3/6] Java: Add compact source file tests --- .../CompactSourceAnalysis.expected | 1 + .../CompactSourceAnalysis.ql | 9 ++++ .../CompactSourceDetection.expected | 1 + .../CompactSourceDetection.ql | 5 +++ .../ImplicitClassDetection.expected | 2 + .../ImplicitClassDetection.ql | 7 ++++ .../compact-source-files/PrintAst.expected | 42 +++++++++++++++++++ .../compact-source-files/PrintAst.qlref | 1 + .../compact-source-files/Test.java | 27 ++++++++++++ .../compact-source-files/options | 1 + 10 files changed, 96 insertions(+) create mode 100644 java/ql/test/library-tests/compact-source-files/CompactSourceAnalysis.expected create mode 100644 java/ql/test/library-tests/compact-source-files/CompactSourceAnalysis.ql create mode 100644 java/ql/test/library-tests/compact-source-files/CompactSourceDetection.expected create mode 100644 java/ql/test/library-tests/compact-source-files/CompactSourceDetection.ql create mode 100644 java/ql/test/library-tests/compact-source-files/ImplicitClassDetection.expected create mode 100644 java/ql/test/library-tests/compact-source-files/ImplicitClassDetection.ql create mode 100644 java/ql/test/library-tests/compact-source-files/PrintAst.expected create mode 100644 java/ql/test/library-tests/compact-source-files/PrintAst.qlref create mode 100644 java/ql/test/library-tests/compact-source-files/Test.java create mode 100644 java/ql/test/library-tests/compact-source-files/options diff --git a/java/ql/test/library-tests/compact-source-files/CompactSourceAnalysis.expected b/java/ql/test/library-tests/compact-source-files/CompactSourceAnalysis.expected new file mode 100644 index 000000000000..05db00aa26de --- /dev/null +++ b/java/ql/test/library-tests/compact-source-files/CompactSourceAnalysis.expected @@ -0,0 +1 @@ +| Test.java:0:0:0:0 | Test | Test.java:1:1:1:1 | Test | Compact source file 'Test' contains implicit class 'Test' | diff --git a/java/ql/test/library-tests/compact-source-files/CompactSourceAnalysis.ql b/java/ql/test/library-tests/compact-source-files/CompactSourceAnalysis.ql new file mode 100644 index 000000000000..ae6700f64cd2 --- /dev/null +++ b/java/ql/test/library-tests/compact-source-files/CompactSourceAnalysis.ql @@ -0,0 +1,9 @@ +import java + +from CompilationUnit cu, Class c +where + cu.isCompactSourceFile() and + c.getCompilationUnit() = cu and + c.isImplicit() +select cu, c, + "Compact source file '" + cu.getName() + "' contains implicit class '" + c.getName() + "'" diff --git a/java/ql/test/library-tests/compact-source-files/CompactSourceDetection.expected b/java/ql/test/library-tests/compact-source-files/CompactSourceDetection.expected new file mode 100644 index 000000000000..0aebdddfb877 --- /dev/null +++ b/java/ql/test/library-tests/compact-source-files/CompactSourceDetection.expected @@ -0,0 +1 @@ +| Test.java:0:0:0:0 | Test | diff --git a/java/ql/test/library-tests/compact-source-files/CompactSourceDetection.ql b/java/ql/test/library-tests/compact-source-files/CompactSourceDetection.ql new file mode 100644 index 000000000000..3cf2633c8970 --- /dev/null +++ b/java/ql/test/library-tests/compact-source-files/CompactSourceDetection.ql @@ -0,0 +1,5 @@ +import java + +from CompilationUnit cu +where cu.isCompactSourceFile() +select cu diff --git a/java/ql/test/library-tests/compact-source-files/ImplicitClassDetection.expected b/java/ql/test/library-tests/compact-source-files/ImplicitClassDetection.expected new file mode 100644 index 000000000000..61dcdd8a17ff --- /dev/null +++ b/java/ql/test/library-tests/compact-source-files/ImplicitClassDetection.expected @@ -0,0 +1,2 @@ +| Test.java:1:1:1:1 | Test | implicit | +| Test.java:25:7:25:16 | NotCompact | not implicit | diff --git a/java/ql/test/library-tests/compact-source-files/ImplicitClassDetection.ql b/java/ql/test/library-tests/compact-source-files/ImplicitClassDetection.ql new file mode 100644 index 000000000000..f1c6b4a27c73 --- /dev/null +++ b/java/ql/test/library-tests/compact-source-files/ImplicitClassDetection.ql @@ -0,0 +1,7 @@ +import java + +from Class c, string res +where + exists(c.getCompilationUnit().getRelativePath()) and + if c.isImplicit() then res = "implicit" else res = "not implicit" +select c, res diff --git a/java/ql/test/library-tests/compact-source-files/PrintAst.expected b/java/ql/test/library-tests/compact-source-files/PrintAst.expected new file mode 100644 index 000000000000..bfb24933cd69 --- /dev/null +++ b/java/ql/test/library-tests/compact-source-files/PrintAst.expected @@ -0,0 +1,42 @@ +Test.java: +# 0| [CompilationUnit] Test +# 1| 1: [Class] Test +# 1| 4: [FieldDeclaration] int instanceField; +# 1| -1: [TypeAccess] int +# 1| 0: [IntegerLiteral] 10 +# 2| 5: [FieldDeclaration] int STATIC_CONSTANT; +# 2| -1: [TypeAccess] int +# 2| 0: [IntegerLiteral] 42 +# 3| 6: [FieldDeclaration] String privateField; +# 3| -1: [TypeAccess] String +# 3| 0: [StringLiteral] "data" +# 5| 7: [Method] main +# 5| 3: [TypeAccess] void +# 5| 5: [BlockStmt] { ... } +# 6| 0: [ExprStmt] ; +# 6| 0: [MethodCall] processData(...) +# 7| 1: [ExprStmt] ; +# 7| 0: [MethodCall] testStaticAccess(...) +# 11| 8: [Method] processData +# 11| 3: [TypeAccess] void +# 11| 5: [BlockStmt] { ... } +# 12| 0: [ExprStmt] ; +# 12| 0: [PostIncExpr] ...++ +# 12| 0: [VarAccess] instanceField +# 13| 1: [ExprStmt] ; +# 13| 0: [MethodCall] updatePrivateField(...) +# 16| 9: [Method] updatePrivateField +# 16| 3: [TypeAccess] void +# 16| 5: [BlockStmt] { ... } +# 17| 0: [ExprStmt] ; +# 17| 0: [AssignExpr] ...=... +# 17| 0: [VarAccess] privateField +# 17| 1: [StringLiteral] "updated" +# 21| 10: [Method] testStaticAccess +# 21| 3: [TypeAccess] void +# 21| 5: [BlockStmt] { ... } +# 22| 0: [ExprStmt] ; +# 22| 0: [MethodCall] println(...) +# 22| -1: [TypeAccess] IO +# 22| 0: [StringLiteral] "Static access test" +# 25| 11: [Class] NotCompact diff --git a/java/ql/test/library-tests/compact-source-files/PrintAst.qlref b/java/ql/test/library-tests/compact-source-files/PrintAst.qlref new file mode 100644 index 000000000000..f391eb5e4636 --- /dev/null +++ b/java/ql/test/library-tests/compact-source-files/PrintAst.qlref @@ -0,0 +1 @@ +semmle/code/java/PrintAst.ql diff --git a/java/ql/test/library-tests/compact-source-files/Test.java b/java/ql/test/library-tests/compact-source-files/Test.java new file mode 100644 index 000000000000..4b5af13b9693 --- /dev/null +++ b/java/ql/test/library-tests/compact-source-files/Test.java @@ -0,0 +1,27 @@ +int instanceField = 10; +static final int STATIC_CONSTANT = 42; +private String privateField = "data"; + +void main() { + processData(); + testStaticAccess(); +} + +// Test instance methods +void processData() { + instanceField++; + updatePrivateField(); +} + +private void updatePrivateField() { + privateField = "updated"; +} + +// Test static method access +static void testStaticAccess() { + IO.println("Static access test"); +} + +class NotCompact { +//Test explict class +} \ No newline at end of file diff --git a/java/ql/test/library-tests/compact-source-files/options b/java/ql/test/library-tests/compact-source-files/options new file mode 100644 index 000000000000..db1dc01e53b7 --- /dev/null +++ b/java/ql/test/library-tests/compact-source-files/options @@ -0,0 +1 @@ +//semmle-extractor-options: --javac-args --release 25 --enable-preview From 3603128c904ada21a197e39d1eee04740368cf6e Mon Sep 17 00:00:00 2001 From: idrissrio Date: Wed, 23 Jul 2025 15:00:38 +0200 Subject: [PATCH 4/6] Java: Add upgrade and downgrade script --- .../old.dbscheme | 1240 +++++++++++++++++ .../semmlecode.dbscheme | 1236 ++++++++++++++++ .../upgrade.properties | 3 + .../old.dbscheme | 1236 ++++++++++++++++ .../semmlecode.dbscheme | 1240 +++++++++++++++++ .../upgrade.properties | 2 + 6 files changed, 4957 insertions(+) create mode 100644 java/downgrades/9f6026c400996c13842974b24f076a486ad1f69c/old.dbscheme create mode 100644 java/downgrades/9f6026c400996c13842974b24f076a486ad1f69c/semmlecode.dbscheme create mode 100644 java/downgrades/9f6026c400996c13842974b24f076a486ad1f69c/upgrade.properties create mode 100644 java/ql/lib/upgrades/1b8f5f4c747e4249f4731796ccaa0661c7434d8a/old.dbscheme create mode 100644 java/ql/lib/upgrades/1b8f5f4c747e4249f4731796ccaa0661c7434d8a/semmlecode.dbscheme create mode 100644 java/ql/lib/upgrades/1b8f5f4c747e4249f4731796ccaa0661c7434d8a/upgrade.properties diff --git a/java/downgrades/9f6026c400996c13842974b24f076a486ad1f69c/old.dbscheme b/java/downgrades/9f6026c400996c13842974b24f076a486ad1f69c/old.dbscheme new file mode 100644 index 000000000000..9f6026c40099 --- /dev/null +++ b/java/downgrades/9f6026c400996c13842974b24f076a486ad1f69c/old.dbscheme @@ -0,0 +1,1240 @@ +/** + * An invocation of the compiler. Note that more than one file may be + * compiled per invocation. For example, this command compiles three + * source files: + * + * javac A.java B.java C.java + * + * The `id` simply identifies the invocation, while `cwd` is the working + * directory from which the compiler was invoked. + */ +compilations( + /** + * An invocation of the compiler. Note that more than one file may + * be compiled per invocation. For example, this command compiles + * three source files: + * + * javac A.java B.java C.java + */ + unique int id : @compilation, + int kind: int ref, + string cwd : string ref, + string name : string ref +); + +case @compilation.kind of + 1 = @javacompilation +| 2 = @kotlincompilation +; + +compilation_started( + int id : @compilation ref +) + +compilation_info( + int id : @compilation ref, + string info_key: string ref, + string info_value: string ref +) + +/** + * The arguments that were passed to the extractor for a compiler + * invocation. If `id` is for the compiler invocation + * + * javac A.java B.java C.java + * + * then typically there will be rows for + * + * num | arg + * --- | --- + * 0 | *path to extractor* + * 1 | `--javac-args` + * 2 | A.java + * 3 | B.java + * 4 | C.java + */ +#keyset[id, num] +compilation_args( + int id : @compilation ref, + int num : int ref, + string arg : string ref +); + +/** + * The expanded arguments that were passed to the extractor for a + * compiler invocation. This is similar to `compilation_args`, but + * for a `@@@someFile` argument, it includes the arguments from that + * file, rather than just taking the argument literally. + */ +#keyset[id, num] +compilation_expanded_args( + int id : @compilation ref, + int num : int ref, + string arg : string ref +); + +/** + * The source files that are compiled by a compiler invocation. + * If `id` is for the compiler invocation + * + * javac A.java B.java C.java + * + * then there will be rows for + * + * num | arg + * --- | --- + * 0 | A.java + * 1 | B.java + * 2 | C.java + */ +#keyset[id, num] +compilation_compiling_files( + int id : @compilation ref, + int num : int ref, + int file : @file ref +); + +/** + * For each file recorded in `compilation_compiling_files`, + * there will be a corresponding row in + * `compilation_compiling_files_completed` once extraction + * of that file is complete. The `result` will indicate the + * extraction result: + * + * 0: Successfully extracted + * 1: Errors were encountered, but extraction recovered + * 2: Errors were encountered, and extraction could not recover + */ +#keyset[id, num] +compilation_compiling_files_completed( + int id : @compilation ref, + int num : int ref, + int result : int ref +); + +/** + * The time taken by the extractor for a compiler invocation. + * + * For each file `num`, there will be rows for + * + * kind | seconds + * ---- | --- + * 1 | CPU seconds used by the extractor frontend + * 2 | Elapsed seconds during the extractor frontend + * 3 | CPU seconds used by the extractor backend + * 4 | Elapsed seconds during the extractor backend + */ +#keyset[id, num, kind] +compilation_time( + int id : @compilation ref, + int num : int ref, + /* kind: + 1 = frontend_cpu_seconds + 2 = frontend_elapsed_seconds + 3 = extractor_cpu_seconds + 4 = extractor_elapsed_seconds + */ + int kind : int ref, + float seconds : float ref +); + +/** + * The `cpu_seconds` and `elapsed_seconds` are the CPU time and elapsed + * time (respectively) that the original compilation (not the extraction) + * took for compiler invocation `id`. + */ +compilation_compiler_times( + unique int id : @compilation ref, + float cpu_seconds : float ref, + float elapsed_seconds : float ref +); + +/** + * If extraction was successful, then `cpu_seconds` and + * `elapsed_seconds` are the CPU time and elapsed time (respectively) + * that extraction took for compiler invocation `id`. + * The `result` will indicate the extraction result: + * + * 0: Successfully extracted + * 1: Errors were encountered, but extraction recovered + * 2: Errors were encountered, and extraction could not recover + */ +compilation_finished( + unique int id : @compilation ref, + float cpu_seconds : float ref, + float elapsed_seconds : float ref, + int result : int ref +); + +diagnostics( + unique int id: @diagnostic, + string generated_by: string ref, // TODO: Sync this with the other languages? + int severity: int ref, + string error_tag: string ref, + string error_message: string ref, + string full_error_message: string ref, + int location: @location_default ref +); + +/** + * An error or warning generated by the extractor. + * The diagnostic message `diagnostic` was generated during compiler + * invocation `compilation`, and is the `file_number_diagnostic_number`th + * message generated while extracting the `file_number`th file of that + * invocation. + */ +#keyset[compilation, file_number, file_number_diagnostic_number] +diagnostic_for( + unique int diagnostic : @diagnostic ref, + int compilation : @compilation ref, + int file_number : int ref, + int file_number_diagnostic_number : int ref +); + +/* + * External artifacts + */ + +externalData( + int id : @externalDataElement, + string path : string ref, + int column: int ref, + string value : string ref +); + +sourceLocationPrefix( + string prefix : string ref +); + +databaseMetadata( + string metadataKey : string ref, + string value : string ref +); + +overlayChangedFiles( + string path: string ref +); + +/* + * SMAP + */ + +smap_header( + int outputFileId: @file ref, + string outputFilename: string ref, + string defaultStratum: string ref +); + +smap_files( + int outputFileId: @file ref, + string stratum: string ref, + int inputFileNum: int ref, + string inputFileName: string ref, + int inputFileId: @file ref +); + +smap_lines( + int outputFileId: @file ref, + string stratum: string ref, + int inputFileNum: int ref, + int inputStartLine: int ref, + int inputLineCount: int ref, + int outputStartLine: int ref, + int outputLineIncrement: int ref +); + +/* + * Locations and files + */ + +@location = @location_default ; + +locations_default( + unique int id: @location_default, + int file: @file ref, + int beginLine: int ref, + int beginColumn: int ref, + int endLine: int ref, + int endColumn: int ref +); + +hasLocation( + int locatableid: @locatable ref, + int id: @location ref +); + +@sourceline = @locatable ; + +#keyset[element_id] +numlines( + int element_id: @sourceline ref, + int num_lines: int ref, + int num_code: int ref, + int num_comment: int ref +); + +files( + unique int id: @file, + string name: string ref +); + +folders( + unique int id: @folder, + string name: string ref +); + +@container = @folder | @file + +containerparent( + int parent: @container ref, + unique int child: @container ref +); + +/* + * Java + */ + +cupackage( + unique int id: @file ref, + int packageid: @package ref +); + +#keyset[fileid,keyName] +jarManifestMain( + int fileid: @file ref, + string keyName: string ref, + string value: string ref +); + +#keyset[fileid,entryName,keyName] +jarManifestEntries( + int fileid: @file ref, + string entryName: string ref, + string keyName: string ref, + string value: string ref +); + +packages( + unique int id: @package, + string nodeName: string ref +); + +primitives( + unique int id: @primitive, + string nodeName: string ref +); + +modifiers( + unique int id: @modifier, + string nodeName: string ref +); + +/** + * An errortype is used when the extractor is unable to extract a type + * correctly for some reason. + */ +error_type( + unique int id: @errortype +); + +classes_or_interfaces( + unique int id: @classorinterface, + string nodeName: string ref, + int parentid: @package ref, + int sourceid: @classorinterface ref +); + +file_class( + int id: @classorinterface ref +); + +class_object( + unique int id: @classorinterface ref, + unique int instance: @field ref +); + +type_companion_object( + unique int id: @classorinterface ref, + unique int instance: @field ref, + unique int companion_object: @classorinterface ref +); + +kt_nullable_types( + unique int id: @kt_nullable_type, + int classid: @reftype ref +) + +kt_notnull_types( + unique int id: @kt_notnull_type, + int classid: @reftype ref +) + +kt_type_alias( + unique int id: @kt_type_alias, + string name: string ref, + int kttypeid: @kt_type ref +) + +@kt_type = @kt_nullable_type | @kt_notnull_type + +isInterface( + unique int id: @classorinterface ref +); + +isRecord( + unique int id: @classorinterface ref +); + +fielddecls( + unique int id: @fielddecl, + int parentid: @reftype ref +); + +#keyset[fieldId] #keyset[fieldDeclId,pos] +fieldDeclaredIn( + int fieldId: @field ref, + int fieldDeclId: @fielddecl ref, + int pos: int ref +); + +fields( + unique int id: @field, + string nodeName: string ref, + int typeid: @type ref, + int parentid: @reftype ref +); + +fieldsKotlinType( + unique int id: @field ref, + int kttypeid: @kt_type ref +); + +constrs( + unique int id: @constructor, + string nodeName: string ref, + string signature: string ref, + int typeid: @type ref, + int parentid: @reftype ref, + int sourceid: @constructor ref +); + +constrsKotlinType( + unique int id: @constructor ref, + int kttypeid: @kt_type ref +); + +methods( + unique int id: @method, + string nodeName: string ref, + string signature: string ref, + int typeid: @type ref, + int parentid: @reftype ref, + int sourceid: @method ref +); + +methodsKotlinType( + unique int id: @method ref, + int kttypeid: @kt_type ref +); + +#keyset[parentid,pos] +params( + unique int id: @param, + int typeid: @type ref, + int pos: int ref, + int parentid: @callable ref, + int sourceid: @param ref +); + +paramsKotlinType( + unique int id: @param ref, + int kttypeid: @kt_type ref +); + +paramName( + unique int id: @param ref, + string nodeName: string ref +); + +isVarargsParam( + int param: @param ref +); + +exceptions( + unique int id: @exception, + int typeid: @type ref, + int parentid: @callable ref +); + +isAnnotType( + int interfaceid: @classorinterface ref +); + +isAnnotElem( + int methodid: @method ref +); + +annotValue( + int parentid: @annotation ref, + int id2: @method ref, + unique int value: @expr ref +); + +isEnumType( + int classid: @classorinterface ref +); + +isEnumConst( + int fieldid: @field ref +); + +#keyset[parentid,pos] +typeVars( + unique int id: @typevariable, + string nodeName: string ref, + int pos: int ref, + int parentid: @classorinterfaceorcallable ref +); + +wildcards( + unique int id: @wildcard, + string nodeName: string ref, + int kind: int ref +); + +#keyset[parentid,pos] +typeBounds( + unique int id: @typebound, + int typeid: @reftype ref, + int pos: int ref, + int parentid: @boundedtype ref +); + +#keyset[parentid,pos] +typeArgs( + int argumentid: @reftype ref, + int pos: int ref, + int parentid: @classorinterfaceorcallable ref +); + +isParameterized( + int memberid: @member ref +); + +isRaw( + int memberid: @member ref +); + +#keyset[classid] #keyset[parent] +isAnonymClass( + int classid: @classorinterface ref, + int parent: @classinstancexpr ref +); + +#keyset[typeid] #keyset[parent] +isLocalClassOrInterface( + int typeid: @classorinterface ref, + int parent: @localtypedeclstmt ref +); + +isImplicitClass( + unique int classid: @classorinterface ref +); + +isDefConstr( + int constructorid: @constructor ref +); + +#keyset[exprId] +lambdaKind( + int exprId: @lambdaexpr ref, + int bodyKind: int ref +); + +isCanonicalConstr( + int constructorid: @constructor ref +); + +arrays( + unique int id: @array, + string nodeName: string ref, + int elementtypeid: @type ref, + int dimension: int ref, + int componenttypeid: @type ref +); + +enclInReftype( + unique int child: @reftype ref, + int parent: @reftype ref +); + +extendsReftype( + int id1: @reftype ref, + int id2: @classorinterface ref +); + +implInterface( + int id1: @classorarray ref, + int id2: @classorinterface ref +); + +permits( + int id1: @classorinterface ref, + int id2: @classorinterface ref +); + +hasModifier( + int id1: @modifiable ref, + int id2: @modifier ref +); + +imports( + unique int id: @import, + int holder: @classorinterfaceorpackage ref, + string name: string ref, + int kind: int ref +); + +#keyset[parent,idx] +stmts( + unique int id: @stmt, + int kind: int ref, + int parent: @stmtparent ref, + int idx: int ref, + int bodydecl: @callable ref +); + +@stmtparent = @callable | @stmt | @switchexpr | @whenexpr| @stmtexpr; + +case @stmt.kind of + 0 = @block +| 1 = @ifstmt +| 2 = @forstmt +| 3 = @enhancedforstmt +| 4 = @whilestmt +| 5 = @dostmt +| 6 = @trystmt +| 7 = @switchstmt +| 8 = @synchronizedstmt +| 9 = @returnstmt +| 10 = @throwstmt +| 11 = @breakstmt +| 12 = @continuestmt +| 13 = @emptystmt +| 14 = @exprstmt +| 15 = @labeledstmt +| 16 = @assertstmt +| 17 = @localvariabledeclstmt +| 18 = @localtypedeclstmt +| 19 = @constructorinvocationstmt +| 20 = @superconstructorinvocationstmt +| 21 = @case +| 22 = @catchclause +| 23 = @yieldstmt +| 24 = @errorstmt +| 25 = @whenbranch +; + +#keyset[parent,idx] +exprs( + unique int id: @expr, + int kind: int ref, + int typeid: @type ref, + int parent: @exprparent ref, + int idx: int ref +); + +exprsKotlinType( + unique int id: @expr ref, + int kttypeid: @kt_type ref +); + +callableEnclosingExpr( + unique int id: @expr ref, + int callable_id: @callable ref +); + +statementEnclosingExpr( + unique int id: @expr ref, + int statement_id: @stmt ref +); + +isParenthesized( + unique int id: @expr ref, + int parentheses: int ref +); + +case @expr.kind of + 1 = @arrayaccess +| 2 = @arraycreationexpr +| 3 = @arrayinit +| 4 = @assignexpr +| 5 = @assignaddexpr +| 6 = @assignsubexpr +| 7 = @assignmulexpr +| 8 = @assigndivexpr +| 9 = @assignremexpr +| 10 = @assignandexpr +| 11 = @assignorexpr +| 12 = @assignxorexpr +| 13 = @assignlshiftexpr +| 14 = @assignrshiftexpr +| 15 = @assignurshiftexpr +| 16 = @booleanliteral +| 17 = @integerliteral +| 18 = @longliteral +| 19 = @floatingpointliteral +| 20 = @doubleliteral +| 21 = @characterliteral +| 22 = @stringliteral +| 23 = @nullliteral +| 24 = @mulexpr +| 25 = @divexpr +| 26 = @remexpr +| 27 = @addexpr +| 28 = @subexpr +| 29 = @lshiftexpr +| 30 = @rshiftexpr +| 31 = @urshiftexpr +| 32 = @andbitexpr +| 33 = @orbitexpr +| 34 = @xorbitexpr +| 35 = @andlogicalexpr +| 36 = @orlogicalexpr +| 37 = @ltexpr +| 38 = @gtexpr +| 39 = @leexpr +| 40 = @geexpr +| 41 = @eqexpr +| 42 = @neexpr +| 43 = @postincexpr +| 44 = @postdecexpr +| 45 = @preincexpr +| 46 = @predecexpr +| 47 = @minusexpr +| 48 = @plusexpr +| 49 = @bitnotexpr +| 50 = @lognotexpr +| 51 = @castexpr +| 52 = @newexpr +| 53 = @conditionalexpr +| 54 = @parexpr // deprecated +| 55 = @instanceofexpr +| 56 = @localvariabledeclexpr +| 57 = @typeliteral +| 58 = @thisaccess +| 59 = @superaccess +| 60 = @varaccess +| 61 = @methodaccess +| 62 = @unannotatedtypeaccess +| 63 = @arraytypeaccess +| 64 = @packageaccess +| 65 = @wildcardtypeaccess +| 66 = @declannotation +| 67 = @uniontypeaccess +| 68 = @lambdaexpr +| 69 = @memberref +| 70 = @annotatedtypeaccess +| 71 = @typeannotation +| 72 = @intersectiontypeaccess +| 73 = @switchexpr +| 74 = @errorexpr +| 75 = @whenexpr +| 76 = @getclassexpr +| 77 = @safecastexpr +| 78 = @implicitcastexpr +| 79 = @implicitnotnullexpr +| 80 = @implicitcoerciontounitexpr +| 81 = @notinstanceofexpr +| 82 = @stmtexpr +| 83 = @stringtemplateexpr +| 84 = @notnullexpr +| 85 = @unsafecoerceexpr +| 86 = @valueeqexpr +| 87 = @valueneexpr +| 88 = @propertyref +| 89 = @recordpatternexpr +; + +/** Holds if this `when` expression was written as an `if` expression. */ +when_if(unique int id: @whenexpr ref); + +/** Holds if this `when` branch was written as an `else` branch. */ +when_branch_else(unique int id: @whenbranch ref); + +@classinstancexpr = @newexpr | @lambdaexpr | @memberref | @propertyref + +@annotation = @declannotation | @typeannotation +@typeaccess = @unannotatedtypeaccess | @annotatedtypeaccess + +@assignment = @assignexpr + | @assignop; + +@unaryassignment = @postincexpr + | @postdecexpr + | @preincexpr + | @predecexpr; + +@assignop = @assignaddexpr + | @assignsubexpr + | @assignmulexpr + | @assigndivexpr + | @assignremexpr + | @assignandexpr + | @assignorexpr + | @assignxorexpr + | @assignlshiftexpr + | @assignrshiftexpr + | @assignurshiftexpr; + +@literal = @booleanliteral + | @integerliteral + | @longliteral + | @floatingpointliteral + | @doubleliteral + | @characterliteral + | @stringliteral + | @nullliteral; + +@binaryexpr = @mulexpr + | @divexpr + | @remexpr + | @addexpr + | @subexpr + | @lshiftexpr + | @rshiftexpr + | @urshiftexpr + | @andbitexpr + | @orbitexpr + | @xorbitexpr + | @andlogicalexpr + | @orlogicalexpr + | @ltexpr + | @gtexpr + | @leexpr + | @geexpr + | @eqexpr + | @neexpr + | @valueeqexpr + | @valueneexpr; + +@unaryexpr = @postincexpr + | @postdecexpr + | @preincexpr + | @predecexpr + | @minusexpr + | @plusexpr + | @bitnotexpr + | @lognotexpr + | @notnullexpr; + +@caller = @classinstancexpr + | @methodaccess + | @constructorinvocationstmt + | @superconstructorinvocationstmt; + +callableBinding( + unique int callerid: @caller ref, + int callee: @callable ref +); + +memberRefBinding( + unique int id: @expr ref, + int callable: @callable ref +); + +propertyRefGetBinding( + unique int id: @expr ref, + int getter: @callable ref +); + +propertyRefFieldBinding( + unique int id: @expr ref, + int field: @field ref +); + +propertyRefSetBinding( + unique int id: @expr ref, + int setter: @callable ref +); + +@exprparent = @stmt | @expr | @whenbranch | @callable | @field | @fielddecl | @classorinterface | @param | @localvar | @typevariable; + +variableBinding( + unique int expr: @varaccess ref, + int variable: @variable ref +); + +@variable = @localscopevariable | @field; + +@localscopevariable = @localvar | @param; + +localvars( + unique int id: @localvar, + string nodeName: string ref, + int typeid: @type ref, + int parentid: @localvariabledeclexpr ref +); + +localvarsKotlinType( + unique int id: @localvar ref, + int kttypeid: @kt_type ref +); + +@namedexprorstmt = @breakstmt + | @continuestmt + | @labeledstmt + | @literal; + +namestrings( + string name: string ref, + string value: string ref, + unique int parent: @namedexprorstmt ref +); + +/* + * Modules + */ + +#keyset[name] +modules( + unique int id: @module, + string name: string ref +); + +isOpen( + int id: @module ref +); + +#keyset[fileId] +cumodule( + int fileId: @file ref, + int moduleId: @module ref +); + +@directive = @requires + | @exports + | @opens + | @uses + | @provides + +#keyset[directive] +directives( + int id: @module ref, + int directive: @directive ref +); + +requires( + unique int id: @requires, + int target: @module ref +); + +isTransitive( + int id: @requires ref +); + +isStatic( + int id: @requires ref +); + +exports( + unique int id: @exports, + int target: @package ref +); + +exportsTo( + int id: @exports ref, + int target: @module ref +); + +opens( + unique int id: @opens, + int target: @package ref +); + +opensTo( + int id: @opens ref, + int target: @module ref +); + +uses( + unique int id: @uses, + string serviceInterface: string ref +); + +provides( + unique int id: @provides, + string serviceInterface: string ref +); + +providesWith( + int id: @provides ref, + string serviceImpl: string ref +); + +isNullDefaultCase( + int id: @case ref +); + +/* + * Javadoc + */ + +javadoc( + unique int id: @javadoc +); + +isNormalComment( + int commentid : @javadoc ref +); + +isEolComment( + int commentid : @javadoc ref +); + +hasJavadoc( + int documentableid: @member ref, + int javadocid: @javadoc ref +); + +#keyset[parentid,idx] +javadocTag( + unique int id: @javadocTag, + string name: string ref, + int parentid: @javadocParent ref, + int idx: int ref +); + +#keyset[parentid,idx] +javadocText( + unique int id: @javadocText, + string text: string ref, + int parentid: @javadocParent ref, + int idx: int ref +); + +@javadocParent = @javadoc | @javadocTag; +@javadocElement = @javadocTag | @javadocText; + +@classorinterfaceorpackage = @classorinterface | @package; +@classorinterfaceorcallable = @classorinterface | @callable; +@boundedtype = @typevariable | @wildcard; +@reftype = @classorinterface | @array | @boundedtype | @errortype; +@classorarray = @classorinterface | @array; +@type = @primitive | @reftype; +@callable = @method | @constructor; + +/** A program element that has a name. */ +@element = @package | @modifier | @annotation | @errortype | + @locatableElement; + +@locatableElement = @file | @primitive | @classorinterface | @method | @constructor | @param | @exception | @field | + @boundedtype | @array | @localvar | @expr | @stmt | @import | @fielddecl | @kt_type | @kt_type_alias | + @kt_property; + +@modifiable = @member_modifiable| @param | @localvar | @typevariable; + +@member_modifiable = @classorinterface | @method | @constructor | @field | @kt_property; + +@member = @method | @constructor | @field | @reftype ; + +/** A program element that has a location. */ +@locatable = @typebound | @javadoc | @javadocTag | @javadocText | @xmllocatable | @ktcomment | + @locatableElement; + +@top = @element | @locatable | @folder; + +/* + * XML Files + */ + +xmlEncoding( + unique int id: @file ref, + string encoding: string ref +); + +xmlDTDs( + unique int id: @xmldtd, + string root: string ref, + string publicId: string ref, + string systemId: string ref, + int fileid: @file ref +); + +xmlElements( + unique int id: @xmlelement, + string name: string ref, + int parentid: @xmlparent ref, + int idx: int ref, + int fileid: @file ref +); + +xmlAttrs( + unique int id: @xmlattribute, + int elementid: @xmlelement ref, + string name: string ref, + string value: string ref, + int idx: int ref, + int fileid: @file ref +); + +xmlNs( + int id: @xmlnamespace, + string prefixName: string ref, + string URI: string ref, + int fileid: @file ref +); + +xmlHasNs( + int elementId: @xmlnamespaceable ref, + int nsId: @xmlnamespace ref, + int fileid: @file ref +); + +xmlComments( + unique int id: @xmlcomment, + string text: string ref, + int parentid: @xmlparent ref, + int fileid: @file ref +); + +xmlChars( + unique int id: @xmlcharacters, + string text: string ref, + int parentid: @xmlparent ref, + int idx: int ref, + int isCDATA: int ref, + int fileid: @file ref +); + +@xmlparent = @file | @xmlelement; +@xmlnamespaceable = @xmlelement | @xmlattribute; + +xmllocations( + int xmlElement: @xmllocatable ref, + int location: @location_default ref +); + +@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace; + +/* + * configuration files with key value pairs + */ + +configs( + unique int id: @config +); + +configNames( + unique int id: @configName, + int config: @config ref, + string name: string ref +); + +configValues( + unique int id: @configValue, + int config: @config ref, + string value: string ref +); + +configLocations( + int locatable: @configLocatable ref, + int location: @location_default ref +); + +@configLocatable = @config | @configName | @configValue; + +ktComments( + unique int id: @ktcomment, + int kind: int ref, + string text : string ref +) + +ktCommentSections( + unique int id: @ktcommentsection, + int comment: @ktcomment ref, + string content : string ref +) + +ktCommentSectionNames( + unique int id: @ktcommentsection ref, + string name : string ref +) + +ktCommentSectionSubjectNames( + unique int id: @ktcommentsection ref, + string subjectname : string ref +) + +#keyset[id, owner] +ktCommentOwners( + int id: @ktcomment ref, + int owner: @top ref +) + +ktExtensionFunctions( + unique int id: @method ref, + int typeid: @type ref, + int kttypeid: @kt_type ref +) + +ktProperties( + unique int id: @kt_property, + string nodeName: string ref +) + +ktPropertyGetters( + unique int id: @kt_property ref, + int getter: @method ref +) + +ktPropertySetters( + unique int id: @kt_property ref, + int setter: @method ref +) + +ktPropertyBackingFields( + unique int id: @kt_property ref, + int backingField: @field ref +) + +ktSyntheticBody( + unique int id: @callable ref, + int kind: int ref + // 1: ENUM_VALUES + // 2: ENUM_VALUEOF + // 3: ENUM_ENTRIES +) + +ktLocalFunction( + unique int id: @method ref +) + +ktInitializerAssignment( + unique int id: @assignexpr ref +) + +ktPropertyDelegates( + unique int id: @kt_property ref, + unique int variableId: @variable ref +) + +/** + * If `id` is a compiler generated element, then the kind indicates the + * reason that the compiler generated it. + * See `Element.compilerGeneratedReason()` for an explanation of what + * each `kind` means. + */ +compiler_generated( + unique int id: @element ref, + int kind: int ref +) + +ktFunctionOriginalNames( + unique int id: @method ref, + string name: string ref +) + +ktDataClasses( + unique int id: @classorinterface ref +) diff --git a/java/downgrades/9f6026c400996c13842974b24f076a486ad1f69c/semmlecode.dbscheme b/java/downgrades/9f6026c400996c13842974b24f076a486ad1f69c/semmlecode.dbscheme new file mode 100644 index 000000000000..1b8f5f4c747e --- /dev/null +++ b/java/downgrades/9f6026c400996c13842974b24f076a486ad1f69c/semmlecode.dbscheme @@ -0,0 +1,1236 @@ +/** + * An invocation of the compiler. Note that more than one file may be + * compiled per invocation. For example, this command compiles three + * source files: + * + * javac A.java B.java C.java + * + * The `id` simply identifies the invocation, while `cwd` is the working + * directory from which the compiler was invoked. + */ +compilations( + /** + * An invocation of the compiler. Note that more than one file may + * be compiled per invocation. For example, this command compiles + * three source files: + * + * javac A.java B.java C.java + */ + unique int id : @compilation, + int kind: int ref, + string cwd : string ref, + string name : string ref +); + +case @compilation.kind of + 1 = @javacompilation +| 2 = @kotlincompilation +; + +compilation_started( + int id : @compilation ref +) + +compilation_info( + int id : @compilation ref, + string info_key: string ref, + string info_value: string ref +) + +/** + * The arguments that were passed to the extractor for a compiler + * invocation. If `id` is for the compiler invocation + * + * javac A.java B.java C.java + * + * then typically there will be rows for + * + * num | arg + * --- | --- + * 0 | *path to extractor* + * 1 | `--javac-args` + * 2 | A.java + * 3 | B.java + * 4 | C.java + */ +#keyset[id, num] +compilation_args( + int id : @compilation ref, + int num : int ref, + string arg : string ref +); + +/** + * The expanded arguments that were passed to the extractor for a + * compiler invocation. This is similar to `compilation_args`, but + * for a `@@@someFile` argument, it includes the arguments from that + * file, rather than just taking the argument literally. + */ +#keyset[id, num] +compilation_expanded_args( + int id : @compilation ref, + int num : int ref, + string arg : string ref +); + +/** + * The source files that are compiled by a compiler invocation. + * If `id` is for the compiler invocation + * + * javac A.java B.java C.java + * + * then there will be rows for + * + * num | arg + * --- | --- + * 0 | A.java + * 1 | B.java + * 2 | C.java + */ +#keyset[id, num] +compilation_compiling_files( + int id : @compilation ref, + int num : int ref, + int file : @file ref +); + +/** + * For each file recorded in `compilation_compiling_files`, + * there will be a corresponding row in + * `compilation_compiling_files_completed` once extraction + * of that file is complete. The `result` will indicate the + * extraction result: + * + * 0: Successfully extracted + * 1: Errors were encountered, but extraction recovered + * 2: Errors were encountered, and extraction could not recover + */ +#keyset[id, num] +compilation_compiling_files_completed( + int id : @compilation ref, + int num : int ref, + int result : int ref +); + +/** + * The time taken by the extractor for a compiler invocation. + * + * For each file `num`, there will be rows for + * + * kind | seconds + * ---- | --- + * 1 | CPU seconds used by the extractor frontend + * 2 | Elapsed seconds during the extractor frontend + * 3 | CPU seconds used by the extractor backend + * 4 | Elapsed seconds during the extractor backend + */ +#keyset[id, num, kind] +compilation_time( + int id : @compilation ref, + int num : int ref, + /* kind: + 1 = frontend_cpu_seconds + 2 = frontend_elapsed_seconds + 3 = extractor_cpu_seconds + 4 = extractor_elapsed_seconds + */ + int kind : int ref, + float seconds : float ref +); + +/** + * The `cpu_seconds` and `elapsed_seconds` are the CPU time and elapsed + * time (respectively) that the original compilation (not the extraction) + * took for compiler invocation `id`. + */ +compilation_compiler_times( + unique int id : @compilation ref, + float cpu_seconds : float ref, + float elapsed_seconds : float ref +); + +/** + * If extraction was successful, then `cpu_seconds` and + * `elapsed_seconds` are the CPU time and elapsed time (respectively) + * that extraction took for compiler invocation `id`. + * The `result` will indicate the extraction result: + * + * 0: Successfully extracted + * 1: Errors were encountered, but extraction recovered + * 2: Errors were encountered, and extraction could not recover + */ +compilation_finished( + unique int id : @compilation ref, + float cpu_seconds : float ref, + float elapsed_seconds : float ref, + int result : int ref +); + +diagnostics( + unique int id: @diagnostic, + string generated_by: string ref, // TODO: Sync this with the other languages? + int severity: int ref, + string error_tag: string ref, + string error_message: string ref, + string full_error_message: string ref, + int location: @location_default ref +); + +/** + * An error or warning generated by the extractor. + * The diagnostic message `diagnostic` was generated during compiler + * invocation `compilation`, and is the `file_number_diagnostic_number`th + * message generated while extracting the `file_number`th file of that + * invocation. + */ +#keyset[compilation, file_number, file_number_diagnostic_number] +diagnostic_for( + unique int diagnostic : @diagnostic ref, + int compilation : @compilation ref, + int file_number : int ref, + int file_number_diagnostic_number : int ref +); + +/* + * External artifacts + */ + +externalData( + int id : @externalDataElement, + string path : string ref, + int column: int ref, + string value : string ref +); + +sourceLocationPrefix( + string prefix : string ref +); + +databaseMetadata( + string metadataKey : string ref, + string value : string ref +); + +overlayChangedFiles( + string path: string ref +); + +/* + * SMAP + */ + +smap_header( + int outputFileId: @file ref, + string outputFilename: string ref, + string defaultStratum: string ref +); + +smap_files( + int outputFileId: @file ref, + string stratum: string ref, + int inputFileNum: int ref, + string inputFileName: string ref, + int inputFileId: @file ref +); + +smap_lines( + int outputFileId: @file ref, + string stratum: string ref, + int inputFileNum: int ref, + int inputStartLine: int ref, + int inputLineCount: int ref, + int outputStartLine: int ref, + int outputLineIncrement: int ref +); + +/* + * Locations and files + */ + +@location = @location_default ; + +locations_default( + unique int id: @location_default, + int file: @file ref, + int beginLine: int ref, + int beginColumn: int ref, + int endLine: int ref, + int endColumn: int ref +); + +hasLocation( + int locatableid: @locatable ref, + int id: @location ref +); + +@sourceline = @locatable ; + +#keyset[element_id] +numlines( + int element_id: @sourceline ref, + int num_lines: int ref, + int num_code: int ref, + int num_comment: int ref +); + +files( + unique int id: @file, + string name: string ref +); + +folders( + unique int id: @folder, + string name: string ref +); + +@container = @folder | @file + +containerparent( + int parent: @container ref, + unique int child: @container ref +); + +/* + * Java + */ + +cupackage( + unique int id: @file ref, + int packageid: @package ref +); + +#keyset[fileid,keyName] +jarManifestMain( + int fileid: @file ref, + string keyName: string ref, + string value: string ref +); + +#keyset[fileid,entryName,keyName] +jarManifestEntries( + int fileid: @file ref, + string entryName: string ref, + string keyName: string ref, + string value: string ref +); + +packages( + unique int id: @package, + string nodeName: string ref +); + +primitives( + unique int id: @primitive, + string nodeName: string ref +); + +modifiers( + unique int id: @modifier, + string nodeName: string ref +); + +/** + * An errortype is used when the extractor is unable to extract a type + * correctly for some reason. + */ +error_type( + unique int id: @errortype +); + +classes_or_interfaces( + unique int id: @classorinterface, + string nodeName: string ref, + int parentid: @package ref, + int sourceid: @classorinterface ref +); + +file_class( + int id: @classorinterface ref +); + +class_object( + unique int id: @classorinterface ref, + unique int instance: @field ref +); + +type_companion_object( + unique int id: @classorinterface ref, + unique int instance: @field ref, + unique int companion_object: @classorinterface ref +); + +kt_nullable_types( + unique int id: @kt_nullable_type, + int classid: @reftype ref +) + +kt_notnull_types( + unique int id: @kt_notnull_type, + int classid: @reftype ref +) + +kt_type_alias( + unique int id: @kt_type_alias, + string name: string ref, + int kttypeid: @kt_type ref +) + +@kt_type = @kt_nullable_type | @kt_notnull_type + +isInterface( + unique int id: @classorinterface ref +); + +isRecord( + unique int id: @classorinterface ref +); + +fielddecls( + unique int id: @fielddecl, + int parentid: @reftype ref +); + +#keyset[fieldId] #keyset[fieldDeclId,pos] +fieldDeclaredIn( + int fieldId: @field ref, + int fieldDeclId: @fielddecl ref, + int pos: int ref +); + +fields( + unique int id: @field, + string nodeName: string ref, + int typeid: @type ref, + int parentid: @reftype ref +); + +fieldsKotlinType( + unique int id: @field ref, + int kttypeid: @kt_type ref +); + +constrs( + unique int id: @constructor, + string nodeName: string ref, + string signature: string ref, + int typeid: @type ref, + int parentid: @reftype ref, + int sourceid: @constructor ref +); + +constrsKotlinType( + unique int id: @constructor ref, + int kttypeid: @kt_type ref +); + +methods( + unique int id: @method, + string nodeName: string ref, + string signature: string ref, + int typeid: @type ref, + int parentid: @reftype ref, + int sourceid: @method ref +); + +methodsKotlinType( + unique int id: @method ref, + int kttypeid: @kt_type ref +); + +#keyset[parentid,pos] +params( + unique int id: @param, + int typeid: @type ref, + int pos: int ref, + int parentid: @callable ref, + int sourceid: @param ref +); + +paramsKotlinType( + unique int id: @param ref, + int kttypeid: @kt_type ref +); + +paramName( + unique int id: @param ref, + string nodeName: string ref +); + +isVarargsParam( + int param: @param ref +); + +exceptions( + unique int id: @exception, + int typeid: @type ref, + int parentid: @callable ref +); + +isAnnotType( + int interfaceid: @classorinterface ref +); + +isAnnotElem( + int methodid: @method ref +); + +annotValue( + int parentid: @annotation ref, + int id2: @method ref, + unique int value: @expr ref +); + +isEnumType( + int classid: @classorinterface ref +); + +isEnumConst( + int fieldid: @field ref +); + +#keyset[parentid,pos] +typeVars( + unique int id: @typevariable, + string nodeName: string ref, + int pos: int ref, + int parentid: @classorinterfaceorcallable ref +); + +wildcards( + unique int id: @wildcard, + string nodeName: string ref, + int kind: int ref +); + +#keyset[parentid,pos] +typeBounds( + unique int id: @typebound, + int typeid: @reftype ref, + int pos: int ref, + int parentid: @boundedtype ref +); + +#keyset[parentid,pos] +typeArgs( + int argumentid: @reftype ref, + int pos: int ref, + int parentid: @classorinterfaceorcallable ref +); + +isParameterized( + int memberid: @member ref +); + +isRaw( + int memberid: @member ref +); + +#keyset[classid] #keyset[parent] +isAnonymClass( + int classid: @classorinterface ref, + int parent: @classinstancexpr ref +); + +#keyset[typeid] #keyset[parent] +isLocalClassOrInterface( + int typeid: @classorinterface ref, + int parent: @localtypedeclstmt ref +); + +isDefConstr( + int constructorid: @constructor ref +); + +#keyset[exprId] +lambdaKind( + int exprId: @lambdaexpr ref, + int bodyKind: int ref +); + +isCanonicalConstr( + int constructorid: @constructor ref +); + +arrays( + unique int id: @array, + string nodeName: string ref, + int elementtypeid: @type ref, + int dimension: int ref, + int componenttypeid: @type ref +); + +enclInReftype( + unique int child: @reftype ref, + int parent: @reftype ref +); + +extendsReftype( + int id1: @reftype ref, + int id2: @classorinterface ref +); + +implInterface( + int id1: @classorarray ref, + int id2: @classorinterface ref +); + +permits( + int id1: @classorinterface ref, + int id2: @classorinterface ref +); + +hasModifier( + int id1: @modifiable ref, + int id2: @modifier ref +); + +imports( + unique int id: @import, + int holder: @classorinterfaceorpackage ref, + string name: string ref, + int kind: int ref +); + +#keyset[parent,idx] +stmts( + unique int id: @stmt, + int kind: int ref, + int parent: @stmtparent ref, + int idx: int ref, + int bodydecl: @callable ref +); + +@stmtparent = @callable | @stmt | @switchexpr | @whenexpr| @stmtexpr; + +case @stmt.kind of + 0 = @block +| 1 = @ifstmt +| 2 = @forstmt +| 3 = @enhancedforstmt +| 4 = @whilestmt +| 5 = @dostmt +| 6 = @trystmt +| 7 = @switchstmt +| 8 = @synchronizedstmt +| 9 = @returnstmt +| 10 = @throwstmt +| 11 = @breakstmt +| 12 = @continuestmt +| 13 = @emptystmt +| 14 = @exprstmt +| 15 = @labeledstmt +| 16 = @assertstmt +| 17 = @localvariabledeclstmt +| 18 = @localtypedeclstmt +| 19 = @constructorinvocationstmt +| 20 = @superconstructorinvocationstmt +| 21 = @case +| 22 = @catchclause +| 23 = @yieldstmt +| 24 = @errorstmt +| 25 = @whenbranch +; + +#keyset[parent,idx] +exprs( + unique int id: @expr, + int kind: int ref, + int typeid: @type ref, + int parent: @exprparent ref, + int idx: int ref +); + +exprsKotlinType( + unique int id: @expr ref, + int kttypeid: @kt_type ref +); + +callableEnclosingExpr( + unique int id: @expr ref, + int callable_id: @callable ref +); + +statementEnclosingExpr( + unique int id: @expr ref, + int statement_id: @stmt ref +); + +isParenthesized( + unique int id: @expr ref, + int parentheses: int ref +); + +case @expr.kind of + 1 = @arrayaccess +| 2 = @arraycreationexpr +| 3 = @arrayinit +| 4 = @assignexpr +| 5 = @assignaddexpr +| 6 = @assignsubexpr +| 7 = @assignmulexpr +| 8 = @assigndivexpr +| 9 = @assignremexpr +| 10 = @assignandexpr +| 11 = @assignorexpr +| 12 = @assignxorexpr +| 13 = @assignlshiftexpr +| 14 = @assignrshiftexpr +| 15 = @assignurshiftexpr +| 16 = @booleanliteral +| 17 = @integerliteral +| 18 = @longliteral +| 19 = @floatingpointliteral +| 20 = @doubleliteral +| 21 = @characterliteral +| 22 = @stringliteral +| 23 = @nullliteral +| 24 = @mulexpr +| 25 = @divexpr +| 26 = @remexpr +| 27 = @addexpr +| 28 = @subexpr +| 29 = @lshiftexpr +| 30 = @rshiftexpr +| 31 = @urshiftexpr +| 32 = @andbitexpr +| 33 = @orbitexpr +| 34 = @xorbitexpr +| 35 = @andlogicalexpr +| 36 = @orlogicalexpr +| 37 = @ltexpr +| 38 = @gtexpr +| 39 = @leexpr +| 40 = @geexpr +| 41 = @eqexpr +| 42 = @neexpr +| 43 = @postincexpr +| 44 = @postdecexpr +| 45 = @preincexpr +| 46 = @predecexpr +| 47 = @minusexpr +| 48 = @plusexpr +| 49 = @bitnotexpr +| 50 = @lognotexpr +| 51 = @castexpr +| 52 = @newexpr +| 53 = @conditionalexpr +| 54 = @parexpr // deprecated +| 55 = @instanceofexpr +| 56 = @localvariabledeclexpr +| 57 = @typeliteral +| 58 = @thisaccess +| 59 = @superaccess +| 60 = @varaccess +| 61 = @methodaccess +| 62 = @unannotatedtypeaccess +| 63 = @arraytypeaccess +| 64 = @packageaccess +| 65 = @wildcardtypeaccess +| 66 = @declannotation +| 67 = @uniontypeaccess +| 68 = @lambdaexpr +| 69 = @memberref +| 70 = @annotatedtypeaccess +| 71 = @typeannotation +| 72 = @intersectiontypeaccess +| 73 = @switchexpr +| 74 = @errorexpr +| 75 = @whenexpr +| 76 = @getclassexpr +| 77 = @safecastexpr +| 78 = @implicitcastexpr +| 79 = @implicitnotnullexpr +| 80 = @implicitcoerciontounitexpr +| 81 = @notinstanceofexpr +| 82 = @stmtexpr +| 83 = @stringtemplateexpr +| 84 = @notnullexpr +| 85 = @unsafecoerceexpr +| 86 = @valueeqexpr +| 87 = @valueneexpr +| 88 = @propertyref +| 89 = @recordpatternexpr +; + +/** Holds if this `when` expression was written as an `if` expression. */ +when_if(unique int id: @whenexpr ref); + +/** Holds if this `when` branch was written as an `else` branch. */ +when_branch_else(unique int id: @whenbranch ref); + +@classinstancexpr = @newexpr | @lambdaexpr | @memberref | @propertyref + +@annotation = @declannotation | @typeannotation +@typeaccess = @unannotatedtypeaccess | @annotatedtypeaccess + +@assignment = @assignexpr + | @assignop; + +@unaryassignment = @postincexpr + | @postdecexpr + | @preincexpr + | @predecexpr; + +@assignop = @assignaddexpr + | @assignsubexpr + | @assignmulexpr + | @assigndivexpr + | @assignremexpr + | @assignandexpr + | @assignorexpr + | @assignxorexpr + | @assignlshiftexpr + | @assignrshiftexpr + | @assignurshiftexpr; + +@literal = @booleanliteral + | @integerliteral + | @longliteral + | @floatingpointliteral + | @doubleliteral + | @characterliteral + | @stringliteral + | @nullliteral; + +@binaryexpr = @mulexpr + | @divexpr + | @remexpr + | @addexpr + | @subexpr + | @lshiftexpr + | @rshiftexpr + | @urshiftexpr + | @andbitexpr + | @orbitexpr + | @xorbitexpr + | @andlogicalexpr + | @orlogicalexpr + | @ltexpr + | @gtexpr + | @leexpr + | @geexpr + | @eqexpr + | @neexpr + | @valueeqexpr + | @valueneexpr; + +@unaryexpr = @postincexpr + | @postdecexpr + | @preincexpr + | @predecexpr + | @minusexpr + | @plusexpr + | @bitnotexpr + | @lognotexpr + | @notnullexpr; + +@caller = @classinstancexpr + | @methodaccess + | @constructorinvocationstmt + | @superconstructorinvocationstmt; + +callableBinding( + unique int callerid: @caller ref, + int callee: @callable ref +); + +memberRefBinding( + unique int id: @expr ref, + int callable: @callable ref +); + +propertyRefGetBinding( + unique int id: @expr ref, + int getter: @callable ref +); + +propertyRefFieldBinding( + unique int id: @expr ref, + int field: @field ref +); + +propertyRefSetBinding( + unique int id: @expr ref, + int setter: @callable ref +); + +@exprparent = @stmt | @expr | @whenbranch | @callable | @field | @fielddecl | @classorinterface | @param | @localvar | @typevariable; + +variableBinding( + unique int expr: @varaccess ref, + int variable: @variable ref +); + +@variable = @localscopevariable | @field; + +@localscopevariable = @localvar | @param; + +localvars( + unique int id: @localvar, + string nodeName: string ref, + int typeid: @type ref, + int parentid: @localvariabledeclexpr ref +); + +localvarsKotlinType( + unique int id: @localvar ref, + int kttypeid: @kt_type ref +); + +@namedexprorstmt = @breakstmt + | @continuestmt + | @labeledstmt + | @literal; + +namestrings( + string name: string ref, + string value: string ref, + unique int parent: @namedexprorstmt ref +); + +/* + * Modules + */ + +#keyset[name] +modules( + unique int id: @module, + string name: string ref +); + +isOpen( + int id: @module ref +); + +#keyset[fileId] +cumodule( + int fileId: @file ref, + int moduleId: @module ref +); + +@directive = @requires + | @exports + | @opens + | @uses + | @provides + +#keyset[directive] +directives( + int id: @module ref, + int directive: @directive ref +); + +requires( + unique int id: @requires, + int target: @module ref +); + +isTransitive( + int id: @requires ref +); + +isStatic( + int id: @requires ref +); + +exports( + unique int id: @exports, + int target: @package ref +); + +exportsTo( + int id: @exports ref, + int target: @module ref +); + +opens( + unique int id: @opens, + int target: @package ref +); + +opensTo( + int id: @opens ref, + int target: @module ref +); + +uses( + unique int id: @uses, + string serviceInterface: string ref +); + +provides( + unique int id: @provides, + string serviceInterface: string ref +); + +providesWith( + int id: @provides ref, + string serviceImpl: string ref +); + +isNullDefaultCase( + int id: @case ref +); + +/* + * Javadoc + */ + +javadoc( + unique int id: @javadoc +); + +isNormalComment( + int commentid : @javadoc ref +); + +isEolComment( + int commentid : @javadoc ref +); + +hasJavadoc( + int documentableid: @member ref, + int javadocid: @javadoc ref +); + +#keyset[parentid,idx] +javadocTag( + unique int id: @javadocTag, + string name: string ref, + int parentid: @javadocParent ref, + int idx: int ref +); + +#keyset[parentid,idx] +javadocText( + unique int id: @javadocText, + string text: string ref, + int parentid: @javadocParent ref, + int idx: int ref +); + +@javadocParent = @javadoc | @javadocTag; +@javadocElement = @javadocTag | @javadocText; + +@classorinterfaceorpackage = @classorinterface | @package; +@classorinterfaceorcallable = @classorinterface | @callable; +@boundedtype = @typevariable | @wildcard; +@reftype = @classorinterface | @array | @boundedtype | @errortype; +@classorarray = @classorinterface | @array; +@type = @primitive | @reftype; +@callable = @method | @constructor; + +/** A program element that has a name. */ +@element = @package | @modifier | @annotation | @errortype | + @locatableElement; + +@locatableElement = @file | @primitive | @classorinterface | @method | @constructor | @param | @exception | @field | + @boundedtype | @array | @localvar | @expr | @stmt | @import | @fielddecl | @kt_type | @kt_type_alias | + @kt_property; + +@modifiable = @member_modifiable| @param | @localvar | @typevariable; + +@member_modifiable = @classorinterface | @method | @constructor | @field | @kt_property; + +@member = @method | @constructor | @field | @reftype ; + +/** A program element that has a location. */ +@locatable = @typebound | @javadoc | @javadocTag | @javadocText | @xmllocatable | @ktcomment | + @locatableElement; + +@top = @element | @locatable | @folder; + +/* + * XML Files + */ + +xmlEncoding( + unique int id: @file ref, + string encoding: string ref +); + +xmlDTDs( + unique int id: @xmldtd, + string root: string ref, + string publicId: string ref, + string systemId: string ref, + int fileid: @file ref +); + +xmlElements( + unique int id: @xmlelement, + string name: string ref, + int parentid: @xmlparent ref, + int idx: int ref, + int fileid: @file ref +); + +xmlAttrs( + unique int id: @xmlattribute, + int elementid: @xmlelement ref, + string name: string ref, + string value: string ref, + int idx: int ref, + int fileid: @file ref +); + +xmlNs( + int id: @xmlnamespace, + string prefixName: string ref, + string URI: string ref, + int fileid: @file ref +); + +xmlHasNs( + int elementId: @xmlnamespaceable ref, + int nsId: @xmlnamespace ref, + int fileid: @file ref +); + +xmlComments( + unique int id: @xmlcomment, + string text: string ref, + int parentid: @xmlparent ref, + int fileid: @file ref +); + +xmlChars( + unique int id: @xmlcharacters, + string text: string ref, + int parentid: @xmlparent ref, + int idx: int ref, + int isCDATA: int ref, + int fileid: @file ref +); + +@xmlparent = @file | @xmlelement; +@xmlnamespaceable = @xmlelement | @xmlattribute; + +xmllocations( + int xmlElement: @xmllocatable ref, + int location: @location_default ref +); + +@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace; + +/* + * configuration files with key value pairs + */ + +configs( + unique int id: @config +); + +configNames( + unique int id: @configName, + int config: @config ref, + string name: string ref +); + +configValues( + unique int id: @configValue, + int config: @config ref, + string value: string ref +); + +configLocations( + int locatable: @configLocatable ref, + int location: @location_default ref +); + +@configLocatable = @config | @configName | @configValue; + +ktComments( + unique int id: @ktcomment, + int kind: int ref, + string text : string ref +) + +ktCommentSections( + unique int id: @ktcommentsection, + int comment: @ktcomment ref, + string content : string ref +) + +ktCommentSectionNames( + unique int id: @ktcommentsection ref, + string name : string ref +) + +ktCommentSectionSubjectNames( + unique int id: @ktcommentsection ref, + string subjectname : string ref +) + +#keyset[id, owner] +ktCommentOwners( + int id: @ktcomment ref, + int owner: @top ref +) + +ktExtensionFunctions( + unique int id: @method ref, + int typeid: @type ref, + int kttypeid: @kt_type ref +) + +ktProperties( + unique int id: @kt_property, + string nodeName: string ref +) + +ktPropertyGetters( + unique int id: @kt_property ref, + int getter: @method ref +) + +ktPropertySetters( + unique int id: @kt_property ref, + int setter: @method ref +) + +ktPropertyBackingFields( + unique int id: @kt_property ref, + int backingField: @field ref +) + +ktSyntheticBody( + unique int id: @callable ref, + int kind: int ref + // 1: ENUM_VALUES + // 2: ENUM_VALUEOF + // 3: ENUM_ENTRIES +) + +ktLocalFunction( + unique int id: @method ref +) + +ktInitializerAssignment( + unique int id: @assignexpr ref +) + +ktPropertyDelegates( + unique int id: @kt_property ref, + unique int variableId: @variable ref +) + +/** + * If `id` is a compiler generated element, then the kind indicates the + * reason that the compiler generated it. + * See `Element.compilerGeneratedReason()` for an explanation of what + * each `kind` means. + */ +compiler_generated( + unique int id: @element ref, + int kind: int ref +) + +ktFunctionOriginalNames( + unique int id: @method ref, + string name: string ref +) + +ktDataClasses( + unique int id: @classorinterface ref +) diff --git a/java/downgrades/9f6026c400996c13842974b24f076a486ad1f69c/upgrade.properties b/java/downgrades/9f6026c400996c13842974b24f076a486ad1f69c/upgrade.properties new file mode 100644 index 000000000000..cfc9417d13e2 --- /dev/null +++ b/java/downgrades/9f6026c400996c13842974b24f076a486ad1f69c/upgrade.properties @@ -0,0 +1,3 @@ +description: Remove Java 25 compact source files support by removing `isImplicitClass` table +compatibility: partial +isImplicitClass.rel: delete diff --git a/java/ql/lib/upgrades/1b8f5f4c747e4249f4731796ccaa0661c7434d8a/old.dbscheme b/java/ql/lib/upgrades/1b8f5f4c747e4249f4731796ccaa0661c7434d8a/old.dbscheme new file mode 100644 index 000000000000..1b8f5f4c747e --- /dev/null +++ b/java/ql/lib/upgrades/1b8f5f4c747e4249f4731796ccaa0661c7434d8a/old.dbscheme @@ -0,0 +1,1236 @@ +/** + * An invocation of the compiler. Note that more than one file may be + * compiled per invocation. For example, this command compiles three + * source files: + * + * javac A.java B.java C.java + * + * The `id` simply identifies the invocation, while `cwd` is the working + * directory from which the compiler was invoked. + */ +compilations( + /** + * An invocation of the compiler. Note that more than one file may + * be compiled per invocation. For example, this command compiles + * three source files: + * + * javac A.java B.java C.java + */ + unique int id : @compilation, + int kind: int ref, + string cwd : string ref, + string name : string ref +); + +case @compilation.kind of + 1 = @javacompilation +| 2 = @kotlincompilation +; + +compilation_started( + int id : @compilation ref +) + +compilation_info( + int id : @compilation ref, + string info_key: string ref, + string info_value: string ref +) + +/** + * The arguments that were passed to the extractor for a compiler + * invocation. If `id` is for the compiler invocation + * + * javac A.java B.java C.java + * + * then typically there will be rows for + * + * num | arg + * --- | --- + * 0 | *path to extractor* + * 1 | `--javac-args` + * 2 | A.java + * 3 | B.java + * 4 | C.java + */ +#keyset[id, num] +compilation_args( + int id : @compilation ref, + int num : int ref, + string arg : string ref +); + +/** + * The expanded arguments that were passed to the extractor for a + * compiler invocation. This is similar to `compilation_args`, but + * for a `@@@someFile` argument, it includes the arguments from that + * file, rather than just taking the argument literally. + */ +#keyset[id, num] +compilation_expanded_args( + int id : @compilation ref, + int num : int ref, + string arg : string ref +); + +/** + * The source files that are compiled by a compiler invocation. + * If `id` is for the compiler invocation + * + * javac A.java B.java C.java + * + * then there will be rows for + * + * num | arg + * --- | --- + * 0 | A.java + * 1 | B.java + * 2 | C.java + */ +#keyset[id, num] +compilation_compiling_files( + int id : @compilation ref, + int num : int ref, + int file : @file ref +); + +/** + * For each file recorded in `compilation_compiling_files`, + * there will be a corresponding row in + * `compilation_compiling_files_completed` once extraction + * of that file is complete. The `result` will indicate the + * extraction result: + * + * 0: Successfully extracted + * 1: Errors were encountered, but extraction recovered + * 2: Errors were encountered, and extraction could not recover + */ +#keyset[id, num] +compilation_compiling_files_completed( + int id : @compilation ref, + int num : int ref, + int result : int ref +); + +/** + * The time taken by the extractor for a compiler invocation. + * + * For each file `num`, there will be rows for + * + * kind | seconds + * ---- | --- + * 1 | CPU seconds used by the extractor frontend + * 2 | Elapsed seconds during the extractor frontend + * 3 | CPU seconds used by the extractor backend + * 4 | Elapsed seconds during the extractor backend + */ +#keyset[id, num, kind] +compilation_time( + int id : @compilation ref, + int num : int ref, + /* kind: + 1 = frontend_cpu_seconds + 2 = frontend_elapsed_seconds + 3 = extractor_cpu_seconds + 4 = extractor_elapsed_seconds + */ + int kind : int ref, + float seconds : float ref +); + +/** + * The `cpu_seconds` and `elapsed_seconds` are the CPU time and elapsed + * time (respectively) that the original compilation (not the extraction) + * took for compiler invocation `id`. + */ +compilation_compiler_times( + unique int id : @compilation ref, + float cpu_seconds : float ref, + float elapsed_seconds : float ref +); + +/** + * If extraction was successful, then `cpu_seconds` and + * `elapsed_seconds` are the CPU time and elapsed time (respectively) + * that extraction took for compiler invocation `id`. + * The `result` will indicate the extraction result: + * + * 0: Successfully extracted + * 1: Errors were encountered, but extraction recovered + * 2: Errors were encountered, and extraction could not recover + */ +compilation_finished( + unique int id : @compilation ref, + float cpu_seconds : float ref, + float elapsed_seconds : float ref, + int result : int ref +); + +diagnostics( + unique int id: @diagnostic, + string generated_by: string ref, // TODO: Sync this with the other languages? + int severity: int ref, + string error_tag: string ref, + string error_message: string ref, + string full_error_message: string ref, + int location: @location_default ref +); + +/** + * An error or warning generated by the extractor. + * The diagnostic message `diagnostic` was generated during compiler + * invocation `compilation`, and is the `file_number_diagnostic_number`th + * message generated while extracting the `file_number`th file of that + * invocation. + */ +#keyset[compilation, file_number, file_number_diagnostic_number] +diagnostic_for( + unique int diagnostic : @diagnostic ref, + int compilation : @compilation ref, + int file_number : int ref, + int file_number_diagnostic_number : int ref +); + +/* + * External artifacts + */ + +externalData( + int id : @externalDataElement, + string path : string ref, + int column: int ref, + string value : string ref +); + +sourceLocationPrefix( + string prefix : string ref +); + +databaseMetadata( + string metadataKey : string ref, + string value : string ref +); + +overlayChangedFiles( + string path: string ref +); + +/* + * SMAP + */ + +smap_header( + int outputFileId: @file ref, + string outputFilename: string ref, + string defaultStratum: string ref +); + +smap_files( + int outputFileId: @file ref, + string stratum: string ref, + int inputFileNum: int ref, + string inputFileName: string ref, + int inputFileId: @file ref +); + +smap_lines( + int outputFileId: @file ref, + string stratum: string ref, + int inputFileNum: int ref, + int inputStartLine: int ref, + int inputLineCount: int ref, + int outputStartLine: int ref, + int outputLineIncrement: int ref +); + +/* + * Locations and files + */ + +@location = @location_default ; + +locations_default( + unique int id: @location_default, + int file: @file ref, + int beginLine: int ref, + int beginColumn: int ref, + int endLine: int ref, + int endColumn: int ref +); + +hasLocation( + int locatableid: @locatable ref, + int id: @location ref +); + +@sourceline = @locatable ; + +#keyset[element_id] +numlines( + int element_id: @sourceline ref, + int num_lines: int ref, + int num_code: int ref, + int num_comment: int ref +); + +files( + unique int id: @file, + string name: string ref +); + +folders( + unique int id: @folder, + string name: string ref +); + +@container = @folder | @file + +containerparent( + int parent: @container ref, + unique int child: @container ref +); + +/* + * Java + */ + +cupackage( + unique int id: @file ref, + int packageid: @package ref +); + +#keyset[fileid,keyName] +jarManifestMain( + int fileid: @file ref, + string keyName: string ref, + string value: string ref +); + +#keyset[fileid,entryName,keyName] +jarManifestEntries( + int fileid: @file ref, + string entryName: string ref, + string keyName: string ref, + string value: string ref +); + +packages( + unique int id: @package, + string nodeName: string ref +); + +primitives( + unique int id: @primitive, + string nodeName: string ref +); + +modifiers( + unique int id: @modifier, + string nodeName: string ref +); + +/** + * An errortype is used when the extractor is unable to extract a type + * correctly for some reason. + */ +error_type( + unique int id: @errortype +); + +classes_or_interfaces( + unique int id: @classorinterface, + string nodeName: string ref, + int parentid: @package ref, + int sourceid: @classorinterface ref +); + +file_class( + int id: @classorinterface ref +); + +class_object( + unique int id: @classorinterface ref, + unique int instance: @field ref +); + +type_companion_object( + unique int id: @classorinterface ref, + unique int instance: @field ref, + unique int companion_object: @classorinterface ref +); + +kt_nullable_types( + unique int id: @kt_nullable_type, + int classid: @reftype ref +) + +kt_notnull_types( + unique int id: @kt_notnull_type, + int classid: @reftype ref +) + +kt_type_alias( + unique int id: @kt_type_alias, + string name: string ref, + int kttypeid: @kt_type ref +) + +@kt_type = @kt_nullable_type | @kt_notnull_type + +isInterface( + unique int id: @classorinterface ref +); + +isRecord( + unique int id: @classorinterface ref +); + +fielddecls( + unique int id: @fielddecl, + int parentid: @reftype ref +); + +#keyset[fieldId] #keyset[fieldDeclId,pos] +fieldDeclaredIn( + int fieldId: @field ref, + int fieldDeclId: @fielddecl ref, + int pos: int ref +); + +fields( + unique int id: @field, + string nodeName: string ref, + int typeid: @type ref, + int parentid: @reftype ref +); + +fieldsKotlinType( + unique int id: @field ref, + int kttypeid: @kt_type ref +); + +constrs( + unique int id: @constructor, + string nodeName: string ref, + string signature: string ref, + int typeid: @type ref, + int parentid: @reftype ref, + int sourceid: @constructor ref +); + +constrsKotlinType( + unique int id: @constructor ref, + int kttypeid: @kt_type ref +); + +methods( + unique int id: @method, + string nodeName: string ref, + string signature: string ref, + int typeid: @type ref, + int parentid: @reftype ref, + int sourceid: @method ref +); + +methodsKotlinType( + unique int id: @method ref, + int kttypeid: @kt_type ref +); + +#keyset[parentid,pos] +params( + unique int id: @param, + int typeid: @type ref, + int pos: int ref, + int parentid: @callable ref, + int sourceid: @param ref +); + +paramsKotlinType( + unique int id: @param ref, + int kttypeid: @kt_type ref +); + +paramName( + unique int id: @param ref, + string nodeName: string ref +); + +isVarargsParam( + int param: @param ref +); + +exceptions( + unique int id: @exception, + int typeid: @type ref, + int parentid: @callable ref +); + +isAnnotType( + int interfaceid: @classorinterface ref +); + +isAnnotElem( + int methodid: @method ref +); + +annotValue( + int parentid: @annotation ref, + int id2: @method ref, + unique int value: @expr ref +); + +isEnumType( + int classid: @classorinterface ref +); + +isEnumConst( + int fieldid: @field ref +); + +#keyset[parentid,pos] +typeVars( + unique int id: @typevariable, + string nodeName: string ref, + int pos: int ref, + int parentid: @classorinterfaceorcallable ref +); + +wildcards( + unique int id: @wildcard, + string nodeName: string ref, + int kind: int ref +); + +#keyset[parentid,pos] +typeBounds( + unique int id: @typebound, + int typeid: @reftype ref, + int pos: int ref, + int parentid: @boundedtype ref +); + +#keyset[parentid,pos] +typeArgs( + int argumentid: @reftype ref, + int pos: int ref, + int parentid: @classorinterfaceorcallable ref +); + +isParameterized( + int memberid: @member ref +); + +isRaw( + int memberid: @member ref +); + +#keyset[classid] #keyset[parent] +isAnonymClass( + int classid: @classorinterface ref, + int parent: @classinstancexpr ref +); + +#keyset[typeid] #keyset[parent] +isLocalClassOrInterface( + int typeid: @classorinterface ref, + int parent: @localtypedeclstmt ref +); + +isDefConstr( + int constructorid: @constructor ref +); + +#keyset[exprId] +lambdaKind( + int exprId: @lambdaexpr ref, + int bodyKind: int ref +); + +isCanonicalConstr( + int constructorid: @constructor ref +); + +arrays( + unique int id: @array, + string nodeName: string ref, + int elementtypeid: @type ref, + int dimension: int ref, + int componenttypeid: @type ref +); + +enclInReftype( + unique int child: @reftype ref, + int parent: @reftype ref +); + +extendsReftype( + int id1: @reftype ref, + int id2: @classorinterface ref +); + +implInterface( + int id1: @classorarray ref, + int id2: @classorinterface ref +); + +permits( + int id1: @classorinterface ref, + int id2: @classorinterface ref +); + +hasModifier( + int id1: @modifiable ref, + int id2: @modifier ref +); + +imports( + unique int id: @import, + int holder: @classorinterfaceorpackage ref, + string name: string ref, + int kind: int ref +); + +#keyset[parent,idx] +stmts( + unique int id: @stmt, + int kind: int ref, + int parent: @stmtparent ref, + int idx: int ref, + int bodydecl: @callable ref +); + +@stmtparent = @callable | @stmt | @switchexpr | @whenexpr| @stmtexpr; + +case @stmt.kind of + 0 = @block +| 1 = @ifstmt +| 2 = @forstmt +| 3 = @enhancedforstmt +| 4 = @whilestmt +| 5 = @dostmt +| 6 = @trystmt +| 7 = @switchstmt +| 8 = @synchronizedstmt +| 9 = @returnstmt +| 10 = @throwstmt +| 11 = @breakstmt +| 12 = @continuestmt +| 13 = @emptystmt +| 14 = @exprstmt +| 15 = @labeledstmt +| 16 = @assertstmt +| 17 = @localvariabledeclstmt +| 18 = @localtypedeclstmt +| 19 = @constructorinvocationstmt +| 20 = @superconstructorinvocationstmt +| 21 = @case +| 22 = @catchclause +| 23 = @yieldstmt +| 24 = @errorstmt +| 25 = @whenbranch +; + +#keyset[parent,idx] +exprs( + unique int id: @expr, + int kind: int ref, + int typeid: @type ref, + int parent: @exprparent ref, + int idx: int ref +); + +exprsKotlinType( + unique int id: @expr ref, + int kttypeid: @kt_type ref +); + +callableEnclosingExpr( + unique int id: @expr ref, + int callable_id: @callable ref +); + +statementEnclosingExpr( + unique int id: @expr ref, + int statement_id: @stmt ref +); + +isParenthesized( + unique int id: @expr ref, + int parentheses: int ref +); + +case @expr.kind of + 1 = @arrayaccess +| 2 = @arraycreationexpr +| 3 = @arrayinit +| 4 = @assignexpr +| 5 = @assignaddexpr +| 6 = @assignsubexpr +| 7 = @assignmulexpr +| 8 = @assigndivexpr +| 9 = @assignremexpr +| 10 = @assignandexpr +| 11 = @assignorexpr +| 12 = @assignxorexpr +| 13 = @assignlshiftexpr +| 14 = @assignrshiftexpr +| 15 = @assignurshiftexpr +| 16 = @booleanliteral +| 17 = @integerliteral +| 18 = @longliteral +| 19 = @floatingpointliteral +| 20 = @doubleliteral +| 21 = @characterliteral +| 22 = @stringliteral +| 23 = @nullliteral +| 24 = @mulexpr +| 25 = @divexpr +| 26 = @remexpr +| 27 = @addexpr +| 28 = @subexpr +| 29 = @lshiftexpr +| 30 = @rshiftexpr +| 31 = @urshiftexpr +| 32 = @andbitexpr +| 33 = @orbitexpr +| 34 = @xorbitexpr +| 35 = @andlogicalexpr +| 36 = @orlogicalexpr +| 37 = @ltexpr +| 38 = @gtexpr +| 39 = @leexpr +| 40 = @geexpr +| 41 = @eqexpr +| 42 = @neexpr +| 43 = @postincexpr +| 44 = @postdecexpr +| 45 = @preincexpr +| 46 = @predecexpr +| 47 = @minusexpr +| 48 = @plusexpr +| 49 = @bitnotexpr +| 50 = @lognotexpr +| 51 = @castexpr +| 52 = @newexpr +| 53 = @conditionalexpr +| 54 = @parexpr // deprecated +| 55 = @instanceofexpr +| 56 = @localvariabledeclexpr +| 57 = @typeliteral +| 58 = @thisaccess +| 59 = @superaccess +| 60 = @varaccess +| 61 = @methodaccess +| 62 = @unannotatedtypeaccess +| 63 = @arraytypeaccess +| 64 = @packageaccess +| 65 = @wildcardtypeaccess +| 66 = @declannotation +| 67 = @uniontypeaccess +| 68 = @lambdaexpr +| 69 = @memberref +| 70 = @annotatedtypeaccess +| 71 = @typeannotation +| 72 = @intersectiontypeaccess +| 73 = @switchexpr +| 74 = @errorexpr +| 75 = @whenexpr +| 76 = @getclassexpr +| 77 = @safecastexpr +| 78 = @implicitcastexpr +| 79 = @implicitnotnullexpr +| 80 = @implicitcoerciontounitexpr +| 81 = @notinstanceofexpr +| 82 = @stmtexpr +| 83 = @stringtemplateexpr +| 84 = @notnullexpr +| 85 = @unsafecoerceexpr +| 86 = @valueeqexpr +| 87 = @valueneexpr +| 88 = @propertyref +| 89 = @recordpatternexpr +; + +/** Holds if this `when` expression was written as an `if` expression. */ +when_if(unique int id: @whenexpr ref); + +/** Holds if this `when` branch was written as an `else` branch. */ +when_branch_else(unique int id: @whenbranch ref); + +@classinstancexpr = @newexpr | @lambdaexpr | @memberref | @propertyref + +@annotation = @declannotation | @typeannotation +@typeaccess = @unannotatedtypeaccess | @annotatedtypeaccess + +@assignment = @assignexpr + | @assignop; + +@unaryassignment = @postincexpr + | @postdecexpr + | @preincexpr + | @predecexpr; + +@assignop = @assignaddexpr + | @assignsubexpr + | @assignmulexpr + | @assigndivexpr + | @assignremexpr + | @assignandexpr + | @assignorexpr + | @assignxorexpr + | @assignlshiftexpr + | @assignrshiftexpr + | @assignurshiftexpr; + +@literal = @booleanliteral + | @integerliteral + | @longliteral + | @floatingpointliteral + | @doubleliteral + | @characterliteral + | @stringliteral + | @nullliteral; + +@binaryexpr = @mulexpr + | @divexpr + | @remexpr + | @addexpr + | @subexpr + | @lshiftexpr + | @rshiftexpr + | @urshiftexpr + | @andbitexpr + | @orbitexpr + | @xorbitexpr + | @andlogicalexpr + | @orlogicalexpr + | @ltexpr + | @gtexpr + | @leexpr + | @geexpr + | @eqexpr + | @neexpr + | @valueeqexpr + | @valueneexpr; + +@unaryexpr = @postincexpr + | @postdecexpr + | @preincexpr + | @predecexpr + | @minusexpr + | @plusexpr + | @bitnotexpr + | @lognotexpr + | @notnullexpr; + +@caller = @classinstancexpr + | @methodaccess + | @constructorinvocationstmt + | @superconstructorinvocationstmt; + +callableBinding( + unique int callerid: @caller ref, + int callee: @callable ref +); + +memberRefBinding( + unique int id: @expr ref, + int callable: @callable ref +); + +propertyRefGetBinding( + unique int id: @expr ref, + int getter: @callable ref +); + +propertyRefFieldBinding( + unique int id: @expr ref, + int field: @field ref +); + +propertyRefSetBinding( + unique int id: @expr ref, + int setter: @callable ref +); + +@exprparent = @stmt | @expr | @whenbranch | @callable | @field | @fielddecl | @classorinterface | @param | @localvar | @typevariable; + +variableBinding( + unique int expr: @varaccess ref, + int variable: @variable ref +); + +@variable = @localscopevariable | @field; + +@localscopevariable = @localvar | @param; + +localvars( + unique int id: @localvar, + string nodeName: string ref, + int typeid: @type ref, + int parentid: @localvariabledeclexpr ref +); + +localvarsKotlinType( + unique int id: @localvar ref, + int kttypeid: @kt_type ref +); + +@namedexprorstmt = @breakstmt + | @continuestmt + | @labeledstmt + | @literal; + +namestrings( + string name: string ref, + string value: string ref, + unique int parent: @namedexprorstmt ref +); + +/* + * Modules + */ + +#keyset[name] +modules( + unique int id: @module, + string name: string ref +); + +isOpen( + int id: @module ref +); + +#keyset[fileId] +cumodule( + int fileId: @file ref, + int moduleId: @module ref +); + +@directive = @requires + | @exports + | @opens + | @uses + | @provides + +#keyset[directive] +directives( + int id: @module ref, + int directive: @directive ref +); + +requires( + unique int id: @requires, + int target: @module ref +); + +isTransitive( + int id: @requires ref +); + +isStatic( + int id: @requires ref +); + +exports( + unique int id: @exports, + int target: @package ref +); + +exportsTo( + int id: @exports ref, + int target: @module ref +); + +opens( + unique int id: @opens, + int target: @package ref +); + +opensTo( + int id: @opens ref, + int target: @module ref +); + +uses( + unique int id: @uses, + string serviceInterface: string ref +); + +provides( + unique int id: @provides, + string serviceInterface: string ref +); + +providesWith( + int id: @provides ref, + string serviceImpl: string ref +); + +isNullDefaultCase( + int id: @case ref +); + +/* + * Javadoc + */ + +javadoc( + unique int id: @javadoc +); + +isNormalComment( + int commentid : @javadoc ref +); + +isEolComment( + int commentid : @javadoc ref +); + +hasJavadoc( + int documentableid: @member ref, + int javadocid: @javadoc ref +); + +#keyset[parentid,idx] +javadocTag( + unique int id: @javadocTag, + string name: string ref, + int parentid: @javadocParent ref, + int idx: int ref +); + +#keyset[parentid,idx] +javadocText( + unique int id: @javadocText, + string text: string ref, + int parentid: @javadocParent ref, + int idx: int ref +); + +@javadocParent = @javadoc | @javadocTag; +@javadocElement = @javadocTag | @javadocText; + +@classorinterfaceorpackage = @classorinterface | @package; +@classorinterfaceorcallable = @classorinterface | @callable; +@boundedtype = @typevariable | @wildcard; +@reftype = @classorinterface | @array | @boundedtype | @errortype; +@classorarray = @classorinterface | @array; +@type = @primitive | @reftype; +@callable = @method | @constructor; + +/** A program element that has a name. */ +@element = @package | @modifier | @annotation | @errortype | + @locatableElement; + +@locatableElement = @file | @primitive | @classorinterface | @method | @constructor | @param | @exception | @field | + @boundedtype | @array | @localvar | @expr | @stmt | @import | @fielddecl | @kt_type | @kt_type_alias | + @kt_property; + +@modifiable = @member_modifiable| @param | @localvar | @typevariable; + +@member_modifiable = @classorinterface | @method | @constructor | @field | @kt_property; + +@member = @method | @constructor | @field | @reftype ; + +/** A program element that has a location. */ +@locatable = @typebound | @javadoc | @javadocTag | @javadocText | @xmllocatable | @ktcomment | + @locatableElement; + +@top = @element | @locatable | @folder; + +/* + * XML Files + */ + +xmlEncoding( + unique int id: @file ref, + string encoding: string ref +); + +xmlDTDs( + unique int id: @xmldtd, + string root: string ref, + string publicId: string ref, + string systemId: string ref, + int fileid: @file ref +); + +xmlElements( + unique int id: @xmlelement, + string name: string ref, + int parentid: @xmlparent ref, + int idx: int ref, + int fileid: @file ref +); + +xmlAttrs( + unique int id: @xmlattribute, + int elementid: @xmlelement ref, + string name: string ref, + string value: string ref, + int idx: int ref, + int fileid: @file ref +); + +xmlNs( + int id: @xmlnamespace, + string prefixName: string ref, + string URI: string ref, + int fileid: @file ref +); + +xmlHasNs( + int elementId: @xmlnamespaceable ref, + int nsId: @xmlnamespace ref, + int fileid: @file ref +); + +xmlComments( + unique int id: @xmlcomment, + string text: string ref, + int parentid: @xmlparent ref, + int fileid: @file ref +); + +xmlChars( + unique int id: @xmlcharacters, + string text: string ref, + int parentid: @xmlparent ref, + int idx: int ref, + int isCDATA: int ref, + int fileid: @file ref +); + +@xmlparent = @file | @xmlelement; +@xmlnamespaceable = @xmlelement | @xmlattribute; + +xmllocations( + int xmlElement: @xmllocatable ref, + int location: @location_default ref +); + +@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace; + +/* + * configuration files with key value pairs + */ + +configs( + unique int id: @config +); + +configNames( + unique int id: @configName, + int config: @config ref, + string name: string ref +); + +configValues( + unique int id: @configValue, + int config: @config ref, + string value: string ref +); + +configLocations( + int locatable: @configLocatable ref, + int location: @location_default ref +); + +@configLocatable = @config | @configName | @configValue; + +ktComments( + unique int id: @ktcomment, + int kind: int ref, + string text : string ref +) + +ktCommentSections( + unique int id: @ktcommentsection, + int comment: @ktcomment ref, + string content : string ref +) + +ktCommentSectionNames( + unique int id: @ktcommentsection ref, + string name : string ref +) + +ktCommentSectionSubjectNames( + unique int id: @ktcommentsection ref, + string subjectname : string ref +) + +#keyset[id, owner] +ktCommentOwners( + int id: @ktcomment ref, + int owner: @top ref +) + +ktExtensionFunctions( + unique int id: @method ref, + int typeid: @type ref, + int kttypeid: @kt_type ref +) + +ktProperties( + unique int id: @kt_property, + string nodeName: string ref +) + +ktPropertyGetters( + unique int id: @kt_property ref, + int getter: @method ref +) + +ktPropertySetters( + unique int id: @kt_property ref, + int setter: @method ref +) + +ktPropertyBackingFields( + unique int id: @kt_property ref, + int backingField: @field ref +) + +ktSyntheticBody( + unique int id: @callable ref, + int kind: int ref + // 1: ENUM_VALUES + // 2: ENUM_VALUEOF + // 3: ENUM_ENTRIES +) + +ktLocalFunction( + unique int id: @method ref +) + +ktInitializerAssignment( + unique int id: @assignexpr ref +) + +ktPropertyDelegates( + unique int id: @kt_property ref, + unique int variableId: @variable ref +) + +/** + * If `id` is a compiler generated element, then the kind indicates the + * reason that the compiler generated it. + * See `Element.compilerGeneratedReason()` for an explanation of what + * each `kind` means. + */ +compiler_generated( + unique int id: @element ref, + int kind: int ref +) + +ktFunctionOriginalNames( + unique int id: @method ref, + string name: string ref +) + +ktDataClasses( + unique int id: @classorinterface ref +) diff --git a/java/ql/lib/upgrades/1b8f5f4c747e4249f4731796ccaa0661c7434d8a/semmlecode.dbscheme b/java/ql/lib/upgrades/1b8f5f4c747e4249f4731796ccaa0661c7434d8a/semmlecode.dbscheme new file mode 100644 index 000000000000..9f6026c40099 --- /dev/null +++ b/java/ql/lib/upgrades/1b8f5f4c747e4249f4731796ccaa0661c7434d8a/semmlecode.dbscheme @@ -0,0 +1,1240 @@ +/** + * An invocation of the compiler. Note that more than one file may be + * compiled per invocation. For example, this command compiles three + * source files: + * + * javac A.java B.java C.java + * + * The `id` simply identifies the invocation, while `cwd` is the working + * directory from which the compiler was invoked. + */ +compilations( + /** + * An invocation of the compiler. Note that more than one file may + * be compiled per invocation. For example, this command compiles + * three source files: + * + * javac A.java B.java C.java + */ + unique int id : @compilation, + int kind: int ref, + string cwd : string ref, + string name : string ref +); + +case @compilation.kind of + 1 = @javacompilation +| 2 = @kotlincompilation +; + +compilation_started( + int id : @compilation ref +) + +compilation_info( + int id : @compilation ref, + string info_key: string ref, + string info_value: string ref +) + +/** + * The arguments that were passed to the extractor for a compiler + * invocation. If `id` is for the compiler invocation + * + * javac A.java B.java C.java + * + * then typically there will be rows for + * + * num | arg + * --- | --- + * 0 | *path to extractor* + * 1 | `--javac-args` + * 2 | A.java + * 3 | B.java + * 4 | C.java + */ +#keyset[id, num] +compilation_args( + int id : @compilation ref, + int num : int ref, + string arg : string ref +); + +/** + * The expanded arguments that were passed to the extractor for a + * compiler invocation. This is similar to `compilation_args`, but + * for a `@@@someFile` argument, it includes the arguments from that + * file, rather than just taking the argument literally. + */ +#keyset[id, num] +compilation_expanded_args( + int id : @compilation ref, + int num : int ref, + string arg : string ref +); + +/** + * The source files that are compiled by a compiler invocation. + * If `id` is for the compiler invocation + * + * javac A.java B.java C.java + * + * then there will be rows for + * + * num | arg + * --- | --- + * 0 | A.java + * 1 | B.java + * 2 | C.java + */ +#keyset[id, num] +compilation_compiling_files( + int id : @compilation ref, + int num : int ref, + int file : @file ref +); + +/** + * For each file recorded in `compilation_compiling_files`, + * there will be a corresponding row in + * `compilation_compiling_files_completed` once extraction + * of that file is complete. The `result` will indicate the + * extraction result: + * + * 0: Successfully extracted + * 1: Errors were encountered, but extraction recovered + * 2: Errors were encountered, and extraction could not recover + */ +#keyset[id, num] +compilation_compiling_files_completed( + int id : @compilation ref, + int num : int ref, + int result : int ref +); + +/** + * The time taken by the extractor for a compiler invocation. + * + * For each file `num`, there will be rows for + * + * kind | seconds + * ---- | --- + * 1 | CPU seconds used by the extractor frontend + * 2 | Elapsed seconds during the extractor frontend + * 3 | CPU seconds used by the extractor backend + * 4 | Elapsed seconds during the extractor backend + */ +#keyset[id, num, kind] +compilation_time( + int id : @compilation ref, + int num : int ref, + /* kind: + 1 = frontend_cpu_seconds + 2 = frontend_elapsed_seconds + 3 = extractor_cpu_seconds + 4 = extractor_elapsed_seconds + */ + int kind : int ref, + float seconds : float ref +); + +/** + * The `cpu_seconds` and `elapsed_seconds` are the CPU time and elapsed + * time (respectively) that the original compilation (not the extraction) + * took for compiler invocation `id`. + */ +compilation_compiler_times( + unique int id : @compilation ref, + float cpu_seconds : float ref, + float elapsed_seconds : float ref +); + +/** + * If extraction was successful, then `cpu_seconds` and + * `elapsed_seconds` are the CPU time and elapsed time (respectively) + * that extraction took for compiler invocation `id`. + * The `result` will indicate the extraction result: + * + * 0: Successfully extracted + * 1: Errors were encountered, but extraction recovered + * 2: Errors were encountered, and extraction could not recover + */ +compilation_finished( + unique int id : @compilation ref, + float cpu_seconds : float ref, + float elapsed_seconds : float ref, + int result : int ref +); + +diagnostics( + unique int id: @diagnostic, + string generated_by: string ref, // TODO: Sync this with the other languages? + int severity: int ref, + string error_tag: string ref, + string error_message: string ref, + string full_error_message: string ref, + int location: @location_default ref +); + +/** + * An error or warning generated by the extractor. + * The diagnostic message `diagnostic` was generated during compiler + * invocation `compilation`, and is the `file_number_diagnostic_number`th + * message generated while extracting the `file_number`th file of that + * invocation. + */ +#keyset[compilation, file_number, file_number_diagnostic_number] +diagnostic_for( + unique int diagnostic : @diagnostic ref, + int compilation : @compilation ref, + int file_number : int ref, + int file_number_diagnostic_number : int ref +); + +/* + * External artifacts + */ + +externalData( + int id : @externalDataElement, + string path : string ref, + int column: int ref, + string value : string ref +); + +sourceLocationPrefix( + string prefix : string ref +); + +databaseMetadata( + string metadataKey : string ref, + string value : string ref +); + +overlayChangedFiles( + string path: string ref +); + +/* + * SMAP + */ + +smap_header( + int outputFileId: @file ref, + string outputFilename: string ref, + string defaultStratum: string ref +); + +smap_files( + int outputFileId: @file ref, + string stratum: string ref, + int inputFileNum: int ref, + string inputFileName: string ref, + int inputFileId: @file ref +); + +smap_lines( + int outputFileId: @file ref, + string stratum: string ref, + int inputFileNum: int ref, + int inputStartLine: int ref, + int inputLineCount: int ref, + int outputStartLine: int ref, + int outputLineIncrement: int ref +); + +/* + * Locations and files + */ + +@location = @location_default ; + +locations_default( + unique int id: @location_default, + int file: @file ref, + int beginLine: int ref, + int beginColumn: int ref, + int endLine: int ref, + int endColumn: int ref +); + +hasLocation( + int locatableid: @locatable ref, + int id: @location ref +); + +@sourceline = @locatable ; + +#keyset[element_id] +numlines( + int element_id: @sourceline ref, + int num_lines: int ref, + int num_code: int ref, + int num_comment: int ref +); + +files( + unique int id: @file, + string name: string ref +); + +folders( + unique int id: @folder, + string name: string ref +); + +@container = @folder | @file + +containerparent( + int parent: @container ref, + unique int child: @container ref +); + +/* + * Java + */ + +cupackage( + unique int id: @file ref, + int packageid: @package ref +); + +#keyset[fileid,keyName] +jarManifestMain( + int fileid: @file ref, + string keyName: string ref, + string value: string ref +); + +#keyset[fileid,entryName,keyName] +jarManifestEntries( + int fileid: @file ref, + string entryName: string ref, + string keyName: string ref, + string value: string ref +); + +packages( + unique int id: @package, + string nodeName: string ref +); + +primitives( + unique int id: @primitive, + string nodeName: string ref +); + +modifiers( + unique int id: @modifier, + string nodeName: string ref +); + +/** + * An errortype is used when the extractor is unable to extract a type + * correctly for some reason. + */ +error_type( + unique int id: @errortype +); + +classes_or_interfaces( + unique int id: @classorinterface, + string nodeName: string ref, + int parentid: @package ref, + int sourceid: @classorinterface ref +); + +file_class( + int id: @classorinterface ref +); + +class_object( + unique int id: @classorinterface ref, + unique int instance: @field ref +); + +type_companion_object( + unique int id: @classorinterface ref, + unique int instance: @field ref, + unique int companion_object: @classorinterface ref +); + +kt_nullable_types( + unique int id: @kt_nullable_type, + int classid: @reftype ref +) + +kt_notnull_types( + unique int id: @kt_notnull_type, + int classid: @reftype ref +) + +kt_type_alias( + unique int id: @kt_type_alias, + string name: string ref, + int kttypeid: @kt_type ref +) + +@kt_type = @kt_nullable_type | @kt_notnull_type + +isInterface( + unique int id: @classorinterface ref +); + +isRecord( + unique int id: @classorinterface ref +); + +fielddecls( + unique int id: @fielddecl, + int parentid: @reftype ref +); + +#keyset[fieldId] #keyset[fieldDeclId,pos] +fieldDeclaredIn( + int fieldId: @field ref, + int fieldDeclId: @fielddecl ref, + int pos: int ref +); + +fields( + unique int id: @field, + string nodeName: string ref, + int typeid: @type ref, + int parentid: @reftype ref +); + +fieldsKotlinType( + unique int id: @field ref, + int kttypeid: @kt_type ref +); + +constrs( + unique int id: @constructor, + string nodeName: string ref, + string signature: string ref, + int typeid: @type ref, + int parentid: @reftype ref, + int sourceid: @constructor ref +); + +constrsKotlinType( + unique int id: @constructor ref, + int kttypeid: @kt_type ref +); + +methods( + unique int id: @method, + string nodeName: string ref, + string signature: string ref, + int typeid: @type ref, + int parentid: @reftype ref, + int sourceid: @method ref +); + +methodsKotlinType( + unique int id: @method ref, + int kttypeid: @kt_type ref +); + +#keyset[parentid,pos] +params( + unique int id: @param, + int typeid: @type ref, + int pos: int ref, + int parentid: @callable ref, + int sourceid: @param ref +); + +paramsKotlinType( + unique int id: @param ref, + int kttypeid: @kt_type ref +); + +paramName( + unique int id: @param ref, + string nodeName: string ref +); + +isVarargsParam( + int param: @param ref +); + +exceptions( + unique int id: @exception, + int typeid: @type ref, + int parentid: @callable ref +); + +isAnnotType( + int interfaceid: @classorinterface ref +); + +isAnnotElem( + int methodid: @method ref +); + +annotValue( + int parentid: @annotation ref, + int id2: @method ref, + unique int value: @expr ref +); + +isEnumType( + int classid: @classorinterface ref +); + +isEnumConst( + int fieldid: @field ref +); + +#keyset[parentid,pos] +typeVars( + unique int id: @typevariable, + string nodeName: string ref, + int pos: int ref, + int parentid: @classorinterfaceorcallable ref +); + +wildcards( + unique int id: @wildcard, + string nodeName: string ref, + int kind: int ref +); + +#keyset[parentid,pos] +typeBounds( + unique int id: @typebound, + int typeid: @reftype ref, + int pos: int ref, + int parentid: @boundedtype ref +); + +#keyset[parentid,pos] +typeArgs( + int argumentid: @reftype ref, + int pos: int ref, + int parentid: @classorinterfaceorcallable ref +); + +isParameterized( + int memberid: @member ref +); + +isRaw( + int memberid: @member ref +); + +#keyset[classid] #keyset[parent] +isAnonymClass( + int classid: @classorinterface ref, + int parent: @classinstancexpr ref +); + +#keyset[typeid] #keyset[parent] +isLocalClassOrInterface( + int typeid: @classorinterface ref, + int parent: @localtypedeclstmt ref +); + +isImplicitClass( + unique int classid: @classorinterface ref +); + +isDefConstr( + int constructorid: @constructor ref +); + +#keyset[exprId] +lambdaKind( + int exprId: @lambdaexpr ref, + int bodyKind: int ref +); + +isCanonicalConstr( + int constructorid: @constructor ref +); + +arrays( + unique int id: @array, + string nodeName: string ref, + int elementtypeid: @type ref, + int dimension: int ref, + int componenttypeid: @type ref +); + +enclInReftype( + unique int child: @reftype ref, + int parent: @reftype ref +); + +extendsReftype( + int id1: @reftype ref, + int id2: @classorinterface ref +); + +implInterface( + int id1: @classorarray ref, + int id2: @classorinterface ref +); + +permits( + int id1: @classorinterface ref, + int id2: @classorinterface ref +); + +hasModifier( + int id1: @modifiable ref, + int id2: @modifier ref +); + +imports( + unique int id: @import, + int holder: @classorinterfaceorpackage ref, + string name: string ref, + int kind: int ref +); + +#keyset[parent,idx] +stmts( + unique int id: @stmt, + int kind: int ref, + int parent: @stmtparent ref, + int idx: int ref, + int bodydecl: @callable ref +); + +@stmtparent = @callable | @stmt | @switchexpr | @whenexpr| @stmtexpr; + +case @stmt.kind of + 0 = @block +| 1 = @ifstmt +| 2 = @forstmt +| 3 = @enhancedforstmt +| 4 = @whilestmt +| 5 = @dostmt +| 6 = @trystmt +| 7 = @switchstmt +| 8 = @synchronizedstmt +| 9 = @returnstmt +| 10 = @throwstmt +| 11 = @breakstmt +| 12 = @continuestmt +| 13 = @emptystmt +| 14 = @exprstmt +| 15 = @labeledstmt +| 16 = @assertstmt +| 17 = @localvariabledeclstmt +| 18 = @localtypedeclstmt +| 19 = @constructorinvocationstmt +| 20 = @superconstructorinvocationstmt +| 21 = @case +| 22 = @catchclause +| 23 = @yieldstmt +| 24 = @errorstmt +| 25 = @whenbranch +; + +#keyset[parent,idx] +exprs( + unique int id: @expr, + int kind: int ref, + int typeid: @type ref, + int parent: @exprparent ref, + int idx: int ref +); + +exprsKotlinType( + unique int id: @expr ref, + int kttypeid: @kt_type ref +); + +callableEnclosingExpr( + unique int id: @expr ref, + int callable_id: @callable ref +); + +statementEnclosingExpr( + unique int id: @expr ref, + int statement_id: @stmt ref +); + +isParenthesized( + unique int id: @expr ref, + int parentheses: int ref +); + +case @expr.kind of + 1 = @arrayaccess +| 2 = @arraycreationexpr +| 3 = @arrayinit +| 4 = @assignexpr +| 5 = @assignaddexpr +| 6 = @assignsubexpr +| 7 = @assignmulexpr +| 8 = @assigndivexpr +| 9 = @assignremexpr +| 10 = @assignandexpr +| 11 = @assignorexpr +| 12 = @assignxorexpr +| 13 = @assignlshiftexpr +| 14 = @assignrshiftexpr +| 15 = @assignurshiftexpr +| 16 = @booleanliteral +| 17 = @integerliteral +| 18 = @longliteral +| 19 = @floatingpointliteral +| 20 = @doubleliteral +| 21 = @characterliteral +| 22 = @stringliteral +| 23 = @nullliteral +| 24 = @mulexpr +| 25 = @divexpr +| 26 = @remexpr +| 27 = @addexpr +| 28 = @subexpr +| 29 = @lshiftexpr +| 30 = @rshiftexpr +| 31 = @urshiftexpr +| 32 = @andbitexpr +| 33 = @orbitexpr +| 34 = @xorbitexpr +| 35 = @andlogicalexpr +| 36 = @orlogicalexpr +| 37 = @ltexpr +| 38 = @gtexpr +| 39 = @leexpr +| 40 = @geexpr +| 41 = @eqexpr +| 42 = @neexpr +| 43 = @postincexpr +| 44 = @postdecexpr +| 45 = @preincexpr +| 46 = @predecexpr +| 47 = @minusexpr +| 48 = @plusexpr +| 49 = @bitnotexpr +| 50 = @lognotexpr +| 51 = @castexpr +| 52 = @newexpr +| 53 = @conditionalexpr +| 54 = @parexpr // deprecated +| 55 = @instanceofexpr +| 56 = @localvariabledeclexpr +| 57 = @typeliteral +| 58 = @thisaccess +| 59 = @superaccess +| 60 = @varaccess +| 61 = @methodaccess +| 62 = @unannotatedtypeaccess +| 63 = @arraytypeaccess +| 64 = @packageaccess +| 65 = @wildcardtypeaccess +| 66 = @declannotation +| 67 = @uniontypeaccess +| 68 = @lambdaexpr +| 69 = @memberref +| 70 = @annotatedtypeaccess +| 71 = @typeannotation +| 72 = @intersectiontypeaccess +| 73 = @switchexpr +| 74 = @errorexpr +| 75 = @whenexpr +| 76 = @getclassexpr +| 77 = @safecastexpr +| 78 = @implicitcastexpr +| 79 = @implicitnotnullexpr +| 80 = @implicitcoerciontounitexpr +| 81 = @notinstanceofexpr +| 82 = @stmtexpr +| 83 = @stringtemplateexpr +| 84 = @notnullexpr +| 85 = @unsafecoerceexpr +| 86 = @valueeqexpr +| 87 = @valueneexpr +| 88 = @propertyref +| 89 = @recordpatternexpr +; + +/** Holds if this `when` expression was written as an `if` expression. */ +when_if(unique int id: @whenexpr ref); + +/** Holds if this `when` branch was written as an `else` branch. */ +when_branch_else(unique int id: @whenbranch ref); + +@classinstancexpr = @newexpr | @lambdaexpr | @memberref | @propertyref + +@annotation = @declannotation | @typeannotation +@typeaccess = @unannotatedtypeaccess | @annotatedtypeaccess + +@assignment = @assignexpr + | @assignop; + +@unaryassignment = @postincexpr + | @postdecexpr + | @preincexpr + | @predecexpr; + +@assignop = @assignaddexpr + | @assignsubexpr + | @assignmulexpr + | @assigndivexpr + | @assignremexpr + | @assignandexpr + | @assignorexpr + | @assignxorexpr + | @assignlshiftexpr + | @assignrshiftexpr + | @assignurshiftexpr; + +@literal = @booleanliteral + | @integerliteral + | @longliteral + | @floatingpointliteral + | @doubleliteral + | @characterliteral + | @stringliteral + | @nullliteral; + +@binaryexpr = @mulexpr + | @divexpr + | @remexpr + | @addexpr + | @subexpr + | @lshiftexpr + | @rshiftexpr + | @urshiftexpr + | @andbitexpr + | @orbitexpr + | @xorbitexpr + | @andlogicalexpr + | @orlogicalexpr + | @ltexpr + | @gtexpr + | @leexpr + | @geexpr + | @eqexpr + | @neexpr + | @valueeqexpr + | @valueneexpr; + +@unaryexpr = @postincexpr + | @postdecexpr + | @preincexpr + | @predecexpr + | @minusexpr + | @plusexpr + | @bitnotexpr + | @lognotexpr + | @notnullexpr; + +@caller = @classinstancexpr + | @methodaccess + | @constructorinvocationstmt + | @superconstructorinvocationstmt; + +callableBinding( + unique int callerid: @caller ref, + int callee: @callable ref +); + +memberRefBinding( + unique int id: @expr ref, + int callable: @callable ref +); + +propertyRefGetBinding( + unique int id: @expr ref, + int getter: @callable ref +); + +propertyRefFieldBinding( + unique int id: @expr ref, + int field: @field ref +); + +propertyRefSetBinding( + unique int id: @expr ref, + int setter: @callable ref +); + +@exprparent = @stmt | @expr | @whenbranch | @callable | @field | @fielddecl | @classorinterface | @param | @localvar | @typevariable; + +variableBinding( + unique int expr: @varaccess ref, + int variable: @variable ref +); + +@variable = @localscopevariable | @field; + +@localscopevariable = @localvar | @param; + +localvars( + unique int id: @localvar, + string nodeName: string ref, + int typeid: @type ref, + int parentid: @localvariabledeclexpr ref +); + +localvarsKotlinType( + unique int id: @localvar ref, + int kttypeid: @kt_type ref +); + +@namedexprorstmt = @breakstmt + | @continuestmt + | @labeledstmt + | @literal; + +namestrings( + string name: string ref, + string value: string ref, + unique int parent: @namedexprorstmt ref +); + +/* + * Modules + */ + +#keyset[name] +modules( + unique int id: @module, + string name: string ref +); + +isOpen( + int id: @module ref +); + +#keyset[fileId] +cumodule( + int fileId: @file ref, + int moduleId: @module ref +); + +@directive = @requires + | @exports + | @opens + | @uses + | @provides + +#keyset[directive] +directives( + int id: @module ref, + int directive: @directive ref +); + +requires( + unique int id: @requires, + int target: @module ref +); + +isTransitive( + int id: @requires ref +); + +isStatic( + int id: @requires ref +); + +exports( + unique int id: @exports, + int target: @package ref +); + +exportsTo( + int id: @exports ref, + int target: @module ref +); + +opens( + unique int id: @opens, + int target: @package ref +); + +opensTo( + int id: @opens ref, + int target: @module ref +); + +uses( + unique int id: @uses, + string serviceInterface: string ref +); + +provides( + unique int id: @provides, + string serviceInterface: string ref +); + +providesWith( + int id: @provides ref, + string serviceImpl: string ref +); + +isNullDefaultCase( + int id: @case ref +); + +/* + * Javadoc + */ + +javadoc( + unique int id: @javadoc +); + +isNormalComment( + int commentid : @javadoc ref +); + +isEolComment( + int commentid : @javadoc ref +); + +hasJavadoc( + int documentableid: @member ref, + int javadocid: @javadoc ref +); + +#keyset[parentid,idx] +javadocTag( + unique int id: @javadocTag, + string name: string ref, + int parentid: @javadocParent ref, + int idx: int ref +); + +#keyset[parentid,idx] +javadocText( + unique int id: @javadocText, + string text: string ref, + int parentid: @javadocParent ref, + int idx: int ref +); + +@javadocParent = @javadoc | @javadocTag; +@javadocElement = @javadocTag | @javadocText; + +@classorinterfaceorpackage = @classorinterface | @package; +@classorinterfaceorcallable = @classorinterface | @callable; +@boundedtype = @typevariable | @wildcard; +@reftype = @classorinterface | @array | @boundedtype | @errortype; +@classorarray = @classorinterface | @array; +@type = @primitive | @reftype; +@callable = @method | @constructor; + +/** A program element that has a name. */ +@element = @package | @modifier | @annotation | @errortype | + @locatableElement; + +@locatableElement = @file | @primitive | @classorinterface | @method | @constructor | @param | @exception | @field | + @boundedtype | @array | @localvar | @expr | @stmt | @import | @fielddecl | @kt_type | @kt_type_alias | + @kt_property; + +@modifiable = @member_modifiable| @param | @localvar | @typevariable; + +@member_modifiable = @classorinterface | @method | @constructor | @field | @kt_property; + +@member = @method | @constructor | @field | @reftype ; + +/** A program element that has a location. */ +@locatable = @typebound | @javadoc | @javadocTag | @javadocText | @xmllocatable | @ktcomment | + @locatableElement; + +@top = @element | @locatable | @folder; + +/* + * XML Files + */ + +xmlEncoding( + unique int id: @file ref, + string encoding: string ref +); + +xmlDTDs( + unique int id: @xmldtd, + string root: string ref, + string publicId: string ref, + string systemId: string ref, + int fileid: @file ref +); + +xmlElements( + unique int id: @xmlelement, + string name: string ref, + int parentid: @xmlparent ref, + int idx: int ref, + int fileid: @file ref +); + +xmlAttrs( + unique int id: @xmlattribute, + int elementid: @xmlelement ref, + string name: string ref, + string value: string ref, + int idx: int ref, + int fileid: @file ref +); + +xmlNs( + int id: @xmlnamespace, + string prefixName: string ref, + string URI: string ref, + int fileid: @file ref +); + +xmlHasNs( + int elementId: @xmlnamespaceable ref, + int nsId: @xmlnamespace ref, + int fileid: @file ref +); + +xmlComments( + unique int id: @xmlcomment, + string text: string ref, + int parentid: @xmlparent ref, + int fileid: @file ref +); + +xmlChars( + unique int id: @xmlcharacters, + string text: string ref, + int parentid: @xmlparent ref, + int idx: int ref, + int isCDATA: int ref, + int fileid: @file ref +); + +@xmlparent = @file | @xmlelement; +@xmlnamespaceable = @xmlelement | @xmlattribute; + +xmllocations( + int xmlElement: @xmllocatable ref, + int location: @location_default ref +); + +@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace; + +/* + * configuration files with key value pairs + */ + +configs( + unique int id: @config +); + +configNames( + unique int id: @configName, + int config: @config ref, + string name: string ref +); + +configValues( + unique int id: @configValue, + int config: @config ref, + string value: string ref +); + +configLocations( + int locatable: @configLocatable ref, + int location: @location_default ref +); + +@configLocatable = @config | @configName | @configValue; + +ktComments( + unique int id: @ktcomment, + int kind: int ref, + string text : string ref +) + +ktCommentSections( + unique int id: @ktcommentsection, + int comment: @ktcomment ref, + string content : string ref +) + +ktCommentSectionNames( + unique int id: @ktcommentsection ref, + string name : string ref +) + +ktCommentSectionSubjectNames( + unique int id: @ktcommentsection ref, + string subjectname : string ref +) + +#keyset[id, owner] +ktCommentOwners( + int id: @ktcomment ref, + int owner: @top ref +) + +ktExtensionFunctions( + unique int id: @method ref, + int typeid: @type ref, + int kttypeid: @kt_type ref +) + +ktProperties( + unique int id: @kt_property, + string nodeName: string ref +) + +ktPropertyGetters( + unique int id: @kt_property ref, + int getter: @method ref +) + +ktPropertySetters( + unique int id: @kt_property ref, + int setter: @method ref +) + +ktPropertyBackingFields( + unique int id: @kt_property ref, + int backingField: @field ref +) + +ktSyntheticBody( + unique int id: @callable ref, + int kind: int ref + // 1: ENUM_VALUES + // 2: ENUM_VALUEOF + // 3: ENUM_ENTRIES +) + +ktLocalFunction( + unique int id: @method ref +) + +ktInitializerAssignment( + unique int id: @assignexpr ref +) + +ktPropertyDelegates( + unique int id: @kt_property ref, + unique int variableId: @variable ref +) + +/** + * If `id` is a compiler generated element, then the kind indicates the + * reason that the compiler generated it. + * See `Element.compilerGeneratedReason()` for an explanation of what + * each `kind` means. + */ +compiler_generated( + unique int id: @element ref, + int kind: int ref +) + +ktFunctionOriginalNames( + unique int id: @method ref, + string name: string ref +) + +ktDataClasses( + unique int id: @classorinterface ref +) diff --git a/java/ql/lib/upgrades/1b8f5f4c747e4249f4731796ccaa0661c7434d8a/upgrade.properties b/java/ql/lib/upgrades/1b8f5f4c747e4249f4731796ccaa0661c7434d8a/upgrade.properties new file mode 100644 index 000000000000..3ecad4ebaa4b --- /dev/null +++ b/java/ql/lib/upgrades/1b8f5f4c747e4249f4731796ccaa0661c7434d8a/upgrade.properties @@ -0,0 +1,2 @@ +description: Add support for Java 25 compact source files by introducing isImplicitClass table +compatibility: full From 618b0c01d26e486d508134f6b3e7d1c544f0d78e Mon Sep 17 00:00:00 2001 From: idrissrio Date: Wed, 23 Jul 2025 15:10:28 +0200 Subject: [PATCH 5/6] Java: Add change note --- java/ql/lib/change-notes/2025-07-23-compact-source-files.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 java/ql/lib/change-notes/2025-07-23-compact-source-files.md diff --git a/java/ql/lib/change-notes/2025-07-23-compact-source-files.md b/java/ql/lib/change-notes/2025-07-23-compact-source-files.md new file mode 100644 index 000000000000..277ce14398ed --- /dev/null +++ b/java/ql/lib/change-notes/2025-07-23-compact-source-files.md @@ -0,0 +1,4 @@ +--- +category: feature +--- +* Added support for Java 25 compact source files (JEP 512). The new predicate `Class.isImplicit()` identifies classes that are implicitly declared when using compact source files, and the new predicate `CompilationUnit.isCompactSourceFile()` identifies compilation units that contain compact source files. From 5a805954a402deec5a6e7e916f78b07b2c7f12cd Mon Sep 17 00:00:00 2001 From: idrissrio Date: Mon, 28 Jul 2025 22:05:31 +0200 Subject: [PATCH 6/6] Java: Update stats file --- java/ql/lib/config/semmlecode.dbscheme.stats | 12880 +++++++++-------- 1 file changed, 6503 insertions(+), 6377 deletions(-) diff --git a/java/ql/lib/config/semmlecode.dbscheme.stats b/java/ql/lib/config/semmlecode.dbscheme.stats index 650c4649439d..5109726824b9 100644 --- a/java/ql/lib/config/semmlecode.dbscheme.stats +++ b/java/ql/lib/config/semmlecode.dbscheme.stats @@ -2,203 +2,203 @@ @javacompilation - 1138 + 2925 @kotlincompilation - 2356 + 2025 @diagnostic - 57106 + 705818 @externalDataElement 1 + + @location_default + 915359999 + @file - 1291911 + 4338434 @folder - 211876 + 857155 @package - 96053 + 459294 @primitive - 5690 + 26329 @modifier - 6259 + 32179 @errortype - 22 + 2925 @classorinterface - 22273131 + 22649681 @kt_nullable_type - 262 - - - @location_default - 82315299 + 264 @kt_notnull_type - 156265 + 161049 @kt_type_alias - 707 + 625 @fielddecl - 210035 + 204459 @field - 2886451 + 9378976 @constructor - 1103682 + 3016133 @method - 15113893 + 38724113 @param - 16587479 + 41491584 @exception - 1232644 + 3735793 @typevariable - 864332 + 1331077 @wildcard - 458250 + 590939 @typebound - 581989 + 827900 @array - 190588 + 608492 @import - 356137 + 525435 @block - 707376 + 853492 @ifstmt - 188282 + 191468 @forstmt - 52504 + 53708 @enhancedforstmt - 21607 + 21973 @whilestmt - 13266 + 13464 @dostmt - 2251 + 2289 @trystmt - 58624 + 59613 @switchstmt - 10546 + 10724 @synchronizedstmt - 23121 + 45951 @returnstmt - 345793 + 323816 @throwstmt - 35917 + 36523 @breakstmt - 35329 + 35926 @continuestmt - 3257 + 3312 @emptystmt - 1561 + 1868 @exprstmt - 942102 + 958028 + + + @labeledstmt + 4490 @assertstmt - 15158 + 15410 @localvariabledeclstmt - 318689 + 486900 @localtypedeclstmt - 3532 + 3483 @constructorinvocationstmt - 9165 + 9319 @superconstructorinvocationstmt - 182518 + 189390 @case - 107927 + 109697 @catchclause - 55201 - - - @labeledstmt - 4493 + 56134 @yieldstmt - 36 + 44 @errorstmt @@ -206,263 +206,275 @@ @whenbranch - 207292 + 204113 @arrayaccess - 409677 + 417372 @arraycreationexpr - 69247 + 70418 @arrayinit - 405405 + 579238 @assignexpr - 465407 + 473276 @assignaddexpr - 17016 + 17303 @assignsubexpr - 3505 + 3557 @assignmulexpr - 2153 + 2189 @assigndivexpr - 1071 + 1090 + + + @assignremexpr + 325 @assignandexpr - 3970 + 4035 @assignorexpr - 14528 + 17197 + + + @assignxorexpr + 1135 + + + @assignlshiftexpr + 930 + + + @assignrshiftexpr + 1428 + + + @assignurshiftexpr + 437 @booleanliteral - 524468 + 1032682 @integerliteral - 1151446 + 1173075 @longliteral - 185873 + 188939 @floatingpointliteral - 2824967 + 2878044 @doubleliteral - 486619 + 494845 @characterliteral - 40016 + 40611 @stringliteral - 1262851 + 2353526 @nullliteral - 355806 + 361821 @mulexpr - 204580 + 228663 @divexpr - 36264 + 37220 @remexpr - 3904 + 5205 @addexpr - 176986 + 179978 @subexpr - 84385 + 91953 @lshiftexpr - 8736 + 8866 @rshiftexpr - 4206 + 4269 @urshiftexpr - 9643 + 9804 @andbitexpr - 29089 + 29580 @orbitexpr - 11594 + 8772 @xorbitexpr - 1925 + 1958 @andlogicalexpr - 36742 + 37363 @orlogicalexpr - 31150 + 31676 @ltexpr - 66249 + 67577 @gtexpr - 17203 + 17459 @leexpr - 10529 + 10707 @geexpr - 13411 + 13638 @eqexpr - 104273 + 106035 @neexpr - 60975 + 62005 @postincexpr - 41857 + 42560 @postdecexpr - 11683 + 11880 @preincexpr - 23714 + 24115 @predecexpr - 3781 + 3845 @minusexpr - 744379 + 758361 @plusexpr - 53007 + 53903 @bitnotexpr - 8186 + 8325 @lognotexpr - 40110 + 40789 @castexpr - 93185 + 94761 @newexpr - 252083 + 256339 @conditionalexpr - 16047 + 16319 @instanceofexpr - 29542 + 30041 @localvariabledeclexpr - 385272 + 547241 @typeliteral - 98504 + 390900 @thisaccess - 490120 + 454776 @superaccess - 53021 + 35123 @varaccess - 2434277 + 2475431 @methodaccess - 1512380 + 1685726 @unannotatedtypeaccess - 2374849 + 2416174 @arraytypeaccess - 120727 + 122768 @wildcardtypeaccess - 78834 + 80161 @declannotation - 6740832 - - - @assignremexpr - 62 - - - @assignxorexpr - 1102 + 6854791 - @assignlshiftexpr - 916 + @uniontypeaccess + 2580 - @assignrshiftexpr - 1404 + @lambdaexpr + 157421 - @assignurshiftexpr - 431 + @memberref + 24296 @parexpr @@ -472,33 +484,21 @@ @packageaccess 1 - - @uniontypeaccess - 1010 - - - @lambdaexpr - 152268 - - - @memberref - 23859 - @annotatedtypeaccess - 1281 + 1302 @typeannotation - 1281 + 1302 @intersectiontypeaccess - 25 + 31 @switchexpr - 591 + 628 @errorexpr @@ -506,43 +506,43 @@ @whenexpr - 116200 + 114649 @getclassexpr - 733 + 568 @safecastexpr - 6086 + 6516 @implicitcastexpr - 28817 + 32568 @implicitnotnullexpr - 163412 + 159477 @implicitcoerciontounitexpr - 73781 + 72660 @notinstanceofexpr - 3981 + 4235 @stmtexpr - 50550 + 56622 @stringtemplateexpr - 24879 + 28942 @notnullexpr - 23342 + 11970 @unsafecoerceexpr @@ -550,15 +550,15 @@ @valueeqexpr - 85697 + 81195 @valueneexpr - 22980 + 21432 @propertyref - 8439 + 11930 @recordpatternexpr @@ -566,113 +566,113 @@ @localvar - 385272 + 547241 @module - 6092 + 131645 @requires - 3190 + 4159 @exports - 26163 + 336426 @opens - 716 + 14627 @uses - 7884 + 96539 @provides - 1792 + 2925 @javadoc - 985091 + 1001744 @javadocTag - 335808 + 341478 @javadocText - 2502848 + 2545161 @xmldtd - 569 + 578 @xmlelement - 20510401 + 233696238 - @xmlattribute - 24948200 + @xmlnamespace + 17552 - @xmlnamespace - 2845 + @xmlattribute + 281184985 @xmlcomment - 20643577 + 231835655 @xmlcharacters - 19508174 + 222401095 @config - 1 + 669552 @configName - 1 + 669552 @configValue - 1 + 669315 @ktcomment - 116780 + 122924 @ktcommentsection - 74919 + 78073 @kt_property - 2989117 + 3024536 compilations - 2356 + 2925 id - 2356 + 2925 kind - 94 + 2925 cwd - 94 + 2925 name - 2356 + 2925 @@ -686,7 +686,7 @@ 1 2 - 2356 + 2925 @@ -702,7 +702,7 @@ 1 2 - 2356 + 2925 @@ -718,7 +718,7 @@ 1 2 - 2356 + 2925 @@ -732,9 +732,9 @@ 12 - 25 - 26 - 94 + 1 + 2 + 2925 @@ -750,7 +750,7 @@ 1 2 - 94 + 2925 @@ -764,9 +764,9 @@ 12 - 25 - 26 - 94 + 1 + 2 + 2925 @@ -780,9 +780,9 @@ 12 - 25 - 26 - 94 + 1 + 2 + 2925 @@ -798,7 +798,7 @@ 1 2 - 94 + 2925 @@ -812,9 +812,9 @@ 12 - 25 - 26 - 94 + 1 + 2 + 2925 @@ -830,7 +830,7 @@ 1 2 - 2356 + 2925 @@ -846,7 +846,7 @@ 1 2 - 2356 + 2925 @@ -862,7 +862,7 @@ 1 2 - 2356 + 2925 @@ -872,30 +872,30 @@ compilation_started - 2261 + 2025 id - 2261 + 2025 compilation_info - 4523 + 8776 id - 2261 + 2925 info_key - 188 + 5850 info_value - 188 + 8776 @@ -909,7 +909,7 @@ 2 3 - 2261 + 2925 @@ -923,9 +923,9 @@ 12 - 2 - 3 - 2261 + 3 + 4 + 2925 @@ -939,9 +939,9 @@ 12 - 24 - 25 - 188 + 1 + 2 + 5850 @@ -957,7 +957,12 @@ 1 2 - 188 + 2925 + + + 2 + 3 + 2925 @@ -971,9 +976,9 @@ 12 - 24 - 25 - 188 + 1 + 2 + 8776 @@ -989,7 +994,7 @@ 1 2 - 188 + 8776 @@ -999,19 +1004,19 @@ compilation_args - 69266 + 49952 id - 2356 + 2025 num - 12062 + 4387 arg - 35151 + 22360 @@ -1022,45 +1027,45 @@ 12 + + 18 + 19 + 506 + 19 20 - 565 + 590 20 21 - 753 + 168 21 - 22 - 188 + 23 + 168 - 22 - 25 - 188 + 24 + 32 + 168 32 - 33 - 188 + 35 + 168 - 34 - 43 - 188 + 44 + 52 + 168 52 - 54 - 188 - - - 128 - 129 - 94 + 53 + 84 @@ -1073,45 +1078,45 @@ 12 + + 18 + 19 + 506 + 19 20 - 565 + 590 20 21 - 753 + 168 21 - 22 - 188 + 23 + 168 - 22 - 25 - 188 + 24 + 32 + 168 32 - 33 - 188 + 35 + 168 - 34 - 43 - 188 + 44 + 52 + 168 52 - 54 - 188 - - - 127 - 128 - 94 + 53 + 84 @@ -1127,32 +1132,42 @@ 1 2 - 7068 + 84 2 + 3 + 590 + + + 3 4 - 1036 + 843 4 6 - 942 + 253 + + + 6 + 7 + 590 7 - 9 - 942 + 10 + 337 - 9 - 20 - 282 + 11 + 19 + 168 - 25 - 26 - 1790 + 24 + 25 + 1518 @@ -1168,32 +1183,47 @@ 1 2 - 7350 + 337 2 3 - 188 + 1096 3 4 - 1507 + 928 4 6 - 1036 + 253 6 - 9 - 942 + 7 + 590 - 9 - 26 - 1036 + 7 + 10 + 337 + + + 10 + 13 + 337 + + + 13 + 20 + 337 + + + 24 + 25 + 168 @@ -1209,12 +1239,17 @@ 1 2 - 32607 + 20166 2 - 26 - 2544 + 13 + 1096 + + + 24 + 25 + 1096 @@ -1230,12 +1265,12 @@ 1 2 - 33078 + 20588 2 - 12 - 2073 + 13 + 1771 @@ -1245,19 +1280,19 @@ compilation_expanded_args - 69428 + 85214 id - 1138 + 682 num - 45527 + 18653 arg - 54632 + 70928 @@ -1269,14 +1304,34 @@ 12 - 42 - 43 - 569 + 24 + 25 + 136 - 80 - 81 - 569 + 25 + 26 + 272 + + + 139 + 140 + 45 + + + 143 + 144 + 90 + + + 408 + 409 + 90 + + + 410 + 411 + 45 @@ -1290,14 +1345,29 @@ 12 - 40 - 41 - 569 + 23 + 24 + 409 - 78 - 79 - 569 + 137 + 138 + 45 + + + 141 + 142 + 90 + + + 407 + 408 + 90 + + + 409 + 410 + 45 @@ -1313,12 +1383,27 @@ 1 2 - 21625 + 90 - 2 - 3 - 23901 + 3 + 4 + 12056 + + + 5 + 6 + 181 + + + 6 + 7 + 5186 + + + 12 + 16 + 1137 @@ -1333,13 +1418,28 @@ 1 - 2 - 35283 + 3 + 1091 - 2 - 3 - 10243 + 3 + 4 + 12056 + + + 4 + 6 + 272 + + + 6 + 7 + 5004 + + + 8 + 16 + 227 @@ -1355,12 +1455,12 @@ 1 2 - 42112 + 69791 - 2 - 3 - 12519 + 3 + 16 + 1137 @@ -1376,12 +1476,12 @@ 1 2 - 53494 + 70519 2 - 3 - 1138 + 5 + 409 @@ -1391,19 +1491,19 @@ compilation_compiling_files - 60809 + 67743 id - 757 + 682 num - 9485 + 17334 file - 60809 + 67743 @@ -1417,62 +1517,27 @@ 1 2 - 104 - - - 2 - 4 - 56 - - - 4 - 7 - 60 - - - 7 - 11 - 69 - - - 11 - 15 - 56 - - - 15 - 22 - 60 - - - 22 - 31 - 65 - - - 32 - 47 - 65 + 409 - 51 - 88 - 69 + 111 + 112 + 45 - 93 - 151 - 60 + 115 + 116 + 90 - 163 - 367 - 60 + 379 + 380 + 90 - 441 - 2179 - 26 + 381 + 382 + 45 @@ -1488,62 +1553,27 @@ 1 2 - 104 - - - 2 - 4 - 56 - - - 4 - 7 - 60 - - - 7 - 11 - 69 - - - 11 - 15 - 56 - - - 15 - 22 - 60 - - - 22 - 31 - 65 - - - 32 - 47 - 65 + 409 - 51 - 88 - 69 + 111 + 112 + 45 - 93 - 151 - 60 + 115 + 116 + 90 - 163 - 367 - 60 + 379 + 380 + 90 - 441 - 2179 - 26 + 381 + 382 + 45 @@ -1559,37 +1589,27 @@ 1 2 - 4080 - - - 2 - 3 - 452 + 90 3 4 - 2552 - - - 4 - 7 - 805 + 12010 - 7 - 17 - 827 + 5 + 6 + 181 - 17 - 104 - 714 + 6 + 7 + 5004 - 105 - 175 - 52 + 15 + 16 + 45 @@ -1605,37 +1625,27 @@ 1 2 - 4080 - - - 2 - 3 - 452 + 90 3 4 - 2552 + 12010 - 4 - 7 - 805 - - - 7 - 17 - 827 + 5 + 6 + 181 - 17 - 104 - 714 + 6 + 7 + 5004 - 105 - 175 - 52 + 15 + 16 + 45 @@ -1651,7 +1661,7 @@ 1 2 - 60809 + 67743 @@ -1667,7 +1677,7 @@ 1 2 - 60809 + 67743 @@ -1677,19 +1687,19 @@ compilation_compiling_files_completed - 60809 + 67743 id - 757 + 682 num - 9485 + 17334 result - 4 + 45 @@ -1703,62 +1713,27 @@ 1 2 - 104 - - - 2 - 4 - 56 - - - 4 - 7 - 60 - - - 7 - 11 - 69 - - - 11 - 15 - 56 - - - 15 - 22 - 60 - - - 22 - 31 - 65 - - - 32 - 47 - 65 + 409 - 51 - 88 - 69 + 111 + 112 + 45 - 93 - 151 - 60 + 115 + 116 + 90 - 163 - 367 - 60 + 379 + 380 + 90 - 441 - 2179 - 26 + 381 + 382 + 45 @@ -1774,7 +1749,7 @@ 1 2 - 757 + 682 @@ -1790,37 +1765,27 @@ 1 2 - 4080 - - - 2 - 3 - 452 + 90 3 4 - 2552 - - - 4 - 7 - 805 + 12010 - 7 - 17 - 827 + 5 + 6 + 181 - 17 - 104 - 714 + 6 + 7 + 5004 - 105 - 175 - 52 + 15 + 16 + 45 @@ -1836,7 +1801,7 @@ 1 2 - 9485 + 17334 @@ -1850,9 +1815,9 @@ 12 - 174 - 175 - 4 + 15 + 16 + 45 @@ -1866,9 +1831,9 @@ 12 - 2178 - 2179 - 4 + 381 + 382 + 45 @@ -1878,23 +1843,23 @@ compilation_time - 166778 + 273705 id - 238 + 682 num - 30464 + 17379 kind - 477 + 181 seconds - 83269 + 135988 @@ -1906,14 +1871,29 @@ 12 - 94 - 95 - 119 + 2 + 3 + 409 - 255 - 256 - 119 + 112 + 113 + 45 + + + 116 + 117 + 90 + + + 380 + 381 + 90 + + + 382 + 383 + 45 @@ -1929,7 +1909,7 @@ 4 5 - 238 + 682 @@ -1943,14 +1923,29 @@ 12 - 188 - 189 - 119 + 4 + 5 + 409 - 510 - 511 - 119 + 224 + 225 + 45 + + + 232 + 233 + 90 + + + 759 + 760 + 90 + + + 764 + 765 + 45 @@ -1966,12 +1961,27 @@ 1 2 - 19234 + 90 - 2 - 3 - 11230 + 3 + 4 + 12010 + + + 5 + 6 + 181 + + + 6 + 7 + 5004 + + + 15 + 16 + 90 @@ -1987,7 +1997,7 @@ 4 5 - 30464 + 17379 @@ -2003,12 +2013,27 @@ 3 4 - 19353 + 90 - 5 - 6 - 11110 + 7 + 8 + 12010 + + + 11 + 12 + 181 + + + 13 + 14 + 5004 + + + 16 + 32 + 90 @@ -2022,9 +2047,9 @@ 12 - 2 - 3 - 477 + 15 + 16 + 181 @@ -2038,9 +2063,9 @@ 12 - 255 - 256 - 477 + 382 + 383 + 181 @@ -2056,17 +2081,17 @@ 1 2 - 238 + 90 - 348 - 349 - 119 + 1490 + 1491 + 45 - 349 - 350 - 119 + 1499 + 1500 + 45 @@ -2082,12 +2107,12 @@ 1 2 - 83150 + 135806 2 - 3 - 119 + 16 + 181 @@ -2103,12 +2128,12 @@ 1 2 - 83150 + 135715 - 255 - 256 - 119 + 2 + 383 + 272 @@ -2124,12 +2149,12 @@ 1 2 - 83150 + 135942 3 4 - 119 + 45 @@ -2138,30 +2163,26 @@ - diagnostic_for - 57106 + compilation_compiler_times + 2025 - diagnostic - 57106 - - - compilation - 374 + id + 2025 - file_number - 6678 + cpu_seconds + 84 - file_number_diagnostic_number - 1248 + elapsed_seconds + 2025 - diagnostic - compilation + id + cpu_seconds 12 @@ -2169,15 +2190,15 @@ 1 2 - 57106 + 2025 - diagnostic - file_number + id + elapsed_seconds 12 @@ -2185,67 +2206,47 @@ 1 2 - 57106 + 2025 - diagnostic - file_number_diagnostic_number + cpu_seconds + id 12 - 1 - 2 - 57106 + 24 + 25 + 84 - compilation - diagnostic + cpu_seconds + elapsed_seconds 12 - 1 - 2 - 124 - - - 34 - 35 - 62 - - - 266 - 267 - 62 - - - 303 - 304 - 62 - - - 310 - 311 - 62 + 24 + 25 + 84 - compilation - file_number + elapsed_seconds + id 12 @@ -2253,30 +2254,15 @@ 1 2 - 124 - - - 14 - 15 - 62 - - - 102 - 103 - 124 - - - 104 - 105 - 62 + 2025 - compilation - file_number_diagnostic_number + elapsed_seconds + cpu_seconds 12 @@ -2284,107 +2270,71 @@ 1 2 - 124 - - - 8 - 9 - 62 - - - 15 - 16 - 62 - - - 20 - 21 - 124 + 2025 + + + + compilation_finished + 2925 + + + id + 2925 + + + cpu_seconds + 2925 + + + elapsed_seconds + 2925 + + + result + 2925 + + + - file_number - diagnostic + id + cpu_seconds 12 1 - 5 - 312 - - - 6 - 7 - 3682 - - - 7 - 8 - 312 - - - 8 - 9 - 686 - - - 9 - 12 - 499 - - - 12 - 15 - 561 - - - 17 - 30 - 561 - - - 47 - 48 - 62 + 2 + 2925 - file_number - compilation + id + elapsed_seconds 12 1 - 3 - 436 - - - 3 - 4 - 5367 - - - 4 - 5 - 873 + 2 + 2925 - file_number - file_number_diagnostic_number + id + result 12 @@ -2392,152 +2342,47 @@ 1 2 - 124 - - - 2 - 3 - 3994 - - - 3 - 4 - 873 - - - 4 - 5 - 312 - - - 5 - 6 - 436 - - - 6 - 8 - 499 - - - 8 - 21 - 436 + 2925 - file_number_diagnostic_number - diagnostic + cpu_seconds + id 12 - 2 - 3 - 312 - - - 3 - 4 - 124 - - - 5 - 6 - 124 - - - 7 - 8 - 124 - - - 9 - 10 - 62 - - - 12 - 13 - 62 - - - 21 - 22 - 62 - - - 25 - 26 - 62 - - - 39 - 40 - 62 - - - 47 - 48 - 62 - - - 77 - 78 - 62 - - - 321 - 322 - 62 - - - 324 - 325 - 62 + 1 + 2 + 2925 - file_number_diagnostic_number - compilation + cpu_seconds + elapsed_seconds 12 - 2 - 3 - 312 - - - 3 - 4 - 436 - - - 4 - 5 - 436 - - - 6 - 7 - 62 + 1 + 2 + 2925 - file_number_diagnostic_number - file_number + cpu_seconds + result 12 @@ -2545,95 +2390,15 @@ 1 2 - 312 - - - 2 - 3 - 124 - - - 3 - 4 - 124 - - - 4 - 5 - 124 - - - 5 - 6 - 62 - - - 7 - 8 - 62 - - - 12 - 13 - 62 - - - 15 - 16 - 62 - - - 22 - 23 - 62 - - - 27 - 28 - 62 - - - 41 - 42 - 62 - - - 105 - 106 - 62 - - - 107 - 108 - 62 + 2925 - - - - compilation_compiler_times - 2261 - - - id - 2261 - - - cpu_seconds - 94 - - - elapsed_seconds - 2167 - - - - id - cpu_seconds + elapsed_seconds + id 12 @@ -2641,15 +2406,15 @@ 1 2 - 2261 + 2925 - id - elapsed_seconds + elapsed_seconds + cpu_seconds 12 @@ -2657,47 +2422,47 @@ 1 2 - 2261 + 2925 - cpu_seconds - id + elapsed_seconds + result 12 - 24 - 25 - 94 + 1 + 2 + 2925 - cpu_seconds - elapsed_seconds + result + id 12 - 23 - 24 - 94 + 1 + 2 + 2925 - elapsed_seconds - id + result + cpu_seconds 12 @@ -2705,20 +2470,15 @@ 1 2 - 2073 - - - 2 - 3 - 94 + 2925 - elapsed_seconds - cpu_seconds + result + elapsed_seconds 12 @@ -2726,7 +2486,7 @@ 1 2 - 2167 + 2925 @@ -2735,30 +2495,42 @@ - compilation_finished - 2261 + diagnostics + 705818 id - 2261 + 705818 - cpu_seconds - 94 + generated_by + 2 - elapsed_seconds - 2261 + severity + 8 - result - 94 + error_tag + 2 + + + error_message + 48861 + + + full_error_message + 2 + + + location + 361043 id - cpu_seconds + generated_by 12 @@ -2766,7 +2538,7 @@ 1 2 - 2261 + 705818 @@ -2774,7 +2546,7 @@ id - elapsed_seconds + severity 12 @@ -2782,7 +2554,7 @@ 1 2 - 2261 + 705818 @@ -2790,7 +2562,7 @@ id - result + error_tag 12 @@ -2798,47 +2570,47 @@ 1 2 - 2261 + 705818 - cpu_seconds - id + id + error_message 12 - 24 - 25 - 94 + 1 + 2 + 705818 - cpu_seconds - elapsed_seconds + id + full_error_message 12 - 24 - 25 - 94 + 1 + 2 + 705818 - cpu_seconds - result + id + location 12 @@ -2846,47 +2618,47 @@ 1 2 - 94 + 705818 - elapsed_seconds + generated_by id 12 - 1 - 2 - 2261 + 330823 + 330824 + 2 - elapsed_seconds - cpu_seconds + generated_by + severity 12 - 1 - 2 - 2261 + 4 + 5 + 2 - elapsed_seconds - result + generated_by + error_tag 12 @@ -2894,31 +2666,31 @@ 1 2 - 2261 + 2 - result - id + generated_by + error_message 12 - 24 - 25 - 94 + 22902 + 22903 + 2 - result - cpu_seconds + generated_by + full_error_message 12 @@ -2926,67 +2698,31 @@ 1 2 - 94 + 2 - result - elapsed_seconds + generated_by + location 12 - 24 - 25 - 94 + 169224 + 169225 + 2 - - - - diagnostics - 57106 - - - id - 57106 - - - generated_by - 124 - - - severity - 62 - - - error_tag - 62 - - - error_message - 1435 - - - full_error_message - 39319 - - - location - 312 - - - - id - generated_by + severity + id 12 @@ -2994,15 +2730,30 @@ 1 2 - 57106 + 2 + + + 3 + 4 + 2 + + + 6 + 7 + 2 + + + 330813 + 330814 + 2 - id - severity + severity + generated_by 12 @@ -3010,14 +2761,14 @@ 1 2 - 57106 + 8 - id + severity error_tag @@ -3026,14 +2777,14 @@ 1 2 - 57106 + 8 - id + severity error_message @@ -3042,14 +2793,24 @@ 1 2 - 57106 + 2 + + + 3 + 4 + 4 + + + 22895 + 22896 + 2 - id + severity full_error_message @@ -3058,14 +2819,14 @@ 1 2 - 57106 + 8 - id + severity location @@ -3074,36 +2835,46 @@ 1 2 - 57106 + 2 + + + 2 + 3 + 2 + + + 3 + 4 + 2 + + + 169219 + 169220 + 2 - generated_by + error_tag id 12 - 2 - 3 - 62 - - - 913 - 914 - 62 + 330823 + 330824 + 2 - generated_by - severity + error_tag + generated_by 12 @@ -3111,51 +2882,46 @@ 1 2 - 124 + 2 - generated_by - error_tag + error_tag + severity 12 - 1 - 2 - 124 + 4 + 5 + 2 - generated_by + error_tag error_message 12 - 2 - 3 - 62 - - - 21 - 22 - 62 + 22902 + 22903 + 2 - generated_by + error_tag full_error_message @@ -3164,73 +2930,103 @@ 1 2 - 62 - - - 629 - 630 - 62 + 2 - generated_by + error_tag location 12 - 1 - 2 - 62 - - - 4 - 5 - 62 + 169224 + 169225 + 2 - severity + error_message id 12 - 915 - 916 - 62 + 1 + 2 + 6345 + + + 2 + 3 + 7079 + + + 3 + 4 + 4171 + + + 4 + 5 + 4815 + + + 5 + 6 + 9477 + + + 6 + 9 + 3816 + + + 9 + 15 + 1909 + + + 15 + 16 + 11156 + + + 16 + 159326 + 91 - severity + error_message generated_by 12 - 2 - 3 - 62 + 1 + 2 + 48861 - severity - error_tag + error_message + severity 12 @@ -3238,158 +3034,198 @@ 1 2 - 62 + 48861 - severity - error_message + error_message + error_tag 12 - 23 - 24 - 62 + 1 + 2 + 48861 - severity + error_message full_error_message 12 - 630 - 631 - 62 + 1 + 2 + 48861 - severity + error_message location 12 + + 1 + 2 + 6353 + + + 2 + 3 + 7074 + + + 3 + 4 + 4171 + + + 4 + 5 + 4813 + 5 6 - 62 + 9477 + + + 6 + 9 + 3814 + + + 9 + 15 + 1909 + + + 15 + 16 + 11156 + + + 16 + 159326 + 91 - error_tag + full_error_message id 12 - 915 - 916 - 62 + 330823 + 330824 + 2 - error_tag + full_error_message generated_by 12 - 2 - 3 - 62 + 1 + 2 + 2 - error_tag + full_error_message severity 12 - 1 - 2 - 62 + 4 + 5 + 2 - error_tag - error_message + full_error_message + error_tag 12 - 23 - 24 - 62 + 1 + 2 + 2 - error_tag - full_error_message + full_error_message + error_message 12 - 630 - 631 - 62 + 22902 + 22903 + 2 - error_tag + full_error_message location 12 - 5 - 6 - 62 + 169224 + 169225 + 2 - error_message + location id @@ -3398,54 +3234,24 @@ 1 2 - 312 - - - 2 - 3 - 249 - - - 4 - 7 - 124 - - - 7 - 10 - 124 - - - 13 - 16 - 124 - - - 19 - 23 - 124 - - - 25 - 27 - 124 + 23210 - 48 - 81 - 124 + 2 + 3 + 330902 - 314 - 315 - 124 + 3 + 9 + 6929 - error_message + location generated_by @@ -3454,14 +3260,14 @@ 1 2 - 1435 + 361043 - error_message + location severity @@ -3470,14 +3276,19 @@ 1 2 - 1435 + 361041 + + + 2 + 3 + 2 - error_message + location error_tag @@ -3486,15 +3297,15 @@ 1 2 - 1435 + 361043 - error_message - full_error_message + location + error_message 12 @@ -3502,55 +3313,25 @@ 1 2 - 312 + 23216 2 3 - 249 - - - 4 - 6 - 124 - - - 6 - 8 - 124 - - - 9 - 16 - 124 - - - 19 - 23 - 124 - - - 25 - 27 - 124 + 330900 - 38 - 49 - 124 - - - 80 - 315 - 124 + 3 + 4 + 6925 - error_message - location + location + full_error_message 12 @@ -3558,20 +3339,39 @@ 1 2 - 1373 - - - 3 - 4 - 62 + 361043 + + + + diagnostic_for + 705818 + + + diagnostic + 705818 + + + compilation + 2 + + + file_number + 2402 + + + file_number_diagnostic_number + 38757 + + + - full_error_message - id + diagnostic + compilation 12 @@ -3579,20 +3379,15 @@ 1 2 - 37010 - - - 2 - 37 - 2309 + 705818 - full_error_message - generated_by + diagnostic + file_number 12 @@ -3600,15 +3395,15 @@ 1 2 - 39319 + 705818 - full_error_message - severity + diagnostic + file_number_diagnostic_number 12 @@ -3616,104 +3411,134 @@ 1 2 - 39319 + 705818 - full_error_message - error_tag + compilation + diagnostic 12 - 1 - 2 - 39319 + 330823 + 330824 + 2 - full_error_message - error_message + compilation + file_number 12 - 1 - 2 - 39257 - - - 2 - 3 - 62 + 1126 + 1127 + 2 - full_error_message - location + compilation + file_number_diagnostic_number 12 - 1 - 2 - 39319 + 18166 + 18167 + 2 - location - id + file_number + diagnostic 12 + + 1 + 2 + 328 + 2 3 - 62 + 149 3 4 - 62 + 315 4 - 5 - 62 + 6 + 179 6 - 7 - 62 + 8 + 151 + + + 8 + 11 + 204 + + + 11 + 17 + 196 + + + 17 + 30 + 185 + + + 30 + 55 + 181 + + + 55 + 133 + 181 + + + 134 + 327 + 181 - 900 - 901 - 62 + 342 + 18167 + 147 - location - generated_by + file_number + compilation 12 @@ -3721,31 +3546,147 @@ 1 2 - 312 + 2402 - location - severity + file_number + file_number_diagnostic_number + + + 12 + + + 1 + 2 + 328 + + + 2 + 3 + 149 + + + 3 + 4 + 315 + + + 4 + 6 + 179 + + + 6 + 8 + 151 + + + 8 + 11 + 204 + + + 11 + 17 + 196 + + + 17 + 30 + 185 + + + 30 + 55 + 181 + + + 55 + 133 + 181 + + + 134 + 327 + 181 + + + 342 + 18167 + 147 + + + + + + + file_number_diagnostic_number + diagnostic 12 - 1 - 2 - 312 + 2 + 5 + 981 + + + 5 + 6 + 3895 + + + 6 + 9 + 1790 + + + 9 + 10 + 5822 + + + 10 + 14 + 537 + + + 15 + 16 + 15926 + + + 16 + 21 + 2745 + + + 23 + 25 + 3208 + + + 25 + 57 + 2927 + + + 57 + 1127 + 921 - location - error_tag + file_number_diagnostic_number + compilation 12 @@ -3753,59 +3694,68 @@ 1 2 - 312 + 38757 - location - error_message + file_number_diagnostic_number + file_number 12 - 1 - 2 - 187 + 2 + 5 + 981 - 2 - 3 - 62 + 5 + 6 + 3895 - 20 + 6 + 9 + 1790 + + + 9 + 10 + 5822 + + + 10 + 14 + 537 + + + 15 + 16 + 15926 + + + 16 21 - 62 + 2745 - - - - - - location - full_error_message - - - 12 - - 1 - 2 - 187 + 23 + 25 + 3208 - 3 - 4 - 62 + 25 + 57 + 2927 - 624 - 625 - 62 + 57 + 1127 + 921 @@ -3959,11 +3909,11 @@ sourceLocationPrefix - 569 + 2925 prefix - 569 + 2925 @@ -4781,31 +4731,31 @@ locations_default - 82315299 + 915359999 id - 82315299 + 915359999 file - 1291911 + 4332583 beginLine - 538208 + 5932802 beginColumn - 33818 + 377382 endLine - 538471 + 5935727 endColumn - 119281 + 1404213 @@ -4819,7 +4769,7 @@ 1 2 - 82315299 + 915359999 @@ -4835,7 +4785,7 @@ 1 2 - 82315299 + 915359999 @@ -4851,7 +4801,7 @@ 1 2 - 82315299 + 915359999 @@ -4867,7 +4817,7 @@ 1 2 - 82315299 + 915359999 @@ -4883,7 +4833,7 @@ 1 2 - 82315299 + 915359999 @@ -4899,17 +4849,32 @@ 1 2 - 1131995 + 2600720 2 - 11 - 97522 + 6 + 394935 - 11 + 6 + 7 + 359829 + + + 7 + 12 + 351053 + + + 12 + 680 + 327649 + + + 831 3605 - 62393 + 298395 @@ -4925,17 +4890,37 @@ 1 2 - 1131995 + 2600720 2 - 9 - 97260 + 4 + 134570 - 9 + 4 + 5 + 286693 + + + 5 + 6 + 362755 + + + 6 + 10 + 353978 + + + 10 + 1001 + 327649 + + + 1038 1830 - 62655 + 266215 @@ -4951,17 +4936,32 @@ 1 2 - 1131995 + 2600720 2 - 5 - 105911 + 3 + 125794 - 5 + 3 + 4 + 798646 + + + 4 + 6 + 356904 + + + 6 + 85 + 245737 + + + 85 105 - 54004 + 204781 @@ -4977,17 +4977,37 @@ 1 2 - 1131995 + 2600720 2 - 11 - 99619 + 5 + 163824 - 11 + 5 + 6 + 430040 + + + 6 + 8 + 333500 + + + 8 + 17 + 339351 + + + 17 + 1691 + 330575 + + + 1691 1834 - 60296 + 134570 @@ -5003,17 +5023,37 @@ 1 2 - 1131995 + 2600720 2 - 10 - 99619 + 5 + 155048 - 10 + 5 + 6 + 351053 + + + 6 + 7 + 333500 + + + 7 + 12 + 371531 + + + 12 + 178 + 327649 + + + 178 205 - 60296 + 193079 @@ -5028,68 +5068,68 @@ 1 - 14 - 42731 + 89 + 450518 - 14 - 125 - 41158 + 89 + 127 + 468071 - 125 - 142 - 41945 + 127 + 138 + 476847 - 142 - 152 - 43255 + 138 + 146 + 447593 - 152 - 159 - 49023 + 146 + 154 + 479772 - 159 - 164 - 37226 + 154 + 161 + 532430 - 164 - 169 - 46926 + 161 + 167 + 511952 - 169 - 173 - 40896 + 167 + 172 + 462220 - 173 + 172 178 - 45353 + 462220 178 - 184 - 47450 + 185 + 479772 - 184 - 193 - 43255 + 185 + 194 + 450518 - 193 - 211 - 40372 + 194 + 206 + 470996 - 211 - 4929 - 18613 + 206 + 1479 + 239886 @@ -5104,73 +5144,68 @@ 1 - 7 - 44042 + 46 + 450518 - 7 - 65 - 40896 + 47 + 66 + 497325 - 65 - 73 - 41945 + 66 + 71 + 547058 - 73 - 78 - 40372 + 71 + 76 + 476847 - 78 - 81 - 36177 + 76 + 80 + 497325 - 81 - 84 - 48761 + 80 + 83 + 441742 - 84 + 83 86 - 40896 + 514878 86 - 87 - 25691 - - - 87 89 - 48761 + 482698 89 - 91 - 35129 + 92 + 514878 - 91 - 94 - 44566 + 92 + 95 + 509027 - 94 - 99 - 44828 + 95 + 100 + 517803 - 99 - 142 - 40634 + 100 + 154 + 447593 - 142 - 4929 - 5505 + 159 + 1479 + 35105 @@ -5185,63 +5220,63 @@ 1 - 5 - 42731 + 14 + 482698 - 5 + 14 17 - 38274 + 491474 17 + 18 + 371531 + + + 18 19 - 34342 + 491474 19 20 - 42207 + 655299 20 21 - 55053 + 740137 21 22 - 57412 + 705032 22 23 - 65015 + 620194 23 24 - 62393 + 529505 24 25 - 46401 + 359829 25 - 26 - 29099 - - - 26 29 - 49285 + 468071 29 - 40 - 15991 + 32 + 17552 @@ -5257,32 +5292,32 @@ 1 2 - 173810 + 1901539 2 3 - 172761 + 1980526 3 4 - 92017 + 982949 4 5 - 40896 + 465145 5 - 11 - 41945 + 12 + 473922 - 11 - 97 - 16778 + 12 + 99 + 128719 @@ -5297,73 +5332,73 @@ 1 - 13 - 42207 + 48 + 447593 - 13 - 60 - 41945 + 48 + 59 + 421264 - 60 + 59 + 62 + 465145 + + + 62 64 - 42469 + 432965 64 66 - 42207 + 514878 66 + 67 + 339351 + + + 67 68 - 48499 + 254513 68 69 - 26477 + 327649 69 - 70 - 29361 - - - 70 - 72 - 49023 + 71 + 526580 - 72 - 74 - 44042 + 71 + 73 + 465145 - 74 - 76 - 33818 + 73 + 75 + 392009 - 76 - 79 - 45091 + 75 + 78 + 494400 - 79 + 78 83 - 40372 + 482698 83 - 91 - 43255 - - - 91 - 103 - 9437 + 107 + 368606 @@ -5377,69 +5412,69 @@ 12 - 1 - 11 - 2883 + 2 + 7 + 26329 - 15 - 24 - 2883 + 8 + 12 + 32179 - 28 - 58 - 2883 + 13 + 29 + 29254 - 58 - 88 - 2621 + 30 + 73 + 29254 - 89 - 131 - 2621 + 78 + 106 + 32179 - 131 - 196 - 2883 + 108 + 183 + 29254 - 213 - 297 - 2621 + 184 + 237 + 29254 - 307 - 496 - 2621 + 250 + 341 + 29254 - 513 - 883 - 2621 + 346 + 794 + 29254 - 933 - 1470 - 2621 + 805 + 1339 + 29254 - 1665 - 2279 - 2621 + 1344 + 1967 + 29254 - 2295 - 2583 - 2621 + 2066 + 2529 + 29254 - 2694 - 226487 - 1310 + 2593 + 229061 + 23403 @@ -5454,73 +5489,83 @@ 1 - 9 - 2359 + 3 + 23403 - 9 + 3 + 4 + 17552 + + + 4 + 6 + 26329 + + + 6 11 - 2883 + 29254 11 - 15 - 2097 + 52 + 29254 - 15 - 19 - 2883 + 71 + 79 + 26329 - 23 - 68 - 2621 + 82 + 91 + 32179 - 69 - 78 - 2621 + 92 + 99 + 29254 - 79 - 100 - 1835 + 99 + 102 + 26329 - 100 + 102 104 - 2883 + 17552 104 - 109 - 2621 + 105 + 17552 - 109 - 112 - 1835 + 105 + 107 + 32179 - 112 - 115 - 2621 + 107 + 108 + 11701 - 115 - 117 - 2621 + 108 + 109 + 23403 - 117 - 123 - 2621 + 109 + 524 + 29254 - 145 - 4929 - 1310 + 591 + 1479 + 5850 @@ -5535,68 +5580,68 @@ 1 - 10 - 2883 + 5 + 29254 - 10 - 22 - 2883 + 7 + 11 + 29254 - 23 - 39 - 2621 + 11 + 22 + 29254 - 41 - 58 - 2621 + 25 + 43 + 29254 - 58 - 84 - 2621 + 43 + 66 + 29254 - 84 - 106 - 2621 + 66 + 91 + 29254 108 - 166 - 2621 + 136 + 29254 - 167 - 225 - 2621 + 142 + 169 + 29254 - 230 - 376 - 2621 + 175 + 334 + 29254 - 381 - 647 - 2621 + 341 + 583 + 29254 - 657 - 941 - 2621 + 591 + 825 + 29254 - 941 - 1090 - 2621 + 874 + 1041 + 29254 - 1102 - 2051 - 1835 + 1060 + 2021 + 26329 @@ -5611,68 +5656,68 @@ 1 - 10 - 2883 + 5 + 29254 - 10 - 22 - 2883 + 7 + 11 + 29254 - 23 - 39 - 2621 + 11 + 26 + 32179 - 41 - 59 - 2621 + 26 + 45 + 29254 - 59 - 86 - 2621 + 45 + 78 + 29254 - 86 - 109 - 2621 + 78 + 113 + 29254 - 114 - 168 - 2621 + 113 + 146 + 29254 - 170 - 224 - 2621 + 146 + 204 + 29254 - 229 - 379 - 2621 + 204 + 342 + 29254 - 382 - 647 - 2621 + 357 + 592 + 29254 - 658 - 941 - 2621 + 606 + 876 + 29254 - 941 - 1089 - 2621 + 922 + 1061 + 29254 - 1102 - 2051 - 1835 + 1065 + 2021 + 23403 @@ -5687,68 +5732,73 @@ 1 + 4 + 26329 + + + 4 8 - 2883 + 26329 8 - 16 - 2883 + 15 + 29254 - 16 - 23 - 2621 + 15 + 21 + 29254 - 23 - 30 - 2621 + 21 + 29 + 32179 30 - 36 - 2621 + 39 + 26329 - 36 - 44 - 2621 + 41 + 47 + 29254 - 46 + 47 55 - 2621 + 29254 - 55 + 56 65 - 2883 + 29254 - 65 - 76 - 2621 + 66 + 79 + 29254 - 77 - 94 - 2621 + 80 + 101 + 29254 - 94 - 117 - 2621 + 105 + 126 + 29254 - 119 - 152 - 2621 + 131 + 208 + 29254 - 153 - 393 - 1572 + 415 + 416 + 2925 @@ -5763,68 +5813,68 @@ 1 - 14 - 42207 + 85 + 447593 - 14 - 124 - 41683 + 85 + 127 + 476847 - 124 - 143 - 42207 + 127 + 138 + 482698 - 143 - 152 - 45615 + 138 + 147 + 488549 - 152 - 159 - 44042 + 147 + 154 + 453443 - 159 - 164 - 40896 + 154 + 161 + 494400 - 164 - 169 - 46664 + 161 + 167 + 497325 - 169 - 173 - 41945 + 167 + 172 + 470996 - 173 + 172 178 - 46401 + 450518 178 - 184 - 41683 + 185 + 456369 - 184 + 185 193 - 42993 + 456369 193 - 212 - 41158 + 205 + 468071 - 212 - 4929 - 20972 + 205 + 1479 + 292544 @@ -5839,68 +5889,68 @@ 1 - 7 - 44304 + 46 + 450518 - 7 + 46 66 - 43518 + 494400 66 - 74 - 43780 + 71 + 503176 + + + 71 + 76 + 465145 - 74 + 76 80 - 48499 + 500251 80 83 - 46401 + 415413 83 - 85 - 36702 - - - 85 - 87 - 46926 + 86 + 491474 - 87 + 86 89 - 48499 + 547058 89 - 91 - 36439 + 92 + 497325 - 91 - 94 - 47188 + 92 + 95 + 450518 - 94 + 95 99 - 44304 + 465145 99 - 130 - 40896 + 109 + 450518 - 130 - 4929 - 11010 + 109 + 1479 + 204781 @@ -5916,32 +5966,27 @@ 1 2 - 136583 + 1550485 2 3 - 190064 + 2068289 3 4 - 124000 + 1366182 4 6 - 45877 + 523654 - - 6 - 19 - 40896 - - - 19 - 22 - 1048 + + 6 + 21 + 427114 @@ -5956,63 +6001,63 @@ 1 - 5 - 42207 + 14 + 456369 - 5 + 14 17 - 38799 + 470996 17 + 18 + 342277 + + + 18 19 - 31721 + 491474 19 20 - 38274 + 620194 20 21 - 57412 + 804497 21 22 - 55577 + 699181 22 23 - 65801 + 576312 23 24 - 59771 + 538281 24 25 - 45353 + 412487 25 - 26 - 35653 - - - 26 - 29 - 49547 + 28 + 473922 - 29 - 39 - 18351 + 28 + 33 + 49732 @@ -6027,73 +6072,73 @@ 1 - 13 - 42731 + 48 + 450518 - 13 + 48 60 - 41683 + 523654 60 - 64 - 41683 + 63 + 547058 - 64 + 63 + 65 + 485623 + + + 65 66 - 41158 + 283768 66 + 67 + 301320 + + + 67 68 - 49023 + 251588 68 69 - 27002 + 313022 69 - 70 - 27526 - - - 70 71 - 29623 + 506101 71 73 - 44828 + 468071 73 75 - 35653 + 415413 75 - 77 - 35129 - - - 77 - 80 - 40896 + 78 + 535356 - 80 - 85 - 43780 + 78 + 83 + 453443 - 85 - 119 - 37750 + 83 + 120 + 400785 @@ -6109,57 +6154,57 @@ 1 2 - 28050 + 318873 2 3 - 12321 + 122868 3 5 - 9699 + 111166 5 - 13 - 9699 + 9 + 111166 - 13 - 53 - 9175 + 9 + 18 + 108241 - 53 - 144 - 9175 + 19 + 61 + 105316 - 145 - 348 - 9175 + 62 + 198 + 105316 - 357 - 967 - 9175 + 202 + 482 + 105316 - 1050 - 2386 - 9175 + 489 + 1430 + 105316 - 2392 - 4931 - 9175 + 1448 + 3598 + 105316 - 4949 - 5933 - 4456 + 3743 + 6247 + 105316 @@ -6175,57 +6220,57 @@ 1 2 - 29099 + 330575 2 3 - 11797 + 114092 3 5 - 10224 + 122868 5 - 13 - 9699 + 10 + 122868 - 13 - 42 - 9175 + 10 + 24 + 108241 - 42 - 77 - 9175 + 24 + 51 + 105316 - 77 - 102 - 9175 + 52 + 94 + 108241 - 102 - 113 - 9175 + 94 + 107 + 108241 - 114 - 139 - 9175 + 107 + 120 + 105316 - 139 - 168 - 9175 + 120 + 147 + 108241 - 168 - 4929 - 3408 + 147 + 1479 + 70210 @@ -6241,57 +6286,57 @@ 1 2 - 29623 + 333500 2 3 - 12059 + 122868 3 5 - 9437 + 108241 5 - 13 - 9437 + 9 + 119943 - 13 - 51 - 9175 + 9 + 18 + 105316 - 51 - 113 - 9175 + 18 + 60 + 108241 - 114 - 266 - 9175 + 61 + 184 + 105316 - 269 - 636 - 9175 + 190 + 386 + 105316 - 648 - 1197 - 9175 + 399 + 942 + 105316 - 1198 - 1635 - 9437 + 968 + 1533 + 105316 - 1639 - 1722 - 3408 + 1542 + 1757 + 84837 @@ -6307,47 +6352,52 @@ 1 2 - 37488 + 418338 2 3 - 14156 + 157974 3 + 4 + 102390 + + + 4 6 - 10748 + 105316 6 - 14 - 10486 + 12 + 108241 - 14 - 25 - 10224 + 12 + 21 + 105316 - 25 - 36 - 9699 + 21 + 33 + 108241 - 36 - 47 - 9175 + 33 + 43 + 108241 - 47 + 43 54 - 9175 + 117017 54 - 65 - 8126 + 64 + 73136 @@ -6363,57 +6413,57 @@ 1 2 - 29623 + 333500 2 3 - 11797 + 122868 3 5 - 9437 + 111166 5 - 13 - 9437 + 9 + 111166 - 13 - 52 - 9175 + 9 + 18 + 105316 - 52 - 112 - 9175 + 18 + 60 + 105316 - 112 - 262 - 9175 + 61 + 182 + 105316 - 262 - 630 - 9175 + 182 + 372 + 108241 - 637 - 1186 - 9175 + 383 + 922 + 105316 - 1197 - 1625 - 9175 + 944 + 1519 + 105316 - 1632 - 1722 - 3932 + 1527 + 1757 + 90688 @@ -6423,15 +6473,15 @@ hasLocation - 53281114 + 70974218 locatableid - 53281114 + 70906932 id - 1717130 + 3080493 @@ -6445,7 +6495,12 @@ 1 2 - 53281114 + 70839647 + + + 2 + 3 + 67285 @@ -6461,62 +6516,72 @@ 1 2 - 294140 + 479772 2 3 - 182199 + 64359 3 + 4 + 266215 + + + 4 5 - 155983 + 231110 5 + 6 + 143346 + + + 6 7 - 126884 + 143346 7 - 10 - 148905 + 8 + 146272 - 10 - 13 - 142089 + 8 + 10 + 242811 - 13 - 17 - 132651 + 10 + 14 + 257439 - 17 - 23 - 130030 + 14 + 19 + 231110 - 23 - 35 - 133175 + 19 + 26 + 239886 - 35 - 64 - 129505 + 26 + 44 + 231110 - 64 - 396 - 128981 + 44 + 81 + 236961 - 405 - 9847 - 12583 + 81 + 881 + 166750 @@ -6526,23 +6591,23 @@ numlines - 41395164 + 467290086 element_id - 41395164 + 467290086 num_lines - 84414 + 939067 num_code - 83628 + 941993 num_comment - 258487 + 2881563 @@ -6556,7 +6621,7 @@ 1 2 - 41395164 + 467290086 @@ -6572,7 +6637,7 @@ 1 2 - 41395164 + 467290086 @@ -6588,7 +6653,7 @@ 1 2 - 41395164 + 467290086 @@ -6604,37 +6669,37 @@ 1 2 - 43780 + 509027 2 3 - 10748 + 111166 3 4 - 8389 + 93614 4 7 - 6816 + 76061 7 - 14 - 6553 + 15 + 73136 - 15 - 194 - 6553 + 16 + 3454 + 73136 - 320 - 149659 - 1572 + 151799 + 151800 + 2925 @@ -6650,17 +6715,12 @@ 1 2 - 69471 + 906887 2 - 3 - 9437 - - - 3 - 6 - 5505 + 4 + 32179 @@ -6676,27 +6736,27 @@ 1 2 - 51907 + 593865 2 3 - 13370 + 149197 3 4 - 7078 + 84837 4 - 6 - 7340 + 7 + 76061 - 6 - 987 - 4718 + 8 + 986 + 35105 @@ -6712,37 +6772,37 @@ 1 2 - 43255 + 511952 2 3 - 10748 + 108241 3 4 - 8389 + 93614 4 7 - 7078 + 76061 7 15 - 6291 + 73136 16 - 214 - 6291 + 505 + 73136 - 325 - 78746 - 1572 + 76342 + 79249 + 5850 @@ -6758,17 +6818,12 @@ 1 2 - 70520 + 921515 2 - 3 - 7078 - - - 3 8 - 6029 + 20478 @@ -6784,27 +6839,27 @@ 1 2 - 50596 + 596790 2 3 - 13894 + 149197 3 4 - 7340 + 78987 4 - 6 - 6291 + 7 + 78987 - 6 - 987 - 5505 + 7 + 986 + 38030 @@ -6819,78 +6874,73 @@ 1 - 7 - 20972 + 5 + 219408 - 7 - 49 - 19399 + 5 + 41 + 225259 - 49 - 71 - 20186 + 41 + 70 + 239886 - 71 - 78 - 20710 + 70 + 75 + 225259 - 78 - 83 - 19923 + 75 + 82 + 231110 - 83 - 87 - 22283 + 82 + 86 + 219408 - 87 + 86 89 - 19137 + 193079 89 91 - 18351 + 207706 91 - 92 - 11010 - - - 92 93 - 13107 + 242811 93 94 - 14418 + 143346 94 95 - 13370 + 149197 95 97 - 20710 + 231110 97 - 119 - 19661 + 101 + 234035 - 120 - 75134 - 5243 + 101 + 75700 + 119943 @@ -6906,22 +6956,22 @@ 1 2 - 211560 + 2375461 2 3 - 22545 + 239886 3 7 - 19923 + 216482 7 - 120 - 4456 + 121 + 49732 @@ -6937,22 +6987,22 @@ 1 2 - 211560 + 2375461 2 3 - 22545 + 239886 3 7 - 19923 + 216482 7 122 - 4456 + 49732 @@ -6962,15 +7012,15 @@ files - 1291911 + 4338434 id - 1291911 + 4338434 name - 1291911 + 4338434 @@ -6984,7 +7034,7 @@ 1 2 - 1291911 + 4338434 @@ -7000,7 +7050,7 @@ 1 2 - 1291911 + 4338434 @@ -7010,15 +7060,15 @@ folders - 211876 + 857155 id - 211876 + 857155 name - 211876 + 857155 @@ -7032,7 +7082,7 @@ 1 2 - 211876 + 857155 @@ -7048,7 +7098,7 @@ 1 2 - 211876 + 857155 @@ -7058,15 +7108,15 @@ containerparent - 1496393 + 5189739 parent - 212871 + 871782 child - 1496393 + 5189739 @@ -7080,32 +7130,32 @@ 1 2 - 125311 + 585088 2 3 - 18613 + 58508 3 - 5 - 18613 + 6 + 76061 - 5 - 10 - 18088 + 6 + 12 + 67285 - 10 - 20 - 15991 + 12 + 45 + 67285 - 20 - 194 - 16253 + 55 + 192 + 17552 @@ -7121,7 +7171,7 @@ 1 2 - 1496393 + 5189739 @@ -7131,15 +7181,15 @@ cupackage - 1129635 + 2589018 id - 1129635 + 2589018 packageid - 85463 + 216482 @@ -7153,7 +7203,7 @@ 1 2 - 1129635 + 2589018 @@ -7169,57 +7219,62 @@ 1 2 - 18351 + 46807 2 3 - 11797 + 17552 3 4 - 6029 + 17552 4 5 - 5505 + 14627 5 - 7 - 4980 + 6 + 8776 - 7 + 6 + 8 + 17552 + + + 8 9 - 6291 + 5850 9 - 11 - 6553 + 10 + 17552 - 11 - 17 - 7864 + 10 + 15 + 17552 - 17 + 15 26 - 6816 + 17552 26 - 53 - 6553 + 40 + 17552 - 54 - 187 - 4718 + 41 + 80 + 17552 @@ -7229,19 +7284,19 @@ jarManifestMain - 132371 + 161093 fileid - 8960 + 11300 keyName - 9676 + 10098 value - 67858 + 82590 @@ -7255,67 +7310,57 @@ 1 5 - 358 + 480 5 6 - 1792 + 2885 6 7 - 1075 + 1081 9 - 10 - 358 - - - 13 15 - 597 + 961 15 - 16 - 716 + 17 + 961 - 16 - 18 - 716 + 17 + 19 + 721 - 18 - 21 - 716 + 19 + 20 + 841 - 21 + 20 23 - 477 + 961 23 26 - 597 + 841 26 - 27 - 358 - - - 27 - 29 - 716 + 28 + 961 - 29 + 28 36 - 477 + 601 @@ -7331,67 +7376,67 @@ 1 5 - 358 + 480 5 6 - 1792 + 2885 6 7 - 1075 + 1081 8 - 11 - 597 + 12 + 841 - 11 + 12 13 - 597 + 360 14 15 - 597 + 721 15 16 - 597 + 601 16 17 - 358 + 601 17 18 - 716 + 841 18 19 - 358 + 601 19 21 - 716 + 721 21 23 - 597 + 961 23 29 - 597 + 601 @@ -7407,42 +7452,47 @@ 1 2 - 4420 + 4448 2 4 - 716 + 721 4 6 - 597 + 841 6 - 12 - 836 + 10 + 601 - 18 - 30 - 836 + 11 + 31 + 841 - 30 - 34 - 716 + 33 + 40 + 841 - 34 - 42 - 836 + 40 + 49 + 601 - 42 - 76 - 716 + 50 + 66 + 841 + + + 73 + 95 + 360 @@ -7458,42 +7508,42 @@ 1 2 - 4898 + 4928 2 3 - 597 + 721 3 4 - 716 + 721 4 9 - 836 + 841 - 13 - 18 - 716 + 10 + 19 + 841 - 18 - 31 - 836 + 19 + 30 + 841 - 32 - 42 - 836 + 37 + 50 + 841 - 51 - 54 - 238 + 50 + 66 + 360 @@ -7509,17 +7559,22 @@ 1 2 - 58659 + 70688 2 - 4 - 5615 + 3 + 4928 - 4 - 76 - 3584 + 3 + 12 + 6251 + + + 12 + 95 + 721 @@ -7535,17 +7590,17 @@ 1 2 - 56269 + 69606 2 3 - 6570 + 7934 3 5 - 5017 + 5049 @@ -7555,23 +7610,23 @@ jarManifestEntries - 30196 + 216010 fileid - 61 + 344 entryName - 30124 + 213715 keyName - 27 + 143 value - 30158 + 213056 @@ -7585,72 +7640,67 @@ 1 2 - 4 - - - 4 - 10 - 3 + 28 - 10 - 12 - 4 + 7 + 38 + 28 - 12 - 31 - 4 + 55 + 56 + 14 - 65 - 82 - 4 + 59 + 60 + 28 - 123 - 164 - 4 + 68 + 76 + 28 - 178 - 240 - 4 + 88 + 103 + 28 - 253 - 294 - 4 + 113 + 150 + 28 - 307 - 357 - 4 + 176 + 322 + 28 - 361 - 395 - 4 + 330 + 387 + 28 - 433 - 461 - 4 + 603 + 771 + 28 - 591 - 662 - 4 + 872 + 1420 + 28 - 957 - 2267 - 4 + 1831 + 1963 + 28 - 3647 - 3762 - 3 + 5533 + 5534 + 14 @@ -7666,12 +7716,17 @@ 1 2 - 57 + 301 6 - 10 - 3 + 7 + 14 + + + 7 + 8 + 28 @@ -7687,72 +7742,67 @@ 1 2 - 4 - - - 3 - 8 - 4 + 14 - 9 - 13 - 4 + 4 + 5 + 28 - 24 - 66 - 4 + 17 + 56 + 28 - 70 - 124 - 4 + 59 + 60 + 28 - 127 - 179 - 4 + 68 + 76 + 28 - 195 - 254 - 4 + 88 + 103 + 28 - 265 - 308 - 4 + 109 + 150 + 28 - 320 - 362 - 4 + 176 + 321 + 28 - 381 - 434 - 4 + 330 + 387 + 28 - 434 - 592 - 4 + 603 + 770 + 28 - 618 - 958 - 4 + 851 + 1420 + 28 - 1671 - 3648 - 4 + 1803 + 1961 + 28 - 3761 - 3762 - 1 + 5509 + 5510 + 14 @@ -7768,12 +7818,12 @@ 1 2 - 30108 + 213228 2 - 26 - 16 + 21 + 487 @@ -7789,12 +7839,12 @@ 1 2 - 30121 + 213471 - 6 - 10 - 3 + 2 + 8 + 243 @@ -7810,12 +7860,12 @@ 1 2 - 30120 + 213156 - 3 - 26 - 4 + 2 + 20 + 559 @@ -7831,22 +7881,27 @@ 1 2 - 21 + 14 2 3 - 3 + 14 3 4 - 1 + 86 - 32 - 33 - 1 + 9 + 10 + 14 + + + 11 + 12 + 14 @@ -7859,30 +7914,30 @@ 12 - - 1 - 2 - 21 - 2 3 - 1 + 14 - 11 - 12 - 1 + 9 + 10 + 86 + + + 37 + 38 + 14 - 369 - 370 - 1 + 2415 + 2416 + 14 - 19366 - 19367 - 1 + 12451 + 12452 + 14 @@ -7898,22 +7953,27 @@ 1 2 - 22 + 28 2 3 - 1 + 57 + + + 8 + 9 + 28 - 369 - 370 - 1 + 2432 + 2433 + 14 - 19390 - 19391 - 1 + 12404 + 12405 + 14 @@ -7929,12 +7989,12 @@ 1 2 - 30156 + 212468 2 - 3 - 1 + 11 + 587 @@ -7950,12 +8010,12 @@ 1 2 - 30156 + 211693 - 11 - 12 - 1 + 2 + 38 + 1362 @@ -7971,12 +8031,12 @@ 1 2 - 30150 + 212998 2 3 - 7 + 57 @@ -7986,15 +8046,15 @@ packages - 96053 + 459294 id - 96053 + 459294 nodeName - 96053 + 459294 @@ -8008,7 +8068,7 @@ 1 2 - 96053 + 459294 @@ -8024,7 +8084,7 @@ 1 2 - 96053 + 459294 @@ -8034,15 +8094,15 @@ primitives - 5690 + 26329 id - 5690 + 26329 nodeName - 5690 + 26329 @@ -8056,7 +8116,7 @@ 1 2 - 5690 + 26329 @@ -8072,7 +8132,7 @@ 1 2 - 5690 + 26329 @@ -8082,15 +8142,15 @@ modifiers - 6259 + 32179 id - 6259 + 32179 nodeName - 6259 + 32179 @@ -8104,7 +8164,7 @@ 1 2 - 6259 + 32179 @@ -8120,7 +8180,7 @@ 1 2 - 6259 + 32179 @@ -8130,34 +8190,34 @@ error_type - 22 + 2925 id - 22 + 2925 classes_or_interfaces - 22273131 + 22649681 id - 22273131 + 22649681 nodeName - 5754222 + 5851507 parentid - 734 + 746 sourceid - 26258 + 26702 @@ -8171,7 +8231,7 @@ 1 2 - 22273131 + 22649681 @@ -8187,7 +8247,7 @@ 1 2 - 22273131 + 22649681 @@ -8203,7 +8263,7 @@ 1 2 - 22273131 + 22649681 @@ -8219,27 +8279,27 @@ 1 2 - 3703195 + 3765807 2 3 - 866201 + 880844 3 5 - 424184 + 431356 5 12 - 451316 + 458946 12 9655 - 309324 + 314553 @@ -8255,12 +8315,12 @@ 1 2 - 5753464 + 5850737 2 29 - 757 + 769 @@ -8276,12 +8336,12 @@ 1 2 - 5753210 + 5850478 2 3091 - 1011 + 1028 @@ -8297,62 +8357,62 @@ 1 2 - 132 + 135 2 3 - 40 + 41 3 5 - 63 + 64 5 7 - 46 + 47 7 8 - 57 + 58 8 11 - 63 + 64 11 23 - 57 + 58 23 41 - 63 + 64 42 158 - 57 + 58 162 1034 - 57 + 58 1315 34752 - 57 + 58 36100 2058753 - 34 + 35 @@ -8368,32 +8428,32 @@ 1 2 - 132 + 135 2 3 - 40 + 41 3 4 - 28 + 29 4 5 - 40 + 41 5 6 - 34 + 35 6 7 - 40 + 41 7 @@ -8403,32 +8463,32 @@ 9 15 - 57 + 58 15 24 - 63 + 64 24 56 - 57 + 58 57 178 - 57 + 58 186 3066 - 57 + 58 3515 65688 - 57 + 58 298524 @@ -8449,57 +8509,57 @@ 1 2 - 150 + 152 2 3 - 80 + 82 3 4 - 34 + 35 4 5 - 63 + 64 5 7 - 40 + 41 7 9 - 63 + 64 9 11 - 63 + 64 12 15 - 46 + 47 16 23 - 57 + 58 25 41 - 57 + 58 47 113 - 57 + 58 113 @@ -8520,17 +8580,17 @@ 1 2 - 23281 + 23675 2 15 - 1994 + 2027 15 448199 - 982 + 999 @@ -8546,17 +8606,17 @@ 1 2 - 23281 + 23675 2 10 - 2005 + 2039 10 100263 - 971 + 987 @@ -8572,7 +8632,7 @@ 1 2 - 26258 + 26702 @@ -8582,26 +8642,26 @@ file_class - 17711 + 18779 id - 17711 + 18779 class_object - 22283 + 23013 id - 22283 + 23013 instance - 22283 + 23013 @@ -8615,7 +8675,7 @@ 1 2 - 22283 + 23013 @@ -8631,7 +8691,7 @@ 1 2 - 22283 + 23013 @@ -8641,19 +8701,19 @@ type_companion_object - 41945 + 42587 id - 41945 + 42587 instance - 41945 + 42587 companion_object - 41945 + 42587 @@ -8667,7 +8727,7 @@ 1 2 - 41945 + 42587 @@ -8683,7 +8743,7 @@ 1 2 - 41945 + 42587 @@ -8699,7 +8759,7 @@ 1 2 - 41945 + 42587 @@ -8715,7 +8775,7 @@ 1 2 - 41945 + 42587 @@ -8731,7 +8791,7 @@ 1 2 - 41945 + 42587 @@ -8747,7 +8807,7 @@ 1 2 - 41945 + 42587 @@ -8757,15 +8817,15 @@ kt_nullable_types - 262 + 264 id - 262 + 264 classid - 262 + 264 @@ -8779,7 +8839,7 @@ 1 2 - 262 + 264 @@ -8795,7 +8855,7 @@ 1 2 - 262 + 264 @@ -8805,15 +8865,15 @@ kt_notnull_types - 156265 + 161049 id - 156265 + 161049 classid - 156265 + 161049 @@ -8827,7 +8887,7 @@ 1 2 - 156265 + 161049 @@ -8843,7 +8903,7 @@ 1 2 - 156265 + 161049 @@ -8853,19 +8913,19 @@ kt_type_alias - 707 + 625 id - 707 + 625 name - 583 + 614 kttypeid - 12 + 11 @@ -8879,7 +8939,7 @@ 1 2 - 707 + 625 @@ -8895,7 +8955,7 @@ 1 2 - 707 + 625 @@ -8911,12 +8971,12 @@ 1 2 - 459 + 602 2 3 - 124 + 11 @@ -8932,7 +8992,7 @@ 1 2 - 583 + 614 @@ -8946,9 +9006,9 @@ 12 - 57 - 58 - 12 + 55 + 56 + 11 @@ -8962,9 +9022,9 @@ 12 - 47 - 48 - 12 + 54 + 55 + 11 @@ -8974,48 +9034,37 @@ isInterface - 21473562 + 21836595 id - 21473562 + 21836595 isRecord - 417 + 11019 id - 417 - - - - - - isCanonicalConstr - 417 - - - constructorid - 417 + 11019 fielddecls - 210035 + 204459 id - 210035 + 204459 parentid - 24609 + 16879 @@ -9029,7 +9078,7 @@ 1 2 - 210035 + 204459 @@ -9044,53 +9093,53 @@ 1 - 2 - 6180 - - - 2 3 - 2975 + 227 3 4 - 2769 + 3275 4 6 - 1694 + 272 6 7 - 2563 + 3867 7 - 9 - 938 + 8 + 90 9 - 12 - 1922 + 10 + 2411 12 - 15 - 1877 + 13 + 2684 15 - 24 - 1854 + 16 + 1273 - 24 + 17 + 25 + 1501 + + + 27 145 - 1831 + 1273 @@ -9100,19 +9149,19 @@ fieldDeclaredIn - 210035 + 204459 fieldId - 135178 + 69063 fieldDeclId - 210035 + 204459 pos - 22 + 45 @@ -9125,18 +9174,13 @@ 1 - 2 - 94498 - - - 2 3 - 6501 + 2183 3 4 - 34177 + 66879 @@ -9152,7 +9196,7 @@ 1 2 - 135178 + 69063 @@ -9168,7 +9212,7 @@ 1 2 - 210035 + 204459 @@ -9184,7 +9228,7 @@ 1 2 - 210035 + 204459 @@ -9198,9 +9242,9 @@ 12 - 5905 - 5906 - 22 + 1518 + 1519 + 45 @@ -9214,9 +9258,9 @@ 12 - 9175 - 9176 - 22 + 4494 + 4495 + 45 @@ -9226,23 +9270,23 @@ fields - 2886451 + 9378976 id - 2886451 + 9378976 nodeName - 2508459 + 7831415 typeid - 182623 + 848379 parentid - 249278 + 1515380 @@ -9256,7 +9300,7 @@ 1 2 - 2886451 + 9378976 @@ -9272,7 +9316,7 @@ 1 2 - 2886451 + 9378976 @@ -9288,7 +9332,7 @@ 1 2 - 2886451 + 9378976 @@ -9304,12 +9348,12 @@ 1 2 - 2356342 + 7430629 2 - 302 - 152116 + 211 + 400785 @@ -9325,12 +9369,12 @@ 1 2 - 2425714 + 7609082 2 - 183 - 82744 + 57 + 222333 @@ -9346,12 +9390,12 @@ 1 2 - 2356342 + 7430629 2 - 302 - 152116 + 211 + 400785 @@ -9367,27 +9411,32 @@ 1 2 - 124952 + 517803 2 3 - 21104 + 87763 3 4 - 10447 + 87763 4 - 8 - 14835 + 7 + 73136 - 8 - 9650 - 11283 + 7 + 41 + 64359 + + + 43 + 1685 + 17552 @@ -9403,27 +9452,32 @@ 1 2 - 130385 + 523654 2 3 - 17969 + 87763 3 - 5 - 16716 + 4 + 87763 - 5 - 20 - 13790 + 4 + 7 + 67285 - 22 - 8913 - 3761 + 7 + 40 + 64359 + + + 41 + 1407 + 17552 @@ -9439,17 +9493,17 @@ 1 2 - 154205 + 728435 2 - 3 - 18596 + 4 + 76061 - 3 - 679 - 9820 + 4 + 345 + 43881 @@ -9465,47 +9519,42 @@ 1 2 - 115132 + 798646 2 3 - 25074 + 131645 3 4 - 20477 + 143346 4 5 - 15253 + 76061 5 - 6 - 12328 - - - 6 - 8 - 18387 + 7 + 108241 - 8 - 14 - 19641 + 7 + 12 + 117017 - 14 - 93 - 18805 + 12 + 68 + 114092 - 95 - 1772 - 4179 + 68 + 258 + 26329 @@ -9521,47 +9570,42 @@ 1 2 - 115132 + 798646 2 3 - 25074 + 131645 3 4 - 20477 + 143346 4 5 - 15253 + 76061 5 - 6 - 12328 - - - 6 - 8 - 18387 + 7 + 108241 - 8 - 14 - 19641 + 7 + 12 + 117017 - 14 - 93 - 18805 + 12 + 68 + 114092 - 95 - 1772 - 4179 + 68 + 258 + 26329 @@ -9577,27 +9621,22 @@ 1 2 - 165280 + 1102892 2 3 - 39909 + 172601 3 4 - 20895 + 134570 4 - 7 - 18805 - - - 7 - 27 - 4387 + 16 + 105316 @@ -9607,15 +9646,15 @@ fieldsKotlinType - 2667261 + 2709722 id - 2667261 + 2709722 kttypeid - 208 + 212 @@ -9629,7 +9668,7 @@ 1 2 - 2667261 + 2709722 @@ -9643,9 +9682,9 @@ 12 - 12765 - 12766 - 208 + 12767 + 12768 + 212 @@ -9655,31 +9694,31 @@ constrs - 1103682 + 3016133 id - 1103682 + 3016133 nodeName - 597980 + 1512455 signature - 938261 + 2919593 typeid - 524 + 2925 parentid - 777558 + 1594367 sourceid - 788044 + 2688483 @@ -9693,7 +9732,7 @@ 1 2 - 1103682 + 3016133 @@ -9709,7 +9748,7 @@ 1 2 - 1103682 + 3016133 @@ -9725,7 +9764,7 @@ 1 2 - 1103682 + 3016133 @@ -9741,7 +9780,7 @@ 1 2 - 1103682 + 3016133 @@ -9757,7 +9796,7 @@ 1 2 - 1103682 + 3016133 @@ -9773,27 +9812,27 @@ 1 2 - 363874 + 863006 2 3 - 145759 + 348127 3 4 - 38274 + 93614 4 - 12 - 45615 + 5 + 111166 - 12 - 36 - 4456 + 5 + 19 + 96539 @@ -9809,22 +9848,27 @@ 1 2 - 412373 + 880558 2 3 - 116397 + 345202 3 - 5 - 49285 + 4 + 90688 - 5 + 4 + 6 + 137495 + + + 6 19 - 19923 + 58508 @@ -9840,7 +9884,7 @@ 1 2 - 597980 + 1512455 @@ -9856,17 +9900,12 @@ 1 2 - 520120 + 1468573 2 - 3 - 54528 - - - 3 - 36 - 23332 + 7 + 43881 @@ -9882,22 +9921,27 @@ 1 2 - 379603 + 877633 2 3 - 145497 + 345202 3 - 5 - 51120 + 4 + 93614 - 5 - 32 - 21759 + 4 + 6 + 134570 + + + 6 + 19 + 61434 @@ -9913,12 +9957,12 @@ 1 2 - 869575 + 2866935 2 - 36 - 68685 + 7 + 52658 @@ -9934,7 +9978,7 @@ 1 2 - 938261 + 2919593 @@ -9950,7 +9994,7 @@ 1 2 - 938261 + 2919593 @@ -9966,12 +10010,12 @@ 1 2 - 869575 + 2866935 2 - 36 - 68685 + 7 + 52658 @@ -9987,12 +10031,12 @@ 1 2 - 891597 + 2887414 2 - 23 - 46664 + 4 + 32179 @@ -10006,14 +10050,9 @@ 12 - 22 - 23 - 262 - - - 4188 - 4189 - 262 + 1031 + 1032 + 2925 @@ -10027,14 +10066,9 @@ 12 - 1 - 2 - 262 - - - 2280 - 2281 - 262 + 517 + 518 + 2925 @@ -10048,14 +10082,9 @@ 12 - 1 - 2 - 262 - - - 3578 - 3579 - 262 + 998 + 999 + 2925 @@ -10069,14 +10098,9 @@ 12 - 22 - 23 - 262 - - - 2944 - 2945 - 262 + 545 + 546 + 2925 @@ -10090,14 +10114,9 @@ 12 - 22 - 23 - 262 - - - 2984 - 2985 - 262 + 919 + 920 + 2925 @@ -10113,22 +10132,27 @@ 1 2 - 588281 + 947844 2 3 - 120068 + 359829 3 + 4 + 87763 + + + 4 6 - 61869 + 137495 6 19 - 7340 + 61434 @@ -10144,7 +10168,7 @@ 1 2 - 777558 + 1594367 @@ -10160,22 +10184,27 @@ 1 2 - 588281 + 947844 2 3 - 120068 + 359829 3 + 4 + 87763 + + + 4 6 - 61869 + 137495 6 19 - 7340 + 61434 @@ -10191,7 +10220,7 @@ 1 2 - 777558 + 1594367 @@ -10207,22 +10236,27 @@ 1 2 - 588281 + 947844 2 3 - 120068 + 359829 3 + 4 + 87763 + + + 4 6 - 61869 + 137495 6 19 - 7340 + 61434 @@ -10238,12 +10272,12 @@ 1 2 - 737710 + 2589018 2 - 219 - 50334 + 53 + 99465 @@ -10259,12 +10293,12 @@ 1 2 - 737710 + 2589018 2 - 178 - 50334 + 49 + 99465 @@ -10280,12 +10314,12 @@ 1 2 - 737710 + 2589018 2 - 178 - 50334 + 49 + 99465 @@ -10301,7 +10335,7 @@ 1 2 - 788044 + 2688483 @@ -10317,12 +10351,12 @@ 1 2 - 737710 + 2589018 2 - 219 - 50334 + 53 + 99465 @@ -10332,15 +10366,15 @@ constrsKotlinType - 1103682 + 1126860 id - 1103682 + 1126860 kttypeid - 262 + 264 @@ -10354,7 +10388,7 @@ 1 2 - 1103682 + 1126860 @@ -10368,9 +10402,9 @@ 12 - 4210 - 4211 - 262 + 4260 + 4261 + 264 @@ -10380,31 +10414,31 @@ methods - 15113893 + 38724113 id - 15113893 + 38724113 nodeName - 3165025 + 15305927 signature - 4608463 + 20940334 typeid - 1843228 + 3867438 parentid - 1782931 + 3607073 sourceid - 9250220 + 33645541 @@ -10418,7 +10452,7 @@ 1 2 - 15113893 + 38724113 @@ -10434,7 +10468,7 @@ 1 2 - 15113893 + 38724113 @@ -10450,7 +10484,7 @@ 1 2 - 15113893 + 38724113 @@ -10466,7 +10500,7 @@ 1 2 - 15113893 + 38724113 @@ -10482,7 +10516,7 @@ 1 2 - 15113893 + 38724113 @@ -10498,32 +10532,22 @@ 1 2 - 1845587 + 10323894 2 3 - 561540 + 2553913 3 - 4 - 218114 - - - 4 - 7 - 277624 - - - 7 - 61 - 238038 + 5 + 1366182 - 61 - 1769 - 24118 + 5 + 297 + 1061936 @@ -10539,17 +10563,17 @@ 1 2 - 2647264 + 12842703 2 3 - 306986 + 1647025 3 - 308 - 210774 + 100 + 816199 @@ -10565,22 +10589,17 @@ 1 2 - 2651983 + 13772994 2 - 3 - 257176 - - - 3 - 25 - 238300 + 5 + 1164327 - 25 - 752 - 17564 + 5 + 217 + 368606 @@ -10596,27 +10615,22 @@ 1 2 - 1943110 + 11298068 2 3 - 536111 + 1962973 3 - 4 - 207628 - - - 4 - 7 - 249311 + 5 + 1187730 - 7 - 1120 - 228863 + 5 + 297 + 857155 @@ -10632,27 +10646,22 @@ 1 2 - 1905621 + 10458465 2 3 - 589067 + 2603645 3 - 4 - 213396 - - - 4 - 7 - 254292 + 5 + 1240388 - 7 - 811 - 202647 + 5 + 267 + 1003427 @@ -10668,27 +10677,22 @@ 1 2 - 3143266 + 16473180 2 3 - 751080 + 2533435 3 - 5 - 358893 - - - 5 - 152 - 345785 + 9 + 1623621 - 155 - 1117 - 9437 + 9 + 297 + 310097 @@ -10704,7 +10708,7 @@ 1 2 - 4608463 + 20940334 @@ -10720,17 +10724,12 @@ 1 2 - 4140250 + 19565375 2 - 5 - 362301 - - - 5 - 750 - 105911 + 217 + 1374959 @@ -10746,27 +10745,22 @@ 1 2 - 3144052 + 16473180 2 3 - 750818 + 2533435 3 - 5 - 358369 - - - 5 - 152 - 345785 + 9 + 1623621 - 155 - 1117 - 9437 + 9 + 297 + 310097 @@ -10782,22 +10776,22 @@ 1 2 - 3232137 + 16642855 2 3 - 780704 + 2559764 3 - 6 - 397692 + 10 + 1573889 - 6 - 806 - 197928 + 10 + 267 + 163824 @@ -10813,32 +10807,32 @@ 1 2 - 915453 + 2047811 2 3 - 377244 + 769392 3 4 - 167256 + 260364 4 - 6 - 153099 + 7 + 315948 - 6 - 15 - 140254 + 7 + 22 + 295469 - 15 - 10397 - 89919 + 22 + 3081 + 178452 @@ -10854,22 +10848,27 @@ 1 2 - 1203826 + 2375461 2 3 - 363612 + 740137 3 6 - 160964 + 342277 6 - 2934 - 114824 + 19 + 292544 + + + 19 + 1469 + 117017 @@ -10885,22 +10884,27 @@ 1 2 - 1183115 + 2299399 2 3 - 361514 + 743062 3 6 - 165945 + 351053 6 - 4201 - 132651 + 15 + 292544 + + + 15 + 1842 + 181377 @@ -10916,27 +10920,27 @@ 1 2 - 1068028 + 2381312 2 3 - 396119 + 813273 3 4 - 153886 + 257439 4 - 8 - 146283 + 10 + 304246 - 8 - 2901 - 78909 + 10 + 672 + 111166 @@ -10952,32 +10956,32 @@ 1 2 - 992265 + 2062438 2 3 - 349717 + 778168 3 4 - 151789 + 257439 4 - 6 - 149167 + 7 + 304246 - 6 - 16 - 140254 + 7 + 23 + 318873 - 16 - 6502 - 60034 + 23 + 2847 + 146272 @@ -10993,52 +10997,52 @@ 1 2 - 511993 + 1372033 2 3 - 206055 + 157974 3 4 - 160964 + 318873 4 - 5 - 100930 + 6 + 277917 - 5 - 7 - 139992 + 6 + 9 + 266215 - 7 - 10 - 153099 + 9 + 11 + 295469 - 10 - 13 - 159915 + 11 + 18 + 298395 - 13 - 21 - 162013 + 18 + 30 + 277917 - 21 - 40 - 140778 + 30 + 69 + 272066 - 40 - 319 - 47188 + 69 + 409 + 70210 @@ -11054,52 +11058,52 @@ 1 2 - 518547 + 1389586 2 3 - 206317 + 152123 3 4 - 170140 + 345202 4 - 5 - 108533 - - - 5 - 7 - 131865 + 6 + 277917 - 7 - 10 - 163324 + 6 + 9 + 283768 - 10 - 13 - 153886 + 9 + 11 + 298395 - 13 + 11 18 - 116397 + 298395 18 - 27 - 136846 + 29 + 286693 - 27 - 290 - 77074 + 29 + 291 + 272066 + + + 390 + 391 + 2925 @@ -11115,52 +11119,52 @@ 1 2 - 511993 + 1372033 2 3 - 206055 + 157974 3 4 - 160964 + 318873 4 - 5 - 100930 + 6 + 277917 - 5 - 7 - 139992 + 6 + 9 + 266215 - 7 - 10 - 153099 + 9 + 11 + 295469 - 10 - 13 - 159915 + 11 + 18 + 298395 - 13 - 21 - 162013 + 18 + 30 + 277917 - 21 - 40 - 140778 + 30 + 69 + 272066 - 40 - 319 - 47188 + 69 + 409 + 70210 @@ -11176,52 +11180,47 @@ 1 2 - 611613 + 1494902 2 3 - 246690 + 295469 3 4 - 198453 + 380307 4 5 - 126621 + 213557 5 6 - 102503 + 213557 6 7 - 77074 + 304246 7 - 8 - 122951 - - - 8 - 11 - 160178 + 9 + 248662 - 11 - 35 - 133962 + 9 + 13 + 301320 - 37 - 78 - 2883 + 13 + 41 + 155048 @@ -11237,52 +11236,52 @@ 1 2 - 511993 + 1372033 2 3 - 206055 + 157974 3 4 - 160964 + 318873 4 - 5 - 100930 + 6 + 277917 - 5 - 7 - 139992 + 6 + 9 + 266215 - 7 - 10 - 153099 + 9 + 11 + 295469 - 10 - 13 - 159915 + 11 + 18 + 298395 - 13 - 21 - 162013 + 18 + 30 + 277917 - 21 - 40 - 140778 + 30 + 69 + 272066 - 40 - 319 - 47188 + 69 + 409 + 70210 @@ -11298,17 +11297,12 @@ 1 2 - 8524569 + 32343718 2 - 50 - 695241 - - - 52 - 296 - 30410 + 100 + 1301822 @@ -11324,7 +11318,7 @@ 1 2 - 9250220 + 33645541 @@ -11340,12 +11334,12 @@ 1 2 - 9204343 + 33578256 2 - 294 - 45877 + 99 + 67285 @@ -11361,12 +11355,12 @@ 1 2 - 8968401 + 33156992 2 - 219 - 281819 + 53 + 488549 @@ -11382,17 +11376,12 @@ 1 2 - 8524569 + 32343718 2 - 50 - 695241 - - - 52 - 296 - 30410 + 100 + 1301822 @@ -11402,15 +11391,15 @@ methodsKotlinType - 15113893 + 15270811 id - 15113893 + 15270811 kttypeid - 262 + 264 @@ -11424,7 +11413,7 @@ 1 2 - 15113893 + 15270811 @@ -11438,9 +11427,9 @@ 12 - 57652 - 57653 - 262 + 57730 + 57731 + 264 @@ -11450,27 +11439,27 @@ params - 16587479 + 41491584 id - 16587479 + 41491584 typeid - 1772707 + 3662656 pos - 5767 + 58508 parentid - 8942448 + 24883834 sourceid - 10111931 + 37787971 @@ -11484,7 +11473,7 @@ 1 2 - 16587479 + 41491584 @@ -11500,7 +11489,7 @@ 1 2 - 16587479 + 41491584 @@ -11516,7 +11505,7 @@ 1 2 - 16587479 + 41491584 @@ -11532,7 +11521,7 @@ 1 2 - 16587479 + 41491584 @@ -11548,37 +11537,37 @@ 1 2 - 935901 + 1752341 2 3 - 269759 + 547058 3 4 - 130816 + 280842 4 - 6 - 158080 + 5 + 257439 - 6 - 12 - 138943 + 5 + 9 + 324724 - 12 - 326 - 133438 + 9 + 18 + 280842 - 343 - 6748 - 5767 + 18 + 3026 + 219408 @@ -11594,22 +11583,22 @@ 1 2 - 1442651 + 2706036 2 3 - 185345 + 506101 3 - 9 - 136321 + 5 + 307171 - 9 - 17 - 8389 + 5 + 15 + 143346 @@ -11625,32 +11614,37 @@ 1 2 - 968933 + 1913240 2 3 - 262943 + 494400 3 4 - 134486 + 272066 4 - 6 - 149691 + 5 + 236961 - 6 - 13 - 137894 + 5 + 9 + 283768 - 13 - 4336 - 118757 + 9 + 21 + 280842 + + + 21 + 2094 + 181377 @@ -11666,32 +11660,37 @@ 1 2 - 998032 + 1778670 2 3 - 248787 + 582163 3 4 - 136846 + 283768 4 6 - 153362 + 324724 6 - 13 - 137894 + 11 + 310097 - 13 - 5757 - 97784 + 11 + 39 + 274991 + + + 40 + 2921 + 108241 @@ -11707,57 +11706,87 @@ 1 2 - 524 + 5850 - 50 - 53 - 524 + 2 + 3 + 5850 - 104 - 106 - 524 + 3 + 4 + 5850 + + + 5 + 6 + 2925 + + + 7 + 8 + 2925 + + + 11 + 12 + 2925 + + + 15 + 16 + 2925 + + + 22 + 23 + 2925 + + + 34 + 35 + 2925 - 157 - 165 - 524 + 50 + 51 + 2925 - 214 - 231 - 524 + 78 + 79 + 2925 - 291 - 315 - 524 + 128 + 129 + 2925 - 485 - 606 - 524 + 215 + 216 + 2925 - 804 - 1067 - 524 + 567 + 568 + 2925 - 1445 - 2015 - 524 + 1284 + 1285 + 2925 - 3087 - 5218 - 524 + 3249 + 3250 + 2925 - 12756 - 34112 - 524 + 8506 + 8507 + 2925 @@ -11773,57 +11802,82 @@ 1 2 - 524 + 5850 2 - 5 - 524 + 3 + 5850 - 6 - 7 - 524 + 3 + 4 + 5850 - 11 - 14 - 524 + 5 + 6 + 5850 - 15 - 20 - 524 + 8 + 9 + 2925 - 27 - 37 - 524 + 9 + 10 + 2925 - 57 - 75 - 524 + 14 + 15 + 2925 - 97 - 153 - 524 + 20 + 21 + 2925 - 201 - 289 - 524 + 26 + 27 + 2925 - 406 - 789 - 524 + 28 + 29 + 2925 + + + 42 + 43 + 2925 + + + 70 + 71 + 2925 + + + 109 + 110 + 2925 - 1997 - 5152 - 524 + 208 + 209 + 2925 + + + 450 + 451 + 2925 + + + 964 + 965 + 2925 @@ -11839,57 +11893,87 @@ 1 2 - 524 + 5850 - 50 - 53 - 524 + 2 + 3 + 5850 - 104 - 106 - 524 + 3 + 4 + 5850 + + + 5 + 6 + 2925 + + + 7 + 8 + 2925 + + + 11 + 12 + 2925 + + + 15 + 16 + 2925 + + + 22 + 23 + 2925 + + + 34 + 35 + 2925 - 157 - 165 - 524 + 50 + 51 + 2925 - 214 - 231 - 524 + 78 + 79 + 2925 - 291 - 315 - 524 + 128 + 129 + 2925 - 485 - 606 - 524 + 215 + 216 + 2925 - 804 - 1067 - 524 + 567 + 568 + 2925 - 1445 - 2015 - 524 + 1284 + 1285 + 2925 - 3087 - 5218 - 524 + 3249 + 3250 + 2925 - 12756 - 34112 - 524 + 8506 + 8507 + 2925 @@ -11905,57 +11989,87 @@ 1 2 - 524 + 5850 2 - 5 - 524 + 3 + 5850 - 6 + 3 + 4 + 5850 + + + 5 + 6 + 2925 + + + 7 8 - 524 + 2925 11 - 15 - 524 + 12 + 2925 - 16 - 29 - 524 + 15 + 16 + 2925 - 39 - 63 - 524 + 22 + 23 + 2925 - 101 - 144 - 524 + 34 + 35 + 2925 - 210 - 386 - 524 + 50 + 51 + 2925 + + + 77 + 78 + 2925 + + + 127 + 128 + 2925 - 628 - 1069 - 524 + 212 + 213 + 2925 + + + 558 + 559 + 2925 + + + 1247 + 1248 + 2925 - 1958 - 3765 - 524 + 2999 + 3000 + 2925 - 8596 - 21529 - 524 + 7541 + 7542 + 2925 @@ -11971,27 +12085,22 @@ 1 2 - 5598369 + 15379063 2 3 - 1976404 + 5748499 3 4 - 558395 + 2097543 4 - 10 - 682133 - - - 10 - 23 - 127146 + 21 + 1658727 @@ -12007,17 +12116,22 @@ 1 2 - 6239868 + 16993909 2 3 - 2032767 + 5748499 3 - 23 - 669811 + 5 + 2003929 + + + 5 + 11 + 137495 @@ -12033,27 +12147,22 @@ 1 2 - 5598369 + 15379063 2 3 - 1976404 + 5748499 3 4 - 558395 + 2097543 4 - 10 - 682133 - - - 10 - 23 - 127146 + 21 + 1658727 @@ -12069,27 +12178,22 @@ 1 2 - 5598369 + 15379063 2 3 - 1976404 + 5748499 3 4 - 558395 + 2097543 4 - 10 - 682133 - - - 10 - 23 - 127146 + 21 + 1658727 @@ -12105,12 +12209,12 @@ 1 2 - 9415117 + 36570986 2 - 296 - 696814 + 100 + 1216985 @@ -12126,12 +12230,12 @@ 1 2 - 9877563 + 37246764 2 - 296 - 234368 + 100 + 541207 @@ -12147,7 +12251,7 @@ 1 2 - 10111931 + 37787971 @@ -12163,12 +12267,12 @@ 1 2 - 9415117 + 36570986 2 - 296 - 696814 + 100 + 1216985 @@ -12178,15 +12282,15 @@ paramsKotlinType - 16587479 + 16773557 id - 16587479 + 16773557 kttypeid - 262 + 264 @@ -12200,7 +12304,7 @@ 1 2 - 16587479 + 16773557 @@ -12214,9 +12318,9 @@ 12 - 63273 - 63274 - 262 + 63411 + 63412 + 264 @@ -12226,15 +12330,15 @@ paramName - 2140514 + 3934150 id - 2140514 + 3934150 nodeName - 319307 + 41443 @@ -12248,7 +12352,7 @@ 1 2 - 2140514 + 3934150 @@ -12264,37 +12368,42 @@ 1 2 - 136321 + 12976 2 3 - 61869 + 9556 3 4 - 34342 + 3218 4 5 - 23332 + 3118 5 - 8 - 24904 + 7 + 3721 - 8 - 19 - 24118 + 7 + 13 + 3118 - 19 - 770 - 14418 + 13 + 42 + 3118 + + + 42 + 19048 + 2615 @@ -12304,30 +12413,30 @@ isVarargsParam - 684318 + 695853 param - 684318 + 695853 exceptions - 1232644 + 3735793 id - 1232644 + 3735793 typeid - 36990 + 187228 parentid - 987367 + 3273572 @@ -12341,7 +12450,7 @@ 1 2 - 1232644 + 3735793 @@ -12357,7 +12466,7 @@ 1 2 - 1232644 + 3735793 @@ -12373,47 +12482,52 @@ 1 2 - 11950 + 43881 2 3 - 3983 + 23403 3 4 - 4552 + 23403 4 - 7 - 2276 + 5 + 14627 - 7 + 5 8 - 2845 + 14627 - 9 - 13 - 3414 + 8 + 11 + 14627 - 20 - 35 - 2845 + 11 + 23 + 14627 - 41 - 93 - 2845 + 23 + 34 + 14627 - 106 - 813 - 2276 + 35 + 65 + 14627 + + + 67 + 556 + 8776 @@ -12429,47 +12543,52 @@ 1 2 - 11950 + 43881 2 3 - 3983 + 23403 3 4 - 4552 + 23403 4 - 7 - 2276 + 5 + 14627 - 7 + 5 8 - 2845 + 14627 - 9 - 13 - 3414 + 8 + 11 + 14627 - 20 - 35 - 2845 + 11 + 23 + 14627 - 41 - 93 - 2845 + 23 + 34 + 14627 - 106 - 813 - 2276 + 35 + 65 + 14627 + + + 67 + 556 + 8776 @@ -12485,17 +12604,17 @@ 1 2 - 755179 + 2913743 2 3 - 224220 + 274991 3 6 - 7967 + 84837 @@ -12511,17 +12630,17 @@ 1 2 - 755179 + 2913743 2 3 - 224220 + 274991 3 6 - 7967 + 84837 @@ -12531,41 +12650,41 @@ isAnnotType - 35103 + 61434 interfaceid - 35103 + 61434 isAnnotElem - 49101 + 58508 methodid - 49101 + 58508 annotValue - 1421553 + 3223840 parentid - 1172586 + 1184805 id2 - 1074 + 58508 value - 1421553 + 3223840 @@ -12579,12 +12698,22 @@ 1 2 - 1135381 + 155048 2 - 18 - 37205 + 3 + 784019 + + + 4 + 5 + 73136 + + + 7 + 8 + 172601 @@ -12600,12 +12729,22 @@ 1 2 - 1133350 + 155048 2 - 20 - 39235 + 3 + 784019 + + + 4 + 5 + 73136 + + + 7 + 8 + 172601 @@ -12617,66 +12756,46 @@ 12 - - - 1 - 2 - 198 - - - 2 - 3 - 95 - - - 3 - 4 - 88 - - - 5 - 8 - 88 - + - 8 - 16 - 88 + 2 + 3 + 2925 - 20 - 25 - 88 + 3 + 4 + 2925 - 34 - 59 - 66 + 6 + 7 + 2925 - 86 - 102 - 80 + 21 + 22 + 5850 - 121 - 185 - 51 + 25 + 26 + 11701 - 203 - 684 - 80 + 59 + 60 + 20478 - 1733 - 1734 - 125 + 64 + 65 + 5850 - 1842 - 153327 - 22 + 204 + 205 + 5850 @@ -12689,65 +12808,45 @@ 12 - - 1 - 2 - 198 - 2 3 - 88 + 2925 3 4 - 88 - - - 4 - 8 - 95 - - - 8 - 16 - 88 - - - 20 - 25 - 88 + 2925 - 34 - 59 - 66 + 6 + 7 + 2925 - 86 - 102 - 80 + 21 + 22 + 5850 - 127 - 185 - 51 + 25 + 26 + 11701 - 203 - 684 - 80 + 59 + 60 + 20478 - 1733 - 1734 - 88 + 64 + 65 + 5850 - 1734 - 153327 - 58 + 204 + 205 + 5850 @@ -12763,7 +12862,7 @@ 1 2 - 1421553 + 3223840 @@ -12779,7 +12878,7 @@ 1 2 - 1421553 + 3223840 @@ -12789,45 +12888,45 @@ isEnumType - 56888 + 149197 classid - 56888 + 149197 isEnumConst - 435967 + 1091190 fieldid - 435967 + 1091190 typeVars - 864332 + 1331077 id - 864332 + 1331077 nodeName - 11797 + 43881 pos - 1048 + 8776 parentid - 612137 + 1117519 @@ -12841,7 +12940,7 @@ 1 2 - 864332 + 1331077 @@ -12857,7 +12956,7 @@ 1 2 - 864332 + 1331077 @@ -12873,7 +12972,7 @@ 1 2 - 864332 + 1331077 @@ -12889,47 +12988,62 @@ 1 2 - 2883 + 11701 2 3 - 1572 + 2925 - 3 - 4 - 1310 + 5 + 6 + 2925 - 4 + 6 7 - 1048 + 2925 - 7 - 10 - 1048 + 10 + 11 + 2925 - 10 - 28 - 1048 + 19 + 20 + 2925 - 36 - 70 - 1048 + 28 + 29 + 2925 - 71 - 412 - 1048 + 37 + 38 + 2925 + + + 49 + 50 + 2925 - 605 - 724 - 786 + 53 + 54 + 2925 + + + 56 + 57 + 2925 + + + 186 + 187 + 2925 @@ -12945,22 +13059,17 @@ 1 2 - 7078 + 23403 2 3 - 3145 + 14627 3 4 - 1310 - - - 4 - 5 - 262 + 5850 @@ -12976,47 +13085,62 @@ 1 2 - 2883 + 11701 2 3 - 1572 + 2925 - 3 - 4 - 1310 + 5 + 6 + 2925 - 4 + 6 7 - 1048 + 2925 - 7 - 10 - 1048 + 10 + 11 + 2925 - 10 - 28 - 1048 + 19 + 20 + 2925 - 36 - 70 - 1048 + 28 + 29 + 2925 - 71 - 412 - 1048 + 37 + 38 + 2925 + + + 49 + 50 + 2925 + + + 53 + 54 + 2925 - 605 - 724 - 786 + 56 + 57 + 2925 + + + 186 + 187 + 2925 @@ -13032,22 +13156,17 @@ 6 7 - 262 - - - 89 - 90 - 262 + 2925 - 867 - 868 - 262 + 67 + 68 + 2925 - 2335 - 2336 - 262 + 382 + 383 + 2925 @@ -13061,24 +13180,19 @@ 12 - 2 - 3 - 262 - - - 13 - 14 - 262 + 4 + 5 + 2925 - 21 - 22 - 262 + 8 + 9 + 2925 - 34 - 35 - 262 + 12 + 13 + 2925 @@ -13094,22 +13208,17 @@ 6 7 - 262 - - - 89 - 90 - 262 + 2925 - 867 - 868 - 262 + 67 + 68 + 2925 - 2335 - 2336 - 262 + 382 + 383 + 2925 @@ -13125,17 +13234,17 @@ 1 2 - 384846 + 921515 2 3 - 203958 + 178452 3 - 5 - 23332 + 4 + 17552 @@ -13151,17 +13260,17 @@ 1 2 - 384846 + 921515 2 3 - 203958 + 178452 3 - 5 - 23332 + 4 + 17552 @@ -13177,17 +13286,17 @@ 1 2 - 384846 + 921515 2 3 - 203958 + 178452 3 - 5 - 23332 + 4 + 17552 @@ -13197,19 +13306,19 @@ wildcards - 458250 + 590939 id - 458250 + 590939 nodeName - 74976 + 152123 kind - 524 + 5850 @@ -13223,7 +13332,7 @@ 1 2 - 458250 + 590939 @@ -13239,7 +13348,7 @@ 1 2 - 458250 + 590939 @@ -13255,22 +13364,32 @@ 1 2 - 56363 + 108241 2 3 - 7340 + 5850 - 3 - 7 - 6029 + 4 + 9 + 11701 - 7 - 170 - 5243 + 11 + 12 + 5850 + + + 12 + 13 + 8776 + + + 13 + 36 + 11701 @@ -13286,7 +13405,7 @@ 1 2 - 74976 + 152123 @@ -13300,14 +13419,9 @@ 12 - 795 - 796 - 262 - - - 953 - 954 - 262 + 101 + 102 + 5850 @@ -13321,14 +13435,14 @@ 12 - 94 - 95 - 262 + 19 + 20 + 2925 - 192 - 193 - 262 + 33 + 34 + 2925 @@ -13338,23 +13452,23 @@ typeBounds - 581989 + 827900 id - 581989 + 827900 typeid - 392449 + 547058 pos - 262 + 2925 parentid - 581989 + 827900 @@ -13368,7 +13482,7 @@ 1 2 - 581989 + 827900 @@ -13384,7 +13498,7 @@ 1 2 - 581989 + 827900 @@ -13400,7 +13514,7 @@ 1 2 - 581989 + 827900 @@ -13416,17 +13530,17 @@ 1 2 - 288635 + 392009 2 3 - 94900 + 137495 3 - 52 - 8913 + 30 + 17552 @@ -13442,7 +13556,7 @@ 1 2 - 392449 + 547058 @@ -13458,17 +13572,17 @@ 1 2 - 288635 + 392009 2 3 - 94900 + 137495 3 - 52 - 8913 + 30 + 17552 @@ -13482,9 +13596,9 @@ 12 - 2220 - 2221 - 262 + 283 + 284 + 2925 @@ -13498,9 +13612,9 @@ 12 - 1497 - 1498 - 262 + 187 + 188 + 2925 @@ -13514,9 +13628,9 @@ 12 - 2220 - 2221 - 262 + 283 + 284 + 2925 @@ -13532,7 +13646,7 @@ 1 2 - 581989 + 827900 @@ -13548,7 +13662,7 @@ 1 2 - 581989 + 827900 @@ -13564,7 +13678,7 @@ 1 2 - 581989 + 827900 @@ -13574,19 +13688,19 @@ typeArgs - 53854237 + 54764697 argumentid - 1430551 + 1454742 pos - 57 + 58 parentid - 22244248 + 22620310 @@ -13600,17 +13714,17 @@ 1 2 - 865848 + 880486 2 3 - 470615 + 478577 3 11 - 94087 + 95677 @@ -13626,57 +13740,57 @@ 1 2 - 64071 + 65160 2 3 - 433698 + 441030 3 5 - 100595 + 102296 5 6 - 35547 + 36148 6 7 - 201249 + 204651 7 11 - 39437 + 40103 11 12 - 218178 + 221867 12 15 - 111421 + 113305 15 29 - 108138 + 109966 29 341 - 107450 + 109267 341 757580 - 10762 + 10944 @@ -13730,13 +13844,13 @@ 5 - 142042 - 142043 + 142043 + 142044 5 - 161580 - 161581 + 161581 + 161582 5 @@ -13791,13 +13905,13 @@ 5 - 3800219 - 3800220 + 3800220 + 3800221 5 - 3848466 - 3848467 + 3848467 + 3848468 5 @@ -13814,22 +13928,22 @@ 1 2 - 296162 + 301169 2 3 - 13666793 + 13897847 3 4 - 7750153 + 7881175 4 11 - 531138 + 540117 @@ -13845,22 +13959,22 @@ 1 2 - 278869 + 283583 2 3 - 13599976 + 13829900 3 4 - 7768574 + 7899907 4 11 - 596828 + 606918 @@ -13870,37 +13984,37 @@ isParameterized - 22244248 + 22620310 memberid - 22244248 + 22620310 isRaw - 100406 + 251588 memberid - 100406 + 251588 isAnonymClass - 157916 + 162493 classid - 157916 + 162493 parent - 157916 + 162493 @@ -13914,7 +14028,7 @@ 1 2 - 157916 + 162493 @@ -13930,7 +14044,7 @@ 1 2 - 157916 + 162493 @@ -13940,15 +14054,15 @@ isLocalClassOrInterface - 3532 + 3483 typeid - 3532 + 3483 parent - 3532 + 3483 @@ -13962,7 +14076,7 @@ 1 2 - 3532 + 3483 @@ -13978,7 +14092,7 @@ 1 2 - 3532 + 3483 @@ -13986,28 +14100,39 @@ + + isImplicitClass + 4 + + + classid + 4 + + + + isDefConstr - 139376 + 99109 constructorid - 139376 + 99109 lambdaKind - 152268 + 157421 exprId - 152268 + 157421 bodyKind - 12 + 11 @@ -14021,7 +14146,7 @@ 1 2 - 152268 + 157421 @@ -14035,9 +14160,9 @@ 12 - 12267 - 12268 - 12 + 13842 + 13843 + 11 @@ -14045,29 +14170,40 @@ + + isCanonicalConstr + 845 + + + constructorid + 845 + + + + arrays - 190588 + 608492 id - 190588 + 608492 nodeName - 115349 + 465145 elementtypeid - 189277 + 599716 dimension - 524 + 5850 componenttypeid - 190588 + 608492 @@ -14081,7 +14217,7 @@ 1 2 - 190588 + 608492 @@ -14097,7 +14233,7 @@ 1 2 - 190588 + 608492 @@ -14113,7 +14249,7 @@ 1 2 - 190588 + 608492 @@ -14129,7 +14265,7 @@ 1 2 - 190588 + 608492 @@ -14145,17 +14281,12 @@ 1 2 - 92279 + 430040 2 - 3 - 19137 - - - 3 - 87 - 3932 + 26 + 35105 @@ -14171,17 +14302,12 @@ 1 2 - 92279 + 430040 2 - 3 - 19137 - - - 3 - 87 - 3932 + 26 + 35105 @@ -14197,7 +14323,7 @@ 1 2 - 115349 + 465145 @@ -14212,18 +14338,13 @@ 1 - 2 - 92279 - - - 2 - 3 - 19137 + 2 + 430040 - 3 - 87 - 3932 + 2 + 26 + 35105 @@ -14239,12 +14360,12 @@ 1 2 - 187966 + 590939 2 3 - 1310 + 8776 @@ -14260,12 +14381,12 @@ 1 2 - 187966 + 590939 2 3 - 1310 + 8776 @@ -14281,12 +14402,12 @@ 1 2 - 187966 + 590939 2 3 - 1310 + 8776 @@ -14302,12 +14423,12 @@ 1 2 - 187966 + 590939 2 3 - 1310 + 8776 @@ -14321,14 +14442,14 @@ 12 - 5 - 6 - 262 + 3 + 4 + 2925 - 722 - 723 - 262 + 205 + 206 + 2925 @@ -14342,14 +14463,14 @@ 12 - 5 - 6 - 262 + 3 + 4 + 2925 - 435 - 436 - 262 + 156 + 157 + 2925 @@ -14363,14 +14484,14 @@ 12 - 5 - 6 - 262 + 3 + 4 + 2925 - 722 - 723 - 262 + 205 + 206 + 2925 @@ -14384,14 +14505,14 @@ 12 - 5 - 6 - 262 + 3 + 4 + 2925 - 722 - 723 - 262 + 205 + 206 + 2925 @@ -14407,7 +14528,7 @@ 1 2 - 190588 + 608492 @@ -14423,7 +14544,7 @@ 1 2 - 190588 + 608492 @@ -14439,7 +14560,7 @@ 1 2 - 190588 + 608492 @@ -14455,7 +14576,7 @@ 1 2 - 190588 + 608492 @@ -14465,15 +14586,15 @@ enclInReftype - 564162 + 1146774 child - 564162 + 1146774 parent - 156245 + 327649 @@ -14487,7 +14608,7 @@ 1 2 - 564162 + 1146774 @@ -14503,32 +14624,32 @@ 1 2 - 92803 + 166750 2 3 - 24642 + 78987 3 4 - 11797 + 20478 4 - 7 - 14418 + 6 + 26329 - 7 - 55 - 11797 + 6 + 23 + 29254 - 55 - 265 - 786 + 35 + 67 + 5850 @@ -14538,15 +14659,15 @@ extendsReftype - 27274828 + 27735936 id1 - 22257941 + 22634234 id2 - 17181115 + 17471575 @@ -14560,12 +14681,12 @@ 1 2 - 20991189 + 21346068 2 6 - 1266751 + 1288166 @@ -14581,17 +14702,17 @@ 1 2 - 13982285 + 14218666 2 3 - 1947557 + 1980482 3 - 937651 - 1251272 + 937652 + 1272426 @@ -14601,15 +14722,15 @@ implInterface - 3052545 + 4771400 id1 - 757262 + 2278921 id2 - 2275463 + 854229 @@ -14623,37 +14744,27 @@ 1 2 - 210026 + 769392 2 3 - 50055 + 991725 3 4 - 67412 + 55583 4 5 - 62038 + 459294 5 6 - 19332 - - - 6 - 7 - 305928 - - - 7 - 10 - 42469 + 2925 @@ -14669,12 +14780,22 @@ 1 2 - 2200047 + 687479 2 - 63705 - 75416 + 3 + 93614 + + + 3 + 134 + 64359 + + + 136 + 509 + 8776 @@ -14684,15 +14805,15 @@ permits - 3703 + 37356 id1 - 1075 + 18659 id2 - 3703 + 135 @@ -14706,27 +14827,17 @@ 1 2 - 358 + 12 2 3 - 358 + 18634 3 - 4 - 119 - - - 9 10 - 119 - - - 10 - 11 - 119 + 12 @@ -14742,7 +14853,12 @@ 1 2 - 3703 + 123 + + + 3014 + 3015 + 12 @@ -14752,15 +14868,15 @@ hasModifier - 48527772 + 97268116 id1 - 24369293 + 56847244 id2 - 63 + 32179 @@ -14774,17 +14890,17 @@ 1 2 - 356153 + 24117367 2 3 - 23867801 + 25038882 3 4 - 145338 + 7690994 @@ -14798,59 +14914,54 @@ 12 - 22 - 23 - 5 - - - 27 - 28 - 5 + 9 + 10 + 5850 - 100 - 101 - 5 + 17 + 18 + 2925 - 262 - 263 - 5 + 201 + 202 + 2925 - 712 - 713 - 5 + 212 + 213 + 2925 - 1374 - 1375 - 5 + 470 + 471 + 2925 - 11041 - 11042 - 5 + 756 + 757 + 2925 - 63640 - 63641 - 5 + 4486 + 4487 + 2925 - 242567 - 242568 - 5 + 4669 + 4670 + 2925 - 3864462 - 3864463 - 5 + 4793 + 4794 + 2925 - 4211558 - 4211559 - 5 + 17627 + 17628 + 2925 @@ -14860,23 +14971,23 @@ imports - 356137 + 525435 id - 356137 + 525435 holder - 54477 + 31483 name - 8004 + 45 kind - 358 + 45 @@ -14890,7 +15001,7 @@ 1 2 - 356137 + 525435 @@ -14906,7 +15017,7 @@ 1 2 - 356137 + 525435 @@ -14922,7 +15033,7 @@ 1 2 - 356137 + 525435 @@ -14937,38 +15048,33 @@ 1 - 2 - 24730 - - - 2 3 - 8960 + 454 3 4 - 5017 + 20564 - 4 - 6 - 4420 + 6 + 7 + 3503 - 6 - 10 - 4181 + 9 + 13 + 2911 - 10 - 30 - 4181 + 13 + 88 + 2502 - 31 - 113 - 2986 + 90 + 554 + 1546 @@ -14984,12 +15090,7 @@ 1 2 - 51132 - - - 2 - 8 - 3345 + 31483 @@ -15005,12 +15106,7 @@ 1 2 - 51610 - - - 2 - 3 - 2867 + 31483 @@ -15024,34 +15120,9 @@ 12 - 1 - 2 - 3584 - - - 2 - 3 - 1792 - - - 3 - 4 - 836 - - - 4 - 9 - 716 - - - 9 - 32 - 716 - - - 45 - 2676 - 358 + 11549 + 11550 + 45 @@ -15065,19 +15136,9 @@ 12 - 1 - 2 - 7048 - - - 2 - 3 - 716 - - - 3 - 442 - 238 + 692 + 693 + 45 @@ -15093,12 +15154,7 @@ 1 2 - 7884 - - - 2 - 3 - 119 + 45 @@ -15112,19 +15168,9 @@ 12 - 13 - 14 - 119 - - - 306 - 307 - 119 - - - 2662 - 2663 - 119 + 11549 + 11550 + 45 @@ -15138,19 +15184,9 @@ 12 - 5 - 6 - 119 - - - 39 - 40 - 119 - - - 436 - 437 - 119 + 692 + 693 + 45 @@ -15166,12 +15202,7 @@ 1 2 - 238 - - - 66 - 67 - 119 + 45 @@ -15181,27 +15212,27 @@ stmts - 2441387 + 2482660 id - 2441387 + 2482660 kind - 9674 + 9838 parent - 1353860 + 1376748 idx - 15934 + 16203 bodydecl - 367630 + 373845 @@ -15215,7 +15246,7 @@ 1 2 - 2441387 + 2482660 @@ -15231,7 +15262,7 @@ 1 2 - 2441387 + 2482660 @@ -15247,7 +15278,7 @@ 1 2 - 2441387 + 2482660 @@ -15263,7 +15294,7 @@ 1 2 - 2441387 + 2482660 @@ -15279,77 +15310,77 @@ 1 2 - 1707 + 1736 6 7 - 569 + 578 7 8 - 569 + 578 17 18 - 569 + 578 20 21 - 569 + 578 23 24 - 569 + 578 33 34 - 569 + 578 83 84 - 569 + 578 91 92 - 569 + 578 97 98 - 569 + 578 265 266 - 569 + 578 312 313 - 569 + 578 560 561 - 569 + 578 1243 1244 - 569 + 578 1530 1531 - 569 + 578 @@ -15365,72 +15396,72 @@ 1 2 - 2276 + 2314 7 8 - 569 + 578 12 13 - 569 + 578 17 18 - 569 + 578 21 22 - 569 + 578 33 34 - 569 + 578 71 72 - 569 + 578 81 82 - 569 + 578 91 92 - 569 + 578 246 247 - 569 + 578 265 266 - 569 + 578 271 272 - 569 + 578 716 717 - 569 + 578 1192 1193 - 569 + 578 @@ -15446,57 +15477,57 @@ 1 2 - 2276 + 2314 3 4 - 569 + 578 4 5 - 569 + 578 6 7 - 1138 + 1157 7 8 - 569 + 578 8 9 - 1138 + 1157 10 11 - 1138 + 1157 13 14 - 569 + 578 17 18 - 569 + 578 21 22 - 569 + 578 26 27 - 569 + 578 @@ -15512,67 +15543,67 @@ 1 2 - 2276 + 2314 7 8 - 1138 + 1157 17 18 - 569 + 578 20 21 - 569 + 578 21 22 - 569 + 578 53 54 - 569 + 578 54 55 - 569 + 578 91 92 - 569 + 578 119 120 - 569 + 578 179 180 - 569 + 578 211 212 - 569 + 578 431 432 - 569 + 578 646 647 - 569 + 578 @@ -15588,22 +15619,22 @@ 1 2 - 989074 + 1005795 2 3 - 191782 + 195024 3 6 - 107557 + 109375 6 27 - 65445 + 66551 @@ -15619,17 +15650,17 @@ 1 2 - 1081267 + 1099546 2 3 - 194058 + 197339 3 6 - 78534 + 79861 @@ -15645,22 +15676,22 @@ 1 2 - 989074 + 1005795 2 3 - 191782 + 195024 3 6 - 107557 + 109375 6 27 - 65445 + 66551 @@ -15676,7 +15707,7 @@ 1 2 - 1353860 + 1376748 @@ -15692,67 +15723,67 @@ 3 5 - 1138 + 1157 5 6 - 1138 + 1157 6 7 - 2276 + 2314 10 15 - 1138 + 1157 15 16 - 1138 + 1157 17 20 - 1138 + 1157 24 32 - 1138 + 1157 40 43 - 1138 + 1157 55 72 - 1138 + 1157 83 94 - 1138 + 1157 115 160 - 1138 + 1157 204 386 - 1138 + 1157 939 1919 - 1138 + 1157 @@ -15768,47 +15799,47 @@ 1 2 - 2276 + 2314 2 3 - 3983 + 4050 3 5 - 1138 + 1157 5 6 - 2276 + 2314 6 7 - 2276 + 2314 7 9 - 1138 + 1157 9 10 - 1138 + 1157 12 14 - 1138 + 1157 16 17 - 569 + 578 @@ -15824,67 +15855,67 @@ 3 5 - 1138 + 1157 5 6 - 1138 + 1157 6 7 - 2276 + 2314 10 15 - 1138 + 1157 15 16 - 1138 + 1157 17 20 - 1138 + 1157 24 32 - 1138 + 1157 40 43 - 1138 + 1157 55 72 - 1138 + 1157 83 94 - 1138 + 1157 115 160 - 1138 + 1157 204 386 - 1138 + 1157 939 1919 - 1138 + 1157 @@ -15900,67 +15931,67 @@ 3 5 - 1138 + 1157 5 6 - 1138 + 1157 6 7 - 2276 + 2314 10 15 - 1138 + 1157 15 16 - 1138 + 1157 17 20 - 1138 + 1157 24 32 - 1138 + 1157 40 43 - 1138 + 1157 54 56 - 1138 + 1157 68 87 - 1138 + 1157 104 138 - 1138 + 1157 167 226 - 1138 + 1157 337 647 - 1138 + 1157 @@ -15976,47 +16007,47 @@ 1 2 - 17641 + 17939 2 3 - 157637 + 160302 3 4 - 38128 + 38773 4 5 - 33576 + 34143 5 7 - 24470 + 24884 7 10 - 29023 + 29514 10 16 - 30730 + 31250 16 34 - 27885 + 28356 34 131 - 8536 + 8680 @@ -16032,32 +16063,32 @@ 1 2 - 17641 + 17939 2 3 - 193489 + 196760 3 4 - 77965 + 79283 4 5 - 29592 + 30092 5 7 - 33007 + 33565 7 11 - 15934 + 16203 @@ -16073,27 +16104,27 @@ 1 2 - 17641 + 17939 2 3 - 261780 + 266206 4 5 - 33576 + 34143 5 10 - 31299 + 31828 10 88 - 23332 + 23727 @@ -16109,37 +16140,37 @@ 1 2 - 175279 + 178242 2 3 - 63737 + 64815 3 4 - 27885 + 28356 4 5 - 18210 + 18518 5 7 - 30161 + 30671 7 11 - 29592 + 30092 11 28 - 22763 + 23148 @@ -16149,27 +16180,27 @@ exprs - 7410663 + 7535946 id - 7410663 + 7535946 kind - 1618 + 203 typeid - 115976 + 44680 parent - 5075638 + 4830350 idx - 1426 + 1604 @@ -16183,7 +16214,7 @@ 1 2 - 7410663 + 7535946 @@ -16199,7 +16230,7 @@ 1 2 - 7410663 + 7535946 @@ -16215,7 +16246,7 @@ 1 2 - 7410663 + 7535946 @@ -16231,7 +16262,7 @@ 1 2 - 7410663 + 7535946 @@ -16246,63 +16277,63 @@ 1 - 3 - 137 + 29 + 18 - 3 - 9 - 137 + 45 + 159 + 18 - 13 - 31 - 137 + 159 + 412 + 18 - 31 - 76 - 137 + 423 + 903 + 18 - 85 - 161 - 109 + 1538 + 2086 + 18 - 186 - 307 - 137 + 2170 + 5511 + 18 - 378 - 492 - 137 + 6292 + 8043 + 18 - 494 - 659 - 137 + 9355 + 15242 + 18 - 708 - 1063 - 137 + 16690 + 29935 + 18 - 1114 - 2997 - 137 + 32849 + 68100 + 18 - 3119 - 9319 - 137 + 74170 + 409104 + 18 - 10083 - 75330 - 137 + 748133 + 748134 + 3 @@ -16318,37 +16349,42 @@ 1 2 - 768 + 66 2 3 - 246 + 18 3 - 6 - 137 + 4 + 18 - 18 - 48 - 137 + 4 + 5 + 27 - 48 - 152 - 137 + 5 + 54 + 18 - 246 - 1578 - 137 + 99 + 303 + 18 + + + 331 + 3462 + 18 - 2399 - 2509 - 54 + 3755 + 11926 + 18 @@ -16363,63 +16399,63 @@ 1 - 3 - 137 + 29 + 18 - 3 - 9 - 137 + 45 + 142 + 15 - 13 - 31 - 137 + 158 + 383 + 18 - 31 - 76 - 137 + 408 + 568 + 18 - 81 - 177 - 137 + 879 + 1933 + 18 - 183 - 357 - 137 + 2085 + 4466 + 18 - 378 - 482 - 137 + 4738 + 6394 + 18 - 572 - 708 - 137 + 7532 + 10892 + 18 - 708 - 1060 - 137 + 11806 + 21746 + 18 - 1102 - 3043 - 137 + 28126 + 48464 + 18 - 5490 - 10002 - 137 + 62759 + 319892 + 18 - 16929 - 60299 - 109 + 405045 + 586179 + 6 @@ -16435,42 +16471,57 @@ 1 2 - 246 + 21 2 3 - 521 + 24 3 4 - 246 + 12 4 - 6 - 137 + 5 + 30 - 6 - 8 - 137 + 5 + 7 + 18 - 8 - 11 - 137 + 7 + 9 + 15 - 12 - 27 - 137 + 9 + 13 + 18 - 46 - 49 - 54 + 13 + 19 + 12 + + + 21 + 57 + 15 + + + 64 + 133 + 18 + + + 179 + 514 + 18 @@ -16486,42 +16537,57 @@ 1 2 - 48881 + 8996 2 3 - 13002 + 6180 3 + 4 + 2069 + + + 4 6 - 10697 + 3734 6 - 10 - 9628 + 8 + 3068 - 10 - 17 - 9271 + 8 + 11 + 3597 - 17 - 32 - 8722 + 11 + 16 + 3685 - 32 - 89 - 8750 + 16 + 25 + 3451 - 89 - 52561 - 7022 + 25 + 45 + 3466 + + + 45 + 106 + 3366 + + + 106 + 462822 + 3062 @@ -16537,32 +16603,37 @@ 1 2 - 57851 + 12971 2 3 - 18543 + 8456 3 4 - 8914 + 5247 4 5 - 14455 + 6247 5 6 - 9737 + 5882 6 - 32 - 6473 + 7 + 2929 + + + 7 + 39 + 2947 @@ -16578,47 +16649,62 @@ 1 2 - 49045 + 9036 2 3 - 13413 + 6201 3 + 4 + 2306 + + + 4 5 - 8668 + 2449 5 - 8 - 8530 + 7 + 3603 - 8 - 13 - 9244 + 7 + 10 + 3819 - 13 - 24 - 8750 + 10 + 14 + 3476 - 24 - 57 - 8805 + 14 + 22 + 3561 - 57 - 851 - 8722 + 22 + 39 + 3466 - 890 - 37212 - 795 + 39 + 86 + 3378 + + + 86 + 17855 + 3351 + + + 21746 + 314116 + 30 @@ -16634,27 +16720,32 @@ 1 2 - 58673 + 12998 2 3 - 18378 + 8583 3 4 - 14730 + 7243 4 5 - 19119 + 12324 5 - 50 - 5074 + 11 + 3387 + + + 11 + 516 + 142 @@ -16670,17 +16761,17 @@ 1 2 - 3222211 + 2682992 2 3 - 1522614 + 1888447 3 - 48 - 330812 + 513 + 258910 @@ -16696,17 +16787,17 @@ 1 2 - 3525291 + 3150223 2 3 - 1385461 + 1565093 3 8 - 164884 + 115033 @@ -16722,17 +16813,17 @@ 1 2 - 4085559 + 3752681 2 3 - 832078 + 958080 3 - 10 - 157999 + 17 + 119588 @@ -16748,17 +16839,17 @@ 1 2 - 3222211 + 2682992 2 3 - 1522614 + 1888447 3 - 48 - 330812 + 513 + 258910 @@ -16773,58 +16864,48 @@ 1 - 2 - 82 - - - 2 - 3 - 466 - - - 3 - 4 - 82 - - - 4 - 5 - 54 - - - 5 6 - 82 + 12 6 + 7 + 464 + + + 7 8 - 109 + 425 8 - 19 - 109 + 10 + 130 - 24 - 37 - 109 + 10 + 12 + 100 - 75 - 343 - 109 + 12 + 34 + 133 - 536 - 6117 - 109 + 35 + 75 + 124 - 7863 - 137171 - 109 + 85 + 406 + 121 + + + 406 + 1272806 + 91 @@ -16840,47 +16921,42 @@ 1 2 - 164 - - - 2 - 3 - 521 + 36 3 4 - 27 + 893 4 5 - 246 + 130 - 6 - 7 - 54 + 5 + 6 + 148 - 7 + 6 8 - 109 + 94 8 - 13 - 109 + 12 + 121 - 13 - 26 - 109 + 12 + 15 + 121 - 27 - 59 - 82 + 16 + 66 + 57 @@ -16896,47 +16972,47 @@ 1 2 - 82 - - - 2 - 3 - 521 + 3 3 4 - 54 + 893 4 5 - 246 + 130 - 7 - 12 - 109 + 5 + 6 + 48 - 12 - 20 - 109 + 6 + 7 + 103 - 29 - 66 - 109 + 8 + 9 + 136 - 80 - 1212 - 109 + 9 + 14 + 142 - 1956 - 3022 - 82 + 14 + 167 + 121 + + + 275 + 10578 + 24 @@ -16951,58 +17027,48 @@ 1 - 2 - 82 - - - 2 - 3 - 466 - - - 3 - 4 - 82 - - - 4 - 5 - 54 - - - 5 6 - 82 + 12 6 + 7 + 464 + + + 7 8 - 109 + 425 8 - 19 - 109 + 10 + 130 - 24 - 37 - 109 + 10 + 12 + 100 - 75 - 343 - 109 + 12 + 34 + 133 + + + 35 + 75 + 124 - 536 - 6117 - 109 + 85 + 406 + 121 - 7863 - 137171 - 109 + 406 + 1272806 + 91 @@ -17012,15 +17078,15 @@ exprsKotlinType - 7410663 + 7535946 id - 7410663 + 7535946 kttypeid - 156277 + 53074 @@ -17034,7 +17100,7 @@ 1 2 - 7410663 + 7535946 @@ -17050,12 +17116,12 @@ 1 2 - 152777 + 50880 2 - 584083 - 3500 + 88650 + 2193 @@ -17065,15 +17131,15 @@ callableEnclosingExpr - 7298994 + 7436130 id - 7298994 + 7436130 callable_id - 19876 + 20250 @@ -17087,7 +17153,7 @@ 1 2 - 7298994 + 7436130 @@ -17103,72 +17169,72 @@ 1 2 - 711 + 724 2 3 - 1691 + 1722 3 5 - 1604 + 1634 5 6 - 806 + 821 6 7 - 1955 + 1992 7 9 - 1374 + 1400 9 13 - 1825 + 1859 13 18 - 1574 + 1603 18 26 - 1530 + 1559 26 42 - 1530 + 1559 42 73 - 1504 + 1532 73 177 - 1495 + 1524 179 - 1146 - 1491 + 1147 + 1519 1148 37742 - 780 + 795 @@ -17178,15 +17244,15 @@ statementEnclosingExpr - 7258638 + 7395016 id - 7258638 + 7395016 statement_id - 525773 + 535644 @@ -17200,7 +17266,7 @@ 1 2 - 7258638 + 7395016 @@ -17216,62 +17282,62 @@ 1 3 - 29125 + 29668 3 5 - 47077 + 47961 5 7 - 48473 + 49379 7 8 - 36041 + 36718 8 9 - 38144 + 38861 9 10 - 50446 + 51394 10 11 - 29212 + 29756 11 12 - 127048 + 129435 12 35 - 35322 + 35994 35 40 - 44623 + 45461 40 81 - 40221 + 40977 82 210 - 34 + 35 @@ -17281,15 +17347,15 @@ isParenthesized - 94652 + 95723 id - 94652 + 95723 parentheses - 5 + 6 @@ -17303,7 +17369,7 @@ 1 2 - 94652 + 95723 @@ -17317,14 +17383,14 @@ 12 - 58 - 59 - 2 + 42 + 43 + 3 - 34605 - 34606 - 2 + 31462 + 31463 + 3 @@ -17334,37 +17400,37 @@ when_if - 56072 + 53119 id - 56072 + 53119 when_branch_else - 70057 + 68708 id - 70057 + 68708 callableBinding - 1832514 + 1987914 callerid - 1832514 + 1987914 callee - 264310 + 247374 @@ -17378,7 +17444,7 @@ 1 2 - 1832514 + 1987914 @@ -17394,32 +17460,32 @@ 1 2 - 162994 + 151872 2 3 - 33136 + 29997 3 4 - 16271 + 14932 4 7 - 22271 + 20764 7 - 20 - 19902 + 19 + 19023 - 20 - 46115 - 9734 + 19 + 68828 + 10784 @@ -17429,15 +17495,15 @@ memberRefBinding - 23208 + 23625 id - 23208 + 23625 callable - 11197 + 11257 @@ -17451,7 +17517,7 @@ 1 2 - 23208 + 23625 @@ -17467,22 +17533,22 @@ 1 2 - 7862 + 8000 2 3 - 2075 + 1943 3 - 7 - 940 + 6 + 864 - 7 - 912 - 319 + 6 + 938 + 448 @@ -17492,15 +17558,15 @@ propertyRefGetBinding - 8437 + 11923 id - 8437 + 11923 getter - 5101 + 7256 @@ -17514,7 +17580,7 @@ 1 2 - 8437 + 11923 @@ -17530,17 +17596,17 @@ 1 2 - 1854 + 2624 2 3 - 3163 + 4611 3 6 - 82 + 20 @@ -17550,15 +17616,15 @@ propertyRefFieldBinding - 4 + 6 id - 4 + 6 field - 4 + 6 @@ -17572,7 +17638,7 @@ 1 2 - 4 + 6 @@ -17588,7 +17654,7 @@ 1 2 - 4 + 6 @@ -17598,15 +17664,15 @@ propertyRefSetBinding - 2226 + 1697 id - 2226 + 1697 setter - 1094 + 848 @@ -17620,7 +17686,7 @@ 1 2 - 2226 + 1697 @@ -17633,20 +17699,10 @@ 12 - - 1 - 2 - 32 - 2 3 - 994 - - - 3 - 5 - 67 + 848 @@ -17656,15 +17712,15 @@ variableBinding - 2434277 + 2475431 expr - 2434277 + 2475431 variable - 572528 + 582207 @@ -17678,7 +17734,7 @@ 1 2 - 2434277 + 2475431 @@ -17694,37 +17750,37 @@ 1 2 - 205791 + 209270 2 3 - 120945 + 122990 3 4 - 85022 + 86459 4 5 - 45967 + 46744 5 7 - 40059 + 40736 7 14 - 43072 + 43800 14 464 - 31669 + 32204 @@ -17734,23 +17790,23 @@ localvars - 385272 + 547241 id - 385272 + 547241 nodeName - 139995 + 35581 typeid - 49510 + 2048 parentid - 385272 + 547241 @@ -17764,7 +17820,7 @@ 1 2 - 385272 + 547241 @@ -17780,7 +17836,7 @@ 1 2 - 385272 + 547241 @@ -17796,7 +17852,7 @@ 1 2 - 385272 + 547241 @@ -17812,27 +17868,12 @@ 1 2 - 83655 + 33579 2 - 3 - 26178 - - - 3 - 5 - 10243 - - - 5 - 9 - 11950 - - - 9 - 42 - 7967 + 4488 + 2001 @@ -17848,17 +17889,12 @@ 1 2 - 124630 + 35253 2 - 3 - 13089 - - - 3 - 19 - 2276 + 20 + 328 @@ -17874,27 +17910,12 @@ 1 2 - 83655 + 33579 2 - 3 - 26178 - - - 3 - 5 - 10243 - - - 5 - 9 - 11950 - - - 9 - 42 - 7967 + 4488 + 2001 @@ -17910,47 +17931,57 @@ 1 2 - 16503 + 516 2 - 3 - 9105 + 4 + 187 - 3 - 5 - 2276 + 4 + 20 + 156 - 5 - 6 - 5121 + 21 + 31 + 109 - 6 - 7 - 2845 + 35 + 54 + 156 - 7 - 8 - 2845 + 57 + 64 + 156 - 8 - 12 - 4552 + 72 + 120 + 187 - 14 - 30 - 3983 + 128 + 217 + 156 - 51 - 76 - 2276 + 223 + 354 + 156 + + + 374 + 712 + 156 + + + 794 + 14075 + 109 @@ -17966,32 +17997,27 @@ 1 2 - 23332 + 1532 2 3 - 9105 + 187 3 4 - 6259 + 140 4 - 6 - 3983 - - - 6 - 14 - 3983 + 353 + 156 - 14 - 35 - 2845 + 501 + 1266 + 31 @@ -18007,47 +18033,57 @@ 1 2 - 16503 + 516 2 - 3 - 9105 + 4 + 187 - 3 - 5 - 2276 + 4 + 20 + 156 - 5 - 6 - 5121 + 21 + 31 + 109 - 6 - 7 - 2845 + 35 + 54 + 156 - 7 - 8 - 2845 + 57 + 64 + 156 - 8 - 12 - 4552 + 72 + 120 + 187 - 14 - 30 - 3983 + 128 + 217 + 156 - 51 - 76 - 2276 + 223 + 354 + 156 + + + 374 + 712 + 156 + + + 794 + 14075 + 109 @@ -18063,7 +18099,7 @@ 1 2 - 385272 + 547241 @@ -18079,7 +18115,7 @@ 1 2 - 385272 + 547241 @@ -18095,7 +18131,7 @@ 1 2 - 385272 + 547241 @@ -18105,15 +18141,15 @@ localvarsKotlinType - 149446 + 152463 id - 149446 + 152463 kttypeid - 2 + 11 @@ -18127,7 +18163,7 @@ 1 2 - 149446 + 152463 @@ -18141,9 +18177,9 @@ 12 - 59940 - 59941 - 2 + 13406 + 13407 + 11 @@ -18153,19 +18189,19 @@ namestrings - 4022471 + 4087878 name - 23402 + 23364 value - 22183 + 22145 parent - 4022471 + 4087878 @@ -18179,7 +18215,7 @@ 1 2 - 23402 + 23364 @@ -18195,42 +18231,42 @@ 1 2 - 9604 + 9396 2 3 - 3811 + 3830 3 - 5 - 2163 + 4 + 1126 - 5 - 9 - 1773 + 4 + 7 + 2133 - 9 - 21 - 1795 + 7 + 15 + 1868 - 21 - 69 - 1760 + 15 + 37 + 1767 - 69 - 385 - 1756 + 37 + 163 + 1758 - 390 + 163 412517 - 737 + 1484 @@ -18246,12 +18282,12 @@ 1 2 - 21576 + 21526 2 12 - 607 + 618 @@ -18267,42 +18303,42 @@ 1 2 - 9118 + 8905 2 3 - 3594 + 3609 3 5 - 1925 + 1943 5 9 - 1669 + 1700 9 21 - 1691 + 1722 21 - 67 - 1678 + 64 + 1665 - 67 - 318 - 1665 + 64 + 292 + 1661 - 320 + 292 413340 - 841 + 936 @@ -18318,7 +18354,7 @@ 1 2 - 4022471 + 4087878 @@ -18334,7 +18370,7 @@ 1 2 - 4022471 + 4087878 @@ -18344,15 +18380,15 @@ modules - 6092 + 131645 id - 6092 + 131645 name - 6092 + 131645 @@ -18366,7 +18402,7 @@ 1 2 - 6092 + 131645 @@ -18382,7 +18418,7 @@ 1 2 - 6092 + 131645 @@ -18403,15 +18439,15 @@ cumodule - 188761 + 1690907 fileId - 188761 + 1690907 moduleId - 836 + 2925 @@ -18425,7 +18461,7 @@ 1 2 - 188761 + 1690907 @@ -18439,34 +18475,9 @@ 12 - 12 - 13 - 238 - - - 36 - 37 - 119 - - - 72 - 73 - 119 - - - 75 - 76 - 119 - - - 415 - 416 - 119 - - - 958 - 959 - 119 + 578 + 579 + 2925 @@ -18476,15 +18487,15 @@ directives - 37991 + 450518 id - 836 + 2925 directive - 37991 + 450518 @@ -18496,39 +18507,9 @@ 12 - 3 - 4 - 119 - - - 4 - 5 - 119 - - - 7 - 8 - 119 - - - 9 - 10 - 119 - - - 43 - 44 - 119 - - - 89 - 90 - 119 - - - 163 - 164 - 119 + 154 + 155 + 2925 @@ -18544,7 +18525,7 @@ 1 2 - 37991 + 450518 @@ -18554,15 +18535,15 @@ requires - 3190 + 4159 id - 3190 + 4159 target - 377 + 221 @@ -18576,7 +18557,7 @@ 1 2 - 3190 + 4159 @@ -18592,52 +18573,47 @@ 1 2 - 33 + 59 2 3 - 40 + 17 3 - 4 - 23 - - - 4 - 5 - 23 - - - 5 - 6 - 33 + 16 + 15 - 6 - 9 - 10 + 16 + 17 + 35 - 9 - 10 - 142 + 17 + 22 + 18 - 10 - 11 - 30 + 22 + 40 + 18 - 11 - 29 - 30 + 40 + 41 + 21 - 56 - 73 - 6 + 41 + 44 + 18 + + + 44 + 125 + 14 @@ -18647,37 +18623,37 @@ isTransitive - 597 + 1485 id - 597 + 1485 isStatic - 33 + 34 id - 33 + 34 exports - 26163 + 336426 id - 26163 + 336426 target - 26163 + 336426 @@ -18691,7 +18667,7 @@ 1 2 - 26163 + 336426 @@ -18707,7 +18683,7 @@ 1 2 - 26163 + 336426 @@ -18717,15 +18693,15 @@ exportsTo - 22579 + 456369 id - 9676 + 187228 target - 5734 + 128719 @@ -18739,27 +18715,32 @@ 1 2 - 5495 + 93614 2 3 - 1792 + 43881 3 4 - 836 + 20478 4 - 6 - 716 + 5 + 11701 - 6 - 19 - 836 + 5 + 14 + 14627 + + + 22 + 23 + 2925 @@ -18775,47 +18756,37 @@ 1 2 - 1672 + 38030 2 3 - 1194 + 38030 3 4 - 716 + 8776 4 5 - 358 + 11701 5 - 6 - 477 - - - 6 7 - 238 + 11701 - 8 - 10 - 477 + 7 + 11 + 11701 - 10 + 11 13 - 358 - - - 13 - 14 - 238 + 8776 @@ -18825,15 +18796,15 @@ opens - 716 + 14627 id - 716 + 14627 target - 716 + 14627 @@ -18847,7 +18818,7 @@ 1 2 - 716 + 14627 @@ -18863,7 +18834,7 @@ 1 2 - 716 + 14627 @@ -18873,15 +18844,15 @@ opensTo - 716 + 14627 id - 716 + 14627 target - 238 + 2925 @@ -18895,7 +18866,7 @@ 1 2 - 716 + 14627 @@ -18908,15 +18879,10 @@ 12 - - 1 - 2 - 119 - 5 6 - 119 + 2925 @@ -18926,15 +18892,15 @@ uses - 7884 + 96539 id - 7884 + 96539 serviceInterface - 7884 + 96539 @@ -18948,7 +18914,7 @@ 1 2 - 7884 + 96539 @@ -18964,7 +18930,7 @@ 1 2 - 7884 + 96539 @@ -18974,15 +18940,15 @@ provides - 1792 + 2925 id - 1792 + 2925 serviceInterface - 1792 + 2925 @@ -18996,7 +18962,7 @@ 1 2 - 1792 + 2925 @@ -19012,7 +18978,7 @@ 1 2 - 1792 + 2925 @@ -19022,15 +18988,15 @@ providesWith - 4181 + 4327 id - 1792 + 1923 serviceImpl - 4181 + 4327 @@ -19044,27 +19010,27 @@ 1 2 - 955 + 1081 2 3 - 119 + 120 3 4 - 119 + 120 4 5 - 477 + 480 6 7 - 119 + 120 @@ -19080,7 +19046,7 @@ 1 2 - 4181 + 4327 @@ -19088,50 +19054,61 @@ + + isNullDefaultCase + 50 + + + id + 50 + + + + javadoc - 985091 + 1001744 id - 985091 + 1001744 isNormalComment - 649898 + 660885 commentid - 649898 + 660885 isEolComment - 610062 + 620375 commentid - 610062 + 620375 hasJavadoc - 435352 + 444514 documentableid - 368199 + 64761 javadocid - 435352 + 67363 @@ -19145,17 +19122,17 @@ 1 2 - 320396 + 57383 2 - 3 - 44957 + 14 + 4992 - 3 - 27 - 2845 + 14 + 258 + 2385 @@ -19171,7 +19148,12 @@ 1 2 - 435352 + 66416 + + + 2 + 1326 + 946 @@ -19181,23 +19163,23 @@ javadocTag - 335808 + 341478 id - 335808 + 341478 name - 577 + 587 parentid - 114110 + 116037 idx - 4789 + 4869 @@ -19211,7 +19193,7 @@ 1 2 - 335808 + 341478 @@ -19227,7 +19209,7 @@ 1 2 - 335808 + 341478 @@ -19243,7 +19225,7 @@ 1 2 - 335808 + 341478 @@ -19259,37 +19241,37 @@ 34 35 - 82 + 83 69 70 - 82 + 83 203 204 - 82 + 83 405 406 - 82 + 83 608 609 - 82 + 83 968 969 - 82 + 83 1780 1781 - 82 + 83 @@ -19305,37 +19287,37 @@ 34 35 - 82 + 83 69 70 - 82 + 83 158 159 - 82 + 83 404 405 - 82 + 83 608 609 - 82 + 83 668 669 - 82 + 83 969 970 - 82 + 83 @@ -19351,32 +19333,32 @@ 17 18 - 82 + 83 21 22 - 82 + 83 31 32 - 82 + 83 35 36 - 165 + 167 38 39 - 82 + 83 41 42 - 82 + 83 @@ -19392,37 +19374,37 @@ 1 2 - 33192 + 33753 2 3 - 24935 + 25356 3 4 - 18660 + 18975 4 5 - 13128 + 13350 5 6 - 9990 + 10159 6 7 - 7678 + 7808 7 11 - 6522 + 6633 @@ -19438,27 +19420,27 @@ 1 2 - 39963 + 40638 2 3 - 38642 + 39294 3 4 - 21137 + 21494 4 5 - 12220 + 12426 5 6 - 2146 + 2183 @@ -19474,37 +19456,37 @@ 1 2 - 33192 + 33753 2 3 - 24935 + 25356 3 4 - 18660 + 18975 4 5 - 13128 + 13350 5 6 - 9990 + 10159 6 7 - 7678 + 7808 7 11 - 6522 + 6633 @@ -19520,57 +19502,57 @@ 1 2 - 1238 + 1259 2 3 - 247 + 251 4 5 - 330 + 335 5 6 - 412 + 419 6 8 - 330 + 335 8 17 - 412 + 419 21 34 - 412 + 419 38 72 - 412 + 419 76 152 - 412 + 419 199 504 - 412 + 419 603 713 - 165 + 167 @@ -19586,37 +19568,37 @@ 1 2 - 1321 + 1343 2 3 - 330 + 335 3 4 - 743 + 755 4 5 - 412 + 419 5 6 - 412 + 419 6 7 - 908 + 923 7 8 - 660 + 671 @@ -19632,57 +19614,57 @@ 1 2 - 1238 + 1259 2 3 - 247 + 251 4 5 - 330 + 335 5 6 - 412 + 419 6 8 - 330 + 335 8 17 - 412 + 419 21 34 - 412 + 419 38 72 - 412 + 419 76 152 - 412 + 419 199 504 - 412 + 419 603 713 - 165 + 167 @@ -19692,23 +19674,23 @@ javadocText - 2502848 + 2545161 id - 2502848 + 2545161 text - 1370363 + 1393530 parentid - 1169475 + 1189246 idx - 42112 + 42824 @@ -19722,7 +19704,7 @@ 1 2 - 2502848 + 2545161 @@ -19738,7 +19720,7 @@ 1 2 - 2502848 + 2545161 @@ -19754,7 +19736,7 @@ 1 2 - 2502848 + 2545161 @@ -19770,17 +19752,17 @@ 1 2 - 1139314 + 1158575 2 3 - 149670 + 152200 3 147 - 81379 + 82755 @@ -19796,17 +19778,17 @@ 1 2 - 1140452 + 1159732 2 3 - 149101 + 151621 3 88 - 80810 + 82176 @@ -19822,12 +19804,12 @@ 1 2 - 1346462 + 1369225 2 32 - 23901 + 24305 @@ -19843,22 +19825,22 @@ 1 2 - 870135 + 884845 2 3 - 159344 + 162038 3 12 - 83086 + 84491 12 75 - 56908 + 57870 @@ -19874,22 +19856,22 @@ 1 2 - 870135 + 884845 2 3 - 159344 + 162038 3 12 - 84225 + 85648 12 67 - 55770 + 56713 @@ -19905,22 +19887,22 @@ 1 2 - 870135 + 884845 2 3 - 159344 + 162038 3 12 - 83086 + 84491 12 75 - 56908 + 57870 @@ -19936,42 +19918,42 @@ 2 3 - 21056 + 21412 3 5 - 2276 + 2314 5 7 - 3414 + 3472 7 11 - 2276 + 2314 12 16 - 3414 + 3472 19 102 - 3414 + 3472 108 154 - 3414 + 3472 181 2056 - 2845 + 2893 @@ -19987,47 +19969,47 @@ 1 2 - 569 + 578 2 3 - 20487 + 20833 3 5 - 2845 + 2893 5 7 - 3414 + 3472 7 13 - 3414 + 3472 13 23 - 3414 + 3472 27 47 - 3414 + 3472 47 123 - 3414 + 3472 254 1252 - 1138 + 1157 @@ -20043,42 +20025,42 @@ 2 3 - 21056 + 21412 3 5 - 2276 + 2314 5 7 - 3414 + 3472 7 11 - 2276 + 2314 12 16 - 3414 + 3472 19 102 - 3414 + 3472 108 154 - 3414 + 3472 181 2056 - 2845 + 2893 @@ -20088,15 +20070,15 @@ xmlEncoding - 154148 + 1717236 id - 154148 + 1717236 encoding - 262 + 2925 @@ -20110,7 +20092,7 @@ 1 2 - 154148 + 1717236 @@ -20124,9 +20106,9 @@ 12 - 588 - 589 - 262 + 587 + 588 + 2925 @@ -20136,27 +20118,27 @@ xmlDTDs - 569 + 578 id - 569 + 578 root - 569 + 578 publicId - 569 + 578 systemId - 569 + 578 fileid - 569 + 578 @@ -20170,7 +20152,7 @@ 1 2 - 569 + 578 @@ -20186,7 +20168,7 @@ 1 2 - 569 + 578 @@ -20202,7 +20184,7 @@ 1 2 - 569 + 578 @@ -20218,7 +20200,7 @@ 1 2 - 569 + 578 @@ -20234,7 +20216,7 @@ 1 2 - 569 + 578 @@ -20250,7 +20232,7 @@ 1 2 - 569 + 578 @@ -20266,7 +20248,7 @@ 1 2 - 569 + 578 @@ -20282,7 +20264,7 @@ 1 2 - 569 + 578 @@ -20298,7 +20280,7 @@ 1 2 - 569 + 578 @@ -20314,7 +20296,7 @@ 1 2 - 569 + 578 @@ -20330,7 +20312,7 @@ 1 2 - 569 + 578 @@ -20346,7 +20328,7 @@ 1 2 - 569 + 578 @@ -20362,7 +20344,7 @@ 1 2 - 569 + 578 @@ -20378,7 +20360,7 @@ 1 2 - 569 + 578 @@ -20394,7 +20376,7 @@ 1 2 - 569 + 578 @@ -20410,7 +20392,7 @@ 1 2 - 569 + 578 @@ -20426,7 +20408,7 @@ 1 2 - 569 + 578 @@ -20442,7 +20424,7 @@ 1 2 - 569 + 578 @@ -20458,7 +20440,7 @@ 1 2 - 569 + 578 @@ -20474,7 +20456,7 @@ 1 2 - 569 + 578 @@ -20484,27 +20466,27 @@ xmlElements - 20510401 + 233696238 id - 20510401 + 233696238 name - 65015 + 740137 parentid - 529033 + 5929876 idx - 232533 + 3042462 fileid - 154148 + 1717236 @@ -20518,7 +20500,7 @@ 1 2 - 20510401 + 233696238 @@ -20534,7 +20516,7 @@ 1 2 - 20510401 + 233696238 @@ -20550,7 +20532,7 @@ 1 2 - 20510401 + 233696238 @@ -20566,7 +20548,7 @@ 1 2 - 20510401 + 233696238 @@ -20582,57 +20564,57 @@ 1 2 - 20448 + 234035 2 3 - 7864 + 87763 3 4 - 3145 + 40956 4 6 - 5767 + 67285 6 8 - 4718 + 52658 8 9 - 2359 + 20478 9 10 - 4456 + 49732 10 18 - 5505 + 58508 18 - 48 - 4980 + 39 + 55583 - 52 - 250 - 4980 + 41 + 200 + 55583 - 342 - 73380 - 786 + 242 + 73955 + 17552 @@ -20648,52 +20630,47 @@ 1 2 - 23856 + 283768 2 3 - 8913 + 96539 3 - 4 - 3408 - - - 4 5 - 2883 + 67285 5 6 - 3670 + 43881 6 8 - 5505 + 61434 8 10 - 5505 + 58508 10 - 21 - 5243 + 19 + 55583 - 22 - 128 - 4980 + 20 + 111 + 55583 - 130 - 229 - 1048 + 114 + 230 + 17552 @@ -20709,37 +20686,32 @@ 1 2 - 35915 + 406636 2 3 - 9437 + 108241 3 4 - 4718 + 55583 4 - 6 - 3932 - - - 6 - 9 - 3932 + 7 + 64359 - 9 - 38 - 4980 + 7 + 12 + 58508 - 45 - 888 - 2097 + 12 + 1041 + 46807 @@ -20755,42 +20727,37 @@ 1 2 - 35391 + 412487 2 3 - 7078 + 76061 3 - 4 - 3408 - - - 4 5 - 2621 + 61434 5 - 7 - 5767 + 6 + 43881 - 7 - 16 - 4980 + 6 + 11 + 58508 - 17 - 114 - 5243 + 11 + 35 + 55583 - 118 + 41 131 - 524 + 32179 @@ -20806,32 +20773,32 @@ 1 2 - 321929 + 3615849 2 3 - 82579 + 906887 3 4 - 34342 + 380307 4 8 - 41158 + 470996 8 - 777 - 43255 + 817 + 447593 - 777 - 888 - 5767 + 817 + 1041 + 108241 @@ -20847,17 +20814,17 @@ 1 2 - 436754 + 4911821 2 3 - 56101 + 611417 3 17 - 36177 + 406636 @@ -20873,32 +20840,32 @@ 1 2 - 321929 + 3615849 2 3 - 82579 + 906887 3 4 - 34342 + 380307 4 8 - 41158 + 470996 8 - 777 - 43255 + 817 + 447593 - 777 - 888 - 5767 + 817 + 1041 + 108241 @@ -20914,7 +20881,7 @@ 1 2 - 529033 + 5929876 @@ -20927,70 +20894,70 @@ 12 + + 1 + 2 + 447593 + 2 - 8 - 19661 + 62 + 228184 - 9 - 76 - 18613 + 62 + 73 + 228184 - 76 - 82 - 17564 + 73 + 81 + 231110 - 82 - 89 - 16778 + 81 + 88 + 254513 - 89 + 88 92 - 15205 + 236961 92 - 95 - 18351 - - - 95 97 - 20448 + 234035 97 98 - 28837 + 61434 98 99 - 17826 + 260364 99 - 104 - 21234 + 101 + 236961 - 104 - 106 - 17826 + 101 + 105 + 228184 - 106 - 159 - 17564 + 105 + 112 + 242811 - 162 - 2019 - 2621 + 112 + 2028 + 152123 @@ -21006,22 +20973,22 @@ 1 2 - 188491 + 447593 2 - 5 - 17302 + 3 + 2103394 - 5 - 9 - 19923 + 3 + 7 + 269140 - 9 - 150 - 6816 + 7 + 152 + 222333 @@ -21034,70 +21001,70 @@ 12 + + 1 + 2 + 447593 + 2 - 8 - 19661 + 62 + 228184 - 9 - 76 - 18613 + 62 + 73 + 228184 - 76 - 82 - 17564 + 73 + 81 + 231110 - 82 - 89 - 16778 + 81 + 88 + 254513 - 89 + 88 92 - 15205 + 236961 92 - 95 - 18351 - - - 95 97 - 20448 + 234035 97 98 - 28837 + 61434 98 99 - 17826 + 260364 99 - 104 - 21234 + 101 + 236961 - 104 - 106 - 17826 + 101 + 105 + 228184 - 106 - 159 - 17564 + 105 + 112 + 242811 - 162 - 2019 - 2621 + 112 + 2028 + 152123 @@ -21110,70 +21077,70 @@ 12 + + 1 + 2 + 447593 + 2 - 8 - 19661 + 62 + 228184 - 9 - 76 - 18613 + 62 + 73 + 228184 - 76 - 82 - 17564 + 73 + 81 + 231110 - 82 - 89 - 16778 + 81 + 88 + 254513 - 89 + 88 92 - 15205 + 236961 92 - 95 - 18351 - - - 95 97 - 20448 + 234035 97 98 - 28837 + 61434 98 99 - 17826 + 260364 99 - 104 - 21234 + 101 + 236961 - 104 - 106 - 17826 + 101 + 105 + 228184 - 106 - 139 - 17564 + 105 + 110 + 242811 - 141 - 589 - 2621 + 110 + 588 + 152123 @@ -21189,57 +21156,52 @@ 1 2 - 11272 + 131645 2 3 - 25953 + 289619 3 4 - 34080 + 362755 4 5 - 14418 + 155048 5 7 - 11534 + 125794 7 10 - 12845 + 157974 10 31 - 12059 + 134570 35 - 694 - 11797 - - - 738 - 776 - 3932 + 676 + 134570 - 777 - 779 - 12583 + 686 + 818 + 117017 - 788 - 889 - 3670 + 818 + 1044 + 108241 @@ -21255,37 +21217,37 @@ 1 2 - 11272 + 131645 2 3 - 76812 + 857155 3 4 - 26740 + 280842 4 5 - 12583 + 140421 5 6 - 11797 + 140421 6 9 - 12583 + 140421 9 69 - 2359 + 26329 @@ -21301,27 +21263,27 @@ 1 2 - 11272 + 131645 2 3 - 109319 + 1202357 3 4 - 11010 + 125794 4 6 - 11272 + 128719 6 - 165 - 11272 + 164 + 128719 @@ -21337,42 +21299,42 @@ 1 2 - 39061 + 441742 2 3 - 42207 + 456369 3 4 - 17040 + 184303 4 7 - 12845 + 149197 7 17 - 12845 + 143346 - 18 - 763 - 11797 + 17 + 732 + 131645 - 764 - 777 - 12583 + 732 + 817 + 102390 - 777 - 888 - 5767 + 817 + 1041 + 108241 @@ -21382,31 +21344,31 @@ xmlAttrs - 24948200 + 281184985 id - 24948200 + 281184985 elementid - 20335805 + 228699578 name - 98571 + 1091190 value - 1576089 + 17815959 idx - 6029 + 67285 fileid - 153886 + 1711385 @@ -21420,7 +21382,7 @@ 1 2 - 24948200 + 281184985 @@ -21436,7 +21398,7 @@ 1 2 - 24948200 + 281184985 @@ -21452,7 +21414,7 @@ 1 2 - 24948200 + 281184985 @@ -21468,7 +21430,7 @@ 1 2 - 24948200 + 281184985 @@ -21484,7 +21446,7 @@ 1 2 - 24948200 + 281184985 @@ -21500,17 +21462,17 @@ 1 2 - 18609237 + 209122501 2 6 - 1529163 + 17306931 6 24 - 197404 + 2270145 @@ -21526,17 +21488,17 @@ 1 2 - 18609237 + 209122501 2 6 - 1531785 + 17336186 6 23 - 194782 + 2240890 @@ -21552,17 +21514,17 @@ 1 2 - 18619461 + 209239519 2 6 - 1539387 + 17423949 6 21 - 176956 + 2036109 @@ -21578,17 +21540,17 @@ 1 2 - 18609237 + 209122501 2 6 - 1529163 + 17306931 6 24 - 197404 + 2270145 @@ -21604,7 +21566,7 @@ 1 2 - 20335805 + 228699578 @@ -21620,62 +21582,62 @@ 1 2 - 20448 + 228184 2 3 - 10748 + 117017 3 4 - 6029 + 58508 4 5 - 3408 + 43881 5 6 - 5767 + 64359 6 8 - 7078 + 78987 8 11 - 8126 + 78987 11 - 22 - 7602 + 20 + 84837 - 23 - 38 - 7864 + 20 + 39 + 90688 - 38 - 79 - 7864 + 39 + 76 + 81912 - 81 - 168 - 7602 + 78 + 150 + 81912 - 168 - 74700 - 6029 + 152 + 75273 + 81912 @@ -21691,62 +21653,62 @@ 1 2 - 20448 + 228184 2 3 - 10748 + 117017 3 4 - 6029 + 58508 4 5 - 3408 + 43881 5 6 - 5767 + 64359 6 8 - 7078 + 78987 8 11 - 8913 + 87763 11 - 25 - 8389 + 22 + 81912 - 25 + 22 39 - 8126 + 84837 - 43 - 91 - 7864 + 39 + 76 + 81912 - 91 - 227 - 7602 + 78 + 150 + 84837 - 227 - 74700 - 4194 + 152 + 75273 + 78987 @@ -21762,42 +21724,42 @@ 1 2 - 41420 + 459294 2 3 - 15467 + 166750 3 4 - 6553 + 76061 4 - 5 - 7078 + 6 + 99465 - 5 - 9 - 8126 + 6 + 11 + 81912 - 9 - 21 - 7602 + 12 + 28 + 81912 - 22 - 64 - 8126 + 28 + 70 + 81912 - 68 - 2100 - 4194 + 71 + 2141 + 43881 @@ -21813,37 +21775,37 @@ 1 2 - 38799 + 435891 2 3 - 18351 + 193079 3 4 - 9437 + 111166 4 5 - 10486 + 117017 5 - 7 - 6291 + 8 + 99465 - 7 - 10 - 7864 + 8 + 13 + 96539 - 10 + 13 21 - 7340 + 38030 @@ -21859,52 +21821,52 @@ 1 2 - 34342 + 389084 2 3 - 10224 + 96539 3 4 - 5243 + 55583 4 5 - 4718 + 49732 5 6 - 7340 + 87763 6 - 9 - 8126 + 8 + 81912 - 9 - 17 - 8651 + 8 + 15 + 81912 - 17 - 34 - 7602 + 15 + 27 + 87763 - 36 - 91 - 7602 + 27 + 65 + 81912 - 91 - 223 - 4718 + 68 + 221 + 78987 @@ -21920,37 +21882,37 @@ 1 2 - 860924 + 9694924 2 3 - 233057 + 2615347 3 5 - 120854 + 1345704 5 - 31 - 118757 + 19 + 1357406 - 31 - 91 - 124000 + 19 + 89 + 1348630 - 91 - 1111 - 118232 + 89 + 101 + 1360331 - 3397 - 3398 - 262 + 101 + 3454 + 93614 @@ -21966,32 +21928,37 @@ 1 2 - 878227 + 9882152 2 3 - 222047 + 2498329 3 5 - 122427 + 1357406 5 - 33 - 124262 + 20 + 1345704 - 33 - 93 - 121640 + 20 + 90 + 1339853 - 93 - 3398 - 107484 + 90 + 102 + 1345704 + + + 119 + 3454 + 46807 @@ -22007,17 +21974,17 @@ 1 2 - 1430330 + 16163082 2 4 - 126884 + 1436393 4 53 - 18875 + 216482 @@ -22033,17 +22000,17 @@ 1 2 - 1305281 + 14709136 2 3 - 190588 + 2214561 3 20 - 80220 + 892260 @@ -22059,32 +22026,32 @@ 1 2 - 1014548 + 11432638 2 3 - 170926 + 1916166 3 - 10 - 122427 + 9 + 1339853 - 10 - 83 - 119805 + 9 + 80 + 1372033 - 83 + 80 99 - 120330 + 1442244 99 - 182 - 28050 + 181 + 313022 @@ -22100,62 +22067,62 @@ 1 6 - 524 + 5850 12 14 - 524 + 5850 17 - 26 - 524 + 25 + 5850 - 39 - 56 - 524 + 38 + 59 + 5850 - 83 - 110 - 524 + 88 + 116 + 5850 - 153 - 232 - 524 + 159 + 242 + 5850 - 316 - 400 - 524 + 324 + 407 + 5850 - 468 - 545 - 524 + 480 + 563 + 5850 - 626 - 754 - 524 + 647 + 777 + 5850 - 951 - 1491 - 524 + 974 + 1518 + 5850 - 4718 - 6587 - 524 + 4792 + 6693 + 5850 - 77571 - 77572 - 262 + 78176 + 78177 + 2925 @@ -22171,62 +22138,62 @@ 1 6 - 524 + 5850 12 14 - 524 + 5850 17 - 26 - 524 + 25 + 5850 - 39 - 56 - 524 + 38 + 59 + 5850 - 83 - 110 - 524 + 88 + 116 + 5850 - 153 - 232 - 524 + 159 + 242 + 5850 - 316 - 400 - 524 + 324 + 407 + 5850 - 468 - 545 - 524 + 480 + 563 + 5850 - 626 - 754 - 524 + 647 + 777 + 5850 - 951 - 1491 - 524 + 974 + 1518 + 5850 - 4718 - 6587 - 524 + 4792 + 6693 + 5850 - 77571 - 77572 - 262 + 78176 + 78177 + 2925 @@ -22242,62 +22209,62 @@ 1 4 - 524 + 5850 7 10 - 524 + 5850 11 17 - 524 + 5850 18 - 23 - 524 + 24 + 5850 - 26 - 38 - 524 + 25 + 36 + 5850 - 39 - 49 - 524 + 38 + 48 + 5850 - 57 - 67 - 524 + 53 + 66 + 5850 - 72 - 79 - 524 + 71 + 77 + 5850 - 95 - 101 - 524 + 96 + 99 + 5850 - 105 - 106 - 524 + 103 + 105 + 5850 - 106 - 132 - 524 + 108 + 131 + 5850 - 140 - 141 - 262 + 139 + 140 + 2925 @@ -22313,62 +22280,62 @@ 1 5 - 524 + 5850 7 10 - 524 + 5850 11 - 18 - 524 + 17 + 5850 22 - 32 - 524 + 33 + 5850 - 46 - 63 - 524 + 50 + 60 + 5850 - 85 - 119 - 524 + 84 + 121 + 5850 - 142 - 185 - 524 + 140 + 182 + 5850 - 212 - 228 - 524 + 217 + 236 + 5850 - 253 - 275 - 524 + 254 + 272 + 5850 - 307 - 423 - 524 + 299 + 424 + 5850 580 - 1324 - 524 + 1357 + 5850 - 3579 - 3580 - 262 + 3647 + 3648 + 2925 @@ -22384,62 +22351,62 @@ 1 6 - 524 + 5850 7 8 - 524 + 5850 10 - 19 - 524 + 18 + 5850 - 23 - 36 - 524 + 22 + 37 + 5850 - 45 - 59 - 524 + 44 + 58 + 5850 - 73 - 97 - 524 + 71 + 93 + 5850 - 115 - 131 - 524 + 111 + 127 + 5850 - 140 - 148 - 524 + 137 + 145 + 5850 - 168 - 181 - 524 + 165 + 178 + 5850 - 248 + 245 363 - 524 + 5850 - 473 - 530 - 524 + 477 + 533 + 5850 - 587 - 588 - 262 + 585 + 586 + 2925 @@ -22455,72 +22422,72 @@ 1 3 - 11534 + 128719 3 5 - 11797 + 131645 5 6 - 7078 + 78987 6 7 - 11797 + 134570 7 8 - 9961 + 111166 8 10 - 11272 + 122868 10 15 - 12583 + 140421 15 - 27 - 11797 + 28 + 137495 - 27 - 41 - 11797 + 28 + 44 + 137495 - 41 - 65 - 11797 + 44 + 67 + 131645 - 65 - 157 - 12583 + 68 + 184 + 128719 - 162 - 817 - 11797 + 186 + 835 + 128719 - 818 - 832 - 12845 + 848 + 880 + 73136 - 832 - 1187 - 5243 + 880 + 1163 + 125794 @@ -22536,52 +22503,52 @@ 1 2 - 17564 + 201855 2 3 - 36177 + 397860 3 4 - 21759 + 231110 4 5 - 14942 + 160899 5 - 8 - 13894 + 7 + 119943 - 8 - 14 - 11797 + 7 + 11 + 128719 - 14 - 295 - 11797 + 11 + 40 + 128719 - 330 - 775 - 9699 + 40 + 693 + 128719 - 776 - 778 - 12583 + 717 + 817 + 108241 - 787 + 817 888 - 3670 + 105316 @@ -22597,62 +22564,62 @@ 1 2 - 9699 + 99465 2 3 - 12583 + 134570 3 4 - 9699 + 96539 4 5 - 12845 + 122868 5 6 - 23332 + 304246 6 7 - 22021 + 248662 7 8 - 9699 + 111166 8 12 - 11797 + 131645 12 18 - 13370 + 140421 18 24 - 13107 + 140421 24 - 37 - 12059 + 35 + 131645 - 37 + 35 55 - 3670 + 49732 @@ -22668,67 +22635,67 @@ 1 3 - 13370 + 146272 3 4 - 7602 + 87763 4 5 - 14156 + 160899 5 6 - 17040 + 190153 6 8 - 12059 + 134570 8 12 - 13632 + 149197 12 - 19 - 11797 + 20 + 134570 - 19 + 20 27 - 13370 + 131645 27 41 - 11797 + 137495 42 - 170 - 11797 + 137 + 128719 - 205 - 780 - 11010 + 149 + 813 + 128719 - 781 - 783 - 12583 + 813 + 822 + 76061 - 791 + 822 893 - 3670 + 105316 @@ -22744,47 +22711,47 @@ 1 2 - 15205 + 155048 2 3 - 14680 + 160899 3 4 - 29099 + 336426 4 5 - 29885 + 342277 5 6 - 17826 + 198930 6 10 - 13107 + 149197 10 12 - 8913 + 99465 12 15 - 13370 + 140421 15 24 - 11797 + 128719 @@ -22794,23 +22761,23 @@ xmlNs - 247214 + 2785023 id - 1572 + 17552 prefixName - 1835 + 20478 URI - 1572 + 17552 fileid - 143924 + 1617771 @@ -22824,12 +22791,12 @@ 1 2 - 1310 + 14627 2 3 - 262 + 2925 @@ -22845,7 +22812,7 @@ 1 2 - 1572 + 17552 @@ -22861,32 +22828,32 @@ 2 3 - 262 + 2925 20 21 - 262 + 2925 - 88 - 89 - 262 + 95 + 96 + 2925 - 167 - 168 - 262 + 166 + 167 + 2925 - 213 - 214 - 262 + 218 + 219 + 2925 - 453 - 454 - 262 + 451 + 452 + 2925 @@ -22902,7 +22869,7 @@ 1 2 - 1835 + 20478 @@ -22918,7 +22885,7 @@ 1 2 - 1835 + 20478 @@ -22934,37 +22901,37 @@ 1 2 - 262 + 2925 2 3 - 262 + 2925 20 21 - 262 + 2925 - 88 - 89 - 262 + 95 + 96 + 2925 - 166 - 167 - 262 + 165 + 166 + 2925 - 213 - 214 - 262 + 218 + 219 + 2925 - 453 - 454 - 262 + 451 + 452 + 2925 @@ -22980,7 +22947,7 @@ 1 2 - 1572 + 17552 @@ -22996,12 +22963,12 @@ 1 2 - 1310 + 14627 2 3 - 262 + 2925 @@ -23017,32 +22984,32 @@ 2 3 - 262 + 2925 20 21 - 262 + 2925 - 88 - 89 - 262 + 95 + 96 + 2925 - 167 - 168 - 262 + 166 + 167 + 2925 - 213 - 214 - 262 + 218 + 219 + 2925 - 453 - 454 - 262 + 451 + 452 + 2925 @@ -23058,17 +23025,17 @@ 1 2 - 64228 + 713808 2 3 - 56101 + 640672 3 4 - 23594 + 263290 @@ -23084,17 +23051,17 @@ 1 2 - 64228 + 713808 2 3 - 56101 + 640672 3 4 - 23594 + 263290 @@ -23110,17 +23077,17 @@ 1 2 - 64228 + 713808 2 3 - 56101 + 640672 3 4 - 23594 + 263290 @@ -23130,19 +23097,19 @@ xmlHasNs - 4987018 + 56753630 elementId - 4987018 + 56753630 nsId - 1572 + 17552 fileid - 143137 + 1606069 @@ -23156,7 +23123,7 @@ 1 2 - 4987018 + 56753630 @@ -23172,7 +23139,7 @@ 1 2 - 4987018 + 56753630 @@ -23188,32 +23155,32 @@ 13 14 - 262 + 2925 84 85 - 262 + 2925 - 2426 - 2427 - 262 + 2515 + 2516 + 2925 - 2733 - 2734 - 262 + 2776 + 2777 + 2925 - 3704 - 3705 - 262 + 3759 + 3760 + 2925 - 10063 - 10064 - 262 + 10253 + 10254 + 2925 @@ -23229,32 +23196,32 @@ 2 3 - 262 + 2925 20 21 - 262 + 2925 - 86 - 87 - 262 + 92 + 93 + 2925 - 164 - 165 - 262 + 163 + 164 + 2925 - 209 - 210 - 262 + 213 + 214 + 2925 - 453 - 454 - 262 + 451 + 452 + 2925 @@ -23270,77 +23237,72 @@ 1 3 - 8651 + 93614 3 5 - 12059 + 131645 5 6 - 6553 + 73136 6 7 - 12583 + 143346 7 8 - 9437 + 105316 8 10 - 11797 + 128719 10 15 - 12583 + 137495 15 - 25 - 10748 - - - 25 - 36 - 11010 + 26 + 128719 - 36 - 49 - 11272 + 26 + 39 + 128719 - 49 - 54 - 2883 + 40 + 53 + 122868 - 54 - 55 - 11272 + 53 + 61 + 32179 - 55 - 81 - 11010 + 62 + 63 + 166750 - 81 - 298 - 10748 + 63 + 97 + 122868 - 298 - 833 - 524 + 99 + 889 + 90688 @@ -23356,17 +23318,17 @@ 1 2 - 64490 + 716733 2 3 - 55577 + 631896 3 4 - 23069 + 257439 @@ -23376,23 +23338,23 @@ xmlComments - 20643577 + 231835655 id - 20643577 + 231835655 text - 325861 + 3785525 parentid - 161751 + 1796223 fileid - 151264 + 1682130 @@ -23406,7 +23368,7 @@ 1 2 - 20643577 + 231835655 @@ -23422,7 +23384,7 @@ 1 2 - 20643577 + 231835655 @@ -23438,7 +23400,7 @@ 1 2 - 20643577 + 231835655 @@ -23454,67 +23416,62 @@ 1 2 - 44828 + 509027 2 7 - 26740 + 313022 7 - 32 - 27002 + 19 + 339351 - 32 - 61 - 24642 + 19 + 62 + 336426 - 61 + 62 76 - 24642 + 310097 76 84 - 26215 + 318873 84 - 90 - 24118 - - - 90 - 94 - 21496 + 91 + 339351 - 94 + 91 95 - 11534 + 286693 95 96 - 19399 + 210632 96 98 - 27002 + 295469 98 100 - 24380 + 269140 100 - 460 - 23856 + 457 + 257439 @@ -23530,67 +23487,67 @@ 1 2 - 45353 + 517803 2 6 - 25953 + 301320 6 - 32 - 27526 + 18 + 286693 - 32 - 61 - 24904 + 18 + 58 + 286693 - 61 - 75 - 25429 + 58 + 72 + 313022 - 75 - 84 - 28575 + 72 + 81 + 301320 - 84 - 90 - 23594 + 81 + 88 + 304246 - 90 + 88 94 - 23069 + 348127 94 95 - 12845 + 146272 95 96 - 19923 + 216482 96 98 - 27526 + 310097 98 100 - 25953 + 286693 100 - 460 - 15205 + 457 + 166750 @@ -23606,67 +23563,67 @@ 1 2 - 47450 + 541207 2 7 - 25691 + 298395 7 - 32 - 25691 + 19 + 327649 - 32 - 61 - 24904 + 19 + 62 + 330575 - 61 + 62 75 - 25429 + 289619 75 - 84 - 28575 + 83 + 315948 - 84 + 83 90 - 23594 + 304246 90 94 - 23069 + 251588 94 95 - 12845 + 146272 95 96 - 19923 + 216482 96 98 - 27526 + 310097 98 100 - 25953 + 286693 100 - 460 - 15205 + 457 + 166750 @@ -23682,22 +23639,22 @@ 1 2 - 128719 + 1424691 2 - 724 - 12321 + 674 + 137495 - 726 - 830 - 14942 + 697 + 869 + 128719 - 831 + 869 941 - 5767 + 105316 @@ -23713,27 +23670,22 @@ 1 2 - 128719 + 1424691 2 - 697 - 12321 - - - 697 - 795 - 6553 + 645 + 137495 - 795 - 827 - 12321 + 677 + 838 + 128719 838 899 - 1835 + 105316 @@ -23749,7 +23701,7 @@ 1 2 - 161751 + 1796223 @@ -23765,27 +23717,27 @@ 1 2 - 115611 + 1287195 2 - 549 - 11534 + 511 + 128719 - 579 - 829 - 7864 + 514 + 866 + 108241 - 829 - 832 - 12583 + 868 + 870 + 146272 - 834 + 879 941 - 3670 + 11701 @@ -23801,27 +23753,27 @@ 1 2 - 115611 + 1287195 2 - 536 - 11534 + 495 + 128719 - 560 - 795 - 9961 + 495 + 835 + 108241 - 795 - 812 - 11534 + 837 + 839 + 146272 - 819 + 843 899 - 2621 + 11701 @@ -23837,12 +23789,12 @@ 1 2 - 143662 + 1600218 2 6 - 7602 + 81912 @@ -23852,31 +23804,31 @@ xmlChars - 19508174 + 222401095 id - 19508174 + 222401095 text - 14981766 + 169646548 parentid - 19508174 + 222401095 idx - 262 + 2925 isCDATA - 524 + 5850 fileid - 34080 + 383233 @@ -23890,7 +23842,7 @@ 1 2 - 19508174 + 222401095 @@ -23906,7 +23858,7 @@ 1 2 - 19508174 + 222401095 @@ -23922,7 +23874,7 @@ 1 2 - 19508174 + 222401095 @@ -23938,7 +23890,7 @@ 1 2 - 19508174 + 222401095 @@ -23954,7 +23906,7 @@ 1 2 - 19508174 + 222401095 @@ -23970,17 +23922,17 @@ 1 2 - 12819230 + 145722260 2 3 - 1346439 + 14832005 3 - 128 - 816095 + 204 + 9092282 @@ -23996,17 +23948,17 @@ 1 2 - 12819230 + 145722260 2 3 - 1346439 + 14832005 3 - 128 - 816095 + 204 + 9092282 @@ -24022,7 +23974,7 @@ 1 2 - 14981766 + 169646548 @@ -24038,7 +23990,7 @@ 1 2 - 14981766 + 169646548 @@ -24054,12 +24006,12 @@ 1 2 - 14334499 + 162239321 2 76 - 647266 + 7407226 @@ -24075,7 +24027,7 @@ 1 2 - 19508174 + 222401095 @@ -24091,7 +24043,7 @@ 1 2 - 19508174 + 222401095 @@ -24107,7 +24059,7 @@ 1 2 - 19508174 + 222401095 @@ -24123,7 +24075,7 @@ 1 2 - 19508174 + 222401095 @@ -24139,7 +24091,7 @@ 1 2 - 19508174 + 222401095 @@ -24153,9 +24105,9 @@ 12 - 74414 - 74415 - 262 + 76023 + 76024 + 2925 @@ -24169,9 +24121,9 @@ 12 - 57148 - 57149 - 262 + 57990 + 57991 + 2925 @@ -24185,9 +24137,9 @@ 12 - 74414 - 74415 - 262 + 76023 + 76024 + 2925 @@ -24203,7 +24155,7 @@ 2 3 - 262 + 2925 @@ -24217,9 +24169,9 @@ 12 - 130 - 131 - 262 + 131 + 132 + 2925 @@ -24233,14 +24185,14 @@ 12 - 518 - 519 - 262 + 519 + 520 + 2925 - 73896 - 73897 - 262 + 75504 + 75505 + 2925 @@ -24254,14 +24206,14 @@ 12 - 492 - 493 - 262 + 493 + 494 + 2925 - 56656 - 56657 - 262 + 57497 + 57498 + 2925 @@ -24275,14 +24227,14 @@ 12 - 518 - 519 - 262 + 519 + 520 + 2925 - 73896 - 73897 - 262 + 75504 + 75505 + 2925 @@ -24298,7 +24250,7 @@ 1 2 - 524 + 5850 @@ -24314,12 +24266,12 @@ 98 99 - 262 + 2925 - 130 - 131 - 262 + 131 + 132 + 2925 @@ -24335,57 +24287,57 @@ 1 2 - 2883 + 32179 2 - 23 - 2621 + 24 + 29254 24 243 - 2621 + 29254 294 - 566 - 2621 + 501 + 29254 - 610 - 686 - 2621 + 521 + 653 + 29254 - 691 - 764 - 2621 + 661 + 756 + 29254 - 765 - 775 - 2621 + 762 + 811 + 35105 - 775 - 776 - 786 + 812 + 816 + 20478 - 776 - 777 - 9437 + 816 + 817 + 61434 - 777 - 803 - 2621 + 817 + 818 + 73136 - 807 - 888 - 2621 + 825 + 1041 + 14627 @@ -24401,67 +24353,67 @@ 1 2 - 2883 + 32179 2 21 - 2621 + 29254 - 22 - 188 - 2621 + 23 + 189 + 29254 - 208 - 492 - 2621 + 212 + 434 + 29254 - 525 - 589 - 2621 + 434 + 557 + 29254 - 590 - 638 - 2621 + 565 + 634 + 29254 - 639 - 651 - 2621 + 645 + 669 + 29254 - 652 - 656 - 2359 + 669 + 675 + 32179 - 656 - 659 - 3145 + 675 + 677 + 20478 - 659 - 663 - 2883 + 677 + 681 + 29254 - 663 - 667 - 2621 + 681 + 685 + 35105 - 667 - 701 - 2621 + 685 + 690 + 32179 - 702 - 744 - 1835 + 690 + 1041 + 26329 @@ -24477,57 +24429,57 @@ 1 2 - 2883 + 32179 2 - 23 - 2621 + 24 + 29254 24 243 - 2621 + 29254 294 - 566 - 2621 + 501 + 29254 - 610 - 686 - 2621 + 521 + 653 + 29254 - 691 - 764 - 2621 + 661 + 756 + 29254 - 765 - 775 - 2621 + 762 + 811 + 35105 - 775 - 776 - 786 + 812 + 816 + 20478 - 776 - 777 - 9437 + 816 + 817 + 61434 - 777 - 803 - 2621 + 817 + 818 + 73136 - 807 - 888 - 2621 + 825 + 1041 + 14627 @@ -24543,7 +24495,7 @@ 1 2 - 34080 + 383233 @@ -24559,12 +24511,12 @@ 1 2 - 8389 + 96539 2 3 - 25691 + 286693 @@ -24574,15 +24526,15 @@ xmllocations - 86011718 + 973620234 xmlElement - 85766076 + 970852763 location - 80598169 + 912103979 @@ -24596,12 +24548,12 @@ 1 2 - 85764503 + 970835211 2 - 454 - 1572 + 452 + 17552 @@ -24617,12 +24569,12 @@ 1 2 - 78771195 + 891394755 2 25 - 1826974 + 20709224 @@ -24632,30 +24584,30 @@ configs - 1 + 669552 id - 1 + 669552 configNames - 1 + 669552 id - 1 + 669552 config - 1 + 669552 name - 1 + 13871 @@ -24669,7 +24621,7 @@ 1 2 - 1 + 669552 @@ -24685,7 +24637,7 @@ 1 2 - 1 + 669552 @@ -24697,7 +24649,13 @@ 12 - + + + 1 + 2 + 669552 + + @@ -24707,7 +24665,13 @@ 12 - + + + 1 + 2 + 669552 + + @@ -24717,7 +24681,68 @@ 12 - + + + 1 + 2 + 2157 + + + 2 + 13 + 1088 + + + 13 + 33 + 1048 + + + 33 + 42 + 1044 + + + 42 + 53 + 1094 + + + 53 + 59 + 1122 + + + 59 + 63 + 1008 + + + 63 + 65 + 1008 + + + 65 + 67 + 1192 + + + 67 + 96 + 986 + + + 96 + 97 + 1809 + + + 99 + 132 + 311 + + @@ -24727,7 +24752,68 @@ 12 - + + + 1 + 2 + 2157 + + + 2 + 13 + 1088 + + + 13 + 33 + 1048 + + + 33 + 42 + 1044 + + + 42 + 53 + 1094 + + + 53 + 59 + 1122 + + + 59 + 63 + 1008 + + + 63 + 65 + 1008 + + + 65 + 67 + 1192 + + + 67 + 96 + 986 + + + 96 + 97 + 1809 + + + 99 + 132 + 311 + + @@ -24735,19 +24821,19 @@ configValues - 1 + 669315 id - 1 + 669315 config - 1 + 669315 value - 1 + 483226 @@ -24761,7 +24847,7 @@ 1 2 - 1 + 669315 @@ -24777,7 +24863,7 @@ 1 2 - 1 + 669315 @@ -24789,7 +24875,13 @@ 12 - + + + 1 + 2 + 669315 + + @@ -24799,7 +24891,13 @@ 12 - + + + 1 + 2 + 669315 + + @@ -24809,7 +24907,23 @@ 12 - + + + 1 + 2 + 416999 + + + 2 + 3 + 42151 + + + 3 + 547 + 24074 + + @@ -24819,7 +24933,23 @@ 12 - + + + 1 + 2 + 416999 + + + 2 + 3 + 42151 + + + 3 + 547 + 24074 + + @@ -24827,15 +24957,15 @@ configLocations - 1 + 2008421 locatable - 1 + 2008421 location - 1 + 2008421 @@ -24845,7 +24975,13 @@ 12 - + + + 1 + 2 + 2008421 + + @@ -24855,7 +24991,13 @@ 12 - + + + 1 + 2 + 2008421 + + @@ -24863,19 +25005,19 @@ ktComments - 116780 + 122924 id - 116780 + 122924 kind - 13 + 12 text - 15129 + 15880 @@ -24889,7 +25031,7 @@ 1 2 - 116780 + 122924 @@ -24905,7 +25047,7 @@ 1 2 - 116780 + 122924 @@ -24919,18 +25061,18 @@ 12 - 794 - 795 + 951 + 952 4 - 8820 - 8821 + 10006 + 10007 4 - 17201 - 17202 + 19068 + 19069 4 @@ -24945,18 +25087,18 @@ 12 - 20 - 21 + 22 + 23 4 - 680 - 681 + 810 + 811 4 - 2774 - 2775 + 3047 + 3048 4 @@ -24973,42 +25115,42 @@ 1 2 - 6780 + 7500 2 3 - 692 + 1109 3 4 - 1506 + 1342 4 5 - 126 + 192 5 6 - 3436 + 1445 6 - 16 - 1258 + 7 + 2280 - 16 - 32 - 1201 + 7 + 19 + 1150 - 33 - 4236 - 126 + 24 + 4801 + 859 @@ -25024,7 +25166,7 @@ 1 2 - 15129 + 15880 @@ -25034,19 +25176,19 @@ ktCommentSections - 74919 + 78073 id - 74919 + 78073 comment - 74910 + 78065 content - 8109 + 8736 @@ -25060,7 +25202,7 @@ 1 2 - 74919 + 78073 @@ -25076,7 +25218,7 @@ 1 2 - 74919 + 78073 @@ -25092,7 +25234,7 @@ 1 2 - 74902 + 78057 2 @@ -25113,7 +25255,7 @@ 1 2 - 74902 + 78057 2 @@ -25134,52 +25276,47 @@ 1 2 - 3170 + 3529 2 3 - 522 + 937 3 5 - 518 + 564 5 6 - 962 + 438 6 - 9 - 622 - - - 9 - 10 - 34 + 7 + 982 - 10 - 11 - 718 + 7 + 12 + 442 - 11 - 21 - 675 + 12 + 16 + 499 - 21 - 37 - 622 + 18 + 31 + 773 - 42 - 504 - 261 + 31 + 575 + 569 @@ -25195,52 +25332,47 @@ 1 2 - 3170 + 3529 2 3 - 522 + 937 3 5 - 518 + 564 5 6 - 962 + 438 6 - 9 - 622 - - - 9 - 10 - 34 + 7 + 982 - 10 - 11 - 718 + 7 + 12 + 442 - 11 - 21 - 675 + 12 + 16 + 499 - 21 - 37 - 622 + 18 + 31 + 773 - 42 - 504 - 261 + 31 + 575 + 569 @@ -25250,15 +25382,15 @@ ktCommentSectionNames - 4034 + 3673 id - 4034 + 3673 name - 12 + 11 @@ -25272,7 +25404,7 @@ 1 2 - 4034 + 3673 @@ -25286,9 +25418,9 @@ 12 - 325 - 326 - 12 + 323 + 324 + 11 @@ -25298,15 +25430,15 @@ ktCommentSectionSubjectNames - 4034 + 3673 id - 4034 + 3673 subjectname - 2643 + 2388 @@ -25320,7 +25452,7 @@ 1 2 - 4034 + 3673 @@ -25336,22 +25468,22 @@ 1 2 - 2010 + 1819 2 3 - 397 + 341 3 - 9 - 198 + 6 + 181 - 10 + 8 16 - 37 + 45 @@ -25361,15 +25493,15 @@ ktCommentOwners - 76609 + 79801 id - 74810 + 77967 owner - 71853 + 74856 @@ -25383,12 +25515,12 @@ 1 2 - 73186 + 76329 2 6 - 1624 + 1637 @@ -25404,12 +25536,12 @@ 1 2 - 69697 + 72407 2 - 5 - 2155 + 13 + 2448 @@ -25419,19 +25551,19 @@ ktExtensionFunctions - 166732 + 149983 id - 166732 + 149983 typeid - 13632 + 13755 kttypeid - 262 + 264 @@ -25445,7 +25577,7 @@ 1 2 - 166732 + 149983 @@ -25461,7 +25593,7 @@ 1 2 - 166732 + 149983 @@ -25477,37 +25609,42 @@ 1 2 - 7864 + 7935 2 3 - 524 + 529 3 4 - 786 + 793 - 5 - 6 - 1310 + 4 + 5 + 1058 6 - 13 - 1048 + 10 + 1058 - 13 - 30 - 1048 + 10 + 17 + 1058 - 35 - 227 - 1048 + 31 + 99 + 1058 + + + 184 + 185 + 264 @@ -25523,7 +25660,7 @@ 1 2 - 13632 + 13755 @@ -25537,9 +25674,9 @@ 12 - 636 - 637 - 262 + 567 + 568 + 264 @@ -25555,7 +25692,7 @@ 52 53 - 262 + 264 @@ -25565,15 +25702,15 @@ ktProperties - 2989117 + 3024536 id - 2989117 + 3024536 nodeName - 1848733 + 1863287 @@ -25587,7 +25724,7 @@ 1 2 - 2989117 + 3024536 @@ -25603,17 +25740,17 @@ 1 2 - 1614626 + 1625747 2 4 - 155721 + 156861 4 352 - 78385 + 80678 @@ -25623,15 +25760,15 @@ ktPropertyGetters - 816357 + 830861 id - 816357 + 830861 getter - 816357 + 830861 @@ -25645,7 +25782,7 @@ 1 2 - 816357 + 830861 @@ -25661,7 +25798,7 @@ 1 2 - 816357 + 830861 @@ -25671,15 +25808,15 @@ ktPropertySetters - 53073 + 53910 id - 53073 + 53910 setter - 53073 + 53910 @@ -25693,7 +25830,7 @@ 1 2 - 53073 + 53910 @@ -25709,7 +25846,7 @@ 1 2 - 53073 + 53910 @@ -25719,15 +25856,15 @@ ktPropertyBackingFields - 2459964 + 2496205 id - 2459964 + 2496205 backingField - 2459964 + 2496205 @@ -25741,7 +25878,7 @@ 1 2 - 2459964 + 2496205 @@ -25757,7 +25894,7 @@ 1 2 - 2459964 + 2496205 @@ -25767,15 +25904,15 @@ ktSyntheticBody - 1497 + 3319 id - 1497 + 3319 kind - 124 + 301 @@ -25789,7 +25926,7 @@ 1 2 - 1497 + 3319 @@ -25803,9 +25940,9 @@ 12 - 12 - 13 - 124 + 11 + 12 + 301 @@ -25815,37 +25952,37 @@ ktLocalFunction - 1573 + 1714 id - 1573 + 1714 ktInitializerAssignment - 69820 + 57546 id - 69820 + 57546 ktPropertyDelegates - 4944 + 6938 id - 4944 + 6938 variableId - 4944 + 6938 @@ -25859,7 +25996,7 @@ 1 2 - 4944 + 6938 @@ -25875,7 +26012,7 @@ 1 2 - 4944 + 6938 @@ -25885,15 +26022,15 @@ compiler_generated - 268390 + 266747 id - 268390 + 266747 kind - 148 + 136 @@ -25907,7 +26044,7 @@ 1 2 - 268390 + 266747 @@ -25921,59 +26058,59 @@ 12 - 61 - 62 - 12 + 15 + 16 + 11 - 84 - 85 - 24 + 70 + 71 + 11 - 94 - 95 - 12 + 86 + 87 + 22 - 143 - 144 - 12 + 114 + 115 + 11 - 186 - 187 - 12 + 146 + 147 + 11 - 203 - 204 - 12 + 246 + 247 + 11 - 737 - 738 - 12 + 588 + 589 + 11 - 1028 - 1029 - 12 + 1148 + 1149 + 11 - 1275 - 1276 - 12 + 1354 + 1355 + 11 - 5140 - 5141 - 12 + 5444 + 5445 + 11 - 12589 - 12590 - 12 + 14161 + 14162 + 11 @@ -25983,15 +26120,15 @@ ktFunctionOriginalNames - 216279 + 218494 id - 216279 + 218494 name - 25167 + 25658 @@ -26005,7 +26142,7 @@ 1 2 - 216279 + 218494 @@ -26021,22 +26158,22 @@ 1 2 - 19923 + 20368 2 4 - 1835 + 1851 6 16 - 2097 + 2116 22 339 - 1310 + 1322 @@ -26046,25 +26183,14 @@ ktDataClasses - 15467 - - - id - 15467 - - - - - - isNullDefaultCase - 50 + 15606 id - 50 + 15606 - + \ No newline at end of file