[Automake-commit] [SCM] GNU Automake branch, ylwrap-refactor, updated. v1.11-421-g5fb4363

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=5fb4363d32f115b343db2f3755c278f0c5e9131d

The branch, ylwrap-refactor has been updated
       via  5fb4363d32f115b343db2f3755c278f0c5e9131d (commit)
       via  d6c3e31e6aa7da0af2ba99e762a9738775a0a266 (commit)
      from  5e8caedcf0a32f4321296c3afc790274dfe9a71f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 5fb4363d32f115b343db2f3755c278f0c5e9131d
Author: Stefano Lattarini <address@hidden>
Date:   Thu May 12 17:17:38 2011 +0200

    ylwrap: bugfix in postprocessing of "#line" directives
    
    Bug introduced by commit v1.11-403-gc47667f, "ylwrap: various
    refactorings, few improvements", when the `dirname_' function
    was introduced.
    
    * lib/ylwrap (dirname_): Renamed ...
    (strip_nondir): ... to this, and make sure that any trailing `/'
    is kept.
    * tests/yacc-line.test: Extend.

commit d6c3e31e6aa7da0af2ba99e762a9738775a0a266
Author: Stefano Lattarini <address@hidden>
Date:   Thu May 12 17:19:24 2011 +0200

    cosmetics: fix typos in most recent ChangeLog entry

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog               |   15 +++++++++++++--
 lib/ylwrap              |   10 +++++-----
 tests/yacclex-line.test |    2 ++
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 02cf573..ee5bc36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,15 @@
-2011-05-06  Stefano Lattarini  <address@hidden>
+2011-05-12  Stefano Lattarini  <address@hidden>
+
+       ylwrap: bugfix in postprocessing of "#line" directives
+       Bug introduced by commit v1.11-403-gc47667f, "ylwrap: various
+       refactorings, few improvements", when the `dirname_' function
+       was introduced.
+       * lib/ylwrap (dirname_): Renamed ...
+       (strip_nondir): ... to this, and make sure that any trailing `/'
+       is kept.
+       * tests/yacc-line.test: Extend.
+
+2011-05-12  Stefano Lattarini  <address@hidden>
 
        ylwrap: bugfix in postprocessing of "#..." C directives
        Bug introduced by commit v1.11-413-geab64df, ``ylwrap: move
@@ -9,7 +20,7 @@
        target name in postprocessing of "#..." C directives.
        Update other code consequently.
        * tests/yacclex-cpp-directives.test: New test.
-       * tests/makefile.am (TESTS): Update.
+       * tests/Makefile.am (TESTS): Update.
 
 2011-05-06  Stefano Lattarini  <address@hidden>
 
diff --git a/lib/ylwrap b/lib/ylwrap
index 58541da..e5d17b1 100755
--- a/lib/ylwrap
+++ b/lib/ylwrap
@@ -44,11 +44,11 @@ quote_for_sed ()
   printf '%s\n' "$1" | sed -e 's/[].[^$\\*|]/\\&/g'
 }
 
-# For system that lacks a dirname command, we simulate it with sed.
-dirname_ ()
+# Strip trailing non-directory component (if any) from the given path,
+# preserving trailing `/' characters in the directory components.
+strip_nondir ()
 {
-  dirname "$1" 2>/dev/null \
-    || printf '%s\n' "$1" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'
+  printf '%s\n' "$1" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'
 }
 
 # Turn the given string into a suitable C preprocessor symbol.
@@ -244,7 +244,7 @@ cd "$ocwd" || exit 1
 test $ret -eq 0 || eval "$do_exit"
 
 # The directory holding the input.
-input_dir=`dirname_ "$input"`
+input_dir=`strip_nondir "$input"`
 # Quote $input_dir so we can use it in a regexp.
 input_rx=`quote_for_sed "$input_dir"`
 
diff --git a/tests/yacclex-line.test b/tests/yacclex-line.test
index 2f8765a..c59e5e1 100755
--- a/tests/yacclex-line.test
+++ b/tests/yacclex-line.test
@@ -89,6 +89,8 @@ for vpath in : false; do
   $EGREP '#.*(y\.tab|lex\.yy)' foobar.c zardoz.c zardoz.h && Exit 1
   grep "^$ws*#.*line$ws.*foobar\\.l" foobar.c
   grep "^$ws*#.*line$ws.*zardoz\\.y" zardoz.c
+  grep "#.*\"/foobar\\.l" foobar.c && Exit 1
+  grep "#.*\"/zardoz\\.y" zardoz.c && Exit 1
   cd $srcdir
 done
 


hooks/post-receive
-- 
GNU Automake