diff options
| author | Zandra <[email protected]> | 2015-10-08 09:13:03 +0200 |
|---|---|---|
| committer | Zandra <[email protected]> | 2015-10-08 09:13:03 +0200 |
| commit | 3a3fd51639fd98f01d12aebc4a15f16107930719 (patch) | |
| tree | 49cc2e0ebd22e1b41c5b650d368be45905f6d5e3 | |
| parent | f8f1bf3326e98bff7dbfed6f284b136b799c0be4 (diff) | |
| parent | add3f5ebead9e079f9652b48227586233b298799 (diff) | |
| download | otp-3a3fd51639fd98f01d12aebc4a15f16107930719.tar.gz otp-3a3fd51639fd98f01d12aebc4a15f16107930719.tar.bz2 otp-3a3fd51639fd98f01d12aebc4a15f16107930719.zip | |
Merge branch 'tuncer/leex-leo-liu-result-field-order' into maint
OTP-13031
* tuncer/leex-leo-liu-result-field-order:
yecc: fix file/2 error tuple doc
leex: fix file/2 error tuple doc (Reported-by: Leo Liu)
| -rw-r--r-- | lib/parsetools/doc/src/leex.xml | 2 | ||||
| -rw-r--r-- | lib/parsetools/doc/src/yecc.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/parsetools/doc/src/leex.xml b/lib/parsetools/doc/src/leex.xml index 7ee0633dac..85680f58a6 100644 --- a/lib/parsetools/doc/src/leex.xml +++ b/lib/parsetools/doc/src/leex.xml @@ -47,7 +47,7 @@ Token = tuple()</code> <v>LeexRet = {ok, Scannerfile} | {ok, Scannerfile, Warnings} | error - | {error, Warnings, Errors}</v> + | {error, Errors, Warnings}</v> <v>Scannerfile = filename()</v> <v>Warnings = Errors = [{filename(), [ErrorInfo]}]</v> <v>ErrorInfo = {ErrorLine, module(), Reason}</v> diff --git a/lib/parsetools/doc/src/yecc.xml b/lib/parsetools/doc/src/yecc.xml index 8c356099e7..87fdfcdaef 100644 --- a/lib/parsetools/doc/src/yecc.xml +++ b/lib/parsetools/doc/src/yecc.xml @@ -52,7 +52,7 @@ <v>Grammarfile = filename()</v> <v>Options = Option | [Option]</v> <v>Option = - see below -</v> - <v>YeccRet = {ok, Parserfile} | {ok, Parserfile, Warnings} | error | {error, Warnings, Errors}</v> + <v>YeccRet = {ok, Parserfile} | {ok, Parserfile, Warnings} | error | {error, Errors, Warnings}</v> <v>Parserfile = filename()</v> <v>Warnings = Errors = [{filename(), [ErrorInfo]}]</v> <v>ErrorInfo = {ErrorLine, module(), Reason}</v> |