Merge branch 'maint'

3 files changed, 140 insertions, 30 deletions

diff --git a/lib/diameter/test/diameter_codec_test.erl b/lib/diameter/test/diameter_codec_test.erl
index 295d23912b..0b4568a9e5 100644
--- a/lib/diameter/test/diameter_codec_test.erl
+++ b/lib/diameter/test/diameter_codec_test.erl
@@ -473,9 +473,6 @@ pack(true, Arity, Avp, Value, Acc) ->
 pack(false, Arity, Avp, Value, Acc) ->
     min(Arity, Avp, Value, Acc).
 
-all(Mod, Name, Avp, V) ->
-    all(Mod:avp_arity(Name, Avp), Avp, V).
-
 all(1, Avp, V) ->
     {Avp, V};
 all({0,'*'}, Avp, V) ->
@@ -489,9 +486,6 @@ a(N, Avp, V)
   when N /= 0 ->
     {Avp, lists:duplicate(N,V)}.
 
-min(Mod, Name, Avp, V, Acc) ->
-    min(Mod:avp_arity(Name, Avp), Avp, V, Acc).
-
 min(1, Avp, V, Acc) ->
     [{Avp, V} | Acc];
 min({0,_}, _, _, Acc) ->
diff --git a/lib/diameter/test/diameter_compiler_SUITE.erl b/lib/diameter/test/diameter_compiler_SUITE.erl
index 81722c8dca..ed369e8af3 100644
--- a/lib/diameter/test/diameter_compiler_SUITE.erl
+++ b/lib/diameter/test/diameter_compiler_SUITE.erl
@@ -31,10 +31,15 @@
 %% testcases
 -export([format/1,    format/2,
          replace/1,   replace/2,
-         generate/1,  generate/4]).
+         generate/1,  generate/4,
+         flatten1/1,  flatten1/3,
+         flatten2/1]).
 
 -export([dict/0]).  %% fake dictionary module
 
+%% dictionary callbacks for flatten2/1
+-export(['A1'/3, 'Unsigned32'/3]).
+
 -define(base, "base_rfc3588.dia").
 -define(util, diameter_util).
 -define(S, atom_to_list).
@@ -45,7 +50,7 @@
 %% RE/Replacement (in the sense of re:replace/4) pairs for morphing
 %% base_rfc3588.dia. The key is 'ok' or the the expected error as
 %% returned in the first element of the error tuple returned by
