From 515f444e7cb631ed354bda06cce16d21d73d2983 Mon Sep 17 00:00:00 2001
From: Robert Virding <rvirding@gmail.com>
Date: Wed, 6 Feb 2019 14:02:46 +0100
Subject: [PATCH] Remove specific filename extension handling

And take the chance to make file handling errors ahve the same format
as other errors.
---
 src/aeso_compiler.erl | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/aeso_compiler.erl b/src/aeso_compiler.erl
index c41b09c..e54b8ef 100644
--- a/src/aeso_compiler.erl
+++ b/src/aeso_compiler.erl
@@ -44,9 +44,11 @@ file(Filename) ->
 
 -spec file(string(), options()) -> {ok, map()} | {error, binary()}.
 file(File, Options) ->
-    case read_contract(File, Options) of
+    case read_contract(File) of
         {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.
 
 -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({parse_errors, [Error]}).
 
-read_contract(Name, Opts) ->
-    FileName = filename(Name, ".aes", Opts),
-    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.
+read_contract(Name) ->
+    file:read_file(Name).