diff options
| author | Henrik Nord <[email protected]> | 2011-08-16 15:01:22 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2011-08-16 15:01:32 +0200 |
| commit | 48d0c4adbe85450f1224311f9b8495affaae9c6a (patch) | |
| tree | b7ca1cb97b452768898094eb44ddc6b0286af214 /lib/edoc/src/edoc.erl | |
| parent | f74168772f6eb7765d8cfe0ffcce58273f920bcf (diff) | |
| parent | 52e430eb1570c0cda49a8070063f1a6a2328578b (diff) | |
| download | otp-48d0c4adbe85450f1224311f9b8495affaae9c6a.tar.gz otp-48d0c4adbe85450f1224311f9b8495affaae9c6a.tar.bz2 otp-48d0c4adbe85450f1224311f9b8495affaae9c6a.zip | |
Merge branch 'rc/edoc-minor' into dev
* rc/edoc-minor:
forgot to ensure that xmerl is found in path for include_lib to work
fix -spec declaration that doesn't work in R13B04
eliminate warnings about unused imports
removed CVS-keywords from source files
synchronized with edoc development version
OTP-9463
Diffstat (limited to 'lib/edoc/src/edoc.erl')
| -rw-r--r-- | lib/edoc/src/edoc.erl | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/lib/edoc/src/edoc.erl b/lib/edoc/src/edoc.erl index 360f2dbc9e..a279f7dcb3 100644 --- a/lib/edoc/src/edoc.erl +++ b/lib/edoc/src/edoc.erl @@ -14,8 +14,6 @@ %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 %% USA %% -%% $Id$ -%% %% @copyright 2001-2007 Richard Carlsson %% @author Richard Carlsson <[email protected]> %% @version {@version} @@ -60,8 +58,6 @@ -compile({no_auto_import,[error/1]}). --import(edoc_report, [report/2, report/3, error/1, error/3]). - -include("edoc.hrl"). @@ -179,8 +175,8 @@ application(App, Options) when is_atom(App) -> Dir when is_list(Dir) -> application(App, Dir, Options); _ -> - report("cannot find application directory for '~s'.", - [App]), + edoc_report:report("cannot find application directory for '~s'.", + [App]), exit(error) end. @@ -663,8 +659,8 @@ read_source(Name, Opts0) -> check_forms(Forms, Name), Forms; {error, R} -> - error({"error reading file '~s'.", - [edoc_lib:filename(Name)]}), + edoc_report:error({"error reading file '~s'.", + [edoc_lib:filename(Name)]}), exit({error, R}) end. @@ -688,11 +684,10 @@ check_forms(Fs, Name) -> error_marker -> case erl_syntax:error_marker_info(F) of {L, M, D} -> - error(L, Name, {format_error, M, D}); - + edoc_report:error(L, Name, {format_error, M, D}); Other -> - report(Name, "unknown error in " - "source code: ~w.", [Other]) + edoc_report:report(Name, "unknown error in " + "source code: ~w.", [Other]) end, exit(error); _ -> |