Merge branch 'anders/diameter/dictionary_make/OTP-11348' into maint

* anders/diameter/dictionary_make/OTP-11348:
  Return compilable forms instead of beam
  Document diameter_make:format/1 and diameter_make:flatten/1
  Fix diameter_make:flatten/1
  Modify type that currently causes dialyzer woe
  Simplify and extend diameter_make interface
  Add diameter_make:flatten/1, remove reformat/1
  Adapt compiler suite to diameter_make
  Remove dead code from codec suite
  Extend diameter_make:codec/2
  Don't pollute process dictionary in diameter_codegen:from_dict/4
  Make forms a separate output from diameter_codegen
  Remove last remnants of "spec"
  Write as last step in code generation
  Change extensions for debug output: .spec/forms -> .D/F

1 files changed, 5 insertions, 2 deletions

diff --git a/lib/diameter/src/compiler/diameter_dict_util.erl b/lib/diameter/src/compiler/diameter_dict_util.erl
index 36a6efa294..3941f30e03 100644
--- a/lib/diameter/src/compiler/diameter_dict_util.erl
+++ b/lib/diameter/src/compiler/diameter_dict_util.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -46,7 +46,7 @@
 -spec parse(File, Opts)
    -> {ok, orddict:orddict()}
     | {error, term()}
- when File :: {path, string()}
+ when File :: {path, file:name_all()}
             | iolist()
             | binary(),
       Opts :: list().
@@ -265,6 +265,9 @@ io(K, Id)
 io(vendor = K, {Id, Name}) ->
     [?NL, section(K) | [[?SP, tok(X)] || X <- [Id, Name]]];
 
+io(_, []) ->
+    [];
+
 io(avp_types = K, Body) ->
     [?NL, ?NL, section(K), ?NL, [body(K,A) || A <- Body]];