[ fix ] Add escapeArg in executeExpr

idris-lang · Dec 19, 2024 · ccc7adf · ccc7adf
1 parent 6ac9301
commit ccc7adf
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 6 deletions.
diff --git a/src/Compiler/ES/Node.idr b/src/Compiler/ES/Node.idr
@@ -66,7 +66,9 @@ executeExpr :
 executeExpr c s tmpDir tm =
   do out <- compileExpr c s tmpDir tmpDir tm "_tmp_node.js"
      node <- coreLift findNode
-     system $ "\"" ++ node ++ "\" " ++ out -- Windows often have a space in the path.
+     system $ "\"" ++ node ++ "\" " ++ escapeArg out -- Windows often have a space in the path.
+     -- TODO: Replace with the following call after fix idris-lang/Idris2#3436
+    --  system $ [node, out]
 
 ||| Codegen wrapper for Node implementation.
 export

diff --git a/src/Compiler/RefC/RefC.idr b/src/Compiler/RefC/RefC.idr
@@ -1006,7 +1006,9 @@ compileExpr c s _ outputDir tm outfile =
 export
 executeExpr : Ref Ctxt Defs -> Ref Syn SyntaxInfo ->
               (execDir : String) -> ClosedTerm -> Core ExitCode
-executeExpr c s tmpDir tm = system !(compileExpr c s tmpDir tmpDir tm "_tmp_refc")
+executeExpr c s tmpDir tm = do
+  out <- compileExpr c s tmpDir tmpDir tm "_tmp_refc"
+  system $ escapeArg out
 
 export
 codegenRefC : Codegen

diff --git a/src/Compiler/Scheme/Chez.idr b/src/Compiler/Scheme/Chez.idr
@@ -648,7 +648,9 @@ executeExpr :
   Ref Ctxt Defs ->
   Ref Syn SyntaxInfo ->
   (tmpDir : String) -> ClosedTerm -> Core ExitCode
-executeExpr c s tmpDir tm = system !(compileExpr False c s tmpDir tmpDir tm "_tmpchez")
+executeExpr c s tmpDir tm = do
+  out <- compileExpr False c s tmpDir tmpDir tm "_tmpchez"
+  system $ escapeArg out
 
 incCompile :
   Ref Ctxt Defs ->

diff --git a/src/Compiler/Scheme/ChezSep.idr b/src/Compiler/Scheme/ChezSep.idr
@@ -310,7 +310,9 @@ executeExpr :
   Ref Ctxt Defs ->
   Ref Syn SyntaxInfo ->
   (tmpDir : String) -> ClosedTerm -> Core ExitCode
-executeExpr c s tmpDir tm = system !(compileExpr False c s tmpDir tmpDir tm "_tmpchez")
+executeExpr c s tmpDir tm = do
+  out <- compileExpr False c s tmpDir tmpDir tm "_tmpchez"
+  system $ escapeArg out
 
 ||| Codegen wrapper for Chez scheme implementation.
 export

diff --git a/src/Compiler/Scheme/Gambit.idr b/src/Compiler/Scheme/Gambit.idr
@@ -407,7 +407,9 @@ executeExpr :
   Ref Ctxt Defs ->
   Ref Syn SyntaxInfo ->
   (tmpDir : String) -> ClosedTerm -> Core ExitCode
-executeExpr c s tmpDir tm = system !(compileExpr c s tmpDir tmpDir tm "_tmpgambit") -- TODO: on windows, should add exe extension
+executeExpr c s tmpDir tm = do
+  out <- compileExpr c s tmpDir tmpDir tm "_tmpgambit" -- TODO: on windows, should add exe extension
+  system $ escapeArg out
 
 export
 codegenGambit : Codegen

diff --git a/src/Compiler/Scheme/Racket.idr b/src/Compiler/Scheme/Racket.idr
@@ -465,7 +465,9 @@ executeExpr :
   Ref Ctxt Defs ->
   Ref Syn SyntaxInfo ->
   (tmpDir : String) -> ClosedTerm -> Core ExitCode
-executeExpr c s tmpDir tm = system !(compileExpr False c s tmpDir tmpDir tm "_tmpracket")
+executeExpr c s tmpDir tm = do
+  out <- compileExpr False c s tmpDir tmpDir tm "_tmpracket"
+  system $ escapeArg out
 
 export
 codegenRacket : Codegen