Skip to content

Commit ae7de4a

Browse files
authored
Merge pull request #84 from gap-packages/mh/Process-input-output
Fix input/output handling of subprocesses
2 parents e7669a9 + 69be126 commit ae7de4a

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

lib/codeman.gi

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -406,16 +406,16 @@ function(C, wt)
406406
GuavaToLeon(C, incode);
407407
Process(DirectoryCurrent(),
408408
Filename(DirectoriesPackagePrograms("guava"), "wtdist"),
409-
InputTextUser(),
410-
OutputTextUser(),
409+
InputTextNone(),
410+
OutputTextNone(),
411411
["-q", Concatenation(incode,"::code"), wt,
412412
Concatenation(cwsc,"::code")]
413413
);
414414
if IsReadableFile( cwsc ) then
415415
Process(DirectoryCurrent(),
416416
Filename(DirectoriesPackagePrograms("guava"), "leonconv"),
417-
InputTextUser(),
418-
OutputTextUser(),
417+
InputTextNone(),
418+
OutputTextNone(),
419419
["-c", cwsc, infile]
420420
);
421421
else

lib/codeops.gi

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1709,26 +1709,26 @@ function(C)
17091709
GuavaToLeon(Ccalc, incode);
17101710
Process(DirectoryCurrent(),
17111711
Filename(path, "wtdist"),
1712-
InputTextUser(),
1713-
OutputTextUser(),
1712+
InputTextNone(),
1713+
OutputTextNone(),
17141714
["-q", Concatenation(incode,"::code"), MinimumDistance(Ccalc), Concatenation(inV, "::code")]
17151715
);
17161716
#Exec(Filename(DirectoriesPackagePrograms("guava"), "wtdist"),
17171717
# Concatenation("-q ",incode,"::code ",
17181718
# String(MinimumDistance(Ccalc))," ",inV,"::code"));
17191719
Process(DirectoryCurrent(),
17201720
Filename(path, "desauto"),
1721-
InputTextUser(),
1722-
OutputTextUser(),
1721+
InputTextNone(),
1722+
OutputTextNone(),
17231723
["-code", "-q", Concatenation(incode,"::code"), Concatenation(inV, "::code"), outgroup]
17241724
);
17251725
#Exec(Filename(DirectoriesPackagePrograms("guava"), "desauto"),
17261726
# Concatenation("-code -q ",
17271727
# incode,"::code ",inV,"::code ",outgroup));
17281728
Process(DirectoryCurrent(),
17291729
Filename(path, "leonconv"),
1730-
InputTextUser(),
1731-
OutputTextUser(),
1730+
InputTextNone(),
1731+
OutputTextNone(),
17321732
["-a", outgroup, infile]
17331733
);
17341734
#Exec(Filename(DirectoriesPackagePrograms("guava"), "leonconv"),
@@ -2016,8 +2016,8 @@ function(C1, C2)
20162016
# String(MinimumDistance(C1))," ",cwcode1,"::code"));
20172017
Process(DirectoryCurrent(),
20182018
Filename(DirectoriesPackagePrograms("guava"), "wtdist"),
2019-
InputTextUser(),
2020-
OutputTextUser(),
2019+
InputTextNone(),
2020+
OutputTextNone(),
20212021
["-q", Concatenation(code1,"::code"),
20222022
MinimumDistance(C1), Concatenation(cwcode1, "::code")]
20232023
);
@@ -2026,8 +2026,8 @@ function(C1, C2)
20262026
# String(MinimumDistance(C2))," ",cwcode2,"::code"));
20272027
Process(DirectoryCurrent(),
20282028
Filename(DirectoriesPackagePrograms("guava"), "wtdist"),
2029-
InputTextUser(),
2030-
OutputTextUser(),
2029+
InputTextNone(),
2030+
OutputTextNone(),
20312031
["-q", Concatenation(code2,"::code"),
20322032
MinimumDistance(C2), Concatenation(cwcode2, "::code")]
20332033
);
@@ -2037,8 +2037,8 @@ function(C1, C2)
20372037
# cwcode2,"::code ",output));
20382038
Process(DirectoryCurrent(),
20392039
Filename(DirectoriesPackagePrograms("guava"), "desauto"),
2040-
InputTextUser(),
2041-
OutputTextUser(),
2040+
InputTextNone(),
2041+
OutputTextNone(),
20422042
["-iso", "-code", "-q",
20432043
Concatenation(code1,"::code"),
20442044
Concatenation(code2,"::code"),
@@ -2051,8 +2051,8 @@ function(C1, C2)
20512051
# infile));
20522052
Process(DirectoryCurrent(),
20532053
Filename(DirectoriesPackagePrograms("guava"), "leonconv"),
2054-
InputTextUser(),
2055-
OutputTextUser(),
2054+
InputTextNone(),
2055+
OutputTextNone(),
20562056
["-e", output, infile]
20572057
);
20582058
Read(infile);
@@ -2809,8 +2809,8 @@ function(C)
28092809

28102810
Process(DirectoryCurrent(),
28112811
Filename(path, "minimum-weight"),
2812-
InputTextUser(),
2813-
OutputTextUser(),
2812+
InputTextNone(),
2813+
OutputTextNone(),
28142814
param
28152815
);
28162816
Read(tmpOutFile);

0 commit comments

Comments
 (0)