diff options
| author | Erlang/OTP <[email protected]> | 2010-02-02 14:22:37 +0000 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-02-02 14:22:37 +0000 |
| commit | 085012b1ac9251d1cbd821f8b28034072fba63c3 (patch) | |
| tree | ddc08c9ff5bce8cc8f7881300316d774fb006fba /lib/parsetools/test/yecc_SUITE.erl | |
| parent | f91fcac6739141af4bb66a97dfdaaccdcd74f50b (diff) | |
| parent | 1ab56cb24a8a037d61076314230839fdcc325d7d (diff) | |
| download | otp-085012b1ac9251d1cbd821f8b28034072fba63c3.tar.gz otp-085012b1ac9251d1cbd821f8b28034072fba63c3.tar.bz2 otp-085012b1ac9251d1cbd821f8b28034072fba63c3.zip | |
Merge branch 'cf/epp-macro-overloading' into ccase/r13b04_dev
* cf/epp-macro-overloading:
yecc_SUITE: Adjustment for modified error tuple
epp_SUITE: Increase code coverage
Minor corrections and clean-ups
documentation: Macros overloading partly rewritten
update the documentation on preprocessor in the reference manual
epp: change rules to choose the right version of a macro
epp: Add support of macros overloading
epp: fix bug in the function scan_undef
OTP-8388 Macros overloading has been implemented. (Thanks to Christopher
Faulet.)
Diffstat (limited to 'lib/parsetools/test/yecc_SUITE.erl')
| -rw-r--r-- | lib/parsetools/test/yecc_SUITE.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/parsetools/test/yecc_SUITE.erl b/lib/parsetools/test/yecc_SUITE.erl index 212557194c..b5da414f7b 100644 --- a/lib/parsetools/test/yecc_SUITE.erl +++ b/lib/parsetools/test/yecc_SUITE.erl @@ -312,7 +312,7 @@ syntax(Config) when is_list(Config) -> ?line {ok, _, []} = yecc:file(Filename, ParserFile3 ++ Ret), %% Note: checking the line numbers. Changes when yeccpre.hrl changes. fun() -> - ?line {error,[{_,[{5,_,{undefined,'F'}}]}, + ?line {error,[{_,[{5,_,{undefined,'F',1}}]}, {_,[{L1,_,{undefined_function,{yeccpars2_2_,1}}}, {L2,_,{bad_inline,{yeccpars2_2_,1}}}]}], []} = compile:file(Parserfile1, [basic_validation,return]), |