Merge branch 'master' into policy-dating

1 files changed, 8 insertions, 4 deletions

diff --git a/lib/compilers/pascal.js b/lib/compilers/pascal.js
index 19ada7285..d9f027749 100644
--- a/lib/compilers/pascal.js
+++ b/lib/compilers/pascal.js
@@ -74,6 +74,10 @@ class FPCCompiler extends BaseCompiler {
         return path.join(dirPath, `${path.basename(this.compileFilename, this.lang.extensions[0])}.s`);
     }
 
+    getExecutableFilename(dirPath) {
+        return path.join(dirPath, "prog");
+    }
+
     static preProcessBinaryAsm(input) {
         const relevantAsmStartsAt = input.indexOf("<OUTPUT");
         if (relevantAsmStartsAt !== -1) {
@@ -92,7 +96,7 @@ class FPCCompiler extends BaseCompiler {
     }
 
     objdump(outputFilename, result, maxSize, intelAsm, demangle) {
-        outputFilename = path.join(path.dirname(outputFilename), "prog");
+        outputFilename = this.getExecutableFilename(path.dirname(outputFilename));
         let args = ["-d", outputFilename, "-l", "--insn-width=16"];
         if (demangle) args = args.concat(["-C"]);
         if (intelAsm) args = args.concat(["-M", "intel"]);
@@ -146,13 +150,13 @@ class FPCCompiler extends BaseCompiler {
     }
 
     execBinary(executable, result, maxSize) {
-        executable = path.join(path.dirname(executable), "prog");
+        executable = this.getExecutableFilename(path.dirname(executable));
 
-        super.execBinary(executable, result, maxSize);
+        return super.execBinary(executable, result, maxSize);
     }
 
     getArgumentParser() {
-        return argumentParsers.Base;
+        return argumentParsers.Pascal;
     }
 
     getExtraAsmHint(asm) {