From b5ba2c0d7d1f79695c3aadd09f1ebc4ca17dfe40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Rinc=C3=B3n=20Blanco?= Date: Sat, 24 Dec 2022 19:46:04 +0100 Subject: [PATCH] Mark Assembly compilers cfg-able (#4461) --- lib/base-compiler.ts | 4 ++-- lib/compilers/assembly.ts | 4 ++++ lib/compilers/beebasm.ts | 4 ++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/base-compiler.ts b/lib/base-compiler.ts index e7e82b2900d..006468902d5 100644 --- a/lib/base-compiler.ts +++ b/lib/base-compiler.ts @@ -2387,7 +2387,7 @@ export class BaseCompiler implements ICompiler { return output; } - couldSupportASTDump(version) { + couldSupportASTDump(version: string) { const versionRegex = /version (\d+.\d+)/; const versionMatch = versionRegex.exec(version); @@ -2399,7 +2399,7 @@ export class BaseCompiler implements ICompiler { return false; } - isCfgCompiler(compilerVersion) { + isCfgCompiler(compilerVersion: string) { return compilerVersion.includes('clang') || compilerVersion.match(/^([\w-]*-)?g((\+\+)|(cc)|(dc))/g) !== null; } diff --git a/lib/compilers/assembly.ts b/lib/compilers/assembly.ts index 1d7d4dbaef7..cfe60237ef2 100644 --- a/lib/compilers/assembly.ts +++ b/lib/compilers/assembly.ts @@ -185,4 +185,8 @@ export class AssemblyCompiler extends BaseCompiler { override getObjdumpOutputFilename(defaultOutputFilename) { return this.getGeneratedOutputFilename(defaultOutputFilename); } + + override isCfgCompiler(/* compilerVersion */) { + return true; + } } diff --git a/lib/compilers/beebasm.ts b/lib/compilers/beebasm.ts index f750604cfd8..0081d8c6681 100644 --- a/lib/compilers/beebasm.ts +++ b/lib/compilers/beebasm.ts @@ -101,4 +101,8 @@ export class BeebAsmCompiler extends BaseCompiler { return result; } + + override isCfgCompiler(/*compilerVersion: string*/): boolean { + return true; + } }