Merge remote-tracking branch 'origin/maint'

[bison.git] / src / location.h

diff --git a/src/location.h b/src/location.h
index ec481649f1c3e684530f7b053cb3a99bc80c5a2e..17da73ca6b174b29ea95a2f7ae656de97e395301 100644 (file)
--- a/src/location.h
+++ b/src/location.h
@@ -1,6 +1,6 @@
 /* Locations for Bison
-   Copyright (C) 2002, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
-   Foundation, Inc.
+
+   Copyright (C) 2002, 2004-2012 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -73,8 +73,8 @@ static inline bool
 equal_boundaries (boundary a, boundary b)
 {
   return (a.column == b.column
-         && a.line == b.line
-         && UNIQSTR_EQ (a.file, b.file));
+          && a.line == b.line
+          && UNIQSTR_EQ (a.file, b.file));
 }
 
 /* A location, that is, a region of source code.  */
@@ -96,9 +96,11 @@ extern location const empty_location;
 /* Set *LOC and adjust scanner cursor to account for token TOKEN of
    size SIZE.  */
 void location_compute (location *loc,
-                      boundary *cur, char const *token, size_t size);
+                       boundary *cur, char const *token, size_t size);
 
-void location_print (FILE *out, location loc);
+/* Print location to file. Return number of actually printed
+   characters.  */
+unsigned location_print (FILE *out, location loc);
 
 /* Return -1, 0, 1, depending whether a is before, equal, or
    after b.  */