administrator/pascalabcnet
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

bug fix #365

Browse source
This commit is contained in:
Бондарев Иван 2017-03-13 20:28:12 +01:00
parent d8fd720043
commit 34431bb546
2 changed files with 11 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
VisualPascalABCNET/DS/RunManager/RunManager.cs
View file

@ -288,18 +288,6 @@ namespace VisualPascalABC
StartedProcesses.Add(fileName, PRunner);
StartedFiles.Add(PRunner, fileName);
string ReadSignalName=null;
/*if (redirectIO)
{
ReadSignalName = Path.GetFileNameWithoutExtension(fileName) + (new Random()).Next(10000).ToString();
args = "READSIGNAL" + ReadSignalName + " " + args;
ReadSignalNames.Add(ReadSignalName, fileName);
ReadSignalNames.Add(fileName, ReadSignalName);
ReadSignalList.Add(ReadSignalName);
}
if (redirectErrors)
{
//args = "CATCHUNHANDLEDEXCEPTIONS" +" "+ args;
}*/
if (Starting != null)
Starting(fileName);
try
@ -328,8 +316,6 @@ namespace VisualPascalABC
{
StreamObject so = (StreamObject)ar.AsyncState;
so.stream.EndWrite(ar);
//if (OutputStringReceived != null)
// OutputStringReceived(so.id, StreamType.Output, so.text);
so.stream.Flush();
}
class StreamObject
@ -341,10 +327,6 @@ namespace VisualPascalABC
public void WritelnStringToProcess(string id, string data)
{
Utils.ProcessRunner pr = StartedProcesses[id] as Utils.ProcessRunner;
/*string s=StartedProcesses.Count.ToString()+" ";
foreach (string ss in StartedProcesses.Keys)
s += ss + "|";
if (pr == null) throw new Exception("pr==null, " + id + " " + data+" started process"+s);*/
byte[] buffer = InputEncoding.GetBytes(data + pr.process.StandardInput.NewLine);
StreamObject so=new StreamObject();
so.stream = pr.process.StandardInput.BaseStream;
@ -353,12 +335,6 @@ namespace VisualPascalABC
pr.process.StandardInput.BaseStream.BeginWrite(buffer, 0, buffer.Length, Write_Callback, so);
}
/*void PRunner_OutputLineReceived(object sender, global::VisualPascalABC.Utils.LineReceivedEventArgs e)
{
if (OutputStringReceived != null)
OutputStringReceived((string)StartedFiles[sender], e.Line);
}*/
public void Run(string fileName, bool redirectIO, string ModeName, bool RunWithPause, string WorkingDirectory, bool attachDebugger, bool fictive_attach)
{
if (ModeName == null)

13
VisualPascalABCNET/Form1.cs
View file

@ -651,10 +651,19 @@ namespace VisualPascalABC
{
get
{
string path = "";
if (UserOptions.UseOutputDirectory)
return Path.Combine(UserOptions.OutputDirectory , Path.GetFileNameWithoutExtension(CurrentSourceFileName)) + ".exe";
path = Path.Combine(UserOptions.OutputDirectory, Path.GetFileNameWithoutExtension(CurrentSourceFileName)) + ".exe";
else
return Path.ChangeExtension(CurrentSourceFileName, ".exe");
path = Path.ChangeExtension(CurrentSourceFileName, ".exe");
if (!File.Exists(path) && ActiveCodeFileDocument != null)
{
if (UserOptions.UseOutputDirectory)
path = Path.Combine(UserOptions.OutputDirectory, Path.GetFileNameWithoutExtension(ActiveCodeFileDocument.FileName)) + ".exe";
else
path = Path.ChangeExtension(ActiveCodeFileDocument.FileName, ".exe");
}
return path;
}
}