--- parser3/src/main/compile_tools.h	2003/04/03 11:19:50	1.67.2.8.2.8
+++ parser3/src/main/compile_tools.h	2003/04/04 06:41:48	1.67.2.8.2.11
@@ -8,13 +8,16 @@
 #ifndef COMPILE_TOOLS
 #define COMPILE_TOOLS
 
-static const char* IDENT_COMPILE_TOOLS_H="$Date: 2003/04/03 11:19:50 $";
+static const char* IDENT_COMPILE_TOOLS_H="$Date: 2003/04/04 06:41:48 $";
 
 #include "pa_opcode.h"
 #include "pa_types.h"
 #include "pa_vstring.h"
 #include "pa_request.h"
 
+/// used to track source column number
+#define TAB_SIZE 8
+
 enum lexical_state {
 	LS_USER, LS_NAME_SQUARE_PART,
 	LS_USER_COMMENT,
@@ -52,6 +55,7 @@ struct Pos {
 /// compiler status
 class Parse_control {
 	const String* main_alias;
+	uint last_line_end_col;
 public:
 	const String& alias_method(const String& name);
 	//@{
@@ -93,13 +97,36 @@ public:
 		source(asource), main_alias(amain_alias),
 
 		file_no(afile_no),
+		last_line_end_col(0),
 
 		// initialize state
 		trim_bof(true),
 		pending_state(0),
 		ls(LS_USER),
 		ls_sp(0),
-		in_call_value(false) {
+		in_call_value(false) {}
+
+	void pos_next_line() {
+		pos.line++;
+		last_line_end_col=pos.col;
+		pos.col=0;
+	}
+	void pos_next_c(char c) {
+		if(c=='\t')
+			pos.col=(pos.col+TAB_SIZE)&~(TAB_SIZE-1);
+		else
+			pos.col++;
+	}
+	/// not precise in case of \t in the middle of the text
+	void pos_prev_c() {
+		if(pos.col==0) {
+			--pos.line;  pos.col=last_line_end_col;
+		} else
+			--pos.col;
+	}
+	void ungetc() {
+		source--;
+		pos_prev_c();
 	}
 };
 
@@ -108,7 +135,7 @@ inline ArrayOperation* N() {
 	return new ArrayOperation;
 }
 
-	/// Assembler instruction // append ordinary instruction to ops
+/// Assembler instruction // append ordinary instruction to ops
 inline void O(ArrayOperation& result, OPCODE code) {
 	result+=Operation(code);
 }
@@ -130,23 +157,25 @@ inline void OA(ArrayOperation& result, O
 
 /**
 	Value Literal // returns array with 
-	- first: OP_VALUE instruction
-	- second op: string itself
+	- first op: OP_VALUE instruction
+	- second op: origin (debug information)
+	- third op: string itself
 */
 inline ArrayOperation* VL(Value* value, uint file_no, uint line, uint col) {
 	// empty ops array
-	ArrayOperation* result=N();
+	ArrayOperation& result=*N();
 
 	// append 'value' to 'result'
-	*result+=Operation(OP_VALUE, file_no, line, col); // append OP_VALUE
-	*result+=Operation(value); // append 'value'
+	result+=Operation(OP_VALUE);
+	result+=Operation(file_no, line, col); // append origin
+	result+=Operation(value); // append 'value'
 
-	return result;
+	return &result;
 }
 
-/// Literal Array to(2) Value @return Value from literal Array OP+Value
+/// Literal Array to(2) Value @return Value from literal Array OP+origin+Value
 Value* LA2V(ArrayOperation& literal_string_array, int offset=0);
-/// Literal Array to(2) String  @return String value from literal Array OP+String array
+/// Literal Array to(2) String  @return String value from literal Array OP+origin+String array
 inline const String* LA2S(ArrayOperation& literal_string_array, int offset=0) {
 	if(Value* value=LA2V(literal_string_array, offset))
 		return value->get_string();