Keep track of columns in the node and value locations. Improve error diagnostics.

* src/grecs.h (grecs_locus_point): New struct.
(grecs_locus_point_advance_line): New macro.
(grecs_locus_t): Redesign.
(grecs_value) <locus>: New member.
(grecs_node) <idloc>: New member.
(grecs_print_diag_fun): Change signature.
(grecs_warning,grecs_error): Change signature.
(grecs_parse_line_directive)
(grecs_parse_line_directive_cpp)
(grecs_string_convert): Change signature.
(grecs_current_locus): Remove.
(grecs_current_locus_point): New extern.
* src/grecs-locus.h: New file.
* src/Make.am (noinst_HEADERS): Add grecs-locus.h.
* src/join.c (reset_locus): Rewrite.
* src/lookup.c: Initialize new members of grecs_value and grecs_node.
(split_cfg_path): Return wrdse error code.
(grecs_node_from_path_locus): Take two grecs_locus_t arguments.
Make sure all created nodes have their locus members
properly initialized.
* src/parser.c (grecs_parse): Initialize grecs_current_locus_point.
* src/tree.c (grecs_node_create_points): New function.
(string_to_bool,string_to_host,string_to_sockaddr)
(grecs_string_convert): Change signatures. Be more precise in
what locus to report.

* src/diag.c (default_print_diag): Use YY_LOCATION_PRINT to
output locus.
(grecs_print_diag_fun): Change signature.
(grecs_warning,grecs_error): Change signature.
* src/format.c (grecs_format_locus): Rewrite.
(grecs_format_node): Be more precise in what locus is being
output.

* src/bind-gram.y: Keep track of locations. Turn on error-verbose mode.
* src/grecs-gram.y: Likewise.
* src/meta1-gram.y: Likewise.

* src/bind-lex.l: Keep track of locations.
* src/git-parser.c: Likewise.
* src/grecs-lex.l: Likewise.
* src/meta1-lex.l: Likewise.
* src/path-parser.c: Likewise.
* src/preproc.c: Likewise.

* tests/gcf1.conf: Untabify.
* tests/format01.at: Reflect changes in the output.
* tests/join.at: Likewise.
* tests/set.at: Likewise.
* tests/locus-bind.at: New testcase.
* tests/locus-git.at: New testcase.
* tests/locus-meta1.at: New testcase.
* tests/locus00.at: New testcase.
* tests/locus01.at: New testcase.
* tests/locus02.at: New testcase.
* tests/path-locus.at: New testcase.

1 files changed, 18 insertions, 19 deletions

diff --git a/src/meta1-gram.y b/src/meta1-gram.y
index 455c362..0fb6727 100644
--- a/src/meta1-gram.y
+++ b/src/meta1-gram.y
@@ -23,2 +23,3 @@
 #include "grecs.h"
+#include "grecs-locus.h"
 
@@ -31,7 +32,6 @@ extern int yy_flex_debug;
 
+%error-verbose
+%locations
+
 %union {
-	struct {
-		grecs_locus_t locus;
-		char *string;
-	} ident;
 	char *string;
@@ -43,4 +43,3 @@ extern int yy_flex_debug;
 
-%token <ident> META1_IDENT
-%token <string> META1_STRING
+%token <string> META1_STRING META1_IDENT
 %type <node> stmt simple block maybe_stmtlist
@@ -55,4 +54,3 @@ input   : maybe_stmtlist
           {
-		  parse_tree = grecs_node_create(grecs_node_root,
-						 &grecs_current_locus);
+		  parse_tree = grecs_node_create(grecs_node_root, &@1);
 		  parse_tree->v.texttab = grecs_text_table();
@@ -89,5 +87,6 @@ simple  : META1_IDENT '=' value opt_sc
           {
-		  $$ = grecs_node_create(grecs_node_stmt,
-					 &$1.locus);
-		  $$->ident = $1.string;
+		  $$ = grecs_node_create_points(grecs_node_stmt,
+						@1.beg, @3.end);
+		  $$->ident = $1;
+		  $$->idloc = @1;
 		  $$->v.value = $3;
@@ -98,5 +97,6 @@ block   : META1_IDENT tag '{' stmtlist '}' opt_sc
           {
-		  $$ = grecs_node_create(grecs_node_block,
-					 &$1.locus);
-		  $$->ident = $1.string;
+		  $$ = grecs_node_create_points(grecs_node_block,
+						@1.beg, @5.end);
+		  $$->ident = $1;
+		  $$->idloc = @1;
 		  $$->v.value = $2;
@@ -114,3 +114,3 @@ tag     : /* empty */
 		  $$->type = GRECS_TYPE_STRING;
-		  $$->v.string = $1.string;
+		  $$->v.string = $1;
 	  }		  
@@ -122,2 +122,3 @@ value   : string
 		  $$->type = GRECS_TYPE_STRING;
+		  $$->locus = @1;
 		  $$->v.string = $1;
@@ -128,2 +129,3 @@ value   : string
 		  $$->type = GRECS_TYPE_LIST;
+		  $$->locus = @1;
 		  $$->v.list = $1;
@@ -133,5 +135,2 @@ value   : string
 string  : META1_IDENT
-          {
-		  $$ = $1.string;
-	  }
         | slist
@@ -195,3 +194,3 @@ yyerror(char *s)
 {
-	grecs_error(&grecs_current_locus, 0, "%s", s);
+	grecs_error(&yylloc, 0, "%s", s);
 	return 0;