X-Git-Url: https://ginac.de/CLN/cln.git//cln.git?a=blobdiff_plain;f=src%2Finteger%2Finput%2Fcl_I_read_stream.cc;h=1ffd54b176f6e35e6789b7822b548e078b6ee853;hb=5370ad8054201cf23d4f94a52f4d3f7f9f3cd511;hp=71fddb68945166866b84566011b6730033c586ec;hpb=f3b29e52ea5a7b013f8294065920365e5d17d18f;p=cln.git

diff --git a/src/integer/input/cl_I_read_stream.cc b/src/integer/input/cl_I_read_stream.cc
index 71fddb6..1ffd54b 100644
--- a/src/integer/input/cl_I_read_stream.cc
+++ b/src/integer/input/cl_I_read_stream.cc
@@ -26,17 +26,17 @@ public:
 	char* end_pointer (void) { return buffer+index; }
 };
 
-static cl_boolean number_char_p (char c)
+static bool number_char_p (char c)
 {
 	if ((c >= '0') && (c <= '9'))
-		return cl_true;
+		return true;
 	if (((c >= 'A') && (c <= 'Z')) || ((c >= 'a') && (c <= 'z')))
-		return cl_true;
+		return true;
 	switch (c) {
 		case '+': case '-': case '.': case '_': case '/':
-			return cl_true;
+			return true;
 		default:
-			return cl_false;
+			return false;
 	}
 }
 
@@ -74,7 +74,6 @@ const cl_I read_integer (std::istream& stream, const cl_read_flags& flags)
 		}
 		if (!(((c >= 'A') && (c <= 'Z')) || ((c >= 'a') && (c <= 'z'))))
 			goto syntax1;
-		buffer.push(c);
 		c = freadchar(stream);
 		if (c == cl_EOF) goto eof;
 	}
@@ -99,10 +98,10 @@ const cl_I read_integer (std::istream& stream, const cl_read_flags& flags)
 
 	// Handle syntax error.
 syntax1:	buffer.push(c);
-	read_number_bad_syntax(buffer.start_pointer(),buffer.end_pointer());
+	throw read_number_bad_syntax_exception(buffer.start_pointer(),buffer.end_pointer());
 
 	// Handle premature EOF.
-eof:	read_number_eof();
+eof:	throw read_number_eof_exception();
 }
 
 }  // namespace cln