aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2011-10-14 01:44:58 +0200
committerAnders Svensson <[email protected]>2011-10-17 12:26:46 +0200
commitc03ac3db1d90e2b86ac4acfd6f0d09a324be4a42 (patch)
tree16b5eeef77edb78c01cb88d937b8257f7ecd7396
parent7f6d6349514a62fa7a66dae9b01a8e5f364826fb (diff)
downloadotp-c03ac3db1d90e2b86ac4acfd6f0d09a324be4a42.tar.gz
otp-c03ac3db1d90e2b86ac4acfd6f0d09a324be4a42.tar.bz2
otp-c03ac3db1d90e2b86ac4acfd6f0d09a324be4a42.zip
@result_code -> @define in dictionary files
The section simply results in generated macros and has nothing specifically to do with result codes. It's still not documented, and neither are the macros generated from @enum, since the generated names are typically so long as to be impractical/unreadable in source. Better to use numeric values with a comment or define your own shorter macros as the need arises.
-rw-r--r--lib/diameter/src/app/diameter_gen_base_rfc3588.dia2
-rw-r--r--lib/diameter/src/compiler/diameter_codegen.erl4
-rw-r--r--lib/diameter/src/compiler/diameter_spec_util.erl8
3 files changed, 8 insertions, 6 deletions
diff --git a/lib/diameter/src/app/diameter_gen_base_rfc3588.dia b/lib/diameter/src/app/diameter_gen_base_rfc3588.dia
index 4a12e21acd..4c14ee7575 100644
--- a/lib/diameter/src/app/diameter_gen_base_rfc3588.dia
+++ b/lib/diameter/src/app/diameter_gen_base_rfc3588.dia
@@ -340,7 +340,7 @@
GRANT_AND_STORE 2
GRANT_AND_LOSE 3
-@result_code Result-Code
+@define Result-Code
;; 7.1.1. Informational
DIAMETER_MULTI_ROUND_AUTH 1001
diff --git a/lib/diameter/src/compiler/diameter_codegen.erl b/lib/diameter/src/compiler/diameter_codegen.erl
index a33b07a3d3..0fd4a0b301 100644
--- a/lib/diameter/src/compiler/diameter_codegen.erl
+++ b/lib/diameter/src/compiler/diameter_codegen.erl
@@ -707,9 +707,9 @@ gen_hrl(Path, Mod, Spec) ->
write("ENUM Macros",
Fd,
m_enums(PREFIX, false, get_value(enums, Spec))),
- write("RESULT CODE Macros",
+ write("DEFINE Macros",
Fd,
- m_enums(PREFIX, false, get_value(result_codes, Spec))),
+ m_enums(PREFIX, false, get_value(defines, Spec))),
lists:foreach(fun({M,Es}) ->
write("ENUM Macros from " ++ atom_to_list(M),
diff --git a/lib/diameter/src/compiler/diameter_spec_util.erl b/lib/diameter/src/compiler/diameter_spec_util.erl
index b60886b678..e9221ed00a 100644
--- a/lib/diameter/src/compiler/diameter_spec_util.erl
+++ b/lib/diameter/src/compiler/diameter_spec_util.erl
@@ -204,9 +204,11 @@ chunk({avp_vendor_id = T, [{number, I}], Body}, Dict) ->
chunk({enum, [N], Str}, Dict) ->
append(enums, {atomize(N), parse_enums(Str)}, Dict);
-%% result_codes -> [{ResultName, [{Value, Name}, ...]}, ...]
-chunk({result_code, [N], Str}, Dict) ->
- append(result_codes, {atomize(N), parse_enums(Str)}, Dict);
+%% defines -> [{DefineName, [{Value, Name}, ...]}, ...]
+chunk({define, [N], Str}, Dict) ->
+ append(defines, {atomize(N), parse_enums(Str)}, Dict);
+chunk({result_code, [_] = N, Str}, Dict) -> %% backwards compatibility
+ chunk({define, N, Str}, Dict);
%% commands -> [{Name, Abbrev}, ...]
chunk({commands = T, [], Body}, Dict) ->