fix

compiler-explorer · May 14, 2024 · 9697bb4 · 9697bb4
1 parent 4e5a64b
commit 9697bb4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/lib/buildenvsetup/base.ts b/lib/buildenvsetup/base.ts
@@ -26,22 +26,24 @@ import path from 'path';
 
 import _ from 'underscore';
 
+import {CompilerInfo} from '../../types/compiler.interfaces.js';
 import {LibraryVersion} from '../../types/libraries/libraries.interfaces.js';
+import {CompilationEnvironment} from '../compilation-env.js';
 import {logger} from '../logger.js';
 import * as utils from '../utils.js';
 
 import type {BuildEnvDownloadInfo} from './buildenv.interfaces.js';
 
 export class BuildEnvSetupBase {
-    protected compiler: any;
-    protected env: any;
+    protected compiler: CompilerInfo;
+    protected env: CompilationEnvironment;
     protected compilerOptionsArr: string[];
     public compilerArch: string | false;
     protected compilerTypeOrGCC: any;
     public compilerSupportsX86: boolean;
     public defaultLibCxx: string;
 
-    constructor(compilerInfo, env) {
+    constructor(compilerInfo: CompilerInfo, env: CompilationEnvironment) {
         this.compiler = compilerInfo;
         this.env = env;
 
@@ -54,7 +56,7 @@ export class BuildEnvSetupBase {
     }
 
     protected props(propName: string, def?: any): any {
-        return this.env.compilerProps(this.compiler.langId, 'buildenvsetup.' + propName, def);
+        return this.env.compilerProps.get(this.compiler.lang, 'buildenvsetup.' + propName, def);
     }
 
     async initialise(execCompilerCachedFunc) {

diff --git a/lib/external-parsers/base.ts b/lib/external-parsers/base.ts
@@ -2,8 +2,10 @@ import fs from 'fs';
 import path from 'path';
 
 import type {ParsedAsmResult} from '../../types/asmresult/asmresult.interfaces.js';
+import {CompilerInfo} from '../../types/compiler.interfaces.js';
 import type {TypicalExecutionFunc, UnprocessedExecResult} from '../../types/execution/execution.interfaces.js';
 import type {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js';
+import {CompilationEnvironment} from '../compilation-env.js';
 import {logger} from '../logger.js';
 import {maskRootdir} from '../utils.js';
 
@@ -15,10 +17,10 @@ export class ExternalParserBase implements IExternalParser {
     private readonly objdumperPath: string;
     private readonly parserPath: string;
     private readonly execFunc: TypicalExecutionFunc;
-    private compilerInfo;
-    private envInfo;
+    private compilerInfo: CompilerInfo;
+    private envInfo: CompilationEnvironment;
 
-    constructor(compilerInfo, envInfo, execFunc: TypicalExecutionFunc) {
+    constructor(compilerInfo: CompilerInfo, envInfo, execFunc: TypicalExecutionFunc) {
         this.compilerInfo = compilerInfo;
         this.envInfo = envInfo;
         this.objdumperPath = compilerInfo.objdumper;
@@ -31,7 +33,7 @@ export class ExternalParserBase implements IExternalParser {
     }
 
     protected props(propName: string, def: any): any {
-        return this.envInfo.compilerProps(this.compilerInfo.langId, 'externalparser.' + propName, def);
+        return this.envInfo.compilerProps.get(this.compilerInfo.lang, 'externalparser.' + propName, def);
     }
 
     private getParserArguments(filters: ParseFiltersAndOutputOptions, fromStdin: boolean): string[] {