some work on the lexer of minic (reading comments)

1 files changed, 7 insertions, 6 deletions

diff --git a/miniasm/scan.c b/miniasm/scan.c
index ab8dffb..00f9f4e 100644
--- a/miniasm/scan.c
+++ b/miniasm/scan.c
@@ -29,13 +29,14 @@ static char get_char( Scanner *s )
 
 	c = *s->pos;
 	s->pos++;
+	s->peek = c;
 		
 	return c;
 }
 
 static void skip_whitespace( Scanner *s )
 {
-	for( ; ; s->peek = get_char( s ) ) {
+	for( ; ; get_char( s ) ) {
 		s->col++;
 		if( s->peek == ' ' || s->peek == '\t' ) {
 			continue;
@@ -55,7 +56,7 @@ void scanner_skip_line( Scanner *s )
 {
 	while( s->peek != '\0' && s->peek != '\n' ) {
 		s->col++;
-		s->peek = get_char( s );
+		get_char( s );
 	}
 	
 	if( s->peek == '\n' ) {
@@ -72,8 +73,8 @@ Symbol get_int( Scanner *s )
 
 	do {
 		sym.data.n = sym.data.n * 10 + ( s->peek - '0' );
-		s->peek = get_char( s );
-	} while( isdigit( s->peek ) && ( s->peek != '\0' ) );
+		get_char( s );
+	} while( s->peek != '\0' && isdigit( s->peek ) );
 
 	return sym;
 }
@@ -89,12 +90,12 @@ Symbol get_ident_or_label( Scanner *s )
 
 	do {
 		*p++ = s->peek;
-		s->peek = get_char( s );
+		get_char( s );
 	} while( ( isalnum( s->peek ) || s->peek == '_' ) && !isspace( s->peek ) && ( s->peek != '\0' ) && ( s->peek != ':' ) && ( p - newSym.data.s < MAX_IDENT_LEN ) );
 
 	if( s->peek == ':' ) {
 		newSym.sym = S_label;
-		s->peek = get_char( s );
+		get_char( s );
 	}
 	
 	*p = '\0';