diff options
| author | Anders Svensson <[email protected]> | 2014-03-24 17:33:02 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2014-03-25 15:05:28 +0100 |
| commit | d1ceb909e8867b4dfd97130270ef16201cc3e27b (patch) | |
| tree | ff5b94a08cafc5c4f649fe092c0d1713a6732cdc | |
| parent | 2aa88958de6b07f35eea5e26a65adb69619daa7b (diff) | |
| download | otp-d1ceb909e8867b4dfd97130270ef16201cc3e27b.tar.gz otp-d1ceb909e8867b4dfd97130270ef16201cc3e27b.tar.bz2 otp-d1ceb909e8867b4dfd97130270ef16201cc3e27b.zip | |
Use fun encoding to erl_parse:abstract/2
This is an encoding that didn't exist at the time of the previous
commit, but which was added in commit 83b6daef. Use it to restrict
stringification to lists containing printable ascii.
| -rw-r--r-- | lib/diameter/src/compiler/diameter_codegen.erl | 8 | ||||
| -rw-r--r-- | lib/diameter/src/compiler/diameter_forms.hrl | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/lib/diameter/src/compiler/diameter_codegen.erl b/lib/diameter/src/compiler/diameter_codegen.erl index 22422f2ef2..5a068c1a25 100644 --- a/lib/diameter/src/compiler/diameter_codegen.erl +++ b/lib/diameter/src/compiler/diameter_codegen.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2010-2013. All Rights Reserved. +%% Copyright Ericsson AB 2010-2014. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -31,7 +31,8 @@ %% on the beam file of another dictionary. %% --export([from_dict/4]). +-export([from_dict/4, + is_printable_ascii/1]). %% used by ?TERM/1 in diameter_forms.hrl -include("diameter_forms.hrl"). -include("diameter_vsn.hrl"). @@ -121,6 +122,9 @@ eraser(Key) -> %% =========================================================================== %% =========================================================================== +is_printable_ascii(C) -> + 16#20 =< C andalso C =< 16#7F. + get_value(Key, Plist) -> proplists:get_value(Key, Plist, []). diff --git a/lib/diameter/src/compiler/diameter_forms.hrl b/lib/diameter/src/compiler/diameter_forms.hrl index da680666f0..dd03401b9e 100644 --- a/lib/diameter/src/compiler/diameter_forms.hrl +++ b/lib/diameter/src/compiler/diameter_forms.hrl @@ -57,4 +57,6 @@ -define(FIELDS(Fs), [{?record_field, ?ATOM(F), V} || {F,V} <- Fs]). %% Literal term. --define(TERM(T), erl_parse:abstract(T, [{line, ?LINE}, {encoding, latin1}])). +-define(TERM(T), erl_parse:abstract(T, [ + {line, ?LINE}, + {encoding, fun diameter_codegen:is_printable_ascii/1}])). |