Add support for LuaToken to the LuaCall unreal pipeline

Source/Integration/LuaCall.cpp

@@ -30,6 +30,13 @@ void UlxLuaCallLibrary::LuaCallAddStringParameter(UObject *context, const FStrin
 	sb.write_string(pstring);
 }
 	
+void UlxLuaCallLibrary::LuaCallAddNameParameter(UObject *context, const FName &pname) {
+    AIntegrationGameModeBase *mode = AIntegrationGameModeBase::GetFromContext(context);
+    FlxStreamBuffer &sb = mode->LuaCallGetBuffer();
+    CheckNotEmpty(sb);
+	sb.write_simple_dynamic_tag(SimpleDynamicTag::STRING);
+	sb.write_fname(pname);
+}
 
 void UlxLuaCallLibrary::LuaCallAddFloatParameter(UObject *context, double pfloat) {
     AIntegrationGameModeBase *mode = AIntegrationGameModeBase::GetFromContext(context);
@@ -98,6 +105,7 @@ ELpxSimpleDynamicTag UlxLuaCallLibrary::LuaCallNextResultType(UObject *context)
     sb.unread_to(total_reads);
     switch (tag) {
         case SimpleDynamicTag::STRING: return ELpxSimpleDynamicTag::String;
+        case SimpleDynamicTag::TOKEN: return ELpxSimpleDynamicTag::Name;
         case SimpleDynamicTag::NUMBER: return ELpxSimpleDynamicTag::Float;
         case SimpleDynamicTag::VECTOR: return ELpxSimpleDynamicTag::Vector;
         case SimpleDynamicTag::BOOLEAN: return ELpxSimpleDynamicTag::Boolean;
@@ -110,8 +118,15 @@ FString UlxLuaCallLibrary::LuaCallGetStringResult(UObject *context) {
     FlxStreamBuffer &sb = mode->LuaCallGetResult();
     SimpleDynamicTag tag = sb.read_simple_dynamic_tag();
     if (tag != SimpleDynamicTag::STRING) FatalBlueprintError(TEXT("expected lua to return a string"));
-    std::string_view s = sb.read_string_view();
+    return sb.read_fstring();
-	return FString(s.size(), (const UTF8CHAR *)s.data());
+}
+
+FName UlxLuaCallLibrary::LuaCallGetNameResult(UObject *context) {
+    AIntegrationGameModeBase *mode = AIntegrationGameModeBase::GetFromContext(context);
+    FlxStreamBuffer &sb = mode->LuaCallGetResult();
+    SimpleDynamicTag tag = sb.read_simple_dynamic_tag();
+    if (tag != SimpleDynamicTag::TOKEN) FatalBlueprintError(TEXT("expected lua to return a name"));
+    return sb.read_fname();
 }
 
 double UlxLuaCallLibrary::LuaCallGetFloatResult(UObject *context) {

Source/Integration/LuaCall.h

@@ -7,6 +7,7 @@ UENUM(BlueprintType)
 enum class ELpxSimpleDynamicTag : uint8 {
     None,
     String,
+	Name,
     Float,
     Boolean,
     Vector
@@ -32,6 +33,9 @@ public:
 	UFUNCTION(BlueprintCallable, meta = (WorldContext = "context"), Category = "Luprex|Call Lua Function")
 	static void LuaCallAddStringParameter(UObject *context, const FString &pstring);
 
+	UFUNCTION(BlueprintCallable, meta = (WorldContext = "context"), Category = "Luprex|Call Lua Function")
+	static void LuaCallAddNameParameter(UObject *context, const FName &pname);
+
 	UFUNCTION(BlueprintCallable, meta = (WorldContext = "context"), Category = "Luprex|Call Lua Function")
 	static void LuaCallAddFloatParameter(UObject *context, double pfloat);
 
@@ -56,6 +60,9 @@ public:
 	UFUNCTION(BlueprintCallable, meta = (WorldContext = "context"), Category = "Luprex|Call Lua Function")
 	static FString LuaCallGetStringResult(UObject *context);
 	
+	UFUNCTION(BlueprintCallable, meta = (WorldContext = "context"), Category = "Luprex|Call Lua Function")
+	static FName LuaCallGetNameResult(UObject *context);
+	
 	UFUNCTION(BlueprintCallable, meta = (WorldContext = "context"), Category = "Luprex|Call Lua Function")
 	static double LuaCallGetFloatResult(UObject *context);
 

Source/Integration/StringDecoder.h

@@ -37,6 +37,11 @@ public:
         write_string(std::string_view(utf8str.Get(), utf8str.Length()));
     }
 
+    void write_fname(const FName &name) {
+	    FTCHARToUTF8 utf8str(name.ToString());
+        write_string(std::string_view(utf8str.Get(), utf8str.Length()));
+    }
+
     void write_string(const char *s) {
         write_string(std::string_view(s));
     }
@@ -53,5 +58,15 @@ public:
         double z = read_double();
         return FVector(x, y, z);
     }
+
+    FString read_fstring() {
+        std::string_view s = read_string_view();
+	    return FString(s.size(), (const UTF8CHAR *)s.data());
+    }
+
+    FName read_fname() {
+        std::string_view s = read_string_view();
+        return FName(s.size(), (const UTF8CHAR *)s.data(), FNAME_Add);
+    }
 };
 

luprex/cpp/core/world-core.cpp

@@ -13,6 +13,16 @@
 void push_simple_dynamic(lua_State *L, StreamBuffer *sb) {
     SimpleDynamicTag type = sb->read_simple_dynamic_tag();
     switch (type) {
+        case SimpleDynamicTag::STRING: {
+            std::string_view s = sb->read_string_view();
+            lua_pushlstring(L, s.data(), s.size());
+            break;
+        }
+        case SimpleDynamicTag::TOKEN: {
+            LuaToken token(sb->read_string_view());
+            lua_pushlightuserdata(L, token.voidvalue());
+            break;
+        }
         case SimpleDynamicTag::NUMBER: {
             lua_pushnumber(L, sb->read_double());
             break;
@@ -21,11 +31,6 @@ void push_simple_dynamic(lua_State *L, StreamBuffer *sb) {
             lua_pushboolean(L, sb->read_bool() ? 1:0);
             break;
         }
-        case SimpleDynamicTag::STRING: {
-            std::string_view s = sb->read_string_view();
-            lua_pushlstring(L, s.data(), s.size());
-            break;
-        }
         case SimpleDynamicTag::VECTOR: {
             double x = sb->read_double();
             double y = sb->read_double();
@@ -46,14 +51,18 @@ void push_simple_dynamic(lua_State *L, StreamBuffer *sb) {
 // Given a lua value, try to pack it into the stream buffer as a simple dynamic.
 bool encode_simple_dynamic(LuaCoreStack &LS, LuaSlot &slot, StreamBuffer *sb) {
     switch (LS.type(slot)) {
-        case LUA_TNUMBER:
-            sb->write_simple_dynamic_tag(SimpleDynamicTag::NUMBER);
-            sb->write_double(LS.cknumber(slot));
-            return true;
         case LUA_TSTRING:
             sb->write_simple_dynamic_tag(SimpleDynamicTag::STRING);
             sb->write_string(LS.ckstringview(slot));
             return true;
+        case LUA_TLIGHTUSERDATA:
+            sb->write_simple_dynamic_tag(SimpleDynamicTag::TOKEN);
+            sb->write_string(LS.cktoken(slot).str());
+            return true;
+        case LUA_TNUMBER:
+            sb->write_simple_dynamic_tag(SimpleDynamicTag::NUMBER);
+            sb->write_double(LS.cknumber(slot));
+            return true;
         case LUA_TBOOLEAN:
             sb->write_simple_dynamic_tag(SimpleDynamicTag::BOOLEAN);
             sb->write_bool(LS.ckboolean(slot));