diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2014-09-29 22:53:53 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2014-09-29 22:53:53 +0800 |
| commit | 6df87cf1d4b7c0c490ab1803b863de10579df92e (patch) | |
| tree | dff633553be4594a134f6fa5763995ab2a72a7d9 | |
| parent | [PARSER] Handle backslash newlines properly after dollar sign (diff) | |
| download | dash-6df87cf1d4b7c0c490ab1803b863de10579df92e.tar.gz dash-6df87cf1d4b7c0c490ab1803b863de10579df92e.zip | |
[PARSER] Add nlprompt/nlnoprompt helpers
This patch adds the nlprompt/nlnoprompt helpers to isolate code dealing with newlines and prompting. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | src/parser.c | 42 |
2 files changed, 22 insertions, 21 deletions
diff --git a/ChangeLog b/ChangeLog index 398bd15..f161a13 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ * Kill pgetc_macro. * Handle backslash newlines properly after dollar sign. + * Add nlprompt/nlnoprompt helpers. 2014-09-28 Herbert Xu <herbert@gondor.apana.org.au> diff --git a/src/parser.c b/src/parser.c index 2b07437..f6c43be 100644 --- a/src/parser.c +++ b/src/parser.c @@ -743,6 +743,19 @@ out: return (t); } +static void nlprompt(void) +{ + plinno++; + if (doprompt) + setprompt(2); +} + +static void nlnoprompt(void) +{ + plinno++; + needprompt = doprompt; +} + /* * Read the next input token. @@ -786,16 +799,13 @@ xxreadtoken(void) continue; case '\\': if (pgetc() == '\n') { - plinno++; - if (doprompt) - setprompt(2); + nlprompt(); continue; } pungetc(); goto breakloop; case '\n': - plinno++; - needprompt = doprompt; + nlnoprompt(); RETURN(TNL); case PEOF: RETURN(TEOF); @@ -837,9 +847,7 @@ static int pgetc_eatbnl(void) break; } - plinno++; - if (doprompt) - setprompt(2); + nlprompt(); } return c; @@ -913,9 +921,7 @@ readtoken1(int firstc, char const *syntax, char *eofmark, int striptabs) if (syntax == BASESYNTAX) goto endword; /* exit outer loop */ USTPUTC(c, out); - plinno++; - if (doprompt) - setprompt(2); + nlprompt(); c = pgetc(); goto loop; /* continue outer loop */ case CWORD: @@ -934,9 +940,7 @@ readtoken1(int firstc, char const *syntax, char *eofmark, int striptabs) USTPUTC('\\', out); pungetc(); } else if (c == '\n') { - plinno++; - if (doprompt) - setprompt(2); + nlprompt(); } else { if ( dblquote && @@ -1092,8 +1096,7 @@ checkend: { if (c == '\n' || c == PEOF) { c = PEOF; - plinno++; - needprompt = doprompt; + nlnoprompt(); } else { int len; @@ -1342,9 +1345,7 @@ parsebackq: { case '\\': if ((pc = pgetc()) == '\n') { - plinno++; - if (doprompt) - setprompt(2); + nlprompt(); /* * If eating a newline, avoid putting * the newline into the new character @@ -1366,8 +1367,7 @@ parsebackq: { synerror("EOF in backquote substitution"); case '\n': - plinno++; - needprompt = doprompt; + nlnoprompt(); break; default: |