diff options
| author | Hans Bolinder <[email protected]> | 2013-09-03 08:10:33 +0200 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2013-09-03 08:10:33 +0200 |
| commit | 1de23e3a31b77db4c9dca952644b764bd37e2e8f (patch) | |
| tree | 9eed394935b8c5172e8c1e1b20649e5a2ebb0d0e /lib/parsetools/doc | |
| parent | 2f1007e60d1a0817e5d80e46c3ab21501d1f714b (diff) | |
| parent | 298ff42f5f80a603306a007540d1c75a013bcf81 (diff) | |
| download | otp-1de23e3a31b77db4c9dca952644b764bd37e2e8f.tar.gz otp-1de23e3a31b77db4c9dca952644b764bd37e2e8f.tar.bz2 otp-1de23e3a31b77db4c9dca952644b764bd37e2e8f.zip | |
Merge branch 'hb/parsetools/unicode_bugfix/OTP-11286' into maint
* hb/parsetools/unicode_bugfix/OTP-11286:
Fix a Unicode filename bug affecting Leex and Yecc
Diffstat (limited to 'lib/parsetools/doc')
| -rw-r--r-- | lib/parsetools/doc/src/leex.xml | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/lib/parsetools/doc/src/leex.xml b/lib/parsetools/doc/src/leex.xml index d5c24c303d..b4e2af6857 100644 --- a/lib/parsetools/doc/src/leex.xml +++ b/lib/parsetools/doc/src/leex.xml @@ -4,7 +4,7 @@ <erlref> <header> <copyright> - <year>2009</year><year>2011</year> + <year>2009</year><year>2013</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> @@ -38,19 +38,21 @@ Token = tuple()</code> </section> <funcs> <func> - <name>file(FileName) -> ok | error</name> - <name>file(FileName, Options) -> ok | error</name> + <name>file(FileName, [, Options]) -> LeexRet</name> <fsummary>Generate a lexical analyzer</fsummary> <type> <v>FileName = filename()</v> <v>Options = Option | [Option]</v> <v>Option = - see below -</v> - <v>FileReturn = {ok, Scannerfile} - | {ok, Scannerfile, Warnings} - | error - | {error, Warnings, Errors}</v> + <v>LeexRet = {ok, Scannerfile} + | {ok, Scannerfile, Warnings} + | error + | {error, Warnings, Errors}</v> <v>Scannerfile = filename()</v> <v>Warnings = Errors = [{filename(), [ErrorInfo]}]</v> + <v>ErrorInfo = {ErrorLine, module(), Reason}</v> + <v>ErrorLine = integer()</v> + <v>Reason = - formatable by format_error/1 -</v> </type> <desc> <p>Generates a lexical analyzer from the definition in the input |