From 3cbb49e6bf65de1d370d396caeaf309e4763457a Mon Sep 17 00:00:00 2001 From: wl Date: Mon, 7 Jan 2013 08:41:22 +0000 Subject: Revert previous change. --- ChangeLog | 7 ------- src/preproc/eqn/lex.cpp | 12 ++++-------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index ab4da9e6..e6398675 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,3 @@ -2013-01-07 Werner LEMBERG - - [eqn] Handle border cases of `delim on' and `delim off'. - - * src/preproc/eqn/lex.cpp (do_delim): Handle multiple sequences of - `delim on' gracefully (ditto for `delim off'). - 2013-01-06 Werner LEMBERG [eqn] Add `delim on'. diff --git a/src/preproc/eqn/lex.cpp b/src/preproc/eqn/lex.cpp index 39917a67..899ecaeb 100644 --- a/src/preproc/eqn/lex.cpp +++ b/src/preproc/eqn/lex.cpp @@ -1071,17 +1071,13 @@ void do_delim() else { if (c == 'o' && d == 'f' && peek_char() == 'f') { (void)get_char(); - if (start_delim) - start_delim_saved = start_delim; - if (end_delim) - end_delim_saved = end_delim; + start_delim_saved = start_delim; + end_delim_saved = end_delim; start_delim = end_delim = '\0'; } else if (c == 'o' && d == 'n' && !compatible_flag) { - if (start_delim_saved) - start_delim = start_delim_saved; - if (end_delim_saved) - end_delim = end_delim_saved; + start_delim = start_delim_saved; + end_delim = end_delim_saved; } else { start_delim = c; -- cgit v1.2.1