OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Merge scanner changes from the scripting branch, since I'm pretty sure the

Browse source 
token names were out of sync here, too.



SVN r2209 (trunk)
This commit is contained in:
Randy Heit 2010-03-14 04:03:07 +00:00
commit f24c0cf292
5 changed files with 148 additions and 224 deletions
Download patch file Download diff file Expand all files Collapse all files

114
src/sc_man.cpp
View file

@ -812,116 +812,8 @@ FString FScanner::TokenName (int token, const char *string)
{
static const char *const names[] =
{
"identifier",
"string constant",
"name constant",
"integer constant",
"float constant",
"'...'",
"'>>='",
"'<<='",
"'+='",
"'-='",
"'*='",
"'/='",
"'%='",
"'&='",
"'^='",
"'|='",
"'>>'",
"'>>>'",
"'<<'",
"'++'",
"'--'",
"'&&'",
"'||'",
"'<='",
"'>='",
"'=='",
"'!='",
"'action'",
"'break'",
"'case'",
"'const'",
"'continue'",
"'default'",
"'do'",
"'else'",
"'for'",
"'if'",
"'return'",
"'states'",
"'switch'",
"'until'",
"'while'",
"'bool'",
"'float'",
"'double'",
"'char'",
"'byte'",
"'sbyte'",
"'short'",
"'ushort'",
"'int'",
"'uint'",
"'long'",
"'ulong'",
"'void'",
"'struct'",
"'class'",
"'mode'",
"'enum'",
"'name'",
"'string'",
"'sound'",
"'state'",
"'color'",
"'goto'",
"'abstract'",
"'foreach'",
"'true'",
"'false'",
"'none'",
"'new'",
"'instanceof'",
"'auto'",
"'exec'",
"'defaultproperties'",
"'native'",
"'out'",
"'ref'",
"'event'",
"'static'",
"'transient'",
"'volatile'",
"'final'",
"'throws'",
"'extends'",
"'public'",
"'protected'",
"'private'",
"'dot'",
"'cross'",
"'ignores'",
"'localized'",
"'latent'",
"'singular'",
"'config'",
"'coerce'",
"'iterator'",
"'optional'",
"'export'",
"'virtual'",
"'super'",
"'global'",
"'self'",
"'stop'",
"'#include'",
"'fixed_t'",
"'angle_t'",
"'abs'",
"'random'",
"'random2'"
#define xx(sym,str) str,
#include "sc_man_tokens.h"
};
FString work;
@ -992,7 +884,7 @@ void STACK_ARGS FScanner::ScriptError (const char *message, ...)
//==========================================================================
//
// FScanner::ScriptError
// FScanner::ScriptMessage
//
//==========================================================================