From e1604bb7f8ef8a9b0f0036d6371b8b995d898cf8 Mon Sep 17 00:00:00 2001 From: Ivan <8611739+IRBorisov@users.noreply.github.com> Date: Wed, 25 Sep 2024 23:07:55 +0300 Subject: [PATCH] F: Implement rules from pyconcept0.1.10 --- rsconcept/backend/requirements-dev-lock.txt | 2 +- rsconcept/backend/requirements.txt | 2 +- rsconcept/frontend/src/models/rslang.ts | 1 + rsconcept/frontend/src/utils/labels.ts | 2 ++ 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/rsconcept/backend/requirements-dev-lock.txt b/rsconcept/backend/requirements-dev-lock.txt index 15ac8ccf..632d236e 100644 --- a/rsconcept/backend/requirements-dev-lock.txt +++ b/rsconcept/backend/requirements-dev-lock.txt @@ -8,7 +8,7 @@ drf-spectacular-sidecar==2024.7.1 coreapi==2.3.3 django-rest-passwordreset==1.4.1 cctext==0.1.4 -pyconcept==0.1.8 +pyconcept==0.1.10 psycopg2-binary==2.9.9 gunicorn==23.0.0 diff --git a/rsconcept/backend/requirements.txt b/rsconcept/backend/requirements.txt index 8296f987..ab8455c0 100644 --- a/rsconcept/backend/requirements.txt +++ b/rsconcept/backend/requirements.txt @@ -8,7 +8,7 @@ drf-spectacular-sidecar==2024.7.1 coreapi==2.3.3 django-rest-passwordreset==1.4.1 cctext==0.1.4 -pyconcept==0.1.8 +pyconcept==0.1.10 psycopg2-binary==2.9.9 gunicorn==23.0.0 \ No newline at end of file diff --git a/rsconcept/frontend/src/models/rslang.ts b/rsconcept/frontend/src/models/rslang.ts index b888f8c1..f9498850 100644 --- a/rsconcept/frontend/src/models/rslang.ts +++ b/rsconcept/frontend/src/models/rslang.ts @@ -232,6 +232,7 @@ export enum RSErrorType { invalidBinding = 34836, localOutOfScope = 34837, invalidElementPredicate = 34838, + invalidEmptySetUsage = 34839, invalidArgsArity = 34840, invalidArgumentType = 34841, globalStructure = 34844, diff --git a/rsconcept/frontend/src/utils/labels.ts b/rsconcept/frontend/src/utils/labels.ts index e3c0ae38..6ed02ec5 100644 --- a/rsconcept/frontend/src/utils/labels.ts +++ b/rsconcept/frontend/src/utils/labels.ts @@ -760,6 +760,8 @@ export function describeRSError(error: IRSErrorDescription): string { return `Использование имени переменной вне области действия: ${error.params[0]}`; case RSErrorType.invalidElementPredicate: return `Несоответствие типизаций операндов для оператора: ${error.params[0]}${error.params[1]}${error.params[2]}`; + case RSErrorType.invalidEmptySetUsage: + return 'Бессмысленное использование пустого множества'; case RSErrorType.invalidArgsArity: return `Неверное число аргументов терм-функции: ${error.params[0]} != ${error.params[1]}`; case RSErrorType.invalidArgumentType: