mesa xkbcomp git update 22 June 2011

1 files changed, 208 insertions, 208 deletions

diff --git a/xkbcomp/parseutils.h b/xkbcomp/parseutils.h
index 9d78ad6bf..8b8a6c11d 100644
--- a/xkbcomp/parseutils.h
+++ b/xkbcomp/parseutils.h
@@ -1,208 +1,208 @@
-/************************************************************

- 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

-

-#ifndef DEBUG_VAR

-#define	DEBUG_VAR	parseDebug

-#endif

-

-#include "xkbcomp.h"

-

-extern char scanBuf[1024];

-extern int scanInt;

-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 */ ,

-                                 ExprDef *      /* value */

-    );

-

-extern KeyAliasDef *KeyAliasCreate(char * /* alias */ ,

-                                   char *       /* real */

-    );

-

-extern VModDef *VModCreate(Atom /* name */ ,

-                           ExprDef *    /* value */

-    );

-

-extern VarDef *VarCreate(ExprDef * /* name */ ,

-                         ExprDef *      /* value */

-    );

-

-extern VarDef *BoolVarCreate(Atom /* nameToken */ ,

-                             unsigned   /* set */

-    );

-

-extern InterpDef *InterpCreate(KeySym /* sym */ ,

-                               ExprDef *        /* match */

-    );

-

-extern KeyTypeDef *KeyTypeCreate(Atom /* name */ ,

-                                 VarDef *       /* body */

-    );

-

-extern SymbolsDef *SymbolsCreate(char * /* keyName */ ,

-                                 ExprDef *      /* symbols */

-    );

-

-extern GroupCompatDef *GroupCompatCreate(int /* group */ ,

-                                         ExprDef *      /* def */

-    );

-

-extern ModMapDef *ModMapCreate(Atom /* modifier */ ,

-                               ExprDef *        /* keys */

-    );

-

-extern IndicatorMapDef *IndicatorMapCreate(Atom /* name */ ,

-                                           VarDef *     /* body */

-    );

-

-extern IndicatorNameDef *IndicatorNameCreate(int /* ndx */ ,

-                                             ExprDef * /* name */ ,

-                                             Bool       /* virtual */

-    );

-

-extern ExprDef *ActionCreate(Atom /* name */ ,

-                             ExprDef *  /* args */

-    );

-

-extern ExprDef *CreateKeysymList(char * /* sym */

-    );

-

-extern ShapeDef *ShapeDeclCreate(Atom /* name */ ,

-                                 OutlineDef *   /* outlines */

-    );

-

-extern OutlineDef *OutlineCreate(Atom /* field */ ,

-                                 ExprDef *      /* points */

-    );

-

-extern KeyDef *KeyDeclCreate(char * /* name */ ,

-                             ExprDef *  /* expr */

-    );

-

-extern KeyDef *KeyDeclMerge(KeyDef * /* into */ ,

-                            KeyDef *    /* from */

-    );

-

-extern RowDef *RowDeclCreate(KeyDef *   /* keys */

-    );

-

-extern SectionDef *SectionDeclCreate(Atom /* name */ ,

-                                     RowDef *   /* rows */

-    );

-

-extern OverlayKeyDef *OverlayKeyCreate(char * /* under */ ,

-                                       char *   /* over  */

-    );

-

-extern OverlayDef *OverlayDeclCreate(Atom /* name */ ,

-                                     OverlayKeyDef *    /* rows */

-    );

-

-extern DoodadDef *DoodadCreate(unsigned /* type */ ,

-                               Atom /* name */ ,

-                               VarDef * /* body */

-    );

-

-extern ExprDef *AppendKeysymList(ExprDef * /* list */ ,

-                                 char * /* sym */

-    );

-

-extern int LookupKeysym(char * /* str */ ,

-                        KeySym *        /* 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 XkbFile *CreateXKBFile(int /* type */ ,

-                              char * /* name */ ,

-                              ParseCommon * /* defs */ ,

-                              unsigned  /* flags */

-    );

-

-extern void yyerror(const char *        /* s */

-    );

-

-extern int yywrap(void);

-

-extern int yylex(void);

