ConceptProd/Portal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

F: Implement rules from pyconcept0.1.10

Browse Source
This commit is contained in:
Ivan 2024-09-25 23:07:55 +03:00
parent 760c4cd659
commit e1604bb7f8
4 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rsconcept/backend/requirements-dev-lock.txt
View File

@ -8,7 +8,7 @@ drf-spectacular-sidecar==2024.7.1
coreapi==2.3.3 coreapi==2.3.3
django-rest-passwordreset==1.4.1 django-rest-passwordreset==1.4.1
cctext==0.1.4 cctext==0.1.4
pyconcept==0.1.8 pyconcept==0.1.10
psycopg2-binary==2.9.9 psycopg2-binary==2.9.9
gunicorn==23.0.0 gunicorn==23.0.0

2
rsconcept/backend/requirements.txt
View File

@ -8,7 +8,7 @@ drf-spectacular-sidecar==2024.7.1
coreapi==2.3.3 coreapi==2.3.3
django-rest-passwordreset==1.4.1 django-rest-passwordreset==1.4.1
cctext==0.1.4 cctext==0.1.4
pyconcept==0.1.8 pyconcept==0.1.10
psycopg2-binary==2.9.9 psycopg2-binary==2.9.9
gunicorn==23.0.0 gunicorn==23.0.0

1
rsconcept/frontend/src/models/rslang.ts
View File

@ -232,6 +232,7 @@ export enum RSErrorType {
invalidBinding = 34836, invalidBinding = 34836,
localOutOfScope = 34837, localOutOfScope = 34837,
invalidElementPredicate = 34838, invalidElementPredicate = 34838,
invalidEmptySetUsage = 34839,
invalidArgsArity = 34840, invalidArgsArity = 34840,
invalidArgumentType = 34841, invalidArgumentType = 34841,
globalStructure = 34844, globalStructure = 34844,

2
rsconcept/frontend/src/utils/labels.ts
View File

@ -760,6 +760,8 @@ export function describeRSError(error: IRSErrorDescription): string {
return `Использование имени переменной вне области действия: ${error.params[0]}`; return `Использование имени переменной вне области действия: ${error.params[0]}`;
case RSErrorType.invalidElementPredicate: case RSErrorType.invalidElementPredicate:
return `Несоответствие типизаций операндов для оператора: ${error.params[0]}${error.params[1]}${error.params[2]}`; return `Несоответствие типизаций операндов для оператора: ${error.params[0]}${error.params[1]}${error.params[2]}`;
case RSErrorType.invalidEmptySetUsage:
return 'Бессмысленное использование пустого множества';
case RSErrorType.invalidArgsArity: case RSErrorType.invalidArgsArity:
return `Неверное число аргументов терм-функции: ${error.params[0]} != ${error.params[1]}`; return `Неверное число аргументов терм-функции: ${error.params[0]} != ${error.params[1]}`;
case RSErrorType.invalidArgumentType: case RSErrorType.invalidArgumentType: