3 files changed, 89 insertions, 0 deletions
diff --git a/lib/compilers/_all.js b/lib/compilers/_all.js
index ba13a2b57..d7c034966 100644
--- a/lib/compilers/_all.js
+++ b/lib/compilers/_all.js
@@ -36,6 +36,7 @@ export {ClangCudaCompiler} from './clang';
 export {ClangHipCompiler} from './clang';
 export {ClangIntelCompiler} from './clang';
 export {CleanCompiler} from './clean';
+export {CppFrontCompiler} from './cppfront';
 export {CprocCompiler} from './cproc';
 export {CLSPVCompiler} from './clspv';
 export {CrystalCompiler} from './crystal';
diff --git a/lib/compilers/cppfront.ts b/lib/compilers/cppfront.ts
new file mode 100644
index 000000000..ebbca43b9
--- /dev/null
+++ b/lib/compilers/cppfront.ts
@@ -0,0 +1,78 @@
+// Copyright (c) 2022, Compiler Explorer Authors
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+//     * Redistributions of source code must retain the above copyright notice,
+//       this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above copyright
+//       notice, this list of conditions and the following disclaimer in the
+//       documentation and/or other materials provided with the distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+
+import path from 'path';
+
+import {ExecutionOptions} from '../../types/compilation/compilation.interfaces';
+import {ParseFilters} from '../../types/features/filters.interfaces';
+import {BaseCompiler} from '../base-compiler';
+import * as exec from '../exec';
+
+export class CppFrontCompiler extends BaseCompiler {
+    static get key() {
+        return 'cppfront';
+    }
+
+    constructor(info, env) {
+        super(info, env);
+
+        this.outputFilebase = 'example';
+    }
+
+    override orderArguments(
+        options: string[],
+        inputFilename: string,
+        libIncludes: string[],
+        libOptions: string[],
+        libPaths: string[],
+        libLinks: string[],
+        userOptions: string[],
+        staticLibLinks: string[],
+    ) {
+        return options.concat(
+            userOptions,
+            ['example.cpp2'], // Grotesque hack to handle the fact we can't use abs filenames with current
+            libIncludes,
+            libOptions,
+            libPaths,
+            libLinks,
+            staticLibLinks,
+        );
+    }
+    override optionsForFilter(filters: ParseFilters, outputFilename: any) {
+        return [];
+    }
+
+    override getSharedLibraryPathsAsArguments(libraries, libDownloadPath) {
+        return [];
+    }
+
+    override getSharedLibraryLinks(libraries): string[] {
+        return [];
+    }
+
+    override getOutputFilename(dirPath: string, outputFilebase: string, key?: any): string {
+        return path.join(dirPath, `${outputFilebase}.cpp`);
+    }
+}
diff --git a/lib/languages.ts b/lib/languages.ts
index 8252aea45..15789c0f0 100644
--- a/lib/languages.ts
+++ b/lib/languages.ts
@@ -193,6 +193,16 @@ const definitions: Record<LanguageKey, LanguageDefinition> = {
         formatter: null,
         previewFilter: null,
     },
+    cppx_cppfront: {
+        name: 'Cppx-cppfront',
+        monaco: 'cppx-cppfront',
+        extensions: ['.cpp2'],
+        alias: [],
+        logoUrl: 'c++.svg', // TODO: Find a better alternative
+        logoUrlDark: null,
+        formatter: null,
+        previewFilter: null,
+    },
     crystal: {
         name: 'Crystal',
         monaco: 'crystal',