@artel/artc 0.6.25212 → 0.6.25214

package/build/types/analysis/Analyzer.d.ts

@@ -520,18 +520,17 @@ declare class DefaultConstructors {
 declare class OverriddenMember {
     private readonly _analyzer;
     constructor(_analyzer: Analyzer);
-    getOverriddenMethod(method: TypeMethodEntity): types.Method | undefined;
-    getTheMostBaseOverriddenMethod(method: TypeMethodEntity): types.Method | undefined;
-    getOverriddenOperator(operator: OperatorEntity): types.Operator | undefined;
-    getOverriddenVariable(variable: entities.TypeVariableEntity): types.Variable | undefined;
+    getOverriddenVariable(node: tree.TypeVariableDeclaration | TypeVariableAccessorDeclaration): types.Variable | undefined;
     getTheMostBaseOverriddenVariable(variable: entities.TypeVariableEntity): types.Variable | undefined;
-    checkMethodOverridesMethod(methodInDerivedType: TypeMethodEntity, methodInBaseType: types.Method): boolean;
-    checkVariableOverridesVariable(variableInDerivedType: entities.TypeVariableEntity, variableInBaseType: types.Variable): boolean;
-    checkOperatorOverridesOperator(operatorInDerivedType: OperatorEntity, operatorInBaseType: types.Operator): boolean;
+    getOverriddenMethod(node: tree.TypeMethodDeclaration): types.Method | undefined;
+    getTheMostBaseOverriddenMethod(method: TypeMethodEntity): types.Method | undefined;
+    getOverriddenOperator(node: tree.OperatorDeclaration): types.Operator | undefined;
     private findOverriddenVariableInType;
     private findOverriddenMethodInType;
-    private methodSignatureTypesAreEqual;
     private findOverriddenOperatorInType;
+    private checkVariableOverridesVariable;
+    private checkMethodOverridesMethod;
+    private checkOperatorOverridesOperator;
 }
 declare class Tags {
     readonly _analyzer: Analyzer;

package/build/types/analysis/IdentifierExpressionMeaning.d.ts

@@ -17,7 +17,7 @@ export declare class Resolver {
     private get semanticContext();
     constructor(analyzer: Analyzer, node: tree.IdentifierExpression, targetTypeHint: TargetTypeHint | undefined);
     resolve(): ResolutionResult;
-    private resolveOperatorAccessMeaning;
+    private tryResolveOperatorAccessMeaning;
     private resolveMethodOverload;
     private createAccessedMethod;
     private convertSyntacticAccessKind;

package/build/types/analysis/PropertyAccessExpressionMeaning.d.ts

@@ -13,7 +13,6 @@ export declare class Resolver {
     private readonly _node;
     private readonly _targetTypeHint;
     private get propertySearchName();
-    private get isOperatorName();
     private get semanticContext();
     private get receiver();
     constructor(analyzer: Analyzer, node: tree.PropertyAccessExpression, targetTypeHint: TargetTypeHint | undefined);
@@ -25,7 +24,7 @@ export declare class Resolver {
     private resolveStaticMemberOrVariantAccessMeaning;
     private createAccessedMethodFromTypeMember;
     private resolveInstanceMemberAccessMeaning;
-    private resolveOperatorAccessMeaning;
+    private tryResolveOperatorAccessMeaning;
     private resolveMethodOverload;
     private convertSyntacticAccessKind;
 }

package/build/types/analysis/TypeMemberLookup.d.ts

@@ -25,3 +25,17 @@ export declare class TypeMemberLookup {
     getDereferenceOperators(hidingMatcher?: IEntityHidingMatcher, typeExtensionsLookup?: Lookup): Query<FoundAnonymousDeclaration<types.DereferenceOperator>>;
     private getLocaleOfTypeEntity;
 }
+export declare class BoundTypeMemberLookup {
+    private readonly _lookup;
+    private readonly _hidingMatcher;
+    private readonly _typeExtensionLookup;
+    constructor(analyzer: Analyzer, type: types.Type, localizationContext: LocalizationContext | undefined, hidingMatcher: IEntityHidingMatcher | undefined, typeExtensionLookup: Lookup | undefined);
+    static ofTypeEntity(analyzer: Analyzer, entity: TypeEntity, localizationContext: LocalizationContext | undefined, hidingMatcher: IEntityHidingMatcher | undefined, typeExtensionLookup: Lookup | undefined): BoundTypeMemberLookup;
+    getNamedMembers(): Query<FoundNamedDeclaration<types.NamedTypeMember>>;
+    getNamedMembersByName(name: SearchName): Query<FoundNamedDeclaration<types.NamedTypeMember>>;
+    getOperators(): Query<FoundAnonymousDeclaration<types.Operator>>;
+    getOperatorsByKind(kind: OperatorKind): Query<FoundAnonymousDeclaration<types.Operator>>;
+    getConstructors(): Query<FoundAnonymousDeclaration<types.Constructor>>;
+    getIndexers(): Query<FoundAnonymousDeclaration<types.Indexer>>;
+    getDereferenceOperators(): Query<FoundAnonymousDeclaration<types.DereferenceOperator>>;
+}

package/build/types/analysis/WellKnownDeclarations.d.ts

@@ -1,5 +1,5 @@
 import { Diagnostic } from '../diagnostic/Diagnostic.js';
-import { AliasTypeEntity, StructuredTypeEntity, VariantTypeEntity } from '../entities/index.js';
+import { AliasTypeEntity, StructuredTypeEntity, TypeMethodEntity } from '../entities/index.js';
 export declare class WellKnownDeclarationsLoadError extends Error {
     readonly diagnostic: Diagnostic;
     constructor(diagnostic: Diagnostic);
@@ -12,10 +12,11 @@ export declare class WellKnownDeclarations {
     text: StructuredTypeEntity;
     textTemplate: StructuredTypeEntity;
     char: StructuredTypeEntity;
-    yesNo: VariantTypeEntity;
+    yesNo: StructuredTypeEntity;
     none: StructuredTypeEntity;
     enumerable: StructuredTypeEntity;
     enumerator: StructuredTypeEntity;
+    enumeratorMethod: TypeMethodEntity;
     array: StructuredTypeEntity;
     readonlyArray: StructuredTypeEntity;
     map: StructuredTypeEntity;

package/build/types/diagnostic/DiagnosticCode.d.ts

@@ -2,156 +2,116 @@ export declare enum DiagnosticCode {
     IdentifierExpected = 0,
     TypeNameExpected = 1,
     PackageNameExpected = 2,
-    IdentifierWithoutPrimeSymbolExpected = 3,
-    TypeMemberDeclarationExpected = 4,
-    SourceFileMemberExpected = 5,
-    EnumerationVariableDeclarationExpected = 6,
-    StatementExpected = 7,
-    ExpressionExpected = 8,
-    BaseTypeNameExpected = 9,
-    VariantDeclarationExpected = 10,
-    TypeSpecifierExpected = 11,
-    TypeBodyExpected = 12,
-    MethodCallArgumentExpected = 13,
-    TagArgumentExpected = 14,
-    TypeParameterExpected = 15,
-    ParameterExpected = 16,
-    RunStatementClauseExpected = 17,
-    PackageImportExpected = 18,
-    UsingDirectiveOrSourceFileMemberExpected = 19,
-    WordFormExpected = 20,
-    TypeMemberTranslationExpected = 21,
-    TranslationExpected = 22,
-    Expected0But1Found = 23,
-    InvalidTextTemplateLiteral = 24,
-    RunKeywordOnCreateKeywordOrModifierListExpected = 25,
-    ModifierListExpected = 26,
-    HidingLevelExpected = 27,
-    PropertyOrElementAccessExpected = 28,
-    NameMustNotStartWithTilde = 29,
-    OperatorNameCanOnlyBeUsedInOperatorDeclaration = 30,
-    ParameterNameCanContainOnlyOneBackQuote = 31,
-    FieldNameCanContainOnlyTwoBackQuote = 32,
-    BackQuotesCanOnlyBeUsedInParameterAndFieldNames = 33,
-    NameThatMatchesKeywordMustBeEnclosedInSingleQuotes = 34,
-    VariantNotFound = 35,
-    TypeCannotBeUsedAsValue = 36,
-    PackageMemberNotFound = 37,
-    CannotAccessMembersOfUnresolvedPackage = 38,
-    TypeMemberNotFound = 39,
-    OperatorNotFound = 40,
-    CannotAccessMembersOnMethodType = 41,
-    CannotAccessStaticMembersOnTypeParameter = 42,
-    CannotAccessStaticMembersOnUnionType = 43,
-    CannotAccessMembersOnUnresolvedType = 44,
-    CannotAccessInstanceMembersOnVariantType = 45,
-    CannotAccessInstanceMembersOnTypeParameterWithoutConstraint = 46,
-    CannotAccessIndexerOnVariantType = 47,
-    CannotAccessIndexerOnMethodType = 48,
-    CannotAccessIndexerOnTypeParameter = 49,
-    CannotAccessIndexerOnUnresolvedType = 50,
-    IndexerOfTheSpecifiedTypeNotFound = 51,
-    DereferenceOperatorOfTheSpecifiedTypeNotFound = 52,
-    IndexedGetterNotFound = 53,
-    IndexedSetterNotFound = 54,
-    IndexerNotFound = 55,
-    CannotCreateInstanceOfAspect = 56,
-    CannotCreateInstanceOfVariantType = 57,
-    CannotCreateInstanceOfMethodType = 58,
-    CannotCreateInstanceOfTypeParameter = 59,
-    CannotCreateInstanceOfUnresolvedType = 60,
-    CannotCreateInstanceOfInvalidType = 61,
-    TypeConstructorNotFound = 62,
-    CannotInvokeExpression = 63,
-    NamedArgumentExpectedButPositionalArgumentFound = 64,
-    ParameterWithGivenNameNotFound = 65,
-    ArgumentForParameterAlreadyPassed = 66,
-    PackageAliasCannotBeUsedAsValue = 67,
-    PackageNameCannotBeUsedAsValue = 68,
-    UnknownVariable = 69,
-    UnknownType = 70,
-    TypeWithArity0NotFound = 71,
-    CannotAccessMembersOnInvalidType = 72,
-    CannotAccessIndexerOnInvalidType = 73,
-    VariableUsedBeforeBeingDeclared = 74,
-    Type0IsNotAssignableToType1 = 75,
-    VariableNotFound = 76,
-    MethodNotFound = 77,
-    PackageAliasNotFound = 78,
-    VariantAliasExpected = 79,
-    UnknownPackage = 80,
-    CannotAssignValueToExpression = 81,
-    NotEveryRequiredParameterIsProvidedWithCallArgument = 82,
-    ParameterForPositionalCallArgumentNotFound = 83,
-    AliasTypeAliasMustNotContainMemberAliases = 84,
-    InvalidTypeAliasMustNotContainMemberAliases = 85,
-    CannotUseSpecialNameForLocalDeclaration = 86,
-    SpecialNameIsNotAllowed = 87,
-    MultipleValuesFound = 88,
-    CannotDetermineTargetTypeToCallTheConstructor = 89,
-    AmbiguousAccess = 90,
-    PackageNameConflictsWithDeclarationName = 91,
-    CannotAccessVariableDueToItsAccessibilityLevel = 92,
-    CannotAccessMethodDueToItsAccessibilityLevel = 93,
-    CannotAccessTypeDueToItsAccessibilityLevel = 94,
-    CanNotAssignValueToContextVariable = 95,
-    ExpectedPackageNameOrAliasButFoundType = 96,
-    TypeExpected = 97,
-    TypeOrPackageNotFound = 98,
-    TypeIsNotATag = 99,
-    ExpressionOfType0CanNotBeUsedForEnumeration = 100,
-    Operator0IsNotDefinedForTypes1And2 = 101,
-    Operator0IsNotDefinedForType1 = 102,
-    VariantMustHaveAssociatedValue = 103,
-    AssociatedValueMustBeANumberOrTextLiteral = 104,
-    PackageMemberOrPackageNotFound = 105,
-    TranslationsCanOnlyBeDeclaredInTranslationPackage = 106,
-    UnknownTranslatedPackage0 = 107,
-    BaseCannotBeUsedInThisContext = 108,
-    OverriddenMethodNotFound = 109,
-    ObjectCannotBeUsedInThisContext = 110,
-    BaseCannotBeUsedAsAnExpressionInItself = 111,
-    InterfacePackageMustNotContainImplementation = 112,
-    InterfacePackageVariablesMustNotHaveInitializers = 113,
-    InterfacePackageVariablesMustNotHaveAccessors = 114,
-    InterfacePackageIndexersMustNotHaveAccessors = 115,
-    BodyIsMissing = 116,
-    AbstractTypeMembersMustNotHaveBody = 117,
-    AbstractIndexersMustNotHaveAccessors = 118,
-    AbstractVariablesMustNotHaveInitializers = 119,
-    AbstractVariablesMustNotHaveAccessors = 120,
-    AccessorsAreMissing = 121,
-    PackageIsAlreadyImportedInAnotherLanguage = 122,
-    OnlySubprogramsWithReturnTypeCanReturnValue = 123,
-    MethodsUsingYieldStatementCanNotReturnValue = 124,
-    YieldStatementCanNotBeUsedInAnonymousMethods = 125,
-    YieldStatementCanNotBeUsedHere = 126,
-    MethodsUsingYieldStatementMustHaveEnumerableAsReturnType = 127,
-    YieldStatementCanNotBeUsedInRunStatementThatHasOnErrorClause = 128,
-    YieldStatementCanNotBeUsedInFinallyClause = 129,
-    SubprogramMustReturnValue = 130,
-    ResultVariableCanNotBeUsedInMethodsUsingYieldStatement = 131,
-    TypeAliasReferencesItself = 132,
-    TypeParameterHasCircularConstraint = 133,
-    BaseTypeCausesInheritanceCycle = 134,
-    OnlyGenericTypesAndFunctionsCanBeSpecialized = 135,
-    Expected0TypeArguments = 136,
-    ExpectedFrom0To1TypeArguments = 137,
-    Type0IsNotAssignableToConstraint1 = 138,
-    VariableIsDeclaredButNotUsed = 139,
-    DefaultConstructorArgumentsMustBeNamed = 140,
-    IncorrectBodyOfRedefinableAliasTypeMethod = 141,
-    TheFollowingDeclarationsAreNotTranslated0 = 142,
-    TheFollowingDeclarationAreNotTranslated0And1More = 143,
-    OperatorMustNotBeStatic = 144,
-    Operator0MustNotHaveParameters = 145,
-    Operator0MustHaveOneParameter = 146,
-    Operator0MustHaveNoMoreThanOneParameter = 147,
-    CanNotFindTsLibDirectoryBaseSearchPaths0 = 148,
-    SourceFile0IsNotPartOfThePackageAndWontBeLoaded = 149,
-    MainPackageConfigurationIsMissingProjectWontBeLoaded = 150,
-    ProgramWithoutMainPackageCanNotBeCompiled = 151,
-    JsonConfigurationValidationError = 152,
-    StandardPackage0NotFound = 153,
-    Declaration0NotFoundInStandardPackage1 = 154
+    TypeMemberDeclarationExpected = 3,
+    SourceFileMemberExpected = 4,
+    EnumerationVariableDeclarationExpected = 5,
+    StatementExpected = 6,
+    ExpressionExpected = 7,
+    BaseTypeNameExpected = 8,
+    TypeSpecifierExpected = 9,
+    TypeBodyExpected = 10,
+    MethodCallArgumentExpected = 11,
+    TagArgumentExpected = 12,
+    TypeParameterExpected = 13,
+    ParameterExpected = 14,
+    RunStatementClauseExpected = 15,
+    PackageImportExpected = 16,
+    UsingDirectiveOrSourceFileMemberExpected = 17,
+    WordFormExpected = 18,
+    TypeMemberTranslationExpected = 19,
+    TranslationExpected = 20,
+    Expected0But1Found = 21,
+    InvalidTextTemplateLiteral = 22,
+    RunKeywordOnCreateKeywordOrModifierListExpected = 23,
+    ModifierListExpected = 24,
+    HidingLevelExpected = 25,
+    ParameterNameCanContainOnlyOneBackQuote = 26,
+    FieldNameCanContainOnlyTwoBackQuote = 27,
+    BackQuotesCanOnlyBeUsedInParameterAndFieldNames = 28,
+    NameThatMatchesKeywordMustBeEnclosedInSingleQuotes = 29,
+    VariantNotFound = 30,
+    TypeCannotBeUsedAsValue = 31,
+    PackageMemberNotFound = 32,
+    TypeMemberNotFound = 33,
+    CannotAccessStaticMembersOnTypeParameter = 34,
+    IndexerOfTheSpecifiedTypeNotFound = 35,
+    DereferenceOperatorOfTheSpecifiedTypeNotFound = 36,
+    IndexerNotFound = 37,
+    CannotCreateInstanceOfAspect = 38,
+    CannotCreateInstanceOfTypeParameter = 39,
+    CannotCreateInstanceOfUnresolvedType = 40,
+    TypeConstructorNotFound = 41,
+    CannotInvokeExpression = 42,
+    NamedArgumentExpectedButPositionalArgumentFound = 43,
+    ParameterWithGivenNameNotFound = 44,
+    ArgumentForParameterAlreadyPassed = 45,
+    PackageAliasCannotBeUsedAsValue = 46,
+    PackageNameCannotBeUsedAsValue = 47,
+    UnknownVariable = 48,
+    UnknownType = 49,
+    TypeWithArity0NotFound = 50,
+    VariableUsedBeforeBeingDeclared = 51,
+    Type0IsNotAssignableToType1 = 52,
+    VariableNotFound = 53,
+    MethodNotFound = 54,
+    UnknownPackage = 55,
+    CannotAssignValueToExpression = 56,
+    NotEveryRequiredParameterIsProvidedWithCallArgument = 57,
+    ParameterForPositionalCallArgumentNotFound = 58,
+    CannotDetermineTargetTypeToCallTheConstructor = 59,
+    AmbiguousAccess = 60,
+    PackageNameConflictsWithDeclarationName = 61,
+    CanNotAssignValueToContextVariable = 62,
+    ExpectedPackageNameOrAliasButFoundType = 63,
+    TypeExpected = 64,
+    TypeOrPackageNotFound = 65,
+    TypeIsNotATag = 66,
+    ExpressionOfType0CanNotBeUsedForEnumeration = 67,
+    Operator0IsNotDefinedForTypes1And2 = 68,
+    Operator0IsNotDefinedForType1 = 69,
+    VariantMustHaveAssociatedValue = 70,
+    PackageMemberOrPackageNotFound = 71,
+    TranslationsCanOnlyBeDeclaredInTranslationPackage = 72,
+    UnknownTranslatedPackage0 = 73,
+    BaseCannotBeUsedInThisContext = 74,
+    OverriddenMethodNotFound = 75,
+    ObjectCannotBeUsedInThisContext = 76,
+    BaseCannotBeUsedAsAnExpressionInItself = 77,
+    InterfacePackageMustNotContainImplementation = 78,
+    InterfacePackageVariablesMustNotHaveInitializers = 79,
+    BodyIsMissing = 80,
+    AbstractTypeMembersMustNotHaveBody = 81,
+    AbstractVariablesMustNotHaveInitializers = 82,
+    PackageIsAlreadyImportedInAnotherLanguage = 83,
+    OnlySubprogramsWithReturnTypeCanReturnValue = 84,
+    MethodsUsingYieldStatementCanNotReturnValue = 85,
+    YieldStatementCanNotBeUsedInAnonymousMethods = 86,
+    YieldStatementCanNotBeUsedHere = 87,
+    MethodsUsingYieldStatementMustHaveEnumerableAsReturnType = 88,
+    YieldStatementCanNotBeUsedInRunStatementThatHasOnErrorClause = 89,
+    YieldStatementCanNotBeUsedInFinallyClause = 90,
+    SubprogramMustReturnValue = 91,
+    ResultVariableCanNotBeUsedInMethodsUsingYieldStatement = 92,
+    TypeAliasReferencesItself = 93,
+    TypeParameterHasCircularConstraint = 94,
+    BaseTypeCausesInheritanceCycle = 95,
+    OnlyGenericTypesAndFunctionsCanBeSpecialized = 96,
+    Expected0TypeArguments = 97,
+    ExpectedFrom0To1TypeArguments = 98,
+    Type0IsNotAssignableToConstraint1 = 99,
+    VariableIsDeclaredButNotUsed = 100,
+    DefaultConstructorArgumentsMustBeNamed = 101,
+    IncorrectBodyOfRedefinableAliasTypeMethod = 102,
+    TheFollowingDeclarationsAreNotTranslated0 = 103,
+    TheFollowingDeclarationAreNotTranslated0And1More = 104,
+    OperatorMustNotBeStatic = 105,
+    Operator0MustNotHaveParameters = 106,
+    Operator0MustHaveOneParameter = 107,
+    Operator0MustHaveNoMoreThanOneParameter = 108,
+    CanNotFindTsLibDirectoryBaseSearchPaths0 = 109,
+    SourceFile0IsNotPartOfThePackageAndWontBeLoaded = 110,
+    ProgramWithoutMainPackageCanNotBeCompiled = 111,
+    JsonConfigurationValidationError = 112,
+    StandardPackage0NotFound = 113,
+    Declaration0NotFoundInStandardPackage1 = 114
 }

package/build/types/emitter/Entities.d.ts

@@ -64,6 +64,7 @@ export declare class TypeOrExtensionEntityDetails {
     structuredTypeKind: StructuredTypeKind;
     aliasedType: Type | undefined;
     isDefaultExport: boolean;
+    extendedType: TypeOrExtensionEntity | undefined;
 }
 export declare enum TypeOrExtensionEntityKind {
     StructuredType = 0,

package/build/types/entities/MethodEntity.d.ts

@@ -19,6 +19,7 @@ export interface TypeMethodEntity extends IMethodEntity {
     isAbstract(): boolean;
     isModifyingOwningPlainObject(): boolean;
     isMethodTypeInvokeMethod(): boolean;
+    getOverriddenMember(): types.Method | undefined;
 }
 export interface NestedMethodEntity extends IMethodEntity {
     readonly subkind: 'nested';
@@ -72,6 +73,7 @@ export declare class TypeMethodDeclarationEntity implements TypeMethodEntity {
     readonly subkind = "type";
     private readonly _typeParameters;
     private readonly _valueParameters;
+    private readonly _overriddenMember;
     constructor(_analyzer: Analyzer, _node: TypeMethodDeclaration);
     getName(): Name;
     getTypeParameters(): readonly TypeParameterEntity[];
@@ -90,6 +92,7 @@ export declare class TypeMethodDeclarationEntity implements TypeMethodEntity {
     isAbstract(): boolean;
     isModifyingOwningPlainObject(): boolean;
     getSubstitutionApplicationMode(): SubstitutionApplicationMode;
+    getOverriddenMember(): types.Method | undefined;
 }
 export declare class NestedMethodDeclarationEntity implements NestedMethodEntity {
     private readonly _analyzer;
@@ -150,9 +153,10 @@ export declare class IntrinsicTypeMethodEntity implements TypeMethodEntity {
     private readonly _isRedefined;
     private readonly _isAbstract;
     private readonly _isModifyingOwningPlainObject;
+    private readonly _overriddenMember;
     readonly kind = EntityKind.Method;
     readonly subkind = "type";
-    constructor(_name: Name, _typeParameters: readonly TypeParameterEntity[], _valueParameters: readonly ParameterVariableEntity[], _returnType: types.Type, _isAsync: boolean, _isHidden: EntityHidingLevel | undefined, _tags: readonly Tag[], _isMethodTypeInvokeMethod: boolean, _container: TypeMemberEntityContainer, _isStatic: boolean, _isRedefinable: boolean, _isRedefined: boolean, _isAbstract: boolean, _isModifyingOwningPlainObject: boolean);
+    constructor(_name: Name, _typeParameters: readonly TypeParameterEntity[], _valueParameters: readonly ParameterVariableEntity[], _returnType: types.Type, _isAsync: boolean, _isHidden: EntityHidingLevel | undefined, _tags: readonly Tag[], _isMethodTypeInvokeMethod: boolean, _container: TypeMemberEntityContainer, _isStatic: boolean, _isRedefinable: boolean, _isRedefined: boolean, _isAbstract: boolean, _isModifyingOwningPlainObject: boolean, _overriddenMember: types.Method | undefined);
     getName(): Name;
     getTypeParameters(): readonly TypeParameterEntity[];
     getValueParameters(): readonly ParameterVariableEntity[];
@@ -170,5 +174,6 @@ export declare class IntrinsicTypeMethodEntity implements TypeMethodEntity {
     isAbstract(): boolean;
     isModifyingOwningPlainObject(): boolean;
     getSubstitutionApplicationMode(): SubstitutionApplicationMode;
+    getOverriddenMember(): types.Method | undefined;
 }
 export {};

package/build/types/entities/OperatorEntity.d.ts

@@ -16,6 +16,7 @@ export interface OperatorEntity {
     isAbstract(): boolean;
     isHidden(): EntityHidingLevel | undefined;
     getTags(): readonly Tag[];
+    getOverriddenMember(): types.Operator | undefined;
 }
 export type OperatorDefinition = {
     kind: DefinitionKind.Source;
@@ -27,6 +28,7 @@ export declare class OperatorDeclarationEntity implements OperatorEntity {
     readonly kind = EntityKind.Operator;
     private readonly _operatorKind;
     private readonly _valueParameters;
+    private readonly _overriddenMember;
     constructor(_analyzer: Analyzer, _node: tree.OperatorDeclaration);
     getOperatorKind(): OperatorKind;
     getValueParameters(): readonly ParameterVariableEntity[];
@@ -39,5 +41,6 @@ export declare class OperatorDeclarationEntity implements OperatorEntity {
     isAbstract(): boolean;
     isHidden(): EntityHidingLevel | undefined;
     getTags(): readonly Tag[];
+    getOverriddenMember(): types.Operator | undefined;
     private convertSyntaxOperatorKind;
 }

package/build/types/entities/OperatorKind.d.ts

@@ -3,28 +3,27 @@ export declare enum OperatorKind {
     UnaryPlus = 0,
     UnaryMinus = 1,
     Not = 2,
-    BitwiseNot = 3,
-    Add = 4,
-    Subtract = 5,
-    Multiply = 6,
-    Divide = 7,
-    IntegerDivide = 8,
-    Modulo = 9,
-    LessThan = 10,
-    GreaterThan = 11,
-    LessThanEquals = 12,
-    GreaterThanEquals = 13,
-    Or = 14,
-    And = 15,
-    Xor = 16,
-    BitwiseAnd = 17,
-    BitwiseOr = 18,
-    BitwiseXor = 19
+    Add = 3,
+    Subtract = 4,
+    Multiply = 5,
+    Divide = 6,
+    IntegerDivide = 7,
+    Modulo = 8,
+    LessThan = 9,
+    GreaterThan = 10,
+    LessThanOrEqual = 11,
+    GreaterThanOrEqual = 12,
+    Or = 13,
+    And = 14,
+    Xor = 15,
+    BitwiseAnd = 16,
+    BitwiseOr = 17,
+    BitwiseXor = 18
 }
 /**
  * Виды операторов, задаваемых токенами (`+`, `-`, `*=` и др.).
  */
-export type KindOfOperatorDefinedByToken = OperatorKind.BitwiseNot | OperatorKind.UnaryPlus | OperatorKind.UnaryMinus | OperatorKind.Add | OperatorKind.Subtract | OperatorKind.Multiply | OperatorKind.Divide | OperatorKind.IntegerDivide | OperatorKind.Modulo | OperatorKind.LessThan | OperatorKind.GreaterThan | OperatorKind.LessThanEquals | OperatorKind.GreaterThanEquals | OperatorKind.BitwiseAnd | OperatorKind.BitwiseOr | OperatorKind.BitwiseXor;
+export type KindOfOperatorDefinedByToken = OperatorKind.UnaryPlus | OperatorKind.UnaryMinus | OperatorKind.Add | OperatorKind.Subtract | OperatorKind.Multiply | OperatorKind.Divide | OperatorKind.IntegerDivide | OperatorKind.Modulo | OperatorKind.LessThan | OperatorKind.GreaterThan | OperatorKind.LessThanOrEqual | OperatorKind.GreaterThanOrEqual | OperatorKind.BitwiseAnd | OperatorKind.BitwiseOr | OperatorKind.BitwiseXor;
 export declare function isOperatorDefinedByToken(kind: OperatorKind): kind is KindOfOperatorDefinedByToken;
 /**
  * Виды операторов, задаваемых ключевыми словами (`и`, `или`, `не` и др.)
@@ -34,12 +33,12 @@ export declare function isOperatorDefinedByKeyword(kind: OperatorKind): kind is
 /**
  * Виды одноместных операторов. Объявление одноместного оператора не должно содержать ни одного параметра.
  */
-export type UnaryOperatorKind = OperatorKind.UnaryPlus | OperatorKind.UnaryMinus | OperatorKind.Not | OperatorKind.BitwiseNot;
+export type UnaryOperatorKind = OperatorKind.UnaryPlus | OperatorKind.UnaryMinus | OperatorKind.Not;
 export declare function isUnaryOperator(kind: OperatorKind): kind is UnaryOperatorKind;
 /**
 * Виды двухместных операторов. Объявление двухместного оператора должно содержать один параметр.
 */
-export type BinaryOperatorKind = OperatorKind.Add | OperatorKind.Subtract | OperatorKind.Multiply | OperatorKind.Divide | OperatorKind.IntegerDivide | OperatorKind.Modulo | OperatorKind.LessThan | OperatorKind.GreaterThan | OperatorKind.LessThanEquals | OperatorKind.GreaterThanEquals | OperatorKind.Or | OperatorKind.And | OperatorKind.Xor | OperatorKind.BitwiseAnd | OperatorKind.BitwiseOr | OperatorKind.BitwiseXor;
+export type BinaryOperatorKind = OperatorKind.Add | OperatorKind.Subtract | OperatorKind.Multiply | OperatorKind.Divide | OperatorKind.IntegerDivide | OperatorKind.Modulo | OperatorKind.LessThan | OperatorKind.GreaterThan | OperatorKind.LessThanOrEqual | OperatorKind.GreaterThanOrEqual | OperatorKind.Or | OperatorKind.And | OperatorKind.Xor | OperatorKind.BitwiseAnd | OperatorKind.BitwiseOr | OperatorKind.BitwiseXor;
 export declare function isBinaryOperator(kind: OperatorKind): kind is BinaryOperatorKind;
 export type KindOfUnaryOperatorDefinedByToken = UnaryOperatorKind & KindOfOperatorDefinedByToken;
 export type KindOfUnaryOperatorDefinedByKeyword = UnaryOperatorKind & KindOfOperatorDefinedByKeyword;

package/build/types/entities/VariableEntity.d.ts

@@ -17,6 +17,7 @@ export interface TypeVariableEntity extends IVariableEntity {
     isRedefinable(): boolean;
     isRedefined(): boolean;
     isAbstract(): boolean;
+    getOverriddenMember(): types.Variable | undefined;
 }
 export interface ParameterVariableEntity extends IVariableEntity {
     readonly subkind: 'parameter';
@@ -140,6 +141,7 @@ export declare class TypeVariableDeclarationEntity implements TypeVariableEntity
     private readonly _analyzer;
     private readonly _node;
     private readonly _typeInferrer;
+    private readonly _overriddenMember;
     constructor(analyzer: Analyzer, node: TypeVariableDeclaration);
     getName(): Name;
     getType(): types.Type;
@@ -155,6 +157,7 @@ export declare class TypeVariableDeclarationEntity implements TypeVariableEntity
     isRedefinable(): boolean;
     isRedefined(): boolean;
     isAbstract(): boolean;
+    getOverriddenMember(): types.Variable | undefined;
 }
 export declare class ComputedTypeVariableDeclarationEntity implements TypeVariableEntity {
     readonly kind = EntityKind.Variable;
@@ -163,6 +166,7 @@ export declare class ComputedTypeVariableDeclarationEntity implements TypeVariab
     private readonly _getterDeclaration;
     private readonly _setterDeclaration;
     private readonly _getterOrSetterDeclaration;
+    private readonly _overriddenMember;
     constructor(analyzer: Analyzer, getterDeclaration: TypeVariableGetterDeclaration | undefined, setterDeclaration: TypeVariableSetterDeclaration | undefined);
     getName(): Name;
     getType(): types.Type;
@@ -178,6 +182,7 @@ export declare class ComputedTypeVariableDeclarationEntity implements TypeVariab
     getSetter(): SetterEntity | undefined;
     isSpecial(): SpecialVariableEntityInfo | undefined;
     getTags(): readonly Tag[];
+    getOverriddenMember(): types.Variable | undefined;
 }
 export declare class LocalVariableDeclarationEntity implements LocalVariableEntity {
     private readonly _analyzer;
@@ -349,9 +354,10 @@ export declare class IntrinsicTypeVariableEntity implements TypeVariableEntity {
     private readonly _isHidden;
     private readonly _getter;
     private readonly _setter;
+    private readonly _overriddenMember;
     readonly kind = EntityKind.Variable;
     readonly subkind = "type";
-    constructor(_name: Name, _type: types.Type, _container: TypeMemberEntityContainer, _isStatic: boolean, _isRedefinable: boolean, _isRedefined: boolean, _isAbstract: boolean, _isSpecial: SpecialVariableEntityInfo | undefined, _isHidden: EntityHidingLevel | undefined, _getter: GetterEntity | undefined, _setter: SetterEntity | undefined);
+    constructor(_name: Name, _type: types.Type, _container: TypeMemberEntityContainer, _isStatic: boolean, _isRedefinable: boolean, _isRedefined: boolean, _isAbstract: boolean, _isSpecial: SpecialVariableEntityInfo | undefined, _isHidden: EntityHidingLevel | undefined, _getter: GetterEntity | undefined, _setter: SetterEntity | undefined, _overriddenMember: types.Variable | undefined);
     getName(): Name;
     getType(): types.Type;
     getDefinition(): VariableEntityDefinition;
@@ -366,6 +372,7 @@ export declare class IntrinsicTypeVariableEntity implements TypeVariableEntity {
     isRedefinable(): boolean;
     isRedefined(): boolean;
     isAbstract(): boolean;
+    getOverriddenMember(): types.Variable | undefined;
 }
 export declare class IntrinsicParameterVariableEntity implements ParameterVariableEntity {
     private readonly _name;

package/build/types/tree/OperatorKind.d.ts

@@ -3,27 +3,26 @@ export declare enum OperatorKind {
     Plus = 0,// Одноместный или двухместный.
     Minus = 1,// Одноместный или двухместный.
     Not = 2,
-    BitwiseNot = 3,
-    Multiply = 4,
-    Divide = 5,
-    IntegerDivide = 6,
-    Modulo = 7,
-    LessThan = 8,
-    GreaterThan = 9,
-    LessThanEquals = 10,
-    GreaterThanEquals = 11,
-    Or = 12,
-    And = 13,
-    Xor = 14,
-    BitwiseAnd = 15,
-    BitwiseOr = 16,
-    BitwiseXor = 17
+    Multiply = 3,
+    Divide = 4,
+    IntegerDivide = 5,
+    Modulo = 6,
+    LessThan = 7,
+    GreaterThan = 8,
+    LessThanOrEqual = 9,
+    GreaterThanOrEqual = 10,
+    Or = 11,
+    And = 12,
+    Xor = 13,
+    BitwiseAnd = 14,
+    BitwiseOr = 15,
+    BitwiseXor = 16
 }
-export declare const operatorKinds: readonly [OperatorKind.Plus, OperatorKind.Minus, OperatorKind.Not, OperatorKind.BitwiseNot, OperatorKind.Multiply, OperatorKind.Divide, OperatorKind.IntegerDivide, OperatorKind.Modulo, OperatorKind.LessThan, OperatorKind.GreaterThan, OperatorKind.LessThanEquals, OperatorKind.GreaterThanEquals, OperatorKind.Or, OperatorKind.And, OperatorKind.Xor, OperatorKind.BitwiseAnd, OperatorKind.BitwiseOr, OperatorKind.BitwiseXor];
+export declare const operatorKinds: readonly [OperatorKind.Plus, OperatorKind.Minus, OperatorKind.Not, OperatorKind.Multiply, OperatorKind.Divide, OperatorKind.IntegerDivide, OperatorKind.Modulo, OperatorKind.LessThan, OperatorKind.GreaterThan, OperatorKind.LessThanOrEqual, OperatorKind.GreaterThanOrEqual, OperatorKind.Or, OperatorKind.And, OperatorKind.Xor, OperatorKind.BitwiseAnd, OperatorKind.BitwiseOr, OperatorKind.BitwiseXor];
 /**
  * Виды операторов, задаваемых токенами (`+`, `-`, `*=` и др.).
  */
-export type KindOfOperatorDefinedByToken = OperatorKind.BitwiseNot | OperatorKind.Plus | OperatorKind.Minus | OperatorKind.Multiply | OperatorKind.Divide | OperatorKind.IntegerDivide | OperatorKind.Modulo | OperatorKind.LessThan | OperatorKind.GreaterThan | OperatorKind.LessThanEquals | OperatorKind.GreaterThanEquals | OperatorKind.BitwiseAnd | OperatorKind.BitwiseOr | OperatorKind.BitwiseXor;
+export type KindOfOperatorDefinedByToken = OperatorKind.Plus | OperatorKind.Minus | OperatorKind.Multiply | OperatorKind.Divide | OperatorKind.IntegerDivide | OperatorKind.Modulo | OperatorKind.LessThan | OperatorKind.GreaterThan | OperatorKind.LessThanOrEqual | OperatorKind.GreaterThanOrEqual | OperatorKind.BitwiseAnd | OperatorKind.BitwiseOr | OperatorKind.BitwiseXor;
 export declare function isOperatorDefinedByToken(kind: OperatorKind): kind is KindOfOperatorDefinedByToken;
 /**
  * Виды операторов, задаваемых ключевыми словами (`и`, `или`, `не` и др.)

package/build/types/tree/green/Nodes.d.ts

@@ -1180,7 +1180,7 @@ export declare class PrefixUnaryExpression extends BaseNode {
     constructor(operator: PrefixUnaryExpressionOperator, operand: Expression);
     toRed(rangeStart: number, parent: red.ExpressionParent): red.PrefixUnaryExpression;
 }
-export type PrefixUnaryExpressionOperator = Token<TokenKind.Plus> | Token<TokenKind.Minus>;
+export type PrefixUnaryExpressionOperator = Token<TokenKind.Plus> | Token<TokenKind.Minus> | Keyword<KeywordKind.Not>;
 export declare class PropertyAccessExpression extends BaseNode {
     readonly kind = NodeKind.PropertyAccessExpression;
     readonly children: readonly [

package/build/types/tree/red/Nodes.d.ts

@@ -1132,7 +1132,7 @@ export declare class PrefixUnaryExpression extends BaseNode {
     constructor(green: green.PrefixUnaryExpression, rangeStart: number, parent: ExpressionParent);
     private createChildren;
 }
-export type PrefixUnaryExpressionOperator = Token<TokenKind.Plus> | Token<TokenKind.Minus>;
+export type PrefixUnaryExpressionOperator = Token<TokenKind.Plus> | Token<TokenKind.Minus> | Keyword<KeywordKind.Not>;
 export declare class PropertyAccessExpression extends BaseNode {
     readonly kind = NodeKind.PropertyAccessExpression;
     readonly green: green.PropertyAccessExpression;