diff options
author | Hans Bolinder <[email protected]> | 2013-01-22 12:45:08 +0100 |
---|---|---|
committer | Hans Bolinder <[email protected]> | 2013-01-25 12:54:28 +0100 |
commit | 7d3be5bd641c99283b003c2b933e89ed68241ccf (patch) | |
tree | 2dd5361974c2d17b34910bde76c6ce06235d70c4 | |
parent | db770869af66309b9505d051770d8dc4d00354bf (diff) | |
download | otp-7d3be5bd641c99283b003c2b933e89ed68241ccf.tar.gz otp-7d3be5bd641c99283b003c2b933e89ed68241ccf.tar.bz2 otp-7d3be5bd641c99283b003c2b933e89ed68241ccf.zip |
Export the type erl_scan:token()
The type erl_parse:token() used to be a two-tuple, but it can also be
a three-tuple.
-rw-r--r-- | lib/stdlib/src/erl_parse.yrl | 4 | ||||
-rw-r--r-- | lib/stdlib/src/erl_scan.erl | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/stdlib/src/erl_parse.yrl b/lib/stdlib/src/erl_parse.yrl index 8316462989..9ff25fcbc5 100644 --- a/lib/stdlib/src/erl_parse.yrl +++ b/lib/stdlib/src/erl_parse.yrl @@ -2,7 +2,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2012. All Rights Reserved. +%% Copyright Ericsson AB 1996-2013. 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 @@ -516,7 +516,7 @@ Erlang code. -type abstract_form() :: term(). -type error_description() :: term(). -type error_info() :: {erl_scan:line(), module(), error_description()}. --type token() :: {Tag :: atom(), Line :: erl_scan:line()}. +-type token() :: erl_scan:token(). %% mkop(Op, Arg) -> {op,Line,Op,Arg}. %% mkop(Left, Op, Right) -> {op,Line,Op,Left,Right}. diff --git a/lib/stdlib/src/erl_scan.erl b/lib/stdlib/src/erl_scan.erl index c9c3563d05..26d5747ee7 100644 --- a/lib/stdlib/src/erl_scan.erl +++ b/lib/stdlib/src/erl_scan.erl @@ -64,6 +64,7 @@ location/0, options/0, return_cont/0, + token/0, tokens_result/0]). %%% |