aboutsummaryrefslogtreecommitdiffstats
path: root/lib/diameter/bin/diameterc
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2013-09-25 11:28:19 +0200
committerAnders Svensson <[email protected]>2013-12-01 16:38:51 +0100
commit8e819a7960a256b6c3b7bf5856c3f81b8df9ca7e (patch)
tree4992f7815af4e08e48351c8d4ee4293f03ba8197 /lib/diameter/bin/diameterc
parentec91114dc4f14d787eeb07d7332b8803298b575c (diff)
downloadotp-8e819a7960a256b6c3b7bf5856c3f81b8df9ca7e.tar.gz
otp-8e819a7960a256b6c3b7bf5856c3f81b8df9ca7e.tar.bz2
otp-8e819a7960a256b6c3b7bf5856c3f81b8df9ca7e.zip
Simplify and extend diameter_make interface
In particular, make codec/2 flexible as to what's generated, the formats (erl, hrl, parse, forms and beam) being passed in the options list and defaulting to [erl, hrl]. The 'parse' format is the internal format to which dictionaries are parsed, which can be manipulated by flatten/1 before being passed back to codec/2 or format/1. Remove the (undocumented) dict/1,2 since codec/2 now subsumes it with the 'parse' option.
Diffstat (limited to 'lib/diameter/bin/diameterc')
-rwxr-xr-xlib/diameter/bin/diameterc25
1 files changed, 8 insertions, 17 deletions
diff --git a/lib/diameter/bin/diameterc b/lib/diameter/bin/diameterc
index d4dd3153c5..d31f341c36 100755
--- a/lib/diameter/bin/diameterc
+++ b/lib/diameter/bin/diameterc
@@ -54,9 +54,6 @@ usage() ->
[?MODULE]).
main(Args) ->
- %% Add the ebin directory relative to the script path.
- BinDir = filename:dirname(escript:script_name()),
- code:add_path(filename:join([BinDir, "..", "ebin"])),
halt(gen(Args)).
gen(Args) ->
@@ -72,15 +69,12 @@ gen(Args) ->
1
end.
-compile(#argv{file = File, options = Opts} = A) ->
- try diameter_dict_util:parse({path, File}, Opts) of
- {ok, Dict} ->
- maybe_output(A, Dict, Opts, dict), %% parsed dictionary
- maybe_output(A, Dict, Opts, erl), %% the erl file
- maybe_output(A, Dict, Opts, hrl), %% The hrl file
+compile(#argv{file = File, options = Opts, output = Out}) ->
+ try diameter_make:codec({path, File}, Opts ++ Out) of
+ ok ->
0;
{error, Reason} ->
- error_msg(diameter_dict_util:format_error(Reason), []),
+ error_msg(Reason, []),
1
catch
error: Reason ->
@@ -88,10 +82,6 @@ compile(#argv{file = File, options = Opts} = A) ->
2
end.
-maybe_output(#argv{file = File, output = Output}, Spec, Opts, Mode) ->
- lists:member(Mode, Output)
- andalso diameter_codegen:from_dict(File, Spec, Opts, Mode).
-
error_msg({Fmt, Args}) ->
error_msg(Fmt, Args).
@@ -119,8 +109,9 @@ arg(["-o", Dir | Args], #argv{options = Opts} = A) ->
true = dir_exists(Dir),
arg(Args, A#argv{options = [{outdir, Dir} | Opts]});
-arg(["-i", Dir | Args], #argv{options = Opts} = A) ->
- arg(Args, A#argv{options = Opts ++ [{include, Dir}]});
+arg(["-i", Dir | Args], #argv{} = A) ->
+ code:add_patha(Dir), %% Set path here instead of passing an include
+ arg(Args, A); %% option so it's set before calling diameter_make.
arg(["--name", Name | Args], #argv{options = Opts} = A) ->
arg(Args, A#argv{options = [{name, Name} | Opts]});
@@ -138,7 +129,7 @@ arg(["-H" | Args], #argv{output = Output} = A) ->
arg(Args, A#argv{output = lists:delete(hrl, Output)});
arg(["-d" | Args], #argv{output = Output} = A) ->
- arg(Args, A#argv{output = [dict, forms | Output]});
+ arg(Args, A#argv{output = [parse, forms | Output -- [parse, forms]]});
arg([[$- = M, C, H | T] | Args], A) %% clustered options
when C /= $i, C /= $o, C /= $- ->