QPQ-AG/gmbytecode
10
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases 9 Wiki Activity

Restore old binary and string comparison #216

Merged
zxq9 merged 1 commits from revert-string-compare into master 2021-04-14 20:25:35 +09:00
Conversation 5 Commits 1 Files Changed 1 +13 -4
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/aeb_fate_data.erl
View File

@ -325,13 +325,22 @@ lt(?ORD_ORACLE, ?FATE_ORACLE(A), ?FATE_ORACLE(B)) ->
A < B; A < B;
lt(?ORD_ORACLE_Q, ?FATE_ORACLE_Q(A), ?FATE_ORACLE_Q(B)) -> lt(?ORD_ORACLE_Q, ?FATE_ORACLE_Q(A), ?FATE_ORACLE_Q(B)) ->
A < B; A < B;
% Compare by first different bit. If one is prefix of another than shorter is smaller. (like in Erlang)
lt(?ORD_STRING, ?FATE_STRING(A), ?FATE_STRING(B)) -> lt(?ORD_STRING, ?FATE_STRING(A), ?FATE_STRING(B)) ->
A < B; compare_bytes(A, B);
lt(?ORD_BYTES, ?FATE_BYTES(A), ?FATE_BYTES(B)) -> lt(?ORD_BYTES, ?FATE_BYTES(A), ?FATE_BYTES(B)) ->
A < B; compare_bytes(A, B);
lt(?ORD_CONTRACT_BYTEARRAY, ?FATE_CONTRACT_BYTEARRAY(A), ?FATE_CONTRACT_BYTEARRAY(B)) -> lt(?ORD_CONTRACT_BYTEARRAY, ?FATE_CONTRACT_BYTEARRAY(A), ?FATE_CONTRACT_BYTEARRAY(B)) ->
A < B. compare_bytes(A, B).
% Shorter comes first
% On same length compare by first different bit
compare_bytes(A, B) ->
SizeA = byte_size(A),
SizeB = byte_size(B),
case SizeA - SizeB of
0 -> A < B;
N -> N < 0
end.
tuple_elements_lt(N,_A,_B, N) -> tuple_elements_lt(N,_A,_B, N) ->
false; false;