-extern int yyparse(void);

-

-extern int setScanState(char * /* file */ ,

-                        int     /* line */

-    );

-

-extern FILE *yyin;

-

-#endif /* XKBPARSE_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
+
+#ifndef DEBUG_VAR
+#define	DEBUG_VAR	parseDebug
+#endif
+
+#include "xkbcomp.h"
+
+extern char scanBuf[1024];
+extern int scanInt;
+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 */ ,
+                                 ExprDef *      /* value */
+    );
+
+extern KeyAliasDef *KeyAliasCreate(char * /* alias */ ,
+                                   char *       /* real */
+    );
+
+extern VModDef *VModCreate(Atom /* name */ ,
+                           ExprDef *    /* value */
+    );
+
+extern VarDef *VarCreate(ExprDef * /* name */ ,
+                         ExprDef *      /* value */
+    );
+
+extern VarDef *BoolVarCreate(Atom /* nameToken */ ,
+                             unsigned   /* set */
+    );
+
+extern InterpDef *InterpCreate(const char * /* sym_str */ ,
+                               ExprDef *        /* match */
+    );
+
+extern KeyTypeDef *KeyTypeCreate(Atom /* name */ ,
+                                 VarDef *       /* body */
+    );
+
+extern SymbolsDef *SymbolsCreate(char * /* keyName */ ,
+                                 ExprDef *      /* symbols */
+    );
+
+extern GroupCompatDef *GroupCompatCreate(int /* group */ ,
+                                         ExprDef *      /* def */
+    );
+
+extern ModMapDef *ModMapCreate(Atom /* modifier */ ,
+                               ExprDef *        /* keys */
+    );
+
+extern IndicatorMapDef *IndicatorMapCreate(Atom /* name */ ,
+                                           VarDef *     /* body */
+    );
+
+extern IndicatorNameDef *IndicatorNameCreate(int /* ndx */ ,
+                                             ExprDef * /* name */ ,
+                                             Bool       /* virtual */
+    );
+
+extern ExprDef *ActionCreate(Atom /* name */ ,
+                             ExprDef *  /* args */
+    );
+
+extern ExprDef *CreateKeysymList(char * /* sym */
+    );
+
+extern ShapeDef *ShapeDeclCreate(Atom /* name */ ,
+                                 OutlineDef *   /* outlines */
+    );
+
+extern OutlineDef *OutlineCreate(Atom /* field */ ,
+                                 ExprDef *      /* points */
+    );
+
+extern KeyDef *KeyDeclCreate(char * /* name */ ,
+                             ExprDef *  /* expr */
+    );
+
+extern KeyDef *KeyDeclMerge(KeyDef * /* into */ ,
+                            KeyDef *    /* from */
+    );
+
+extern RowDef *RowDeclCreate(KeyDef *   /* keys */
+    );
+
+extern SectionDef *SectionDeclCreate(Atom /* name */ ,
+                                     RowDef *   /* rows */
+    );
+
+extern OverlayKeyDef *OverlayKeyCreate(char * /* under */ ,
+                                       char *   /* over  */
+    );
+
+extern OverlayDef *OverlayDeclCreate(Atom /* name */ ,
+                                     OverlayKeyDef *    /* rows */
+    );
+
+extern DoodadDef *DoodadCreate(unsigned /* type */ ,
+                               Atom /* name */ ,
+                               VarDef * /* body */
+    );
+
+extern ExprDef *AppendKeysymList(ExprDef * /* list */ ,
+                                 char * /* sym */
+    );
+
+extern int LookupKeysym(const char * /* str */ ,
+                        KeySym *        /* 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 XkbFile *CreateXKBFile(int /* type */ ,
+                              char * /* name */ ,
+                              ParseCommon * /* defs */ ,
+                              unsigned  /* flags */
+    );
+
+extern void yyerror(const char *        /* s */
+    );
+
+extern int yywrap(void);
+
+extern int yylex(void);
+extern int yyparse(void);
+
+extern int setScanState(char * /* file */ ,
+                        int     /* line */
+    );
+
+extern FILE *yyin;
+
+#endif /* XKBPARSE_H */