Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-08 19:48:20 +02:00
Code Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Brian Fiete 2021-03-17 07:47:55 -04:00
commit a5ee3f6ac0
2 changed files with 26 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

24
IDEHelper/Compiler/BfAutoComplete.cpp
View file

@ -2306,18 +2306,40 @@ bool BfAutoComplete::GetMethodInfo(BfMethodInstance* methodInst, StringImpl* sho
StringT<128> propName;
StringT<256> impl;
propDeclaration->mNameNode->ToString(propName);
if (propDeclaration->mNameNode != NULL)
propDeclaration->mNameNode->ToString(propName);
else
{
StringT<128> args;
propName += "this[";
for (size_t paramIdx = 0, count = methodInst->GetParamCount(); paramIdx < count; ++paramIdx)
{
if (paramIdx > 0)
args += ", ";
args += mModule->TypeToString(methodInst->GetParamType(paramIdx), nameFlags);
args += " ";
args += methodDef->mParams[paramIdx]->mName;
}
propName += args;
propName += "]";
}
bool isAbstract = methodDef->mIsAbstract;
if (propDeclaration->mProtectionSpecifier != NULL)
impl += propDeclaration->mProtectionSpecifier->ToString() + " ";
else if (isInterface && !isExplicitInterface)
impl += "public ";
if (!isInterface)
impl += "override ";
BfType* propType = methodInst->mReturnType;
if (methodDef->mMethodType == BfMethodType_PropertySetter)
propType = methodInst->GetParamType(0);
impl += mModule->TypeToString(propType, nameFlags);
impl += " ";
if (isExplicitInterface)

6
extern/hunspell/CMakeLists.txt vendored
View file

@ -48,9 +48,9 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OUTPUT_DEBUG}")
set(CMAKE_EXECUTABLE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OUTPUT_DEBUG}")
else()
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OUTPUT_REL}")
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OUTPUT_REL}")
set(CMAKE_EXECUTABLE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OUTPUT_REL}")
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OUTPUT_RELEASE}")
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OUTPUT_RELEASE}")
set(CMAKE_EXECUTABLE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OUTPUT_RELEASE}")
endif()
################### Dependencies ##################