mirrors/compiler-explorer
1
0
Fork 0
mirror of https://github.com/compiler-explorer/compiler-explorer.git synced 2025-12-27 07:04:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix pascal execution (#7695)

Browse Source 
Fixes #7224
This commit is contained in:
Patrick Quist
2025-05-20 13:19:31 +02:00
committed by GitHub
parent 447737db5b
commit ac4642283c
1 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/compilers/pascal.ts
View File

@@ -27,7 +27,11 @@ import path from 'node:path';
import fs from 'node:fs/promises';
import _ from 'underscore';
import type {ExecutionOptionsWithEnv} from '../../types/compilation/compilation.interfaces.js';
import type {
CacheKey,
CompilationCacheKey,
ExecutionOptionsWithEnv,
} from '../../types/compilation/compilation.interfaces.js';
import type {PreliminaryCompilerInfo} from '../../types/compiler.interfaces.js';
import type {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js';
import {unwrap} from '../assert.js';
@@ -120,13 +124,21 @@ export class FPCCompiler extends BaseCompiler {
}
override getOutputFilename(dirPath: string, outputFilebase: string, key?: any): string {
const inputFilename = this.getMainSourceFilename(key.source);
const baseFilename = inputFilename.substring(0, inputFilename.length - 4);
let baseFilename: string = outputFilebase;
if (key?.source) {
const inputFilename = this.getMainSourceFilename(key.source);
baseFilename = inputFilename.substring(0, inputFilename.length - 4);
}
return path.join(dirPath, `${baseFilename}.s`);
}
override getExecutableFilename(dirPath: string) {
override getExecutableFilename(dirPath: string, outputFilebase: string, key?: CacheKey | CompilationCacheKey) {
const source = (key && (key as CacheKey).source) || '';
if (key && this.pasUtils.isProgram(source)) {
return path.join(dirPath, this.pasUtils.getProgName(source));
}
return path.join(dirPath, 'prog');
}
@@ -142,11 +154,15 @@ export class FPCCompiler extends BaseCompiler {
) {
const dirPath = path.dirname(outputFilename);
let execBinary = this.getExecutableFilename(dirPath);
let execBinary = '';
const inputExt = path.extname(result.inputFilename);
if (inputExt.toLowerCase() === '.dpr') {
execBinary = path.join(dirPath, path.basename(result.inputFilename, inputExt));
} else if (result.executableFilename) {
execBinary = unwrap<string>(result.executableFilename);
} else {
execBinary = this.getExecutableFilename(dirPath, path.basename(result.inputFilename, inputExt));
}
if (await utils.fileExists(execBinary)) {