diff options
| author | Patrik Nyblom <[email protected]> | 2010-12-21 15:16:50 +0100 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2010-12-21 15:17:01 +0100 |
| commit | c01de41db669a595cf49e0df735514edf54f311a (patch) | |
| tree | 2fbe3871fbeccb7f58dee67265707842b37e9849 /lib | |
| parent | 1f6da3e44fac8e573266b9b32ecf24855d3ac124 (diff) | |
| parent | f5578f760104b437f935b8163c2572c42a2064a1 (diff) | |
| download | otp-c01de41db669a595cf49e0df735514edf54f311a.tar.gz otp-c01de41db669a595cf49e0df735514edf54f311a.tar.bz2 otp-c01de41db669a595cf49e0df735514edf54f311a.zip | |
Merge branch 'pan/r14b01-dialyzer-type-corrections' into dev
* pan/r14b01-dialyzer-type-corrections:
Remove faulty change left by mistake in epp
OTP-9008
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/stdlib/src/epp.erl | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/stdlib/src/epp.erl b/lib/stdlib/src/epp.erl index d4844b8c1e..e5ccaddbb4 100644 --- a/lib/stdlib/src/epp.erl +++ b/lib/stdlib/src/epp.erl @@ -427,7 +427,10 @@ scan_toks(From, St) -> epp_reply(From, {error,E}), wait_req_scan(St#epp{location=Cl}); {eof,Cl} -> - leave_file(From, St#epp{location=Cl}) + leave_file(From, St#epp{location=Cl}); + {error,_E} -> + epp_reply(From, {error,{St#epp.location,epp,cannot_parse}}), + leave_file(wait_request(St), St) %This serious, just exit! end. scan_toks([{'-',_Lh},{atom,_Ld,define}=Define|Toks], From, St) -> @@ -808,7 +811,10 @@ skip_toks(From, St, [I|Sis]) -> {error,_E,Cl} -> skip_toks(From, St#epp{location=Cl}, [I|Sis]); {eof,Cl} -> - leave_file(From, St#epp{location=Cl,istk=[I|Sis]}) + leave_file(From, St#epp{location=Cl,istk=[I|Sis]}); + {error,_E} -> + epp_reply(From, {error,{St#epp.location,epp,cannot_parse}}), + leave_file(wait_request(St), St) %This serious, just exit! end; skip_toks(From, St, []) -> scan_toks(From, St). |