QPQ-AG/sophia
10
0
Fork 0
Code Issues 41 Pull Requests 5 Actions Packages Projects Releases 16 Wiki Activity

Remove specific filename extension handling #513

Merged
rvirding merged 1 commits from fix-compiler-interface into master 2019-02-06 23:17:53 +09:00
Conversation 3 Commits 1 Files Changed 1 +6 -12
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/aeso_compiler.erl
View File

@ -44,9 +44,11 @@ file(Filename) ->
-spec file(string(), options()) -> {ok, map()} | {error, binary()}. -spec file(string(), options()) -> {ok, map()} | {error, binary()}.
file(File, Options) -> file(File, Options) ->
case read_contract(File, Options) of case read_contract(File) of
{ok, Bin} -> from_string(Bin, Options); {ok, Bin} -> from_string(Bin, Options);
{error, Error} -> {error, {File, Error}} {error, Error} ->
ErrorString = [File,": ",file:format_error(Error)],
{error, join_errors("File errors", [ErrorString], fun(E) -> E end)}
end. end.
-spec from_string(binary() | string(), options()) -> {ok, map()} | {error, binary()}. -spec from_string(binary() | string(), options()) -> {ok, map()} | {error, binary()}.
@ -283,13 +285,5 @@ parse_error({Line, Pos}, ErrorString) ->
Error = io_lib:format("line ~p, column ~p: ~s", [Line, Pos, ErrorString]), Error = io_lib:format("line ~p, column ~p: ~s", [Line, Pos, ErrorString]),
error({parse_errors, [Error]}). error({parse_errors, [Error]}).
read_contract(Name, Opts) -> read_contract(Name) ->
FileName = filename(Name, ".aes", Opts), file:read_file(Name).
file:read_file(FileName).
filename(File, Suffix, _Opts) ->
Base = filename:basename(File, Suffix),
Sdir = filename:dirname(File),
if Sdir == "." -> Base ++ Suffix;
true -> filename:join(Sdir, Base ++ Suffix)
end.