mirror of
https://github.com/beefytech/Beef.git
synced 2025-06-20 00:50:25 +02:00
Removed 'internal' protection - it's all about [Friend] now
This commit is contained in:
parent
81af04a1ce
commit
14ac27c977
119 changed files with 1339 additions and 1388 deletions
|
@ -73,7 +73,7 @@ namespace IDE.Compiler
|
|||
public bool mFailed;
|
||||
|
||||
public int32 mId = sCurId++;
|
||||
internal String mDbgStr ~ delete _;
|
||||
public String mDbgStr ~ delete _;
|
||||
|
||||
public this(void* nativePassInstance)
|
||||
{
|
||||
|
|
|
@ -92,7 +92,7 @@ namespace IDE.Debugger
|
|||
static extern void* Debugger_GetActiveBreakpoint();
|
||||
|
||||
[StdCall, CLink]
|
||||
internal static extern void* Debugger_CreateMemoryBreakpoint(int addr, int32 byteCount);
|
||||
static extern void* Debugger_CreateMemoryBreakpoint(int addr, int32 byteCount);
|
||||
|
||||
public void* mNativeBreakpoint;
|
||||
public String mSymbol ~ delete _;
|
||||
|
@ -116,7 +116,7 @@ namespace IDE.Debugger
|
|||
|
||||
public Event<Action> mOnDelete;
|
||||
|
||||
internal ~this()
|
||||
public ~this()
|
||||
{
|
||||
mOnDelete();
|
||||
mIsDisposed = true;
|
||||
|
|
|
@ -591,7 +591,7 @@ namespace IDE.Debugger
|
|||
void* nativeBreakpoint = null;
|
||||
if (addr != (int)0)
|
||||
{
|
||||
nativeBreakpoint = Breakpoint.Debugger_CreateMemoryBreakpoint(addr, (.)byteCount);
|
||||
nativeBreakpoint = Breakpoint.[Friend]Debugger_CreateMemoryBreakpoint(addr, (.)byteCount);
|
||||
if (nativeBreakpoint == null)
|
||||
return null;
|
||||
}
|
||||
|
|
|
@ -7356,16 +7356,16 @@ namespace IDE
|
|||
|
||||
if (mVerbosity >= .Detailed)
|
||||
{
|
||||
String showArgs = startInfo.mArguments;
|
||||
String showArgs = startInfo.[Friend]mArguments;
|
||||
if ((mRunningTestScript) && (showArgs.Length > 1024))
|
||||
{
|
||||
showArgs = scope:: String(showArgs, 0, 1024);
|
||||
showArgs.Append("...");
|
||||
}
|
||||
|
||||
if (!startInfo.mFileName.IsEmpty)
|
||||
if (!startInfo.[Friend]mFileName.IsEmpty)
|
||||
{
|
||||
OutputLine("Executing: {0} {1}", startInfo.mFileName, showArgs);
|
||||
OutputLine("Executing: {0} {1}", startInfo.[Friend]mFileName, showArgs);
|
||||
if ((mVerbosity >= .Diagnostic) && (useArgsFile != .None))
|
||||
OutputLine("Arg file contents: {0}", args);
|
||||
}
|
||||
|
|
|
@ -145,7 +145,7 @@ namespace IDE
|
|||
procInfo.CreateNoWindow = true;
|
||||
procInfo.SetArguments("--version");
|
||||
|
||||
Debug.WriteLine("ProcStartInfo {0} Verb: {1}", procInfo, procInfo.mVerb);
|
||||
Debug.WriteLine("ProcStartInfo {0} Verb: {1}", procInfo, procInfo.[Friend]mVerb);
|
||||
|
||||
/*Process process = null;
|
||||
if (!case .Ok(out process) = Process.Start(procInfo))
|
||||
|
|
|
@ -825,7 +825,7 @@ namespace IDE.ui
|
|||
}
|
||||
}
|
||||
|
||||
String callstackFileName = scope String(Path.MaxPath);
|
||||
String callstackFileName = scope String(Path.[Friend]MaxPath);
|
||||
int callstackLineNum = -1;
|
||||
|
||||
Image linePointerImage = DarkTheme.sDarkTheme.GetImage(.LinePointer);
|
||||
|
|
|
@ -182,8 +182,8 @@ namespace IDE.ui
|
|||
for (let c32 in line.DecodedChars)
|
||||
{
|
||||
if ((isNewStart) && (mSearchOptions.mMatchCase ?
|
||||
String.EqualsHelper(linePtr + lineIdx, searchPtr, searchLength) :
|
||||
String.EqualsIgnoreCaseHelper(linePtr + lineIdx, searchPtr, searchLength)))
|
||||
String.[Friend]EqualsHelper(linePtr + lineIdx, searchPtr, searchLength) :
|
||||
String.[Friend]EqualsIgnoreCaseHelper(linePtr + lineIdx, searchPtr, searchLength)))
|
||||
{
|
||||
int checkIdx = lineIdx + searchLength;
|
||||
if (checkIdx >= line.Length)
|
||||
|
|
|
@ -877,10 +877,10 @@ namespace IDE.ui
|
|||
if (curVariantType.IsNullable)
|
||||
{
|
||||
let elementType = ((SpecializedGenericType)curVariantType).GetGenericArg(0);
|
||||
if (elementType.mTypeCode == .Int32)
|
||||
if (elementType.[Friend]mTypeCode == .Int32)
|
||||
{
|
||||
handled = true;
|
||||
editingProp.mCurValue.mData = 0;
|
||||
editingProp.mCurValue.[Friend]mData = 0;
|
||||
int32? value = null;
|
||||
if ((newValue.Length != 0) && (!String.Equals(newValue, "Not Set", .OrdinalIgnoreCase)))
|
||||
{
|
||||
|
@ -896,11 +896,11 @@ namespace IDE.ui
|
|||
}
|
||||
}
|
||||
|
||||
*((bool*)&editingProp.mCurValue.mData + elementType.mSize) = value.HasValue;
|
||||
*((bool*)&editingProp.mCurValue.[Friend]mData + elementType.[Friend]mSize) = value.HasValue;
|
||||
if (value.HasValue)
|
||||
{
|
||||
void* valueData = editingProp.mCurValue.GetValueData();
|
||||
Internal.MemCpy(valueData, &value.mValue, elementType.mSize);
|
||||
Internal.MemCpy(valueData, &value.[Friend]mValue, elementType.[Friend]mSize);
|
||||
}
|
||||
multiCopyToOthers = true;
|
||||
}
|
||||
|
@ -972,7 +972,7 @@ namespace IDE.ui
|
|||
}
|
||||
editingProp.mCurValue = Variant.Create(entries, true);
|
||||
}
|
||||
else if (curVariantType.mTypeCode == .Int32)
|
||||
else if (curVariantType.[Friend]mTypeCode == .Int32)
|
||||
{
|
||||
if (int32.Parse(newValue) case .Ok(let intVal))
|
||||
{
|
||||
|
@ -999,7 +999,7 @@ namespace IDE.ui
|
|||
setValue = false;
|
||||
}
|
||||
}
|
||||
else if (curVariantType.mTypeCode == .Float)
|
||||
else if (curVariantType.[Friend]mTypeCode == .Float)
|
||||
{
|
||||
if (float.Parse(newValue) case .Ok(let floatVal))
|
||||
{
|
||||
|
@ -1115,13 +1115,13 @@ namespace IDE.ui
|
|||
let genericType = (SpecializedGenericType)curVariantType;
|
||||
let elementType = genericType.GetGenericArg(0);
|
||||
|
||||
propEntry.mCurValue.mData = 0;
|
||||
*((bool*)&propEntry.mCurValue.mData + elementType.mSize) = value.HasValue;
|
||||
propEntry.mCurValue.[Friend]mData = 0;
|
||||
*((bool*)&propEntry.mCurValue.[Friend]mData + elementType.[Friend]mSize) = value.HasValue;
|
||||
if (value.HasValue)
|
||||
{
|
||||
void* valueData = propEntry.mCurValue.GetValueData();
|
||||
var copyValue = value;
|
||||
Internal.MemCpy(valueData, copyValue.GetValueData(), elementType.mSize);
|
||||
Internal.MemCpy(valueData, copyValue.GetValueData(), elementType.[Friend]mSize);
|
||||
}
|
||||
}
|
||||
else
|
||||
|
@ -1339,7 +1339,7 @@ namespace IDE.ui
|
|||
let genericType = (SpecializedGenericType)curVariantType;
|
||||
let elementType = genericType.GetGenericArg(0);
|
||||
|
||||
bool hasValue = *((bool*)&propEntry.mCurValue.mData + elementType.mSize);
|
||||
bool hasValue = *((bool*)&propEntry.mCurValue.[Friend]mData + elementType.[Friend]mSize);
|
||||
curVariantType = elementType;
|
||||
if (!hasValue)
|
||||
{
|
||||
|
@ -1638,7 +1638,7 @@ namespace IDE.ui
|
|||
{
|
||||
//Variant.Create();
|
||||
|
||||
var data = prevVariant.mData;
|
||||
var data = prevVariant.[Friend]mData;
|
||||
return Variant.Create(prevVariant.VariantType, &data);
|
||||
|
||||
/*if (type == typeof(bool))
|
||||
|
|
|
@ -1991,8 +1991,8 @@ namespace IDE.ui
|
|||
UndoBatchStart undoBatchStart = new UndoBatchStart("embeddedToggleComment");
|
||||
mData.mUndoManager.Add(undoBatchStart);
|
||||
|
||||
int minPos = mSelection.mValue.MinPos;
|
||||
int maxPos = mSelection.mValue.MaxPos;
|
||||
int minPos = mSelection.GetValueOrDefault().MinPos;
|
||||
int maxPos = mSelection.GetValueOrDefault().MaxPos;
|
||||
mSelection = null;
|
||||
|
||||
var str = scope String();
|
||||
|
@ -2280,7 +2280,7 @@ namespace IDE.ui
|
|||
char8 c = beforeCursorLineText[checkIdx];
|
||||
if (!c.IsWhiteSpace)
|
||||
break;
|
||||
mSelection.mValue.mStartPos--;
|
||||
mSelection.ValueRef.mStartPos--;
|
||||
}
|
||||
insertFlags |= .NoRestoreSelectionOnUndo;
|
||||
}
|
||||
|
@ -2490,8 +2490,8 @@ namespace IDE.ui
|
|||
UndoBatchStart undoBatchStart = new UndoBatchStart("blockSurround");
|
||||
mData.mUndoManager.Add(undoBatchStart);
|
||||
|
||||
int minPos = mSelection.mValue.MinPos;
|
||||
int maxPos = mSelection.mValue.MaxPos;
|
||||
int minPos = mSelection.GetValueOrDefault().MinPos;
|
||||
int maxPos = mSelection.GetValueOrDefault().MaxPos;
|
||||
mSelection = null;
|
||||
CursorTextPos = minPos;
|
||||
String insertStr = scope String();
|
||||
|
|
|
@ -3400,7 +3400,7 @@ namespace IDE.ui
|
|||
{
|
||||
Reload();
|
||||
if (mRequestedLineAndColumn != null)
|
||||
ShowFileLocation(-1, mRequestedLineAndColumn.mValue.mLine, mRequestedLineAndColumn.mValue.mColumn, .Always);
|
||||
ShowFileLocation(-1, mRequestedLineAndColumn.Value.mLine, mRequestedLineAndColumn.Value.mColumn, .Always);
|
||||
FocusEdit();
|
||||
|
||||
if ((!(mWantHash case .None)) && (mEditData != null) && (!mEditData.CheckHash(mWantHash)))
|
||||
|
@ -4065,7 +4065,7 @@ namespace IDE.ui
|
|||
if (IDEApp.sApp.mExecutionPaused)
|
||||
{
|
||||
int addr;
|
||||
String fileName = scope String(Path.MaxPath);
|
||||
String fileName = scope String(Path.[Friend]MaxPath);
|
||||
int hotIdx;
|
||||
int defLineStart;
|
||||
int defLineEnd;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue