diff options
Diffstat (limited to 'lib/compilers')
| -rw-r--r-- | lib/compilers/_all.js | 1 | ||||
| -rw-r--r-- | lib/compilers/argument-parsers.js | 7 | ||||
| -rw-r--r-- | lib/compilers/java.js | 30 | ||||
| -rw-r--r-- | lib/compilers/kotlin.js | 78 |
4 files changed, 103 insertions, 13 deletions
diff --git a/lib/compilers/_all.js b/lib/compilers/_all.js index f6e9e65af..5af9f3c70 100644 --- a/lib/compilers/_all.js +++ b/lib/compilers/_all.js @@ -42,6 +42,7 @@ export { GolangCompiler } from './golang'; export { HaskellCompiler } from './haskell'; export { ISPCCompiler } from './ispc'; export { JavaCompiler } from './java'; +export { KotlinCompiler } from './kotlin'; export { LDCCompiler } from './ldc'; export { LLCCompiler } from './llc'; export { LLVMmcaTool } from './llvm-mca'; diff --git a/lib/compilers/argument-parsers.js b/lib/compilers/argument-parsers.js index 6b139c829..750e9c2ef 100644 --- a/lib/compilers/argument-parsers.js +++ b/lib/compilers/argument-parsers.js @@ -178,6 +178,13 @@ export class JavaParser extends BaseParser { } } +export class KotlinParser extends BaseParser { + static async parse(compiler) { + await KotlinParser.getOptions(compiler, '-help'); + return compiler; + } +} + export class VCParser extends BaseParser { static async parse(compiler) { await VCParser.getOptions(compiler, '/help'); diff --git a/lib/compilers/java.js b/lib/compilers/java.js index 677eeb323..c61cc8f65 100644 --- a/lib/compilers/java.js +++ b/lib/compilers/java.js @@ -111,22 +111,10 @@ export class JavaCompiler extends BaseCompiler { return path.join(dirPath, `${path.basename(this.compileFilename, this.lang.extensions[0])}.class`); } - filterUserOptions(userOptions) { + filterUserOptionsWithArg(userOptions, oneArgForbiddenList) { const filteredOptions = []; let toSkip = 0; - const oneArgForbiddenList = new Set([ - // -d directory - // Sets the destination directory for class files. - '-d', - // -s directory - // Specifies the directory used to place the generated source files. - '-s', - // --source-path path or -sourcepath path - // Specifies where to find input source files. - '--source-path', '-sourcepath', - ]); - for (const userOption of userOptions) { if (toSkip > 0) { toSkip--; @@ -143,6 +131,22 @@ export class JavaCompiler extends BaseCompiler { return filteredOptions; } + filterUserOptions(userOptions) { + const oneArgForbiddenList = new Set([ + // -d directory + // Sets the destination directory for class files. + '-d', + // -s directory + // Specifies the directory used to place the generated source files. + '-s', + // --source-path path or -sourcepath path + // Specifies where to find input source files. + '--source-path', '-sourcepath', + ]); + + return this.filterUserOptionsWithArg(userOptions, oneArgForbiddenList); + } + processAsm(result) { // Handle "error" documents. if (!result.asm.includes('\n') && result.asm[0] === '<') { diff --git a/lib/compilers/kotlin.js b/lib/compilers/kotlin.js new file mode 100644 index 000000000..a7e21f796 --- /dev/null +++ b/lib/compilers/kotlin.js @@ -0,0 +1,78 @@ +// Copyright (c) 2021, 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 { KotlinParser } from './argument-parsers'; +import { JavaCompiler } from './java'; + +export class KotlinCompiler extends JavaCompiler { + static get key() { + return 'kotlin'; + } + + getDefaultExecOptions() { + const execOptions = super.getDefaultExecOptions(); + const javaHome = this.compilerProps(`compiler.${this.compiler.id}.java_home`); + if (javaHome) { + execOptions.env.JAVA_HOME = javaHome; + } + + return execOptions; + } + + filterUserOptions(userOptions) { + // filter options without extra arguments + userOptions = userOptions.filter(option => + option !== '-script' && option !== '-progressive' && !option.startsWith('-Xjavac')); + + const oneArgForbiddenList = new Set([ + // -d directory + // Destination for generated class files + '-d', + // -jdk-home path + // Include a custom JDK from the specified location + // into the classpath instead of the default JAVA_HOME + '-jdk-home', + // -kotlin-home path + // Path to the home directory of Kotlin compiler used for + // discovery of runtime libraries + '-kotlin-home', + ]); + + // filter options with one argument + return super.filterUserOptionsWithArg(userOptions, oneArgForbiddenList); + } + + optionsForFilter(filters) { + // Forcibly enable javap + filters.binary = true; + + return [ + '-Xjavac-arguments="-Xlint:all"', + ]; + } + + getArgumentParser() { + return KotlinParser; + } +} |