OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Eliminated all use of global variables used as output for P_CheckPosition

Browse source 
and P_TryMove. Moved BlockingLine and BlockingMobj into AActor because 
  the global variables can be easily overwritten with certain DECORATE 
  constructs.


SVN r894 (trunk)
This commit is contained in:
Christoph Oelckers 2008-04-08 20:52:49 +00:00
commit 894b663877
13 changed files with 320 additions and 325 deletions
Download patch file Download diff file Expand all files Collapse all files

120
src/parsecontext.h
View file

@ -40,65 +40,65 @@
// The basic tokens the parser requires the grammar to understand
enum
{
OR =1,
XOR ,
AND ,
MINUS ,
PLUS ,
MULTIPLY ,
DIVIDE ,
NUM ,
FLOATVAL ,
LPAREN ,
RPAREN ,
SYM ,
RBRACE ,
LBRACE ,
COMMA ,
EQUALS ,
LBRACKET ,
RBRACKET ,
OR_EQUAL ,
COLON ,
SEMICOLON,
LSHASSIGN,
RSHASSIGN,
STRING ,
INCLUDE ,
DEFINE ,
};
#define DEFINE_TOKEN_TRANS(prefix) \
static int TokenTrans[] = { \
0, \
prefix##OR, \
prefix##XOR, \
prefix##AND, \
prefix##MINUS, \
prefix##PLUS, \
prefix##MULTIPLY, \
prefix##DIVIDE, \
prefix##NUM, \
prefix##FLOATVAL, \
prefix##LPAREN, \
prefix##RPAREN, \
prefix##SYM, \
prefix##RBRACE, \
prefix##LBRACE, \
prefix##COMMA, \
prefix##EQUALS, \
prefix##LBRACKET, \
prefix##RBRACKET, \
prefix##OR_EQUAL, \
prefix##COLON, \
prefix##SEMICOLON, \
prefix##LSHASSIGN, \
prefix##RSHASSIGN, \
prefix##STRING, \
prefix##INCLUDE, \
prefix##DEFINE, \
};
OR =1,
XOR ,
AND ,
MINUS ,
PLUS ,
MULTIPLY ,
DIVIDE ,
NUM ,
FLOATVAL ,
LPAREN ,
RPAREN ,
SYM ,
RBRACE ,
LBRACE ,
COMMA ,
EQUALS ,
LBRACKET ,
RBRACKET ,
OR_EQUAL ,
COLON ,
SEMICOLON,
LSHASSIGN,
RSHASSIGN,
STRING ,
INCLUDE ,
DEFINE ,
};
#define DEFINE_TOKEN_TRANS(prefix) \
static int TokenTrans[] = { \
0, \
prefix##OR, \
prefix##XOR, \
prefix##AND, \
prefix##MINUS, \
prefix##PLUS, \
prefix##MULTIPLY, \
prefix##DIVIDE, \
prefix##NUM, \
prefix##FLOATVAL, \
prefix##LPAREN, \
prefix##RPAREN, \
prefix##SYM, \
prefix##RBRACE, \
prefix##LBRACE, \
prefix##COMMA, \
prefix##EQUALS, \
prefix##LBRACKET, \
prefix##RBRACKET, \
prefix##OR_EQUAL, \
prefix##COLON, \
prefix##SEMICOLON, \
prefix##LSHASSIGN, \
prefix##RSHASSIGN, \
prefix##STRING, \
prefix##INCLUDE, \
prefix##DEFINE, \
};
struct FParseSymbol
{
@ -118,7 +118,7 @@ union FParseToken
struct FParseContext;
typedef void (*ParseFunc)(void *pParser, int tokentype, FParseToken token, FParseContext *context);
typedef void (*ParseFunc)(void *pParser, int tokentype, FParseToken token, FParseContext *context);
struct FParseContext
{