Skip to content

Commit

Permalink
First pass at making compile.js into TS (#4313)
Browse files Browse the repository at this point in the history
  • Loading branch information
mattgodbolt committed Nov 22, 2022
1 parent fcb7683 commit f276f73
Show file tree
Hide file tree
Showing 6 changed files with 266 additions and 102 deletions.
12 changes: 7 additions & 5 deletions lib/base-compiler.ts
Expand Up @@ -95,12 +95,12 @@ export class BaseCompiler {
protected llvmPassDumpParser: LlvmPassDumpParser;
protected llvmAst: LlvmAstParser;
protected toolchainPath: any;
protected possibleArguments: CompilerArguments;
public possibleArguments: CompilerArguments;
protected possibleTools: Tool[];
protected demanglerClass: any;
protected objdumperClass: any;
public outputFilebase: string;
protected mtime: null;
protected mtime: Date | null = null;
protected cmakeBaseEnv: Record<string, string>;
protected buildenvsetup: null | any;
protected externalparser: null | ExternalParserBase;
Expand Down Expand Up @@ -159,8 +159,6 @@ export class BaseCompiler {

this.outputFilebase = 'output';

this.mtime = null;

this.cmakeBaseEnv = {};

this.buildenvsetup = null;
Expand Down Expand Up @@ -2583,7 +2581,7 @@ but nothing was dumped. Possible causes are:
this.supportedLibraries = this.getSupportedLibraries(this.compiler.libsArr, clientOptions.libs[this.lang.id]);
}

async initialise(mtime, clientOptions, isPrediscovered = false) {
async initialise(mtime: Date, clientOptions, isPrediscovered = false) {
this.mtime = mtime;

if (this.buildenvsetup) {
Expand Down Expand Up @@ -2644,6 +2642,10 @@ but nothing was dumped. Possible causes are:
}
}

getModificationTime(): number | undefined {
return this.mtime ? this.mtime.getTime() : undefined;
}

getInfo() {
return this.compiler;
}
Expand Down
66 changes: 66 additions & 0 deletions lib/handlers/compile.interfaces.ts
@@ -0,0 +1,66 @@
// 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.

// IF YOU MODIFY ANYTHING HERE PLEASE UPDATE THE DOCUMENTATION!

// This type models a request so all fields must be optional strings.
export type CompileRequestQueryArgs = {
options?: string;
filters?: string;
addFilters?: string;
removeFilters?: string;
skipAsm?: string;
skipPopArgs?: string;
};

export type ExecutionRequestParams = {
args?: string | string[];
stdin?: string;
};

// TODO find more types for these.
export type CompilationRequestArgs = {
userArguments: string;
compilerOptions: Record<string, any>;
executeParameters: ExecutionRequestParams;
filters: Record<string, boolean>;
tools: any;
libraries: any[];
};

export type CompileRequestJsonBody = {
options: CompilationRequestArgs;
source: string;
bypassCache: boolean;
};

export type CompileRequestTextBody = {
source: string;
bypassCache: boolean;
options: any;
userArguments: string;
executeParametersArgs: any;
executeParametersStdin: any;
skipAsm: string;
};

0 comments on commit f276f73

Please sign in to comment.