aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib/src/erl_parse.yrl
diff options
context:
space:
mode:
authorHans Bolinder <[email protected]>2017-01-10 10:31:29 +0100
committerHans Bolinder <[email protected]>2017-01-10 10:31:29 +0100
commit99ed930f507868906953c6169a58c03df3e10901 (patch)
tree3b7da9064e9ae4d10f255bf6a826d075e1da4fa2 /lib/stdlib/src/erl_parse.yrl
parent61547cab473396ac5ec03b491fd74c8fe7e7ce54 (diff)
parent6d2380326a67a00eeae31689c00936da6f3526d2 (diff)
downloadotp-99ed930f507868906953c6169a58c03df3e10901.tar.gz
otp-99ed930f507868906953c6169a58c03df3e10901.tar.bz2
otp-99ed930f507868906953c6169a58c03df3e10901.zip
Merge branch 'hasse/stdlib/char_as_integer/ERL-313/OTP-14103' into maint
* hasse/stdlib/char_as_integer/ERL-313/OTP-14103: stdlib: Allow characters in types and constant patterns
Diffstat (limited to 'lib/stdlib/src/erl_parse.yrl')
-rw-r--r--lib/stdlib/src/erl_parse.yrl1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/stdlib/src/erl_parse.yrl b/lib/stdlib/src/erl_parse.yrl
index 4f38256e6b..5656155c53 100644
--- a/lib/stdlib/src/erl_parse.yrl
+++ b/lib/stdlib/src/erl_parse.yrl
@@ -156,6 +156,7 @@ type -> '#' atom '{' field_types '}' : {type, ?anno('$1'),
record, ['$2'|'$4']}.
type -> binary_type : '$1'.
type -> integer : '$1'.
+type -> char : '$1'.
type -> 'fun' '(' ')' : {type, ?anno('$1'), 'fun', []}.
type -> 'fun' '(' fun_type_100 ')' : '$3'.