Skip to content

Commit

Permalink
Port fortran.js to typescript (#4381)
Browse files Browse the repository at this point in the history
* Port fortran.js to typescript
* @jeremy-rifkin suggestions
  • Loading branch information
mattgodbolt committed Dec 2, 2022
1 parent a436592 commit 2b5de93
Showing 1 changed file with 13 additions and 5 deletions.
18 changes: 13 additions & 5 deletions lib/compilers/fortran.js → lib/compilers/fortran.ts
Expand Up @@ -24,6 +24,7 @@

import path from 'path';

import {CompilationResult, ExecutionOptions} from '../../types/compilation/compilation.interfaces';
import {BaseCompiler} from '../base-compiler';
import * as utils from '../utils';

Expand All @@ -32,7 +33,12 @@ export class FortranCompiler extends BaseCompiler {
return 'fortran';
}

async runCompiler(compiler, options, inputFilename, execOptions) {
override async runCompiler(
compiler: string,
options: string[],
inputFilename: string,
execOptions: ExecutionOptions,
): Promise<CompilationResult> {
if (!execOptions) {
execOptions = this.getDefaultExecOptions();
}
Expand All @@ -41,10 +47,12 @@ export class FortranCompiler extends BaseCompiler {
execOptions.customCwd = path.dirname(inputFilename);

const result = await this.exec(compiler, options, execOptions);
result.inputFilename = inputFilename;
const baseFilename = './' + path.basename(inputFilename);
result.stdout = utils.parseOutput(result.stdout, baseFilename);
result.stderr = utils.parseOutput(result.stderr, baseFilename);
return result;
return {
...result,
stdout: utils.parseOutput(result.stdout, baseFilename),
stderr: utils.parseOutput(result.stderr, baseFilename),
inputFilename: inputFilename,
};
}
}

0 comments on commit 2b5de93

Please sign in to comment.