-%% diameter_dict_util:parse/2.
+%% diameter_make:codec/2.
 -define(REPLACE,
         [{ok,
           "",
@@ -335,7 +340,9 @@ suite() ->
 all() ->
     [format,
      replace,
-     generate].
+     generate,
+     flatten1,
+     flatten2].
 
 %% Error handling testcases will make an erroneous dictionary out of
 %% the base dictionary and check that the expected error results.
@@ -361,10 +368,18 @@ format(Config) ->
 
 format(Mods, Bin) ->
     B = modify(Bin, Mods),
-    {ok, Dict} = diameter_dict_util:parse(B, []),
-    {ok, D} = diameter_dict_util:parse(diameter_dict_util:format(Dict), []),
+    {ok, Dict} = parse(B, []),
+    {ok, D} = parse(diameter_make:format(Dict), []),
     {Dict, Dict} = {Dict, D}.
 
+parse(File, Opts) ->
+    case diameter_make:codec(File, [parse, hrl, return | Opts]) of
+        {ok, [Dict, _]} ->
+            {ok, Dict};
+        {error, _} = E ->
+            E
+    end.
+
 %% ===========================================================================
 %% replace/1
 %%
@@ -379,13 +394,10 @@ replace(Config) ->
 
 replace({E, Mods}, Bin) ->
     B = modify(Bin, Mods),
-    case {E, diameter_dict_util:parse(B, [{include, here()}]), Mods} of
+    case {E, parse(B, [{include, here()}]), Mods} of
         {ok, {ok, Dict}, _} ->
             Dict;
-        {_, {error, {E,_} = T}, _} ->
-            S = diameter_dict_util:format_error(T),
-            true = nochar($", S, E),
-            true = nochar($', S, E),
+        {_, {error, S}, _} ->
             S
     end.
 
@@ -403,20 +415,127 @@ generate(Config) ->
     [] = ?util:run([{?MODULE, [generate, M, Bin, N, T]}
                     || {E,N} <- Rs,
                        {ok, M} <- [norm(E)],
-                       T <- [erl, hrl, spec]]).
+                       T <- [erl, hrl, parse, forms]]).
 
 generate(Mods, Bin, N, Mode) ->
     B = modify(Bin, Mods ++ [{"@name .*", "@name dict" ++ ?L(N)}]),
-    {ok, Dict} = diameter_dict_util:parse(B, []),
+    {ok, Dict} = parse(B, []),
     File = "dict" ++ integer_to_list(N),
-    {_, ok} = {Dict, diameter_codegen:from_dict("dict",
-                                                Dict,
-                                                [{name, File},
-                                                 {prefix, "base"},
-                                                 debug],
-                                                Mode)},
-    Mode == erl
-        andalso ({ok, _} = compile:file(File ++ ".erl", [return_errors])).
+    {_, ok} = {Dict, diameter_make:codec(Dict,
+                                         [{name, File},
+                                          {prefix, "base"},
+                                          Mode])},
+    generate(Mode, File, Dict).
+
+generate(erl, File, _) ->
+    {ok, _} = compile:file(File ++ ".erl", [return_errors]);
+
+generate(forms, File, _) ->
+    {ok, [_]} = file:consult(File ++ ".F");
+
+generate(parse, File, Dict) ->
+    {ok, [Dict]} = file:consult(File ++ ".D"),  %% assert
+    {ok, [F]} = diameter_make:codec(Dict, [forms, return]),
+    {ok, _, _, _} = compile:forms(F, [return]);
+
+generate(hrl, _, _) ->
+    ok.
+
+%% ===========================================================================
+%% flatten1/1
+
+flatten1(_Config) ->
+    [Vsn | BaseD] = diameter_gen_base_rfc6733:dict(),
+    {ok, I} = parse("@inherits diameter_gen_base_rfc6733\n", []),
+    [Vsn | FlatD] = diameter_make:flatten(I),
+    [] = ?util:run([{?MODULE, [flatten1, K, BaseD, FlatD]}
+                    || K <- [avp_types, grouped, enum]]).
+
+flatten1(Key, BaseD, FlatD) ->
+    Vs = orddict:fetch(Key, BaseD),
+    Vs = orddict:fetch(Key, FlatD).
+
+%% ===========================================================================
+%% flatten2/1
+
+flatten2(_Config) ->
+    Dict1 =
+        "@name diameter_test1\n"
+        "@prefix diameter_test1\n"
+        "@vendor 666 test\n"
+        "@avp_vendor_id 111 A1 A3\n"
+        "@avp_vendor_id 222 A4 A6\n"
+        "@custom_types " ++ ?S(?MODULE) ++ " A1 A4\n"
+        "@codecs " ++ ?S(?MODULE) ++ " A3 A6\n"
+        "@avp_types\n"
+        "A1 1001 Unsigned32 V\n"
+        "A2 1002 Unsigned32 V\n"
+        "A3 1003 Unsigned32 V\n"
+        "A4 1004 Unsigned32 V\n"
+        "A5 1005 Unsigned32 V\n"
+        "A6 1006 Unsigned32 V\n"
+        "@end ignored\n",
+    Dict2 =
+        "@name diameter_test2\n"
+        "@prefix diameter_test2\n"
+        "@vendor 777 test\n"
+        "@inherits diameter_test1 A1 A2 A3\n"
+        "@inherits diameter_gen_base_rfc6733\n"
+        "@avp_vendor_id 333 A1\n",
+
+    {ok, [E1, F1]}
+        = diameter_make:codec(Dict1, [erl, forms, return]),
+    ct:pal("~s", [E1]),
+    diameter_test1 = M1 = load_forms(F1),
+
+    {ok, [D2, E2, F2]}
+        = diameter_make:codec(Dict2, [parse, erl, forms, return]),
+    ct:pal("~s", [E2]),
+    diameter_test2 = M2 = load_forms(F2),
+
+    Flat = lists:flatten(diameter_make:format(diameter_make:flatten(D2))),
+    ct:pal("~s", [Flat]),
+    {ok, [E3, F3]}
+        = diameter_make:codec(Flat, [erl, forms, return,
+                                     {name, "diameter_test3"}]),
+    ct:pal("~s", [E3]),
+    diameter_test3 = M3 = load_forms(F3),
+
+    [{1001, 111, M1, 'A1'},  %% @avp_vendor_id
+     {1002, 666, M1, 'A2'},  %% @vendor
+     {1003, 111, M1, 'A3'},  %% @avp_vendor_id
+     {1004, 222, M1, 'A4'},  %% @avp_vendor_id
+     {1005, 666, M1, 'A5'},  %% @vendor
+     {1006, 222, M1, 'A6'},  %% @avp_vendor_id
+     {1001, 333, M2, 'A1'},  %% M2 @avp_vendor_id
+     {1002, 666, M2, 'A2'},  %% M1 @vendor
+     {1003, 666, M2, 'A3'},  %% M1 @vendor
+     {1001, 333, M3, 'A1'},  %% (as for M2)
+     {1002, 666, M3, 'A2'},  %%   "
+     {1003, 666, M3, 'A3'}]  %%   "
+        = [{Code, Vid, Mod, Name}
+           || Mod <- [M1, M2, M3],
+              Code <- lists:seq(1001, 1006),
+              Vid <- [666, 111, 222, 777, 333],
+              {Name, 'Unsigned32'} <- [Mod:avp_name(Code, Vid)]],
+
+    [] = [{A,T,M,RC} || A <- ['A1', 'A3'],
+                        T <- [encode, decode],
+                        M <- [M2, M3],
+                        Ref <- [make_ref()],
+                        RC <- [M:avp(T, Ref, A)],
+                        RC /= {T, Ref}].
+
+'A1'(T, 'Unsigned32', Ref) ->
+    {T, Ref}.
+
+'Unsigned32'(T, 'A3', Ref) ->
+    {T, Ref}.
+
+load_forms(Forms) ->
+    {ok, Mod, Bin, _} = compile:forms(Forms, [return]),
+    {module, Mod} = code:load_binary(Mod, ?S(Mod), Bin),
+    Mod.
 
 %% ===========================================================================
 
@@ -428,9 +547,6 @@ norm({E, RE, Repl}) ->
 norm({_,_} = T) ->
     T.
 
-nochar(Char, Str, Err) ->
-    Err == parse orelse not lists:member(Char, Str) orelse Str.
-
 here() ->
     filename:dirname(code:which(?MODULE)).
 
diff --git a/lib/diameter/test/diameter_examples_SUITE.erl b/lib/diameter/test/diameter_examples_SUITE.erl
index 75b542b679..02c8d34361 100644
--- a/lib/diameter/test/diameter_examples_SUITE.erl
+++ b/lib/diameter/test/diameter_examples_SUITE.erl
@@ -133,7 +133,7 @@ make(Path, Dict0) ->
     try
         ok = to_erl(Path, [{name, Name},
                            {prefix, Pre},
-                           {inherits, "rfc3588_base/" ++ Mod0}
+                           {inherits, "common/" ++ Mod0}
                            | [{inherits, D ++ "/" ++ M ++ Suf}
                               || {D,M} <- dep(Dict)]]),
         ok = to_beam(Name)