ConceptProd/ConceptPortal-public
1
0
Fork 0
mirror of https://github.com/IRBorisov/ConceptPortal.git synced 2025-06-26 13:00:39 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

F: Implement rules from pyconcept0.1.10
Some checks failed
Frontend CI / build (22.x) (push) Waiting to run
Details
Backend CI / build (3.12) (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Ivan 2024-09-25 23:09:09 +03:00
parent b7cfb3082b
commit 67f2a9f325
6 changed files with 9 additions and 6 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

2
rsconcept/frontend/index.html
View File

@ -15,7 +15,7 @@
<link rel="preconnect" href="https://fonts.googleapis.com" /> <link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin /> <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link <link
href="https://fonts.googleapis.com/css2?family=Rubik:ital,wght@0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,300;1,400;1,500;1,600;1,700;1,800;1,900&family=Fira+Code:wght@300..700&family=Noto+Sans+Math&family=Noto+Sans+Symbols+2&family=Alegreya+Sans+SC:wght@100;300;400;500;700;800;900" href="https://fonts.googleapis.com/css2?family=Rubik:ital,wght@0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,300;1,400;1,500;1,600;1,700;1,800;1,900&family=Fira+Code:wght@300..700&family=Noto+Sans+Math&family=Noto+Sans+Symbols+2&family=Alegreya+Sans+SC:wght@100;300;400;500;700;800;900&family=Noto+Color+Emoji"
rel="stylesheet" rel="stylesheet"
/> />

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,

6
rsconcept/frontend/src/styling/constants.css
View File

@ -4,9 +4,9 @@
/* prettier-ignore */ /* prettier-ignore */
:root { :root {
--font-ui: 'Alegreya Sans SC', 'Rubik', 'Segoe UI Symbol', sans-serif; --font-ui: 'Alegreya Sans SC', 'Rubik', 'Noto Color Emoji', 'Segoe UI Symbol', sans-serif;
--font-main: 'Rubik', 'Fira Code', 'Noto Sans Math', 'Noto Sans Symbols 2', 'Segoe UI Symbol', sans-serif; --font-main: 'Rubik', 'Noto Color Emoji', 'Fira Code', 'Noto Sans Math', 'Noto Sans Symbols 2', 'Segoe UI Symbol', sans-serif;
--font-math: 'Fira Code', 'Noto Sans Math', 'Noto Sans Symbols 2', 'Rubik', 'Segoe UI Symbol', sans-serif; --font-math: 'Fira Code', 'Noto Sans Math', 'Noto Sans Symbols 2', 'Rubik', 'Noto Color Emoji', 'Segoe UI Symbol', sans-serif;
/* Light Theme */ /* Light Theme */
--cl-bg-120: hsl(000, 000%, 100%); --cl-bg-120: hsl(000, 000%, 100%);

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: