1.1 --- a/source/fwdref.e	Wed Jul 20 14:10:48 2011 -0400
     1.2 +++ b/source/fwdref.e	Wed Jul 20 17:43:57 2011 -0400
     1.3 @@ -1004,24 +1004,24 @@
     1.4  							if ref[FR_QUALIFIED] != -1 then
     1.5  								if ref[FR_QUALIFIED] > 0 then
     1.6  									-- some qualified filename
     1.7 -									errloc = sprintf("\t\'%s\' was not declared in \'%s\'.\n", 
     1.8 -										{ref[FR_NAME], 
     1.9 +									errloc = sprintf("\t\'%s\' (%s:%d) was not declared in \'%s\'.\n", 
    1.10 +										{ref[FR_NAME], abbreviate_path(known_files[ref[FR_FILE]]), ref[FR_LINE],
    1.11  											find_replace('\\',abbreviate_path(known_files[ref[FR_QUALIFIED]]),'/')})
    1.12  								else
    1.13  									-- eu namespace non-file
    1.14 -									errloc = sprintf("\t\'%s\' is not a builtin.\n", 
    1.15 -										{ref[FR_NAME]})
    1.16 +									errloc = sprintf("\t\'%s\' (%s:%d) is not a builtin.\n", 
    1.17 +										{ref[FR_NAME], abbreviate_path(known_files[ref[FR_FILE]]), ref[FR_LINE]})
    1.18  								end if		
    1.19  							else
    1.20  								-- unqualified
    1.21 -								errloc = sprintf("\t\'%s\' has not been declared.\n", 
    1.22 -									{ref[FR_NAME]})
    1.23 +								errloc = sprintf("\t\'%s\' (%s:%d) has not been declared.\n", 
    1.24 +									{ref[FR_NAME], abbreviate_path(known_files[ref[FR_FILE]]), ref[FR_LINE]})
    1.25  							end if
    1.26  						case SC_MULTIPLY_DEFINED then
    1.27  							sequence syms = tok[THESE_GLOBALS] -- there should be no forward references in here.
    1.28  							syms = custom_sort(routine_id("file_name_based_symindex_compare"), syms,, ASCENDING)
    1.29 -							errloc = sprintf("\t\'%s\' has been declared more than once.\n", 
    1.30 -								{ref[FR_NAME]} )
    1.31 +							errloc = sprintf("\t\'%s\' (%s:%d) has been declared more than once.\n", 
    1.32 +								{ref[FR_NAME], abbreviate_path(known_files[ref[FR_FILE]]), ref[FR_LINE] } )
    1.33  							for si = 1 to length(syms) do
    1.34  								symtab_index s = syms[si] 
    1.35  								if equal(ref[FR_NAME], sym_name(s)) then

     2.1 --- a/tests/t_c_decl_redundant.d/control.err	Wed Jul 20 14:10:48 2011 -0400
     2.2 +++ b/tests/t_c_decl_redundant.d/control.err	Wed Jul 20 17:43:57 2011 -0400
     2.3 @@ -1,6 +1,6 @@
     2.4 -C:\Users\Shawn\Documents\development\hg\4.0\tests\t_c_decl_redundant.e:7
     2.5 +t_c_decl_redundant.e:7
     2.6  <0074>:: Errors resolving the following references:
     2.7 -	'x' has been declared more than once.
     2.8 +	'x' (t_c_decl_redundant.e:7) has been declared more than once.
     2.9  		in x1.e
    2.10  		in x2.e
    2.11  

     3.1 --- a/tests/t_c_decl_redundant2.d/control.err	Wed Jul 20 14:10:48 2011 -0400
     3.2 +++ b/tests/t_c_decl_redundant2.d/control.err	Wed Jul 20 17:43:57 2011 -0400
     3.3 @@ -1,4 +1,4 @@
     3.4 -C:\Users\Shawn\Documents\development\hg\4.0\tests\t_c_decl_redundant2.e:2
     3.5 +t_c_decl_redundant2.e:2
     3.6  <0031>:: attempt to redefine foo.
     3.7  integer foo
     3.8            ^

     4.1 --- a/tests/t_c_eu_nonbuiltin.d/control.err	Wed Jul 20 14:10:48 2011 -0400
     4.2 +++ b/tests/t_c_eu_nonbuiltin.d/control.err	Wed Jul 20 17:43:57 2011 -0400
     4.3 @@ -1,6 +1,6 @@
     4.4  t_c_eu_nonbuiltin.e:3
     4.5  <0074>:: Errors resolving the following references:
     4.6 -	'test_pass' is not a builtin.
     4.7 +	'test_pass' (t_c_eu_nonbuiltin.e:3) is not a builtin.
     4.8  
     4.9  eu:test_pass("This should never happen")
    4.10             ^

     5.1 --- a/tests/t_c_fwd_samefile.d/control.err	Wed Jul 20 14:10:48 2011 -0400
     5.2 +++ b/tests/t_c_fwd_samefile.d/control.err	Wed Jul 20 17:43:57 2011 -0400
     5.3 @@ -1,6 +1,6 @@
     5.4  t_c_fwd_samefile.e:4
     5.5  <0074>:: Errors resolving the following references:
     5.6 -	'x' has not been declared.
     5.7 +	'x' (t_c_fwd_samefile.e:4) has not been declared.
     5.8  
     5.9  x = 1
    5.10    ^

     6.1 --- a/tests/t_c_ns_builtin.d/control.err	Wed Jul 20 14:10:48 2011 -0400
     6.2 +++ b/tests/t_c_ns_builtin.d/control.err	Wed Jul 20 17:43:57 2011 -0400
     6.3 @@ -1,6 +1,6 @@
     6.4  t_c_ns_builtin.e:3
     6.5  <0074>:: Errors resolving the following references:
     6.6 -	'puts' was not declared in '../include/std/unittest.e'.
     6.7 +	'puts' (t_c_ns_builtin.e:3) was not declared in '../include/std/unittest.e'.
     6.8  
     6.9  ut:puts( 1, "This should crash\n" )
    6.10        ^

     7.1 --- a/tests/t_c_qualpredef.d/control.err	Wed Jul 20 14:10:48 2011 -0400
     7.2 +++ b/tests/t_c_qualpredef.d/control.err	Wed Jul 20 17:43:57 2011 -0400
     7.3 @@ -1,6 +1,6 @@
     7.4 -C:\Users\Shawn\Documents\development\hg\4.0\tests\t_c_qualpredef.e:4
     7.5 +t_c_qualpredef.e:4
     7.6  <0074>:: Errors resolving the following references:
     7.7 -	'puts' was not declared in 't_c_qualpredef.e'.
     7.8 +	'puts' (t_c_qualpredef.e:4) was not declared in 't_c_qualpredef.e'.
     7.9  
    7.10  fail:puts(1, 1)
    7.11          ^