Edit

kc3-lang/libxkbcommon/src/xkbcomp/parseutils.h

Branch :

  • Show log

    Commit

  • Author : Daniel Stone
    Date : 2012-02-15 19:39:33
    Hash : 83f18b1c
    Message : Fix xkbparse.y compilation Thanks to autotools happily building stale generated sources, I hadn't actually ever built my xkbparse.y changes. Fix that so it not only compiles, but works. This seems to parse long keycodes correctly, although I very much would not recommend testing this by declaring 0x1fffffff as your highest keycode. Signed-off-by: Daniel Stone <daniel@fooishbar.org>

  • src/xkbcomp/parseutils.h
  • /************************************************************
     Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
    
     Permission to use, copy, modify, and distribute this
     software and its documentation for any purpose and without
     fee is hereby granted, provided that the above copyright
     notice appear in all copies and that both that copyright
     notice and this permission notice appear in supporting
     documentation, and that the name of Silicon Graphics not be
     used in advertising or publicity pertaining to distribution
     of the software without specific prior written permission.
     Silicon Graphics makes no representation about the suitability
     of this software for any purpose. It is provided "as is"
     without any express or implied warranty.
    
     SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
     SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
     AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
     GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
     DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
     DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
     OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
     THE USE OR PERFORMANCE OF THIS SOFTWARE.
    
     ********************************************************/
    
    #ifndef XKBPARSE_H
    #define	XKBPARSE_H 1
    
    #include "xkbcomp.h"
    
    extern char scanBuf[1024];
    extern int scanInt;
    extern unsigned long scanULong;
    extern int lineNum;
    
    extern XkbFile *rtrnValue;
    
    #ifdef DEBUG
    #define	d(str)		fprintf(stderr,"%s\n",str);
    #define d1(str,a)	fprintf(stderr,str,a);
    #define d2(str,a,b)	fprintf(stderr,str,a,b);
    #else
    #define	d(str)
    #define	d1(str,a)
    #define d2(str,a,b)
    #endif
    
    
    extern ParseCommon *AppendStmt(ParseCommon * /* to */ ,
                                   ParseCommon *    /* append */
        );
    
    extern ExprDef *ExprCreate(unsigned /* op */ ,
                               unsigned     /* type */
        );
    
    extern ExprDef *ExprCreateUnary(unsigned /* op */ ,
                                    unsigned /* type */ ,
                                    ExprDef *       /* child */
        );
    
    extern ExprDef *ExprCreateBinary(unsigned /* op */ ,
                                     ExprDef * /* left */ ,
                                     ExprDef *      /* right */
        );
    
    extern KeycodeDef *KeycodeCreate(char * /* name */ ,
                                     unsigned long /* value */
        );
    
    extern KeyAliasDef *KeyAliasCreate(char * /* alias */ ,
                                       char *       /* real */
        );
    
    extern VModDef *VModCreate(uint32_t /* name */ ,
                               ExprDef *    /* value */
        );
    
    extern VarDef *VarCreate(ExprDef * /* name */ ,
                             ExprDef *      /* value */
        );
    
    extern VarDef *BoolVarCreate(uint32_t /* nameToken */ ,
                                 unsigned   /* set */
        );
    
    extern InterpDef *InterpCreate(char * /* sym */ ,
                                   ExprDef *        /* match */
        );
    
    extern KeyTypeDef *KeyTypeCreate(uint32_t /* name */ ,
                                     VarDef *       /* body */
        );
    
    extern SymbolsDef *SymbolsCreate(char * /* keyName */ ,
                                     ExprDef *      /* symbols */
        );
    
    extern GroupCompatDef *GroupCompatCreate(int /* group */ ,
                                             ExprDef *      /* def */
        );
    
    extern ModMapDef *ModMapCreate(uint32_t /* modifier */ ,
                                   ExprDef *        /* keys */
        );
    
    extern IndicatorMapDef *IndicatorMapCreate(uint32_t /* name */ ,
                                               VarDef *     /* body */
        );
    
    extern IndicatorNameDef *IndicatorNameCreate(int /* ndx */ ,
                                                 ExprDef * /* name */ ,
                                                 Bool       /* virtual */
        );
    
    extern ExprDef *ActionCreate(uint32_t /* name */ ,
                                 ExprDef *  /* args */
        );
    
    extern ExprDef *CreateKeysymList(char * /* sym */
        );
    
    extern ShapeDef *ShapeDeclCreate(uint32_t /* name */ ,
                                     OutlineDef *   /* outlines */
        );
    
    extern OutlineDef *OutlineCreate(uint32_t /* field */ ,
                                     ExprDef *      /* points */
        );
    
    extern KeyDef *KeyDeclCreate(char * /* name */ ,
                                 ExprDef *  /* expr */
        );
    
    extern RowDef *RowDeclCreate(KeyDef *   /* keys */
        );
    
    extern SectionDef *SectionDeclCreate(uint32_t /* name */ ,
                                         RowDef *   /* rows */
        );
    
    extern OverlayKeyDef *OverlayKeyCreate(char * /* under */ ,
                                           char *   /* over  */
        );
    
    extern OverlayDef *OverlayDeclCreate(uint32_t /* name */ ,
                                         OverlayKeyDef *    /* rows */
        );
    
    extern DoodadDef *DoodadCreate(unsigned /* type */ ,
                                   uint32_t /* name */ ,
                                   VarDef * /* body */
        );
    
    extern ExprDef *AppendKeysymList(ExprDef * /* list */ ,
                                     char * /* sym */
        );
    
    extern int LookupKeysym(char * /* str */ ,
                            uint32_t *        /* sym_rtrn */
        );
    
    extern IncludeStmt *IncludeCreate(char * /* str */ ,
                                      unsigned      /* merge */
        );
    
    extern unsigned StmtSetMerge(ParseCommon * /* stmt */ ,
                                 unsigned   /* merge */
        );
    
    #ifdef DEBUG
    extern void PrintStmtAddrs(ParseCommon *        /* stmt */
        );
    #endif
    
    extern int XKBParseFile(FILE * /* file */ ,
                            XkbFile **      /* pRtrn */
        );
    
    extern int XKBParseString(const char *string, XkbFile ** pRtrn);
    
    extern void CheckDefaultMap(XkbFile * maps);
    
    extern XkbFile *CreateXKBFile(int /* type */ ,
                                  char * /* name */ ,
                                  ParseCommon * /* defs */ ,
                                  unsigned  /* flags */
        );
    
    extern void yyerror(const char *        /* s */
        );
    
    extern int yylex(void);
    extern int yyparse(void);
    
    extern void setScanState(char * /* file */ ,
                             int     /* line */
        );
    
    extern FILE *yyin;
    extern const char *yystring;
    
    #endif /* XKBPARSE_H */