Fix oops w/ array serialization ordering

test/tool/net/lfuncs_test.lua

@@ -54,17 +54,17 @@ assert(EncodeLatin1("helloÿÀ") == "hello\xff\xc0")
 assert(EncodeLua(nil) == "nil")
 assert(EncodeLua(0) == "0")
 assert(EncodeLua(3.14) == "3.14")
-assert(EncodeLua({2, 1}) == "{1, 2}")
+assert(EncodeLua({2, 1}) == "{2, 1}")
 
 assert(EncodeJson(nil) == "null")
 assert(EncodeJson(0) == "0")
 assert(EncodeJson(3.14) == "3.14")
-assert(EncodeJson({2, 1}) == "[1,2]")
+assert(EncodeJson({2, 1}) == "[2,1]")
 
 -- EncodeLua() permits serialization of cyclic data structures
 x = {2, 1}
 x[3] = x
-assert(string.match(EncodeLua(x), "{\"cyclic@0x%x+\", 1, 2}"))
+assert(string.match(EncodeLua(x), "{2, 1, \"cyclic@0x%x+\"}"))
 
 -- EncodeLua() sorts table entries
 x = {}

third_party/lua/luaencodejsondata.c

@@ -120,9 +120,9 @@ static int LuaEncodeJsonDataImpl(lua_State *L, char **buf, int level,
               lua_pop(L, 1);  // table/-2, key/-1
             }
             // stack: table/-1, as the key was popped by lua_next
+            SortStrList(&sl);
           }
           RETURN_ON_ERROR(appendw(buf, isarray ? '[' : '{'));
-          SortStrList(&sl);
           RETURN_ON_ERROR(JoinStrList(&sl, buf, ','));
           FreeStrList(&sl);
           RETURN_ON_ERROR(appendw(buf, isarray ? ']' : '}'));

third_party/lua/luaencodeluadata.c

@@ -181,8 +181,8 @@ static int LuaEncodeLuaDataImpl(lua_State *L, char **buf, int level,
             lua_pop(L, 1);  // table/-2, key/-1
           }
           lua_pop(L, 1);  // table ref
+          if (!isarray) SortStrList(&sl);
           RETURN_ON_ERROR(appendw(buf, '{'));
-          SortStrList(&sl);
           RETURN_ON_ERROR(JoinStrList(&sl, buf, READ16LE(", ")));
           RETURN_ON_ERROR(appendw(buf, '}'));
           FreeStrList(&sl);