From c577165790c5c5a946ffa55ae5c8cc2c774fcf9e Mon Sep 17 00:00:00 2001 From: undefined Date: Mon, 20 Dec 2021 15:39:35 +0800 Subject: [PATCH] judge: redirect cpp to cc --- packages/hydrojudge/package.json | 2 +- packages/hydrojudge/src/hosts/hydro.ts | 1 + packages/hydrojudge/src/service.ts | 1 + packages/utils/lib/cases.ts | 2 +- packages/utils/package.json | 2 +- 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/hydrojudge/package.json b/packages/hydrojudge/package.json index 8e2bedea..6f396c0f 100644 --- a/packages/hydrojudge/package.json +++ b/packages/hydrojudge/package.json @@ -1,7 +1,7 @@ { "name": "@hydrooj/hydrojudge", "bin": "bin/hydrojudge.js", - "version": "2.12.13", + "version": "2.12.14", "main": "package.json", "author": "undefined ", "repository": "https://github.com/hydro-dev/Hydro.git", diff --git a/packages/hydrojudge/src/hosts/hydro.ts b/packages/hydrojudge/src/hosts/hydro.ts index 419bbb9c..dc8f79e8 100644 --- a/packages/hydrojudge/src/hosts/hydro.ts +++ b/packages/hydrojudge/src/hosts/hydro.ts @@ -235,6 +235,7 @@ export default class Hydro { getLang(name: string) { if (this.language[name]) return this.language[name]; + if (name === 'cpp' && this.language.cc) return this.language.cc; throw new SystemError('Unsupported language {0}', [name]); } diff --git a/packages/hydrojudge/src/service.ts b/packages/hydrojudge/src/service.ts index bc63b520..c34687c7 100644 --- a/packages/hydrojudge/src/service.ts +++ b/packages/hydrojudge/src/service.ts @@ -136,6 +136,7 @@ async function postInit() { function getLang(lang: string) { if (setting.langs[lang]) return setting.langs[lang]; + if (lang === 'cpp' && setting.langs['cc']) return setting.langs['cc']; throw new SystemError('Unsupported language {0}.', [lang]); } diff --git a/packages/utils/lib/cases.ts b/packages/utils/lib/cases.ts index 827606fa..b01f1638 100644 --- a/packages/utils/lib/cases.ts +++ b/packages/utils/lib/cases.ts @@ -12,7 +12,7 @@ export default async function readYamlCases(cfg: Record = {}, check config.checker_type = cfg.checker_type || 'default'; if (cfg.checker) { if (!cfg.checker.includes('.')) { - config.checker = findFileSync(`@hydrooj/hydrojudgejudge/vendor/testlib/checkers/${cfg.checker}.cpp`, false); + config.checker = findFileSync(`@hydrooj/hydrojudge/vendor/testlib/checkers/${cfg.checker}.cpp`, false); } if (!config.checker) config.checker = checkFile(cfg.checker, 'Cannot find checker {0}.'); } diff --git a/packages/utils/package.json b/packages/utils/package.json index e8ffac16..0501535a 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/utils", - "version": "1.1.9", + "version": "1.1.10", "description": "hydrooj utils", "main": "package.json", "repository": "https://github.com/hydro-dev/Hydro.git",