Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removed deprecated use of register keyword from the TorqueScript lexer/parser #1908

Merged
2 commits merged into from Jan 7, 2017
Merged

Removed deprecated use of register keyword from the TorqueScript lexer/parser #1908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f73bb9
Merge pull request #2 from GarageGames/development
elfprince13 Jan 5, 2017
233771d
Don't use the register keyword with modern compilers, they know bette…
elfprince13 Jan 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
42 changes: 21 additions & 21 deletions Engine/source/console/CMDscan.cpp
View file
Open in desktop
Expand Up @@ -774,9 +774,9 @@ YY_MALLOC_DECL

YY_DECL
{
register yy_state_type yy_current_state;
register char *yy_cp, *yy_bp;
register int yy_act;
yy_state_type yy_current_state;
char *yy_cp, *yy_bp;
int yy_act;

#line 105 "CMDscan.l"

Expand Down Expand Up @@ -823,7 +823,7 @@ YY_DECL
yy_match:
do
{
register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
if ( yy_accept[yy_current_state] )
{
yy_last_accepting_state = yy_current_state;
Expand Down Expand Up @@ -1048,7 +1048,7 @@ case 37:
YY_RULE_SETUP
#line 143 "CMDscan.l"
{ /* this comment stops syntax highlighting from getting messed up when editing the lexer in TextPad */
register int c = 0, l;
int c = 0, l;
for ( ; ; )
{
l = c;
Expand Down Expand Up @@ -1430,9 +1430,9 @@ case YY_STATE_EOF(INITIAL):

static int yy_get_next_buffer()
{
register char *dest = yy_current_buffer->yy_ch_buf;
register char *source = yytext_ptr;
register int number_to_move, i;
char *dest = yy_current_buffer->yy_ch_buf;
char *source = yytext_ptr;
int number_to_move, i;
int ret_val;

if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
Expand Down Expand Up @@ -1560,14 +1560,14 @@ static int yy_get_next_buffer()

static yy_state_type yy_get_previous_state()
{
register yy_state_type yy_current_state;
register char *yy_cp;
yy_state_type yy_current_state;
char *yy_cp;

yy_current_state = yy_start;

for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp )
{
register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
if ( yy_accept[yy_current_state] )
{
yy_last_accepting_state = yy_current_state;
Expand Down Expand Up @@ -1599,10 +1599,10 @@ static yy_state_type yy_try_NUL_trans( yy_current_state )
yy_state_type yy_current_state;
#endif
{
register int yy_is_jam;
register char *yy_cp = yy_c_buf_p;
int yy_is_jam;
char *yy_cp = yy_c_buf_p;

register YY_CHAR yy_c = 1;
YY_CHAR yy_c = 1;
if ( yy_accept[yy_current_state] )
{
yy_last_accepting_state = yy_current_state;
Expand All @@ -1623,25 +1623,25 @@ yy_state_type yy_current_state;

#ifndef YY_NO_UNPUT
#ifdef YY_USE_PROTOS
static void yyunput( int c, register char *yy_bp )
static void yyunput( int c, char *yy_bp )
#else
static void yyunput( c, yy_bp )
int c;
register char *yy_bp;
char *yy_bp;
#endif
{
register char *yy_cp = yy_c_buf_p;
char *yy_cp = yy_c_buf_p;

/* undo effects of setting up yytext */
*yy_cp = yy_hold_char;

if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
{ /* need to shift things up to make room */
/* +2 for EOB chars. */
register int number_to_move = yy_n_chars + 2;
register char *dest = &yy_current_buffer->yy_ch_buf[
int number_to_move = yy_n_chars + 2;
char *dest = &yy_current_buffer->yy_ch_buf[
yy_current_buffer->yy_buf_size + 2];
register char *source =
char *source =
&yy_current_buffer->yy_ch_buf[number_to_move];

while ( source > yy_current_buffer->yy_ch_buf )
Expand Down Expand Up @@ -2095,7 +2095,7 @@ yyconst char *s2;
int n;
#endif
{
register int i;
int i;
for ( i = 0; i < n; ++i )
s1[i] = s2[i];
}
Expand Down
2 changes: 1 addition & 1 deletion Engine/source/console/CMDscan.l
View file
Open in desktop
Expand Up @@ -141,7 +141,7 @@ HEXDIGIT [a-fA-F0-9]
"SPC" { CMDlval.i = MakeToken< int >( ' ', lineIndex ); return '@'; }
"@" { CMDlval.i = MakeToken< int >( 0, lineIndex ); return '@'; }
"/*" { /* this comment stops syntax highlighting from getting messed up when editing the lexer in TextPad */
register int c = 0, l;
int c = 0, l;
for ( ; ; )
{
l = c;
Expand Down
20 changes: 10 additions & 10 deletions Engine/source/console/cmdgram.cpp
View file
Open in desktop
Expand Up @@ -1288,9 +1288,9 @@ __yy_memcpy (from, to, count)
char *to;
int count;
{
register char *f = from;
register char *t = to;
register int i = count;
char *f = from;
char *t = to;
int i = count;

while (i-- > 0)
*t++ = *f++;
Expand All @@ -1303,9 +1303,9 @@ __yy_memcpy (from, to, count)
static void
__yy_memcpy (char *from, char *to, int count)
{
register char *f = from;
register char *t = to;
register int i = count;
char *f = from;
char *t = to;
int i = count;

while (i-- > 0)
*t++ = *f++;
Expand Down Expand Up @@ -1333,10 +1333,10 @@ int
yyparse(YYPARSE_PARAM)
YYPARSE_PARAM_DECL
{
register int yystate;
register int yyn;
register short *yyssp;
register YYSTYPE *yyvsp;
int yystate;
int yyn;
short *yyssp;
YYSTYPE *yyvsp;
int yyerrstatus; /* number of tokens to shift before error messages enabled */
int yychar1 = 0; /* lookahead token as an internal (translated) token number */

Expand Down