--- parser3/src/main/pa_table.C	2001/09/06 14:55:06	1.36
+++ parser3/src/main/pa_table.C	2001/11/05 11:46:29	1.40
@@ -2,10 +2,10 @@
 	Parser: table class.
 
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
 
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
+	$Id: pa_table.C,v 1.40 2001/11/05 11:46:29 paf Exp $
 */
-static const char *RCSId="$Id: pa_table.C,v 1.36 2001/09/06 14:55:06 parser Exp $"; 
 
 #include <stdlib.h>
 
@@ -35,7 +35,7 @@ int Table::column_name2index(const Strin
 	if(fcolumns) {// named
 		int result=name2number.get_int(column_name)-1; // -1 = column not found
 		if(bark && result<0)
-			THROW(0, 0,
+			throw Exception(0, 0,
 				&column_name,
 				"column not found");
 		return result;
@@ -43,10 +43,10 @@ int Table::column_name2index(const Strin
 		char *error_pos;
 		const char *cstr=column_name.cstr();
 		int result=(int)strtol(cstr, &error_pos, 0);
-		if(error_pos==cstr/*empty*/ || *error_pos/*not eos*/) {
-			result=-1; // calm, compiler
+		if(*error_pos/*not EOS*/) {
+			result=-1;
 			if(bark)
-				THROW(0, 0,
+				throw Exception(0, 0,
 					&column_name,
 					"invalid column number");
 		}