# HG changeset patch
# User Mario de Sousa <msousa@fe.up.pt>
# Date 1302803731 -3600
# Node ID 200efef43c3e9acded0206399809ae14f06f4941
# Parent  9df7fcb9bde55f84377ad8d0240bfede2881aa17# Parent  3a60c6ff98b16931da52e69c1d456a50adcfe810
Merging changes.

diff -r 9df7fcb9bde5 -r 200efef43c3e stage3/visit_expression_type.cc
--- a/stage3/visit_expression_type.cc	Thu Apr 14 18:12:59 2011 +0100
+++ b/stage3/visit_expression_type.cc	Thu Apr 14 18:55:31 2011 +0100
@@ -61,9 +61,9 @@
 #define  LAST_(symbol1, symbol2) (((symbol1)->last_order  > (symbol2)->last_order)    ? (symbol1) : (symbol2))
 
 #define STAGE3_ERROR(symbol1, symbol2, msg) {                                          \
-    fprintf(stderr, "%s:(%d:%d) .. %s(%d:%d): %s\n",                                   \
+    fprintf(stderr, "%s:%d-%d..%d-%d: error : %s\n",                                   \
            FIRST_(symbol1,symbol2)->first_file, FIRST_(symbol1,symbol2)->first_line, FIRST_(symbol1,symbol2)->first_column, \
-           LAST_(symbol1,symbol2) ->last_file,  LAST_(symbol1,symbol2) ->last_line,  LAST_(symbol1,symbol2) ->last_column,  \
+                                                LAST_(symbol1,symbol2) ->last_line,  LAST_(symbol1,symbol2) ->last_column,  \
            msg);                                                                       \
     il_error = true;                                                                   \
     error_found = true;                                                                \