From c5a9878bd9c56f623fe2caad30a1ead3dac1f391 Mon Sep 17 00:00:00 2001 From: Erik Stenman Date: Fri, 15 Feb 2019 12:34:46 +0100 Subject: [PATCH] Rename to library standard. --- include/{aefa_data.hrl => aeb_fate_data.hrl} | 0 ...{aefa_opcodes.hrl => aeb_fate_opcodes.hrl} | 0 src/{aeblake2.erl => aeb_blake2.erl} | 2 +- src/{aefa_asm.erl => aeb_fate_asm.erl} | 52 +++++++++---------- ...efa_asm_scan.xrl => aeb_fate_asm_scan.xrl} | 2 +- src/{aefa_data.erl => aeb_fate_data.erl} | 7 ++- ...efa_encoding.erl => aeb_fate_encoding.erl} | 32 ++++++------ ...{aefa_opcodes.erl => aeb_fate_opcodes.erl} | 4 +- src/{ae_rlp.erl => aeb_rlp.erl} | 2 +- src/aefateasm.erl | 6 +-- 10 files changed, 53 insertions(+), 54 deletions(-) rename include/{aefa_data.hrl => aeb_fate_data.hrl} (100%) rename include/{aefa_opcodes.hrl => aeb_fate_opcodes.hrl} (100%) rename src/{aeblake2.erl => aeb_blake2.erl} (99%) rename src/{aefa_asm.erl => aeb_fate_asm.erl} (91%) rename src/{aefa_asm_scan.xrl => aeb_fate_asm_scan.xrl} (99%) rename src/{aefa_data.erl => aeb_fate_data.erl} (98%) rename src/{aefa_encoding.erl => aeb_fate_encoding.erl} (93%) rename src/{aefa_opcodes.erl => aeb_fate_opcodes.erl} (98%) rename src/{ae_rlp.erl => aeb_rlp.erl} (99%) diff --git a/include/aefa_data.hrl b/include/aeb_fate_data.hrl similarity index 100% rename from include/aefa_data.hrl rename to include/aeb_fate_data.hrl diff --git a/include/aefa_opcodes.hrl b/include/aeb_fate_opcodes.hrl similarity index 100% rename from include/aefa_opcodes.hrl rename to include/aeb_fate_opcodes.hrl diff --git a/src/aeblake2.erl b/src/aeb_blake2.erl similarity index 99% rename from src/aeblake2.erl rename to src/aeb_blake2.erl index 0519440..37fda39 100644 --- a/src/aeblake2.erl +++ b/src/aeb_blake2.erl @@ -5,7 +5,7 @@ %%% @end %%%============================================================================= --module(aeblake2). +-module(aeb_blake2). -export([ blake2b/2 , blake2b/3 diff --git a/src/aefa_asm.erl b/src/aeb_fate_asm.erl similarity index 91% rename from src/aefa_asm.erl rename to src/aeb_fate_asm.erl index 0b9d420..c465c50 100644 --- a/src/aefa_asm.erl +++ b/src/aeb_fate_asm.erl @@ -41,7 +41,7 @@ %%% Created : 21 Dec 2017 %%%------------------------------------------------------------------- --module(aefa_asm). +-module(aeb_fate_asm). -export([ assemble_file/3 , asm_to_bytecode/2 @@ -51,12 +51,12 @@ , to_hexstring/1 ]). --include_lib("aebytecode/include/aefa_opcodes.hrl"). +-include_lib("aebytecode/include/aeb_fate_opcodes.hrl"). -define(HASH_BYTES, 32). assemble_file(InFile, OutFile, Options) -> Asm = read_file(InFile), - {Env, BC} = aefa_asm:asm_to_bytecode(Asm, Options), + {Env, BC} = asm_to_bytecode(Asm, Options), ok = file:write_file(OutFile, BC). pp(Asm) -> @@ -68,7 +68,7 @@ format(Asm) -> format(Asm, 0). format([{comment, Comment} | Rest], Address) -> ";; " ++ Comment ++ "\n" ++ format(Rest, Address); format([Mnemonic | Rest], Address) -> - _Op = aefa_opcodes:m_to_op(Mnemonic), + _Op = aeb_fate_opcodes:m_to_op(Mnemonic), " " ++ atom_to_list(Mnemonic) ++ "\n" ++ format(Rest, Address + 1); format([],_) -> []. @@ -79,7 +79,7 @@ read_file(Filename) -> binary_to_list(File). asm_to_bytecode(AssemblerCode, Options) -> - {ok, Tokens, _} = aefa_asm_scan:scan(AssemblerCode), + {ok, Tokens, _} = aeb_fate_asm_scan:scan(AssemblerCode), case proplists:lookup(pp_tokens, Options) of {pp_tokens, true} -> @@ -148,7 +148,7 @@ deserialize(<>, , current_bb_code := Code , code := Program} = Env) -> {Rest2, OpCode} = deserialize_op(Op, Rest, Code), - case aefa_opcodes:end_bb(Op) of + case aebe_fate_opcodes:end_bb(Op) of true -> deserialize(Rest2, Env#{ bb => BB+1 , current_bb_code => [] @@ -176,40 +176,40 @@ deserialize(<<>>, #{ function := F deserialize_op(?ELEMENT, Rest, Code) -> {Type, Rest2} = deserialize_type(Rest), <> = Rest2, - {Arg0, Rest4} = aefa_encoding:deserialize_one(Rest3), - {Arg1, Rest5} = aefa_encoding:deserialize_one(Rest4), - {Arg2, Rest6} = aefa_encoding:deserialize_one(Rest5), + {Arg0, Rest4} = aeb_fate_encoding:deserialize_one(Rest3), + {Arg1, Rest5} = aeb_fate_encoding:deserialize_one(Rest4), + {Arg2, Rest6} = aeb_fate_encoding:deserialize_one(Rest5), Modifier0 = bits_to_modifier(ArgType band 2#11), Modifier1 = bits_to_modifier((ArgType bsr 2) band 2#11), Modifier2 = bits_to_modifier((ArgType bsr 4) band 2#11), - {Rest6, [{ aefa_opcodes:mnemonic(?ELEMENT) + {Rest6, [{ aeb_fate_opcodes:mnemonic(?ELEMENT) , Type , {Modifier0, Arg0} , {Modifier1, Arg1} , {Modifier2, Arg2}} | Code]}; deserialize_op(Op, Rest, Code) -> - OpName = aefa_opcodes:mnemonic(Op), - case aefa_opcodes:args(Op) of + OpName = aeb_fate_opcodes:mnemonic(Op), + case aeb_fate_opcodes:args(Op) of 0 -> {Rest, [OpName | Code]}; 1 -> <> = Rest, - {Arg, Rest3} = aefa_encoding:deserialize_one(Rest2), + {Arg, Rest3} = aeb_fate_encoding:deserialize_one(Rest2), Modifier = bits_to_modifier(ArgType), {Rest3, [{OpName, {Modifier, Arg}} | Code]}; 2 -> <> = Rest, - {Arg0, Rest3} = aefa_encoding:deserialize_one(Rest2), - {Arg1, Rest4} = aefa_encoding:deserialize_one(Rest3), + {Arg0, Rest3} = aeb_fate_encoding:deserialize_one(Rest2), + {Arg1, Rest4} = aeb_fate_encoding:deserialize_one(Rest3), Modifier0 = bits_to_modifier(ArgType band 2#11), Modifier1 = bits_to_modifier((ArgType bsr 2) band 2#11), {Rest4, [{OpName, {Modifier0, Arg0}, {Modifier1, Arg1}} | Code]}; 3 -> <> = Rest, - {Arg0, Rest3} = aefa_encoding:deserialize_one(Rest2), - {Arg1, Rest4} = aefa_encoding:deserialize_one(Rest3), - {Arg2, Rest5} = aefa_encoding:deserialize_one(Rest4), + {Arg0, Rest3} = aeb_fate_encoding:deserialize_one(Rest2), + {Arg1, Rest4} = aeb_fate_encoding:deserialize_one(Rest3), + {Arg2, Rest5} = aeb_fate_encoding:deserialize_one(Rest4), Modifier0 = bits_to_modifier(ArgType band 2#11), Modifier1 = bits_to_modifier((ArgType bsr 2) band 2#11), Modifier2 = bits_to_modifier((ArgType bsr 4) band 2#11), @@ -220,10 +220,10 @@ deserialize_op(Op, Rest, Code) -> | Code]}; 4 -> <> = Rest, - {Arg0, Rest3} = aefa_encoding:deserialize_one(Rest2), - {Arg1, Rest4} = aefa_encoding:deserialize_one(Rest3), - {Arg2, Rest5} = aefa_encoding:deserialize_one(Rest4), - {Arg3, Rest6} = aefa_encoding:deserialize_one(Rest5), + {Arg0, Rest3} = aeb_fate_encoding:deserialize_one(Rest2), + {Arg1, Rest4} = aeb_fate_encoding:deserialize_one(Rest3), + {Arg2, Rest5} = aeb_fate_encoding:deserialize_one(Rest4), + {Arg3, Rest6} = aeb_fate_encoding:deserialize_one(Rest5), Modifier0 = bits_to_modifier(ArgType band 2#11), Modifier1 = bits_to_modifier((ArgType bsr 2) band 2#11), Modifier2 = bits_to_modifier((ArgType bsr 4) band 2#11), @@ -323,7 +323,7 @@ bits_to_modifier(2#01) -> arg; bits_to_modifier(2#00) -> stack. serialize_data(_, Data) -> - aefa_encoding:serialize(Data). + aeb_fate_encoding:serialize(Data). serialize_signature({Args, RetType}) -> [serialize_type({tuple, Args}) | @@ -379,11 +379,11 @@ to_bytecode([{function,_line, 'FUNCTION'}|Rest], Address, Env, Code, Opts) -> {Fun, Rest2} = to_fun_def(Rest), to_bytecode(Rest2, Fun, Env2, [], Opts); to_bytecode([{mnemonic,_line, 'ELEMENT'}|Rest], Address, Env, Code, Opts) -> - OpCode = aefa_opcodes:m_to_op('ELEMENT'), + OpCode = aeb_fate_opcodes:m_to_op('ELEMENT'), {RetType, Rest2} = to_type(Rest), to_bytecode(Rest2, Address, Env, [RetType, OpCode|Code], Opts); to_bytecode([{mnemonic,_line, Op}|Rest], Address, Env, Code, Opts) -> - OpCode = aefa_opcodes:m_to_op(Op), + OpCode = aeb_fate_opcodes:m_to_op(Op), to_bytecode(Rest, Address, Env, [OpCode|Code], Opts); to_bytecode([{arg,_line, N}|Rest], Address, Env, Code, Opts) -> to_bytecode(Rest, Address, Env, [{arg, N}|Code], Opts); @@ -467,7 +467,7 @@ insert_fun({Name, Type, RetType}, Code, #{functions := Functions} = Env) -> insert_symbol(Id, Env) -> %% Use first 4 bytes of blake hash - {ok, <> } = aeblake2:blake2b(?HASH_BYTES, list_to_binary(Id)), + {ok, <> } = aeb_blake2:blake2b(?HASH_BYTES, list_to_binary(Id)), insert_symbol(Id, <>, Env). insert_symbol(Id, Hash, #{symbols := Symbols} = Env) -> diff --git a/src/aefa_asm_scan.xrl b/src/aeb_fate_asm_scan.xrl similarity index 99% rename from src/aefa_asm_scan.xrl rename to src/aeb_fate_asm_scan.xrl index b61d240..59bf4d9 100644 --- a/src/aefa_asm_scan.xrl +++ b/src/aeb_fate_asm_scan.xrl @@ -170,7 +170,7 @@ Erlang code. -ignore_xref([format_error/1, string/2, token/2, token/3, tokens/2, tokens/3]). --include_lib("aebytecode/include/aefa_opcodes.hrl"). +-include_lib("aebytecode/include/aeb_fate_opcodes.hrl"). parse_hex("0x" ++ Chars) -> list_to_integer(Chars, 16). diff --git a/src/aefa_data.erl b/src/aeb_fate_data.erl similarity index 98% rename from src/aefa_data.erl rename to src/aeb_fate_data.erl index 568dbd7..9426b7c 100644 --- a/src/aefa_data.erl +++ b/src/aeb_fate_data.erl @@ -1,9 +1,8 @@ -%% First draft of FATE data representation. -%% Very likely to change. +%% FATE data representation. %% --include("aefa_data.hrl"). +-include("aeb_fate_data.hrl"). --module(aefa_data). +-module(aeb_fate_data). -type fate_integer() :: ?FATE_INTEGER_T. -type fate_boolean() :: ?FATE_BOOLEAN_T. diff --git a/src/aefa_encoding.erl b/src/aeb_fate_encoding.erl similarity index 93% rename from src/aefa_encoding.erl rename to src/aeb_fate_encoding.erl index dd83e64..4a5daa2 100644 --- a/src/aefa_encoding.erl +++ b/src/aeb_fate_encoding.erl @@ -33,14 +33,14 @@ %% * Handle instructions. %% %% ------------------------------------------------------------------------ --module(aefa_encoding). +-module(aeb_fate_encoding). -export([ deserialize/1 , deserialize_one/1 , serialize/1 ]). --include("aefa_data.hrl"). +-include("aeb_fate_data.hrl"). %% Definition of tag scheme. %% This has to follow the protocol specification. @@ -85,7 +85,7 @@ %% Serialized a Fate data value into a sequence of bytes %% according to the Fate serialization specification. %% TODO: The type Fate Data is not final yet. --spec serialize(aefa_data:fate_type()) -> binary(). +-spec serialize(aeb_fate_data:fate_type()) -> binary(). serialize(?FATE_TRUE) -> <>; serialize(?FATE_FALSE) -> <>; serialize(?FATE_NIL) -> <>; %% ! Untyped @@ -104,9 +104,9 @@ serialize(String) when ?IS_FATE_STRING(String), ?FATE_STRING_SIZE(String) > 0, ?FATE_STRING_SIZE(String) >= ?SHORT_STRING_SIZE -> Bytes = ?FATE_STRING_VALUE(String), - <>; + <>; serialize(?FATE_ADDRESS(Address)) when is_binary(Address) -> - <>; + <>; serialize(?FATE_TUPLE(T)) when size(T) > 0 -> S = size(T), L = tuple_to_list(T), @@ -148,7 +148,7 @@ serialize(?FATE_VARIANT(Size, Tag, Values)) when 0 =< Size %% ----------------------------------------------------- rlp_integer(S) when S >= 0 -> - ae_rlp:encode(binary:encode_unsigned(S)). + aeb_rlp:encode(binary:encode_unsigned(S)). serialize_integer(I) when ?IS_FATE_INTEGER(I) -> V = ?FATE_INTEGER_VALUE(I), @@ -175,7 +175,7 @@ serialize_bits(B) when is_integer(B) -> Sign =:= ?POS_SIGN -> <> end. --spec deserialize(binary()) -> aefa_data:fate_type(). +-spec deserialize(binary()) -> aeb_fate_data:fate_type(). deserialize(B) -> {T, <<>>} = deserialize2(B), T. @@ -187,28 +187,28 @@ deserialize2(<>) -> deserialize2(<>) -> {?MAKE_FATE_INTEGER(-I), Rest}; deserialize2(<>) -> - {Bint, Rest2} = ae_rlp:decode_one(Rest), + {Bint, Rest2} = aeb_rlp:decode_one(Rest), {?MAKE_FATE_INTEGER(-binary:decode_unsigned(Bint) - ?SMALL_INT_SIZE), Rest2}; deserialize2(<>) -> - {Bint, Rest2} = ae_rlp:decode_one(Rest), + {Bint, Rest2} = aeb_rlp:decode_one(Rest), {?MAKE_FATE_INTEGER(binary:decode_unsigned(Bint) + ?SMALL_INT_SIZE), Rest2}; deserialize2(<>) -> - {Bint, Rest2} = ae_rlp:decode_one(Rest), + {Bint, Rest2} = aeb_rlp:decode_one(Rest), {?FATE_BITS(-binary:decode_unsigned(Bint)), Rest2}; deserialize2(<>) -> - {Bint, Rest2} = ae_rlp:decode_one(Rest), + {Bint, Rest2} = aeb_rlp:decode_one(Rest), {?FATE_BITS(binary:decode_unsigned(Bint)), Rest2}; deserialize2(<>) -> - {String, Rest2} = ae_rlp:decode_one(Rest), + {String, Rest2} = aeb_rlp:decode_one(Rest), {?MAKE_FATE_STRING(String), Rest2}; deserialize2(<>) -> String = binary:part(Rest, 0, S), Rest2 = binary:part(Rest, byte_size(Rest), - (byte_size(Rest) - S)), {?MAKE_FATE_STRING(String), Rest2}; deserialize2(<>) -> - {A, Rest2} = ae_rlp:decode_one(Rest), + {A, Rest2} = aeb_rlp:decode_one(Rest), {?FATE_ADDRESS(A), Rest2}; deserialize2(<>) -> {?FATE_TRUE, Rest}; @@ -223,7 +223,7 @@ deserialize2(<>) -> deserialize2(<>) -> {?FATE_EMPTY_STRING, Rest}; deserialize2(<>) -> - {BSize, Rest1} = ae_rlp:decode_one(Rest), + {BSize, Rest1} = aeb_rlp:decode_one(Rest), N = binary:decode_unsigned(BSize) + ?SHORT_TUPLE_SIZE, {List, Rest2} = deserialize_elements(N, Rest1), {?FATE_TUPLE(list_to_tuple(List)), Rest2}; @@ -231,7 +231,7 @@ deserialize2(<>) -> {List, Rest1} = deserialize_elements(S, Rest), {?FATE_TUPLE(list_to_tuple(List)), Rest1}; deserialize2(<>) -> - {BLength, Rest1} = ae_rlp:decode_one(Rest), + {BLength, Rest1} = aeb_rlp:decode_one(Rest), Length = binary:decode_unsigned(BLength) + ?SHORT_LIST_SIZE, {List, Rest2} = deserialize_elements(Length, Rest1), {?MAKE_FATE_LIST(List), Rest2}; @@ -239,7 +239,7 @@ deserialize2(<>) -> {List, Rest1} = deserialize_elements(S, Rest), {?MAKE_FATE_LIST(List), Rest1}; deserialize2(<>) -> - {BSize, Rest1} = ae_rlp:decode_one(Rest), + {BSize, Rest1} = aeb_rlp:decode_one(Rest), Size = binary:decode_unsigned(BSize), {List, Rest2} = deserialize_elements(2*Size, Rest1), Map = insert_kv(List, #{}), diff --git a/src/aefa_opcodes.erl b/src/aeb_fate_opcodes.erl similarity index 98% rename from src/aefa_opcodes.erl rename to src/aeb_fate_opcodes.erl index 20116e5..21ebefe 100644 --- a/src/aefa_opcodes.erl +++ b/src/aeb_fate_opcodes.erl @@ -5,7 +5,7 @@ %%% @end %%%------------------------------------------------------------------- --module(aefa_opcodes). +-module(aeb_fate_opcodes). -export([ args/1 , end_bb/1 @@ -14,7 +14,7 @@ , opcode/1 ]). --include_lib("aebytecode/include/aefa_opcodes.hrl"). +-include_lib("aebytecode/include/aeb_fate_opcodes.hrl"). %%==================================================================== diff --git a/src/ae_rlp.erl b/src/aeb_rlp.erl similarity index 99% rename from src/ae_rlp.erl rename to src/aeb_rlp.erl index 6e537b4..46a27fa 100644 --- a/src/ae_rlp.erl +++ b/src/aeb_rlp.erl @@ -8,7 +8,7 @@ %%% @end %%%------------------------------------------------------------------- --module(ae_rlp). +-module(aeb_rlp). -export([ decode/1 , decode_one/1 , encode/1 diff --git a/src/aefateasm.erl b/src/aefateasm.erl index 2958808..db7910e 100644 --- a/src/aefateasm.erl +++ b/src/aefateasm.erl @@ -43,8 +43,8 @@ assemble(File, Opts) -> Verbose = proplists:get_value(verbose, Opts, false), case proplists:get_value(outfile, Opts, undefined) of undefined -> - Asm = aefa_asm:read_file(File), - {Env, BC} = aefa_asm:asm_to_bytecode(Asm, Opts), + Asm = aeb_fate_asm:read_file(File), + {Env, BC} = aeb_fate_asm:asm_to_bytecode(Asm, Opts), case Verbose of true -> io:format("Env: ~0p~n", [Env]); @@ -52,7 +52,7 @@ assemble(File, Opts) -> end, io:format("Code: ~0p~n", [BC]); OutFile -> - aefa_asm:assemble_file(File, OutFile, Opts) + aeb_fate_asm:assemble_file(File, OutFile, Opts) end.