mirror of
https://github.com/beefytech/Beef.git
synced 2025-06-08 19:48:20 +02:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
09a58b0a24
1 changed files with 13 additions and 8 deletions
|
@ -7798,7 +7798,7 @@ namespace IDE
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Output(String outStr)
|
public virtual void Output(String outStr)
|
||||||
{
|
{
|
||||||
#if CLI
|
#if CLI
|
||||||
Console.Write(outStr);
|
Console.Write(outStr);
|
||||||
|
@ -7809,7 +7809,7 @@ namespace IDE
|
||||||
mOutputPanel.Write(outStr);
|
mOutputPanel.Write(outStr);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void OutputSmart(String outStr)
|
public virtual void OutputSmart(String outStr)
|
||||||
{
|
{
|
||||||
#if CLI
|
#if CLI
|
||||||
Console.Write(outStr);
|
Console.Write(outStr);
|
||||||
|
@ -7826,7 +7826,7 @@ namespace IDE
|
||||||
mOutputPanel.WriteSmart(outStr);
|
mOutputPanel.WriteSmart(outStr);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Output(String format, params Object[] args)
|
public virtual void Output(String format, params Object[] args)
|
||||||
{
|
{
|
||||||
String outStr = format;
|
String outStr = format;
|
||||||
if (args.Count > 0)
|
if (args.Count > 0)
|
||||||
|
@ -7837,7 +7837,12 @@ namespace IDE
|
||||||
else
|
else
|
||||||
outStr = scope:: String(format);
|
outStr = scope:: String(format);
|
||||||
outStr.Replace("\r", "");
|
outStr.Replace("\r", "");
|
||||||
|
|
||||||
|
#if CLI
|
||||||
|
Console.Write(outStr);
|
||||||
|
#else
|
||||||
mOutputPanel.Write(outStr);
|
mOutputPanel.Write(outStr);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
public void CompilerLog(String format, params Object[] args)
|
public void CompilerLog(String format, params Object[] args)
|
||||||
|
@ -7850,7 +7855,7 @@ namespace IDE
|
||||||
mBfResolveSystem.Log(str);
|
mBfResolveSystem.Log(str);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void OutputLine(String format, params Object[] args)
|
public virtual void OutputLine(String format, params Object[] args)
|
||||||
{
|
{
|
||||||
String outStr;
|
String outStr;
|
||||||
if (args.Count > 0)
|
if (args.Count > 0)
|
||||||
|
@ -7873,7 +7878,7 @@ namespace IDE
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
public void OutputErrorLine(String format, params Object[] args)
|
public virtual void OutputErrorLine(String format, params Object[] args)
|
||||||
{
|
{
|
||||||
mWantShowOutput = true;
|
mWantShowOutput = true;
|
||||||
var errStr = scope String();
|
var errStr = scope String();
|
||||||
|
@ -7881,7 +7886,7 @@ namespace IDE
|
||||||
OutputLineSmart(errStr, params args);
|
OutputLineSmart(errStr, params args);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void OutputWarnLine(String format, params Object[] args)
|
public virtual void OutputWarnLine(String format, params Object[] args)
|
||||||
{
|
{
|
||||||
var warnStr = scope String();
|
var warnStr = scope String();
|
||||||
warnStr.AppendF(format, params args);
|
warnStr.AppendF(format, params args);
|
||||||
|
@ -7896,7 +7901,7 @@ namespace IDE
|
||||||
OutputLine(outStr);
|
OutputLine(outStr);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void OutputLineSmart(String format, params Object[] args)
|
public virtual void OutputLineSmart(String format, params Object[] args)
|
||||||
{
|
{
|
||||||
String outStr;
|
String outStr;
|
||||||
if (args.Count > 0)
|
if (args.Count > 0)
|
||||||
|
@ -7918,7 +7923,7 @@ namespace IDE
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
public void OutputFormatted(String str, bool isDbgEvalOutput = false)
|
public virtual void OutputFormatted(String str, bool isDbgEvalOutput = false)
|
||||||
{
|
{
|
||||||
#if CLI
|
#if CLI
|
||||||
Console.Write(str);
|
Console.Write(str);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue