Skip to content

Commit b00a6ec

Browse files
UncleGrumpyUncleGrumpy
committed
Fix formatting
Fix formatting so future PRs can be checked with erlfmt. Signed-off-by: Winford <[email protected]>
1 parent 67257b7 commit b00a6ec

File tree

4 files changed

+115
-72
lines changed

4 files changed

+115
-72
lines changed

‎src/packbeam.erl‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,8 @@ do_create(Opts, Args) ->
181181
validate_args(create, Opts, Args),
182182
[OutputFile | InputFiles] = Args,
183183
ok = packbeam_api:create(
184-
OutputFile, InputFiles,
184+
OutputFile,
185+
InputFiles,
185186
#{
186187
prune => maps:get(prune, Opts, false),
187188
start_module => maps:get(start_module, Opts, undefined),
@@ -312,36 +313,31 @@ parse_args(Argv) ->
312313
%% @private
313314
parse_args([], {Opts, Args}) ->
314315
{Opts, lists:reverse(Args)};
315-
316316
parse_args(["-out", Path | T], {Opts, Args}) ->
317317
io:format("WARNING. Deprecated option. Use --out instead.~n"),
318318
parse_args(["--out", Path | T], {Opts, Args});
319319
parse_args(["-o", Path | T], {Opts, Args}) ->
320320
parse_args(["--out", Path | T], {Opts, Args});
321321
parse_args(["--out", Path | T], {Opts, Args}) ->
322322
parse_args(T, {Opts#{output => Path}, Args});
323-
324323
parse_args(["-prune" | T], {Opts, Args}) ->
325324
io:format("WARNING. Deprecated option. Use --prune instead.~n"),
326325
parse_args(["--prune" | T], {Opts, Args});
327326
parse_args(["-p" | T], {Opts, Args}) ->
328327
parse_args(["--prune" | T], {Opts, Args});
329328
parse_args(["--prune" | T], {Opts, Args}) ->
330329
parse_args(T, {Opts#{prune => true}, Args});
331-
332330
parse_args(["-start", Module | T], {Opts, Args}) ->
333331
io:format("WARNING. Deprecated option. Use --start instead.~n"),
334332
parse_args(["--start", Module | T], {Opts, Args});
335333
parse_args(["-s", Module | T], {Opts, Args}) ->
336334
parse_args(["--start", Module | T], {Opts, Args});
337335
parse_args(["--start", Module | T], {Opts, Args}) ->
338336
parse_args(T, {Opts#{start_module => list_to_atom(Module)}, Args});
339-
340337
parse_args(["-r" | T], {Opts, Args}) ->
341338
parse_args(["--remove_lines" | T], {Opts, Args});
342339
parse_args(["--remove_lines" | T], {Opts, Args}) ->
343340
parse_args(T, {Opts#{remove_lines => true}, Args});
344-
345341
parse_args(["-format", Format | T], {Opts, Args}) ->
346342
io:format("WARNING. Deprecated option. Use --format instead.~n"),
347343
parse_args(["--format", Format | T], {Opts, Args});

‎src/packbeam_api.erl‎

Lines changed: 34 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
%% AVM Entry functions
3030
-export([is_beam/1, is_entrypoint/1, get_element_name/1, get_element_data/1, get_element_module/1]).
3131

32+
% erlfmt:ignore We want to keep the block format
3233
-define(AVM_HEADER,
3334
16#23, 16#21, 16#2f, 16#75,
3435
16#73, 16#72, 16#2f, 16#62,
@@ -37,6 +38,7 @@
3738
16#74, 16#6f, 16#6d, 16#56,
3839
16#4d, 16#0a, 16#00, 16#00
3940
).
41+
4042
-define(ALLOWED_CHUNKS, [
4143
"AtU8", "Code", "ExpT", "LocT", "ImpT", "LitU", "FunT", "StrT", "LitT"
4244
]).
@@ -194,7 +196,9 @@ create(OutputPath, InputPaths, Prune, StartModule) ->
194196
ok | {error, Reason :: term()}.
195197
create(OutputPath, InputPaths, ApplicationModule, Prune, StartModule) ->
196198
io:format("WARNING: Deprecated function: ~p:create/5~n", [?MODULE]),
197-
Options = #{prune => Prune, start_module => StartModule, application_module => ApplicationModule},
199+
Options = #{
200+
prune => Prune, start_module => StartModule, application_module => ApplicationModule
201+
},
198202
create(OutputPath, InputPaths, maps:merge(?DEFAULT_OPTIONS, Options)).
199203

200204
%%-----------------------------------------------------------------------------
@@ -406,24 +410,28 @@ find_application_start_modules(ParsedFiles, ApplicationSpecs, ApplicationModule)
406410
false ->
407411
[];
408412
{value, {application, _ApplicationModule, Properties}} ->
409-
ChildApplicationStartModules = case proplists:get_value(applications, Properties) of
410-
Applications when is_list(Applications) ->
411-
lists:foldl(
412-
fun(Application, InnerAccum) ->
413-
find_application_start_modules(ParsedFiles, ApplicationSpecs, Application) ++ InnerAccum
414-
end,
415-
[],
416-
Applications
417-
);
418-
_ ->
419-
[]
420-
end,
421-
StartModules = case proplists:get_value(mod, Properties) of
422-
{StartModule, _Args} when is_atom(StartModule) ->
423-
[StartModule];
424-
_ ->
425-
[]
426-
end,
413+
ChildApplicationStartModules =
414+
case proplists:get_value(applications, Properties) of
415+
Applications when is_list(Applications) ->
416+
lists:foldl(
417+
fun(Application, InnerAccum) ->
418+
find_application_start_modules(
419+
ParsedFiles, ApplicationSpecs, Application
420+
) ++ InnerAccum
421+
end,
422+
[],
423+
Applications
424+
);
425+
_ ->
426+
[]
427+
end,
428+
StartModules =
429+
case proplists:get_value(mod, Properties) of
430+
{StartModule, _Args} when is_atom(StartModule) ->
431+
[StartModule];
432+
_ ->
433+
[]
434+
end,
427435
ChildApplicationStartModules ++ StartModules
428436
end.
429437

@@ -435,7 +443,8 @@ find_dependencies(Entrypoints, BeamFiles) ->
435443
get_parsed_file(Entrypoint, BeamFiles),
436444
BeamFiles,
437445
[Entrypoint]
438-
) || Entrypoint <- Entrypoints
446+
)
447+
|| Entrypoint <- Entrypoints
439448
]
440449
)
441450
).
@@ -506,7 +515,8 @@ get_imports(ParsedFile) ->
506515
%% @private
507516
get_atoms(ParsedFile) ->
508517
AtomsT = [
509-
Atom || {_Index, Atom} <- proplists:get_value(atoms, proplists:get_value(chunk_refs, ParsedFile))
518+
Atom
519+
|| {_Index, Atom} <- proplists:get_value(atoms, proplists:get_value(chunk_refs, ParsedFile))
510520
],
511521
AtomsFromLiterals = get_atom_literals(proplists:get_value(uncompressed_literals, ParsedFile)),
512522
lists:usort(AtomsT ++ AtomsFromLiterals).
@@ -530,12 +540,12 @@ get_atom_literals(I, Data, Accum) ->
530540

531541
%% @private
532542
extract_atoms(Term, Accum) when is_atom(Term) ->
533-
[Term|Accum];
543+
[Term | Accum];
534544
extract_atoms(Term, Accum) when is_tuple(Term) ->
535545
extract_atoms(tuple_to_list(Term), Accum);
536546
extract_atoms(Term, Accum) when is_map(Term) ->
537547
extract_atoms(maps:to_list(Term), Accum);
538-
extract_atoms([H|T], Accum) ->
548+
extract_atoms([H | T], Accum) ->
539549
HeadAtoms = extract_atoms(H, []),
540550
extract_atoms(T, HeadAtoms ++ Accum);
541551
extract_atoms(_Term, Accum) ->
@@ -820,7 +830,7 @@ write_files(ParsedFiles, OutputDir) ->
820830
end
821831
end,
822832
ParsedFiles
823-
);
833+
);
824834
_ ->
825835
throw(enoent)
826836
end.

‎test/prop_packbeam.erl‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
-define(BUILD_DIR, "_build/").
2121
-define(TEST_BEAM_DIR, "_build/test/lib/atomvm_packbeam/test/").
2222

23-
2423
%%
2524
%% Call graph for modules a-f, x
2625
%%
@@ -46,7 +45,9 @@
4645
%%
4746

4847
prop_simple_test() ->
49-
?FORALL(ModulePaths, module_paths(),
48+
?FORALL(
49+
ModulePaths,
50+
module_paths(),
5051
begin
5152
Modules = [Module || {Module, _Path} <- ModulePaths],
5253
Paths = [Path || {_Module, Path} <- ModulePaths],
@@ -56,17 +57,18 @@ prop_simple_test() ->
5657
begin
5758
ok = packbeam_api:create(AVMFile, Paths),
5859
ParsedFiles = packbeam_api:list(AVMFile),
59-
modules_and_parsed_files_are_equivalent(Modules, ParsedFiles)
60-
andalso all_beam_modules_are_properly_named(ParsedFiles)
61-
andalso maybe_contains_start_beam(Modules, a, ParsedFiles)
62-
andalso maybe_contains_start_beam(Modules, b, ParsedFiles)
60+
modules_and_parsed_files_are_equivalent(Modules, ParsedFiles) andalso
61+
all_beam_modules_are_properly_named(ParsedFiles) andalso
62+
maybe_contains_start_beam(Modules, a, ParsedFiles) andalso
63+
maybe_contains_start_beam(Modules, b, ParsedFiles)
6364
end
6465
)
6566
end
6667
).
6768

6869
modules_and_parsed_files_are_equivalent(Modules, ParsedFiles) ->
69-
lists:sort(Modules) =:= lists:sort([get_module(ParsedFile) || ParsedFile <- get_beam_files(ParsedFiles)]).
70+
lists:sort(Modules) =:=
71+
lists:sort([get_module(ParsedFile) || ParsedFile <- get_beam_files(ParsedFiles)]).
7072

7173
all_beam_modules_are_properly_named(ParsedFiles) ->
7274
lists:all(
@@ -85,12 +87,13 @@ maybe_contains_start_beam(Modules, Module, ParsedFiles) ->
8587
true ->
8688
is_start(find_parsed_file(Module, ParsedFiles));
8789
_ ->
88-
true %% ignore
90+
%% ignore
91+
true
8992
end.
9093

9194
find_parsed_file(Module, []) ->
9295
{parsed_file_not_found, Module};
93-
find_parsed_file(Module, [ParsedFile|Rest]) ->
96+
find_parsed_file(Module, [ParsedFile | Rest]) ->
9497
case get_module(ParsedFile) of
9598
M when M =:= Module ->
9699
ParsedFile;
@@ -125,7 +128,8 @@ is_beam(ParsedFile) ->
125128

126129
module_paths() ->
127130
?LET(
128-
Modules, list(oneof([a, b, c, d, e, f])),
131+
Modules,
132+
list(oneof([a, b, c, d, e, f])),
129133
remove_duplicates([{Module, test_beam_path(Module)} || Module <- Modules])
130134
).
131135

0 commit comments

Comments
 (0)