Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 01:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed bugs in shifting (<<, >>, <<=, >>=)

Browse source 
eliminated some code duplication while I was in there.

svn path=/trunk/; revision=17915
This commit is contained in:
Royce Mitchell III 2005-09-18 17:33:11 +00:00
parent 098082f49d
commit f28d0d895f
1 changed files with 39 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

125
reactos/subsys/system/cmd/set.c
View file

@ -305,20 +305,20 @@ seta_mulTerm ( LPCTSTR* p_, INT* result )
}
static BOOL
seta_addTerm ( LPCTSTR* p_, INT* result )
seta_ltorTerm ( LPCTSTR* p_, INT* result, LPCTSTR ops, BOOL (*subTerm)(LPCTSTR*,INT*) )
{
LPCTSTR p = *p_;
INT lval;
if ( !seta_mulTerm ( &p, &lval ) )
if ( !subTerm ( &p, &lval ) )
return FALSE;
while ( *p && _tcschr(_T("*/%"),*p) )
while ( *p && _tcschr(ops,*p) )
{
INT rval;
TCHAR op = *p;
p = skip_ws ( p+1 );
if ( !seta_mulTerm ( &p, &rval ) )
if ( !subTerm ( &p, &rval ) )
return FALSE;
if ( !calc ( &lval, op, rval ) )
@ -330,30 +330,16 @@ seta_addTerm ( LPCTSTR* p_, INT* result )
return TRUE;
}
static BOOL
seta_addTerm ( LPCTSTR* p_, INT* result )
{
return seta_ltorTerm ( p_, result, _T("*/%"), seta_mulTerm );
}
static BOOL
seta_logShiftTerm ( LPCTSTR* p_, INT* result )
{
LPCTSTR p = *p_;
INT lval;
if ( !seta_addTerm ( &p, &lval ) )
return FALSE;
while ( *p && _tcschr(_T("+-"),*p) )
{
INT rval;
TCHAR op = *p;
p = skip_ws ( p+1 );
if ( !seta_addTerm ( &p, &rval ) )
return FALSE;
if ( !calc ( &lval, op, rval ) )
return FALSE;
}
*result = lval;
*p_ = p;
return TRUE;
return seta_ltorTerm ( p_, result, _T("+-"), seta_addTerm );
}
static BOOL
@ -373,8 +359,18 @@ seta_bitAndTerm ( LPCTSTR* p_, INT* result )
if ( !seta_logShiftTerm ( &p, &rval ) )
return FALSE;
if ( !calc ( &lval, op, rval ) )
switch ( op )
{
case '<':
lval <<= rval;
break;
case '>':
lval >>= rval;
break;
default:
printf ( "Invalid operand.\n" );
return FALSE;
}
}
*result = lval;
@ -385,73 +381,19 @@ seta_bitAndTerm ( LPCTSTR* p_, INT* result )
static BOOL
seta_bitExclOrTerm ( LPCTSTR* p_, INT* result )
{
LPCTSTR p = *p_;
INT lval;
if ( !seta_bitAndTerm ( &p, &lval ) )
return FALSE;
while ( *p == _T('&') )
{
INT rval;
p = skip_ws ( p+1 );
if ( !seta_bitAndTerm ( &p, &rval ) )
return FALSE;
lval &= rval;
}
*result = lval;
*p_ = p;
return TRUE;
return seta_ltorTerm ( p_, result, _T("&"), seta_bitAndTerm );
}
static BOOL
seta_bitOrTerm ( LPCTSTR* p_, INT* result )
{
LPCTSTR p = *p_;
INT lval;
if ( !seta_bitExclOrTerm ( &p, &lval ) )
return FALSE;
while ( *p == _T('^') )
{
INT rval;
p = skip_ws ( p+1 );
if ( !seta_bitExclOrTerm ( &p, &rval ) )
return FALSE;
lval ^= rval;
}
*result = lval;
*p_ = p;
return TRUE;
return seta_ltorTerm ( p_, result, _T("^"), seta_bitExclOrTerm );
}
static BOOL
seta_expr ( LPCTSTR* p_, INT* result )
{
LPCTSTR p = *p_;
INT lval;
if ( !seta_bitOrTerm ( &p, &lval ) )
return FALSE;
while ( *p == _T('|') )
{
INT rval;
p = skip_ws ( p+1 );
if ( !seta_bitOrTerm ( &p, &rval ) )
return FALSE;
lval |= rval;
}
*result = lval;
*p_ = p;
return TRUE;
return seta_ltorTerm ( p_, result, _T("|"), seta_bitOrTerm );
}
static BOOL
@ -498,10 +440,21 @@ seta_assignment ( LPCTSTR* p_, INT* result )
if ( !seta_identval ( ident, &identval ) )
identval = 0;
if ( op == '=' )
switch ( op )
{
case '=':
identval = exprval;
else if ( !calc ( &identval, op, exprval ) )
return FALSE;
break;
case '<':
identval <<= exprval;
break;
case '>':
identval >>= exprval;
break;
default:
if ( !calc ( &identval, op, exprval ) )
return FALSE;
}
buf = (LPTSTR)alloca ( 32 * sizeof(TCHAR) );
_sntprintf ( buf, 32, _T("%i"), identval );
SetEnvironmentVariable ( ident, buf ); // TODO FIXME - check return value