uniqstr wasn't being used for handle_syncline like it should.

diff --git a/ChangeLog b/ChangeLog
index 7f38696c6e835674c4e190912424e2be72c327e3..e246ae1c5ec4b1b686da19446f77158eebd5f401 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-08-07  Florian Krohm  <florian@edamail.fishkill.ibm.com>
+
+       * src/scan-gram.l (handle_syncline): Use uniqstr_new not xstrdup.
+
+       * src/location.h (struct): The file member is a uniqstr.
+       (equal_boundaries): Use UNIQSTR_EQ for comparison.
+

 2004-07-22  Paul Eggert  <eggert@cs.ucla.edu>
 
        Fix bug with non-%union parsers that have printers or destructors,
 2004-07-22  Paul Eggert  <eggert@cs.ucla.edu>
 
        Fix bug with non-%union parsers that have printers or destructors,

diff --git a/src/location.h b/src/location.h
index f4fbb2f805067347a37fdb46b869234ce4e64352..3bdf93c376b5ca5a0c6bf4bb7babbf83e6fecea7 100644 (file)
--- a/src/location.h
+++ b/src/location.h
@@ -1,5 +1,5 @@
 /* Locations for Bison
 /* Locations for Bison

-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.

 
    This file is part of Bison, the GNU Compiler Compiler.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -21,11 +21,13 @@
 #ifndef LOCATION_H_
 # define LOCATION_H_
 
 #ifndef LOCATION_H_
 # define LOCATION_H_
 

+# include "uniqstr.h"
+

 /* A boundary between two characters.  */
 typedef struct
 {
   /* The name of the file that contains the boundary.  */
 /* A boundary between two characters.  */
 typedef struct
 {
   /* The name of the file that contains the boundary.  */

-  char const *file;
+  uniqstr file;

 
   /* The (origin-1) line that contains the boundary.  */
   int line;
 
   /* The (origin-1) line that contains the boundary.  */
   int line;


@@ -42,7 +44,7 @@ equal_boundaries (boundary a, boundary b)
 {
   return (a.column == b.column
          && a.line == b.line
 {
   return (a.column == b.column
          && a.line == b.line

-         && a.file == b.file);
+         && UNIQSTR_EQ (a.file, b.file));

 }
 
 /* A location, that is, a region of source code.  */
 }
 
 /* A location, that is, a region of source code.  */

diff --git a/src/scan-gram.l b/src/scan-gram.l
index 77c304f2bedf4696c0b7abcf214e261a1fab479c..7541bf9f640aa45f35024201c5b818a85991fdb4 100644 (file)
--- a/src/scan-gram.l
+++ b/src/scan-gram.l
@@ -1003,7 +1003,7 @@ handle_syncline (char *args)
   const char *file = NULL;
   file = strchr (args, '"') + 1;
   *strchr (file, '"') = 0;
   const char *file = NULL;
   file = strchr (args, '"') + 1;
   *strchr (file, '"') = 0;

-  scanner_cursor.file = current_file = xstrdup (file);
+  scanner_cursor.file = current_file = uniqstr_new (file);

   scanner_cursor.line = lineno;
   scanner_cursor.column = 1;
 }
   scanner_cursor.line = lineno;
   scanner_cursor.column = 1;
 }