mirror of
https://github.com/reactos/reactos.git
synced 2024-12-28 01:55:19 +00:00
Revert some incorrect changes that were made during rbuild merge
svn path=/trunk/; revision=15685
This commit is contained in:
Gé van Geldorp
parent
1e05d99733
commit
9948c2bbfa
3 changed files with 2037 additions and 2651 deletions
|
|
@ -1002,8 +1002,8 @@ optional_style_pair
|
|||
style
|
||||
: style '|' style { $$ = new_style($1->or_mask | $3->or_mask, $1->and_mask | $3->and_mask); free($1); free($3);}
|
||||
| '(' style ')' { $$ = $2; }
|
||||
| xpr { $$ = new_style($1, 0); }
|
||||
| tNOT xpr { $$ = new_style(0, $2); }
|
||||
| any_num { $$ = new_style($1, 0); }
|
||||
| tNOT any_num { $$ = new_style(0, $2); }
|
||||
;
|
||||
|
||||
ctlclass
|
||||
|
|
@ -2249,32 +2249,27 @@ static event_t *add_event(int key, int id, int flags, event_t *prev)
|
|||
|
||||
static event_t *add_string_event(string_t *key, int id, int flags, event_t *prev)
|
||||
{
|
||||
int keycode = 0, keysym = 0;
|
||||
int keycode = 0;
|
||||
event_t *ev = new_event();
|
||||
|
||||
if(key->type == str_char)
|
||||
keysym = key->str.cstr[0];
|
||||
else
|
||||
keysym = key->str.wstr[0];
|
||||
if(key->type != str_char)
|
||||
yyerror("Key code must be an ascii string");
|
||||
|
||||
if((flags & WRC_AF_VIRTKEY) && (!isupper(keysym & 0xff) && !isdigit(keysym & 0xff)))
|
||||
if((flags & WRC_AF_VIRTKEY) && (!isupper(key->str.cstr[0] & 0xff) && !isdigit(key->str.cstr[0] & 0xff)))
|
||||
yyerror("VIRTKEY code is not equal to ascii value");
|
||||
|
||||
if(keysym == '^' && (flags & WRC_AF_CONTROL) != 0)
|
||||
if(key->str.cstr[0] == '^' && (flags & WRC_AF_CONTROL) != 0)
|
||||
{
|
||||
yyerror("Cannot use both '^' and CONTROL modifier");
|
||||
}
|
||||
else if(keysym == '^')
|
||||
else if(key->str.cstr[0] == '^')
|
||||
{
|
||||
if(key->type == str_char)
|
||||
keycode = toupper(key->str.cstr[1]) - '@';
|
||||
else
|
||||
keycode = toupper(key->str.wstr[1]) - '@';
|
||||
keycode = toupper(key->str.cstr[1]) - '@';
|
||||
if(keycode >= ' ')
|
||||
yyerror("Control-code out of range");
|
||||
}
|
||||
else
|
||||
keycode = keysym;
|
||||
keycode = key->str.cstr[0];
|
||||
ev->key = keycode;
|
||||
ev->id = id;
|
||||
ev->flags = flags & ~WRC_AF_ASCII;
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1,207 +1,8 @@
|
|||
/* A Bison parser, made by GNU Bison 1.875b. */
|
||||
#ifndef BISON_Y_TAB_H
|
||||
# define BISON_Y_TAB_H
|
||||
|
||||
/* Skeleton parser for Yacc-like parsing with Bison,
|
||||
Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2, or (at your option)
|
||||
any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place - Suite 330,
|
||||
Boston, MA 02111-1307, USA. */
|
||||
|
||||
/* As a special exception, when this file is copied by Bison into a
|
||||
Bison output file, you may use that output file without restriction.
|
||||
This special exception was added by the Free Software Foundation
|
||||
in version 1.24 of Bison. */
|
||||
|
||||
/* Tokens. */
|
||||
#ifndef YYTOKENTYPE
|
||||
# define YYTOKENTYPE
|
||||
/* Put the tokens into the symbol table, so that GDB and other debuggers
|
||||
know about them. */
|
||||
enum yytokentype {
|
||||
tNL = 258,
|
||||
tNUMBER = 259,
|
||||
tLNUMBER = 260,
|
||||
tSTRING = 261,
|
||||
tIDENT = 262,
|
||||
tFILENAME = 263,
|
||||
tRAWDATA = 264,
|
||||
tACCELERATORS = 265,
|
||||
tBITMAP = 266,
|
||||
tCURSOR = 267,
|
||||
tDIALOG = 268,
|
||||
tDIALOGEX = 269,
|
||||
tMENU = 270,
|
||||
tMENUEX = 271,
|
||||
tMESSAGETABLE = 272,
|
||||
tRCDATA = 273,
|
||||
tVERSIONINFO = 274,
|
||||
tSTRINGTABLE = 275,
|
||||
tFONT = 276,
|
||||
tFONTDIR = 277,
|
||||
tICON = 278,
|
||||
tAUTO3STATE = 279,
|
||||
tAUTOCHECKBOX = 280,
|
||||
tAUTORADIOBUTTON = 281,
|
||||
tCHECKBOX = 282,
|
||||
tDEFPUSHBUTTON = 283,
|
||||
tPUSHBUTTON = 284,
|
||||
tRADIOBUTTON = 285,
|
||||
tSTATE3 = 286,
|
||||
tGROUPBOX = 287,
|
||||
tCOMBOBOX = 288,
|
||||
tLISTBOX = 289,
|
||||
tSCROLLBAR = 290,
|
||||
tCONTROL = 291,
|
||||
tEDITTEXT = 292,
|
||||
tRTEXT = 293,
|
||||
tCTEXT = 294,
|
||||
tLTEXT = 295,
|
||||
tBLOCK = 296,
|
||||
tVALUE = 297,
|
||||
tSHIFT = 298,
|
||||
tALT = 299,
|
||||
tASCII = 300,
|
||||
tVIRTKEY = 301,
|
||||
tGRAYED = 302,
|
||||
tCHECKED = 303,
|
||||
tINACTIVE = 304,
|
||||
tNOINVERT = 305,
|
||||
tPURE = 306,
|
||||
tIMPURE = 307,
|
||||
tDISCARDABLE = 308,
|
||||
tLOADONCALL = 309,
|
||||
tPRELOAD = 310,
|
||||
tFIXED = 311,
|
||||
tMOVEABLE = 312,
|
||||
tCLASS = 313,
|
||||
tCAPTION = 314,
|
||||
tCHARACTERISTICS = 315,
|
||||
tEXSTYLE = 316,
|
||||
tSTYLE = 317,
|
||||
tVERSION = 318,
|
||||
tLANGUAGE = 319,
|
||||
tFILEVERSION = 320,
|
||||
tPRODUCTVERSION = 321,
|
||||
tFILEFLAGSMASK = 322,
|
||||
tFILEOS = 323,
|
||||
tFILETYPE = 324,
|
||||
tFILEFLAGS = 325,
|
||||
tFILESUBTYPE = 326,
|
||||
tMENUBARBREAK = 327,
|
||||
tMENUBREAK = 328,
|
||||
tMENUITEM = 329,
|
||||
tPOPUP = 330,
|
||||
tSEPARATOR = 331,
|
||||
tHELP = 332,
|
||||
tTOOLBAR = 333,
|
||||
tBUTTON = 334,
|
||||
tBEGIN = 335,
|
||||
tEND = 336,
|
||||
tDLGINIT = 337,
|
||||
tNOT = 338,
|
||||
pUPM = 339
|
||||
};
|
||||
#endif
|
||||
#define tNL 258
|
||||
#define tNUMBER 259
|
||||
#define tLNUMBER 260
|
||||
#define tSTRING 261
|
||||
#define tIDENT 262
|
||||
#define tFILENAME 263
|
||||
#define tRAWDATA 264
|
||||
#define tACCELERATORS 265
|
||||
#define tBITMAP 266
|
||||
#define tCURSOR 267
|
||||
#define tDIALOG 268
|
||||
#define tDIALOGEX 269
|
||||
#define tMENU 270
|
||||
#define tMENUEX 271
|
||||
#define tMESSAGETABLE 272
|
||||
#define tRCDATA 273
|
||||
#define tVERSIONINFO 274
|
||||
#define tSTRINGTABLE 275
|
||||
#define tFONT 276
|
||||
#define tFONTDIR 277
|
||||
#define tICON 278
|
||||
#define tAUTO3STATE 279
|
||||
#define tAUTOCHECKBOX 280
|
||||
#define tAUTORADIOBUTTON 281
|
||||
#define tCHECKBOX 282
|
||||
#define tDEFPUSHBUTTON 283
|
||||
#define tPUSHBUTTON 284
|
||||
#define tRADIOBUTTON 285
|
||||
#define tSTATE3 286
|
||||
#define tGROUPBOX 287
|
||||
#define tCOMBOBOX 288
|
||||
#define tLISTBOX 289
|
||||
#define tSCROLLBAR 290
|
||||
#define tCONTROL 291
|
||||
#define tEDITTEXT 292
|
||||
#define tRTEXT 293
|
||||
#define tCTEXT 294
|
||||
#define tLTEXT 295
|
||||
#define tBLOCK 296
|
||||
#define tVALUE 297
|
||||
#define tSHIFT 298
|
||||
#define tALT 299
|
||||
#define tASCII 300
|
||||
#define tVIRTKEY 301
|
||||
#define tGRAYED 302
|
||||
#define tCHECKED 303
|
||||
#define tINACTIVE 304
|
||||
#define tNOINVERT 305
|
||||
#define tPURE 306
|
||||
#define tIMPURE 307
|
||||
#define tDISCARDABLE 308
|
||||
#define tLOADONCALL 309
|
||||
#define tPRELOAD 310
|
||||
#define tFIXED 311
|
||||
#define tMOVEABLE 312
|
||||
#define tCLASS 313
|
||||
#define tCAPTION 314
|
||||
#define tCHARACTERISTICS 315
|
||||
#define tEXSTYLE 316
|
||||
#define tSTYLE 317
|
||||
#define tVERSION 318
|
||||
#define tLANGUAGE 319
|
||||
#define tFILEVERSION 320
|
||||
#define tPRODUCTVERSION 321
|
||||
#define tFILEFLAGSMASK 322
|
||||
#define tFILEOS 323
|
||||
#define tFILETYPE 324
|
||||
#define tFILEFLAGS 325
|
||||
#define tFILESUBTYPE 326
|
||||
#define tMENUBARBREAK 327
|
||||
#define tMENUBREAK 328
|
||||
#define tMENUITEM 329
|
||||
#define tPOPUP 330
|
||||
#define tSEPARATOR 331
|
||||
#define tHELP 332
|
||||
#define tTOOLBAR 333
|
||||
#define tBUTTON 334
|
||||
#define tBEGIN 335
|
||||
#define tEND 336
|
||||
#define tDLGINIT 337
|
||||
#define tNOT 338
|
||||
#define pUPM 339
|
||||
|
||||
|
||||
|
||||
|
||||
#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
|
||||
#line 240 "parser.y"
|
||||
typedef union YYSTYPE {
|
||||
#ifndef YYSTYPE
|
||||
typedef union{
|
||||
string_t *str;
|
||||
int num;
|
||||
int *iptr;
|
||||
|
|
@ -242,15 +43,94 @@ typedef union YYSTYPE {
|
|||
style_pair_t *styles;
|
||||
style_t *style;
|
||||
ani_any_t *ani;
|
||||
} YYSTYPE;
|
||||
/* Line 1252 of yacc.c. */
|
||||
#line 248 "y.tab.h"
|
||||
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
|
||||
# define YYSTYPE_IS_DECLARED 1
|
||||
} yystype;
|
||||
# define YYSTYPE yystype
|
||||
# define YYSTYPE_IS_TRIVIAL 1
|
||||
#endif
|
||||
# define tNL 257
|
||||
# define tNUMBER 258
|
||||
# define tLNUMBER 259
|
||||
# define tSTRING 260
|
||||
# define tIDENT 261
|
||||
# define tFILENAME 262
|
||||
# define tRAWDATA 263
|
||||
# define tACCELERATORS 264
|
||||
# define tBITMAP 265
|
||||
# define tCURSOR 266
|
||||
# define tDIALOG 267
|
||||
# define tDIALOGEX 268
|
||||
# define tMENU 269
|
||||
# define tMENUEX 270
|
||||
# define tMESSAGETABLE 271
|
||||
# define tRCDATA 272
|
||||
# define tVERSIONINFO 273
|
||||
# define tSTRINGTABLE 274
|
||||
# define tFONT 275
|
||||
# define tFONTDIR 276
|
||||
# define tICON 277
|
||||
# define tAUTO3STATE 278
|
||||
# define tAUTOCHECKBOX 279
|
||||
# define tAUTORADIOBUTTON 280
|
||||
# define tCHECKBOX 281
|
||||
# define tDEFPUSHBUTTON 282
|
||||
# define tPUSHBUTTON 283
|
||||
# define tRADIOBUTTON 284
|
||||
# define tSTATE3 285
|
||||
# define tGROUPBOX 286
|
||||
# define tCOMBOBOX 287
|
||||
# define tLISTBOX 288
|
||||
# define tSCROLLBAR 289
|
||||
# define tCONTROL 290
|
||||
# define tEDITTEXT 291
|
||||
# define tRTEXT 292
|
||||
# define tCTEXT 293
|
||||
# define tLTEXT 294
|
||||
# define tBLOCK 295
|
||||
# define tVALUE 296
|
||||
# define tSHIFT 297
|
||||
# define tALT 298
|
||||
# define tASCII 299
|
||||
# define tVIRTKEY 300
|
||||
# define tGRAYED 301
|
||||
# define tCHECKED 302
|
||||
# define tINACTIVE 303
|
||||
# define tNOINVERT 304
|
||||
# define tPURE 305
|
||||
# define tIMPURE 306
|
||||
# define tDISCARDABLE 307
|
||||
# define tLOADONCALL 308
|
||||
# define tPRELOAD 309
|
||||
# define tFIXED 310
|
||||
# define tMOVEABLE 311
|
||||
# define tCLASS 312
|
||||
# define tCAPTION 313
|
||||
# define tCHARACTERISTICS 314
|
||||
# define tEXSTYLE 315
|
||||
# define tSTYLE 316
|
||||
# define tVERSION 317
|
||||
# define tLANGUAGE 318
|
||||
# define tFILEVERSION 319
|
||||
# define tPRODUCTVERSION 320
|
||||
# define tFILEFLAGSMASK 321
|
||||
# define tFILEOS 322
|
||||
# define tFILETYPE 323
|
||||
# define tFILEFLAGS 324
|
||||
# define tFILESUBTYPE 325
|
||||
# define tMENUBARBREAK 326
|
||||
# define tMENUBREAK 327
|
||||
# define tMENUITEM 328
|
||||
# define tPOPUP 329
|
||||
# define tSEPARATOR 330
|
||||
# define tHELP 331
|
||||
# define tTOOLBAR 332
|
||||
# define tBUTTON 333
|
||||
# define tBEGIN 334
|
||||
# define tEND 335
|
||||
# define tDLGINIT 336
|
||||
# define tNOT 337
|
||||
# define pUPM 338
|
||||
|
||||
|
||||
extern YYSTYPE yylval;
|
||||
|
||||
|
||||
|
||||
#endif /* not BISON_Y_TAB_H */
|
||||
|
|
|
|||
Loading…
Reference in a new issue