From 1049490b7b146e3d2105d05e41ea6f740bae9dda Mon Sep 17 00:00:00 2001
From: Anders Svensson <anders@erlang.org>
Date: Thu, 29 May 2014 08:18:29 +0200
Subject: Add @codecs and @custom_types tests to compiler suite

Dictionary compilation fails to detect undefined AVPs in these sections.
---
 lib/diameter/test/diameter_compiler_SUITE.erl | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/lib/diameter/test/diameter_compiler_SUITE.erl b/lib/diameter/test/diameter_compiler_SUITE.erl
index 08ffe5981d..20c9275808 100644
--- a/lib/diameter/test/diameter_compiler_SUITE.erl
+++ b/lib/diameter/test/diameter_compiler_SUITE.erl
@@ -317,6 +317,21 @@
          {avp_not_defined,
           "CEA ::=",
           "<XXX> &"},
+         {ok,
+          "@avp_types",
+          "@codecs tmod Session-Id &"},
+         {ok,
+          "@avp_types",
+          "@custom_types tmod Session-Id &"},
+         {avp_not_defined,
+          "@avp_types",
+          "@codecs tmod OctetString &"},
+         {avp_not_defined,
+          "@avp_types",
+          "@custom_types tmod OctetString &"},
+         {avp_already_defined,
+          "@avp_types",
+          "@codecs tmod Session-Id @custom_types tmod Session-Id &"},
          {not_loaded,
           [{"@avp_types", "@inherits nomod XXX &"},
            {"CEA ::=", "<XXX> &"}]},
-- 
cgit v1.2.3


From e22d0c9c9d1bc18a68a8eefca6f87edde66c3d86 Mon Sep 17 00:00:00 2001
From: Anders Svensson <anders@erlang.org>
Date: Thu, 29 May 2014 09:18:10 +0200
Subject: Fix broken check for undefined AVPs in @codec and @custom_types

Instead of detecting the error, code generation failed when attempting
to lookup the type of an undefined AVP.
---
 lib/diameter/src/compiler/diameter_dict_util.erl | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/lib/diameter/src/compiler/diameter_dict_util.erl b/lib/diameter/src/compiler/diameter_dict_util.erl
index 136bba16cb..cf4741e563 100644
--- a/lib/diameter/src/compiler/diameter_dict_util.erl
+++ b/lib/diameter/src/compiler/diameter_dict_util.erl
@@ -731,8 +731,8 @@ no_messages_without_id(Dict) ->
 
 %% explode/4
 %%
-%% {avp_vendor_id, AvpName}                 -> [Lineno, Id::integer()]
-%% {custom_types|codecs|inherits,  AvpName} -> [Lineno, Mod::string()]
+%% {avp_vendor_id, AvpName}    -> [Lineno, Id::integer()]
+%% {custom|inherits,  AvpName} -> [Lineno, Mod::string()]
 
 explode({_, Line, AvpName}, Dict, {_, _, X} = T, K) ->
     true = K /= avp_vendor_id orelse is_uint32(T, [K]),
@@ -1094,7 +1094,7 @@ explode_avps([{_, Line, Name} | Toks], Dict) ->
     Vid = avp_vendor_id(Flags, Name, Line, Dict),
 
     %% An AVP is uniquely defined by its AVP code and vendor id (if any).
-    %% Ensure there are no duplicate.
+    %% Ensure there are no duplicates.
     store_new({avp_types, {Code, Vid}},
               [Line, Name],
               Dict,
@@ -1302,8 +1302,7 @@ x({K, {Name, AvpName}}, [Line | _], Dict)
 %% Ditto.
 x({K, AvpName}, [Line | _], Dict)
   when K == avp_vendor_id;
-       K == custom_types;
-       K == codecs ->
+       K == custom ->
     true = avp_is_defined(AvpName, Dict, Line);
 
 %% Ensure that all local AVP's of type Grouped are also present in @grouped.
-- 
cgit v1.2.3