improved syntax highlighter, added multiple return values to ULuaComp…

…onent
rdeioris · Dec 19, 2018 · d40369c · d40369c
1 parent 9f15674
commit d40369c
Show file tree

Hide file tree

Showing 9 changed files with 65 additions and 2 deletions.
diff --git a/Content/Code/TestMainCode.uasset b/Content/Code/TestMainCode.uasset
diff --git a/Content/LuaMachine_Tests.umap b/Content/LuaMachine_Tests.umap
diff --git a/Content/Tests/TestActorMethodMultiNoArgs.uasset b/Content/Tests/TestActorMethodMultiNoArgs.uasset
diff --git a/Content/Tests/TestActorMethodValueMultiNoArgs.uasset b/Content/Tests/TestActorMethodValueMultiNoArgs.uasset
diff --git a/Content/Tests/TestCoroutineResumeMulti.uasset b/Content/Tests/TestCoroutineResumeMulti.uasset
diff --git a/Content/Tests/TestGC.uasset b/Content/Tests/TestGC.uasset
diff --git a/Source/LuaMachine/Private/LuaComponent.cpp b/Source/LuaMachine/Private/LuaComponent.cpp
@@ -221,6 +221,7 @@ FLuaValue ULuaComponent::LuaCallValue(FLuaValue Value, TArray<FLuaValue> Args)
 	if (!L)
 		return ReturnValue;
 
+	// push function
 	L->FromLuaValue(Value);
 	// push component pointer as userdata
 	L->NewUObject(this);
@@ -233,7 +234,66 @@ FLuaValue ULuaComponent::LuaCallValue(FLuaValue Value, TArray<FLuaValue> Args)
 		NArgs++;
 	}
 
-	L->PCall(NArgs, ReturnValue);
+	if (!L->PCall(NArgs, ReturnValue))
+	{
+		if (L->InceptionLevel == 0)
+		{
+			if (bLogError)
+				L->LogError(L->LastError);
+			OnLuaError.Broadcast(L->LastError);
+		}
+	}
+
+	L->Pop();
+
+	return ReturnValue;
+}
+
+TArray<FLuaValue> ULuaComponent::LuaCallValueMulti(FLuaValue Value, TArray<FLuaValue> Args)
+{
+	TArray<FLuaValue> ReturnValue;
+
+	ULuaState* L = Value.LuaState;
+	if (!L)
+		return ReturnValue;
+
+	// push function
+	L->FromLuaValue(Value);
+	int32 StackTop = L->GetTop();
+
+	// push component pointer as userdata
+	L->NewUObject(this);
+	SetupMetatable();
+
+	int NArgs = 1;
+	for (FLuaValue& Arg : Args)
+	{
+		L->FromLuaValue(Arg);
+		NArgs++;
+	}
+
+	FLuaValue LastReturnValue;
+	if (!L->PCall(NArgs, LastReturnValue, LUA_MULTRET))
+	{
+		if (L->InceptionLevel == 0)
+		{
+			if (bLogError)
+				L->LogError(L->LastError);
+			OnLuaError.Broadcast(L->LastError);
+		}
+	}
+	else
+	{
+		int32 NumOfReturnValues = (L->GetTop() - StackTop) + 1;
+		if (NumOfReturnValues > 0)
+		{
+			for (int32 i = -1; i >= -(NumOfReturnValues); i--)
+			{
+				ReturnValue.Insert(L->ToLuaValue(i), 0);
+			}
+			L->Pop(NumOfReturnValues - 1);
+		}
+	}
 
 	L->Pop();
 

diff --git a/Source/LuaMachine/Public/LuaComponent.h b/Source/LuaMachine/Public/LuaComponent.h
@@ -52,6 +52,9 @@ class LUAMACHINE_API ULuaComponent : public UActorComponent
 	UFUNCTION(BlueprintCallable, meta = (AutoCreateRefTerm = "Args"))
 	TArray<FLuaValue> LuaCallFunctionMulti(FString Name, TArray<FLuaValue> Args, bool bGlobal);
 
+	UFUNCTION(BlueprintCallable, meta = (AutoCreateRefTerm = "Args"))
+	TArray<FLuaValue> LuaCallValueMulti(FLuaValue Value, TArray<FLuaValue> Args);
+
 	UFUNCTION(BlueprintCallable, BlueprintPure)
 	FLuaValue LuaGetField(FString Name);
 

diff --git a/Source/LuaMachineEditor/Private/LuaCodeCustomization.cpp b/Source/LuaMachineEditor/Private/LuaCodeCustomization.cpp
@@ -187,7 +187,7 @@ class FLuaMachineSyntaxHighlighterTextLayoutMarshaller : public FSyntaxHighlight
 								CurrentBlockStyle = SyntaxTextStyle.NilTextStyle;
 								ParseState = EParseState::None;
 							}
-							else if (!TChar<WIDECHAR>::IsAlpha(NextChar) && !TChar<WIDECHAR>::IsDigit(NextChar) && !TChar<WIDECHAR>::IsAlpha(PrevChar) && !TChar<WIDECHAR>::IsDigit(PrevChar))
+							else if (!TChar<WIDECHAR>::IsAlpha(NextChar) && !TChar<WIDECHAR>::IsDigit(NextChar) && !TChar<WIDECHAR>::IsAlpha(PrevChar) && !TChar<WIDECHAR>::IsDigit(PrevChar) && NextChar != TCHAR('_') && PrevChar != TCHAR('_'))
 							{
 								RunInfo.Name = TEXT("SyntaxHighlight.LuaMachine.Keyword");
 								CurrentBlockStyle = SyntaxTextStyle.KeywordTextStyle;