aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2011-12-03 11:54:16 +0100
committerAnders Svensson <[email protected]>2011-12-04 17:47:38 +0100
commit246470bd7492f97ca4b7528b3c1c4ed76b91d4e0 (patch)
treec80953acb9f560c54b8498dff6acf186ef9a34b8 /lib
parent0e4fd87177dd24b1d3545b6b5f0df873a580d4ae (diff)
downloadotp-246470bd7492f97ca4b7528b3c1c4ed76b91d4e0.tar.gz
otp-246470bd7492f97ca4b7528b3c1c4ed76b91d4e0.tar.bz2
otp-246470bd7492f97ca4b7528b3c1c4ed76b91d4e0.zip
Minor codegen tweaks
Diffstat (limited to 'lib')
-rw-r--r--lib/diameter/src/compiler/diameter_codegen.erl49
1 files changed, 27 insertions, 22 deletions
diff --git a/lib/diameter/src/compiler/diameter_codegen.erl b/lib/diameter/src/compiler/diameter_codegen.erl
index b3af326049..3105310c5b 100644
--- a/lib/diameter/src/compiler/diameter_codegen.erl
+++ b/lib/diameter/src/compiler/diameter_codegen.erl
@@ -48,6 +48,13 @@
%% ===========================================================================
+-spec from_dict(File, Spec, Opts, Mode)
+ -> ok
+ when File :: string(),
+ Spec :: orddict:orddict(),
+ Opts :: list(),
+ Mode :: spec | erl | hrl.
+
from_dict(File, Spec, Opts, Mode) ->
Outdir = proplists:get_value(outdir, Opts, "."),
putr(verbose, lists:member(verbose, Opts)),
@@ -114,15 +121,11 @@ mod(_, {ok, Mod}) ->
Mod.
gen(spec, Spec, _Mod, Path) ->
- write(Path ++ ".spec", Spec);
+ write(Path ++ ".spec", [?VERSION | Spec]);
gen(hrl, Spec, Mod, Path) ->
gen_hrl(Path ++ ".hrl", Mod, Spec);
-gen(erl = Mode, Spec, Mod, Path)
- when is_list(Mod) ->
- gen(Mode, Spec, ?A(Mod), Path);
-
gen(erl, Spec, Mod, Path) ->
Forms = [{?attribute, module, Mod},
{?attribute, compile, [{parse_transform, diameter_exprecs}]},
@@ -259,11 +262,11 @@ c_id(error) ->
f_vendor_id(Spec) ->
{?function, vendor_id, 0,
- [{?clause, [], [], [vendor_id(orddict:find(vendor, Spec))]}]}.
+ [{?clause, [], [], [b_vendor_id(orddict:find(vendor, Spec))]}]}.
-vendor_id({ok, {Id, _}}) ->
+b_vendor_id({ok, {Id, _}}) ->
?INTEGER(Id);
-vendor_id(error) ->
+b_vendor_id(error) ->
?APPLY(erlang, error, [?TERM(undefined)]).
%%% ------------------------------------------------------------------------
@@ -272,11 +275,11 @@ vendor_id(error) ->
f_vendor_name(Spec) ->
{?function, vendor_name, 0,
- [{?clause, [], [], [vendor_name(orddict:find(vendor, Spec))]}]}.
+ [{?clause, [], [], [b_vendor_name(orddict:find(vendor, Spec))]}]}.
-vendor_name({ok, {_, Name}}) ->
+b_vendor_name({ok, {_, Name}}) ->
?Atom(Name);
-vendor_name(error) ->
+b_vendor_name(error) ->
?APPLY(erlang, error, [?TERM(undefined)]).
%%% ------------------------------------------------------------------------
@@ -290,8 +293,9 @@ f_msg_name(Spec) ->
%% DIAMETER_COMMAND_UNSUPPORTED should be replied.
msg_name(Spec) ->
- lists:flatmap(fun c_msg_name/1,
- proplists:get_value(command_codes, Spec, []))
+ lists:flatmap(fun c_msg_name/1, proplists:get_value(command_codes,
+ Spec,
+ []))
++ [{?clause, [?VAR('_'), ?VAR('_')], [], [?ATOM('')]}].
c_msg_name({Code, Req, Ans}) ->
@@ -480,15 +484,15 @@ not_in(List, X) ->
c_base_avp({AvpName, T}) ->
{?clause, [?VAR('T'), ?VAR('Data'), ?Atom(AvpName)],
[],
- [base_avp(AvpName, T)]}.
+ [b_base_avp(AvpName, T)]}.
-base_avp(AvpName, "Enumerated") ->
+b_base_avp(AvpName, "Enumerated") ->
?CALL(enumerated_avp, [?VAR('T'), ?Atom(AvpName), ?VAR('Data')]);
-base_avp(AvpName, "Grouped") ->
+b_base_avp(AvpName, "Grouped") ->
?CALL(grouped_avp, [?VAR('T'), ?Atom(AvpName), ?VAR('Data')]);
-base_avp(_, Type) ->
+b_base_avp(_, Type) ->
?APPLY(diameter_types, ?A(Type), [?VAR('T'), ?VAR('Data')]).
cs_imported_avp({Mod, Avps}, Enums, CustomNames) ->
@@ -522,14 +526,15 @@ cs_custom_avp({Mod, Key, Avps}, Dict) ->
Avps).
c_custom_avp(Mod, Key, AvpName, Type) ->
+ {F,A} = custom(Key, AvpName, Type),
{?clause, [?VAR('T'), ?VAR('Data'), ?Atom(AvpName)],
[],
- [custom(Mod, Key, AvpName, Type)]}.
+ [?APPLY(?A(Mod), ?A(F), [?VAR('T'), ?Atom(A), ?VAR('Data')])]}.
-custom(Mod, custom_types, AvpName, Type) ->
- ?APPLY(?A(Mod), ?A(AvpName), [?VAR('T'), ?Atom(Type), ?VAR('Data')]);
-custom(Mod, codecs, AvpName, Type) ->
- ?APPLY(?A(Mod), ?A(Type), [?VAR('T'), ?Atom(AvpName), ?VAR('Data')]).
+custom(custom_types, AvpName, Type) ->
+ {AvpName, Type};
+custom(codecs, AvpName, Type) ->
+ {Type, AvpName}.
%%% ------------------------------------------------------------------------
%%% # enumerated_avp/3