xkbcomp: Changes to 'master'

[Daniel Stone]

 parseutils.c |    2 +-
 parseutils.h |    3 +--
 xkbcomp.c    |    2 +-
 xkbparse.y   |   10 +++++++++-
 xkbscan.c    |   10 +++++++++-
 5 files changed, 21 insertions(+), 6 deletions(-)

New commits:
commit a68c5b7b29eb1433b1be73b50c4248e10eab8e64
Author: Daniel Stone <daniel at fooishbar.org>
Date:   Thu Nov 1 16:37:03 2012 +1100

    Reset scan state when opening a new file
    
    When we opened a new file after encountering a parse error, we weren't
    resetting our scan state, and continued to read out of the old buffer
    rather than that of the new file.
    
    Fixes a regression introduced in 9887842e ('Use fread() instead of
    getc()').
    
    Test case:
        xkbcomp -lfhlpR "path/to/xkeyboard-config.git/symbols/*"
    The Makefiles in that tree would cause parse errors, the resulting directory
    file is incomplete (down from ~12000 to ~230 lines).
    
    Reported-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Daniel Stone <daniel at fooishbar.org>

commit e119cbec7e750ffc4d4bd08b577db2c697035a30
Author: Daniel Stone <daniel at fooishbar.org>
Date:   Wed Oct 31 12:40:49 2012 +1100

    Add parsing support for multiple keysyms per level
    
    Parse, but ignore, level definitions in the form of:
    key <FOO> { [ normal_sym, { M, U, L, T, I, S, Y, M } ] };
    
    normal_sym will be carried, but the latter will be turned into NoSymbol.
    
    http://bugs.freedesktop.org/show_bug.cgi?id=25025
    
    Signed-off-by: Daniel Stone <daniel at fooishbar.org>