[PATCH] tokenize.c: Simplify drop_stream_eoln().

[PATCH] tokenize.c: Simplify drop_stream_eoln().

[ricknu-0]

Simplifying function drop_stream_eoln().

Signed-off-by: Richard Knutsson <ricknu-0@student.ltu.se>
---
Is there a reason to call nextchar() before drop_token()?

diff --git a/tokenize.c b/tokenize.c
index fbe4c5a..f4c3d18 100644
--- a/tokenize.c
+++ b/tokenize.c
@@ -578,15 +578,14 @@ static int get_string_token(int next, stream_t *stream)
 
 static int drop_stream_eoln(stream_t *stream)
 {
-	int next = nextchar(stream);
 	drop_token(stream);
 	for (;;) {
-		int curr = next;
-		if (curr == EOF)
-			return next;
-		next = nextchar(stream);
-		if (curr == '\n')
-			return next;
+		switch (nextchar(stream)) {
+		case EOF:
+			return EOF;
+		case '\n':
+			return nextchar(stream);
+		}
 	}
 }
 

Re: [PATCH] tokenize.c: Simplify drop_stream_eoln().

[Josh Triplett]

[-- Attachment #1: Type: text/plain, Size: 320 bytes --]

ricknu-0@student.ltu.se wrote:
> Simplifying function drop_stream_eoln().
> 
> Signed-off-by: Richard Knutsson <ricknu-0@student.ltu.se>
> ---
> Is there a reason to call nextchar() before drop_token()?

None that I know of, and your patch doesn't break the test suite.  Applied;
thanks!

- Josh Triplett



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 252 bytes --]