Mirror
/
icsharpcode-ILSpy
mirror of https://github.com/icsharpcode/ILSpy.git
2
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Remove parenthesis from primitive value, identifies and expression statements.

pull/1/head^2
David Srbecký 18 years ago
parent
6faf690899
commit
dacfade7df
4 changed files with 232 additions and 203 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      Decompiler.csproj
  2. 379
      bin/Debug/output.cs
  3. 1
      src/AstBuilder.cs
  4. 54
      src/Transforms/Ast/RemoveParenthesis.cs

1
Decompiler.csproj
View File

@ -70,6 +70,7 @@
<Compile Include="src\Transforms\Ast\RemoveDeadLabels.cs" />
<Compile Include="src\Transforms\Ast\RemoveEmptyElseBody.cs" />
<Compile Include="src\Transforms\Ast\RemoveGotos.cs" />
<Compile Include="src\Transforms\Ast\RemoveParenthesis.cs" />
<Compile Include="src\Transforms\Ast\RestoreLoop.cs" />
<Compile Include="src\Transforms\Ast\SimplifyTypeReferences.cs" />
<Compile Include="src\Util.cs" />

379
bin/Debug/output.cs
View File

@ -31,322 +31,295 @@ namespace Reversi
}
public void SetForNewGame()
{
for (int i = (0); (((i) < (8)));) {
for (int j = (0); (((j) < (8)));) {
(((@this).squares).Set((i), (j), IL__ldsfld(Empty)));
(((@this).safeDiscs).Set((i), (j), (0)));
(j = ((j) + (1)));
for (int i = 0; i < 8; i = (i + 1)) {
for (int j = 0; j < 8; j = (j + 1)) {
(@this.squares).Set(i, j, IL__ldsfld(Empty));
(@this.safeDiscs).Set(i, j, 0);
}
(i = ((i) + (1)));
}
(((@this).squares).Set((3), (3), IL__ldsfld(White)));
(((@this).squares).Set((3), (4), IL__ldsfld(Black)));
(((@this).squares).Set((4), (3), IL__ldsfld(Black)));
(((@this).squares).Set((4), (4), IL__ldsfld(White)));
((@this).UpdateCounts());
(@this.squares).Set(3, 3, IL__ldsfld(White));
(@this.squares).Set(3, 4, IL__ldsfld(Black));
(@this.squares).Set(4, 3, IL__ldsfld(Black));
(@this.squares).Set(4, 4, IL__ldsfld(White));
@this.UpdateCounts();
}
public int GetSquareContents(int row, int col)
{
return (((@this).squares).Get((row), (col)));
return ((@this.squares).Get(row, col));
}
public void MakeMove(int color, int row, int col)
{
(((@this).squares).Set((row), (col), (color)));
for (int i = (-1); (((i) <= (1)));) {
for (int j = (-1); (((j) <= (1)));) {
if (!(((!((i)) && (!(j))) || (!((@this).IsOutflanking((color), (row), (col), (i), (j))))))) {
int k = ((row) + (i));
for (int l = ((col) + (j)); (((((@this).squares).Get((k), (l))) == (-(color))));) {
(((@this).squares).Set((k), (l), (color)));
(k = ((k) + (i)));
(l = ((l) + (j)));
(@this.squares).Set(row, col, color);
for (int i = -1; i <= 1; i = (i + 1)) {
for (int j = -1; j <= 1; j = (j + 1)) {
if (!((!i && (!j)) || (!(@this.IsOutflanking(color, row, col, i, j))))) {
int k = (row + i);
for (int l = (col + j); ((@this.squares).Get(k, l)) == (-color); l = (l + j)) {
(@this.squares).Set(k, l, color);
k = (k + i);
}
}
(j = ((j) + (1)));
}
(i = ((i) + (1)));
}
((@this).UpdateCounts());
@this.UpdateCounts();
}
public bool HasAnyValidMove(int color)
{
for (int i = (0); (((i) < (8)));) {
for (int j = (0); (((j) < (8)));) {
if (!((!((@this).IsValidMove((color), (i), (j)))))) {
return (1);
for (int i = 0; i < 8; i = (i + 1)) {
for (int j = 0; j < 8; j = (j + 1)) {
if (!(!(@this.IsValidMove(color, i, j)))) {
return 1;
}
(j = ((j) + (1)));
}
(i = ((i) + (1)));
}
return (0);
return 0;
}
public bool IsValidMove(int color, int row, int col)
{
if (!(((((@this).squares).Get((row), (col))) == IL__ldsfld(Empty)))) {
return (0);
if (!(((@this.squares).Get(row, col)) == IL__ldsfld(Empty))) {
return 0;
}
for (int i = (-1); (((i) <= (1)));) {
for (int j = (-1); (((j) <= (1)));) {
if (!(((!((i)) && (!(j))) || (!((@this).IsOutflanking((color), (row), (col), (i), (j))))))) {
return (1);
for (int i = -1; i <= 1; i = (i + 1)) {
for (int j = -1; j <= 1; j = (j + 1)) {
if (!((!i && (!j)) || (!(@this.IsOutflanking(color, row, col, i, j))))) {
return 1;
}
(j = ((j) + (1)));
}
(i = ((i) + (1)));
}
return (0);
return 0;
}
public int GetValidMoveCount(int color)
{
int i = (0);
for (int j = (0); (((j) < (8)));) {
for (int k = (0); (((k) < (8)));) {
if (!((!((@this).IsValidMove((color), (j), (k)))))) {
(i = ((i) + (1)));
int i = 0;
for (int j = 0; j < 8; j = (j + 1)) {
for (int k = 0; k < 8; k = (k + 1)) {
if (!(!(@this.IsValidMove(color, j, k)))) {
i = (i + 1);
}
(k = ((k) + (1)));
}
(j = ((j) + (1)));
}
return (i);
return i;
}
private bool IsOutflanking(int color, int row, int col, int dr, int dc)
{
int i = ((row) + (dr));
for (int j = ((col) + (dc)); ((!(((((i) < (0)) || ((i) >= (8))) || ((j) < (0))) || ((j) >= (8))) && ((((@this).squares).Get((i), (j))) == (-(color)))));) {
(i = ((i) + (dr)));
(j = ((j) + (dc)));
int i = (row + dr);
for (int j = (col + dc); !((((i < 0) || (i >= 8)) || (j < 0)) || (j >= 8)) && (((@this.squares).Get(i, j)) == (-color)); j = (j + dc)) {
i = (i + dr);
}
if (!((!((((((i) < (0)) || ((i) > (7))) || ((j) < (0))) || ((j) > (7))) || (!(((i) - (dr)) != (row)) && (((j) - (dc)) == (col)))) && ((((@this).squares).Get((i), (j))) == (color))))) {
return (0);
if (!(!(((((i < 0) || (i > 7)) || (j < 0)) || (j > 7)) || (!((i - dr) != row) && ((j - dc) == col))) && (((@this.squares).Get(i, j)) == color))) {
return 0;
}
return (1);
return 1;
}
private void UpdateCounts()
{
((@this).blackCount = (0));
((@this).whiteCount = (0));
((@this).emptyCount = (0));
((@this).blackFrontierCount = (0));
((@this).whiteFrontierCount = (0));
((@this).whiteSafeCount = (0));
((@this).blackSafeCount = (0));
for (bool V_2 = (1); (((V_2)));) {
(V_2 = (0));
for (int i = (0); (((i) < (8)));) {
for (int j = (0); (((j) < (8)));) {
if (!(((((((@this).squares).Get((i), (j))) == IL__ldsfld(Empty)) || ((((@this).safeDiscs).Get((i), (j))))) || (((@this).IsOutflankable((i), (j))))))) {
(((@this).safeDiscs).Set((i), (j), (1)));
(V_2 = (1));
@this.blackCount = 0;
@this.whiteCount = 0;
@this.emptyCount = 0;
@this.blackFrontierCount = 0;
@this.whiteFrontierCount = 0;
@this.whiteSafeCount = 0;
@this.blackSafeCount = 0;
for (bool V_2 = 1; V_2;) {
V_2 = 0;
for (int i = 0; i < 8; i = (i + 1)) {
for (int j = 0; j < 8; j = (j + 1)) {
if (!(((((@this.squares).Get(i, j)) == IL__ldsfld(Empty)) || ((@this.safeDiscs).Get(i, j))) || (@this.IsOutflankable(i, j)))) {
(@this.safeDiscs).Set(i, j, 1);
V_2 = 1;
}
(j = ((j) + (1)));
}
(i = ((i) + (1)));
}
}
(i = (0));
for (; (((i) < (8)));) {
(j = (0));
for (; (((j) < (8)));) {
bool V_5 = (0);
if (!(((((@this).squares).Get((i), (j))) == IL__ldsfld(Empty)))) {
for (int k = (-1); (((k) <= (1)));) {
for (int l = (-1); (((l) <= (1)));) {
if (!(((((((!((k)) && (!(l))) || (((i) + (k)) < (0))) || (((i) + (k)) >= (8))) || (((j) + (l)) < (0))) || (((j) + (l)) >= (8))) || ((((@this).squares).Get(((i) + (k)), ((j) + (l)))) != IL__ldsfld(Empty))))) {
(V_5 = (1));
i = 0;
for (; i < 8; i = (i + 1)) {
j = 0;
for (; j < 8; j = (j + 1)) {
bool V_5 = 0;
if (!(((@this.squares).Get(i, j)) == IL__ldsfld(Empty))) {
for (int k = -1; k <= 1; k = (k + 1)) {
for (int l = -1; l <= 1; l = (l + 1)) {
if (!((((((!k && (!l)) || ((i + k) < 0)) || ((i + k) >= 8)) || ((j + l) < 0)) || ((j + l) >= 8)) || (((@this.squares).Get((i + k), (j + l))) != IL__ldsfld(Empty)))) {
V_5 = 1;
}
(l = ((l) + (1)));
}
(k = ((k) + (1)));
}
}
if (!(((((@this).squares).Get((i), (j))) != IL__ldsfld(Black)))) {
IL__dup((@this));
if (!(((@this.squares).Get(i, j)) != IL__ldsfld(Black))) {
IL__dup(@this);
object expr123 = (expr122.blackCount);
int expr129 = (expr123 + (1));
(expr122.blackCount = expr129);
if (!((!(V_5)))) {
IL__dup((@this));
int expr129 = (expr123 + 1);
expr122.blackCount = expr129;
if (!(!V_5)) {
IL__dup(@this);
object expr135 = (expr134.blackFrontierCount);
int expr13B = (expr135 + (1));
(expr134.blackFrontierCount = expr13B);
int expr13B = (expr135 + 1);
expr134.blackFrontierCount = expr13B;
}
if (!((!(((@this).safeDiscs).Get((i), (j)))))) {
IL__dup((@this));
if (!(!((@this.safeDiscs).Get(i, j)))) {
IL__dup(@this);
object expr152 = (expr151.blackSafeCount);
int expr158 = (expr152 + (1));
(expr151.blackSafeCount = expr158);
int expr158 = (expr152 + 1);
expr151.blackSafeCount = expr158;
}
}
else {
if (!(((((@this).squares).Get((i), (j))) != IL__ldsfld(White)))) {
IL__dup((@this));
if (!(((@this.squares).Get(i, j)) != IL__ldsfld(White))) {
IL__dup(@this);
object expr176 = (expr175.whiteCount);
int expr17C = (expr176 + (1));
(expr175.whiteCount = expr17C);
if (!((!(V_5)))) {
IL__dup((@this));
int expr17C = (expr176 + 1);
expr175.whiteCount = expr17C;
if (!(!V_5)) {
IL__dup(@this);
object expr188 = (expr187.whiteFrontierCount);
int expr18E = (expr188 + (1));
(expr187.whiteFrontierCount = expr18E);
int expr18E = (expr188 + 1);
expr187.whiteFrontierCount = expr18E;
}
if (!((!(((@this).safeDiscs).Get((i), (j)))))) {
IL__dup((@this));
if (!(!((@this.safeDiscs).Get(i, j)))) {
IL__dup(@this);
object expr1A5 = (expr1A4.whiteSafeCount);
int expr1AB = (expr1A5 + (1));
(expr1A4.whiteSafeCount = expr1AB);
goto BasicBlock_313;
int expr1AB = (expr1A5 + 1);
expr1A4.whiteSafeCount = expr1AB;
continue;
}
else {
goto BasicBlock_313;
continue;
}
}
IL__dup((@this));
IL__dup(@this);
object expr1B5 = (expr1B4.emptyCount);
int expr1BB = (expr1B5 + (1));
(expr1B4.emptyCount = expr1BB);
int expr1BB = (expr1B5 + 1);
expr1B4.emptyCount = expr1BB;
}
BasicBlock_313:
(j = ((j) + (1)));
}
(i = ((i) + (1)));
}
}
private bool IsOutflankable(int row, int col)
{
int i = (((@this).squares).Get((row), (col)));
bool V_3 = (0);
bool V_5 = (0);
bool V_4 = (0);
bool V_6 = (0);
for (int k = (0); ((!((k) >= (col)) && (!(V_3))));) {
if (!(((((@this).squares).Get((row), (k))) != IL__ldsfld(Empty)))) {
(V_3 = (1));
int i = ((@this.squares).Get(row, col));
bool V_3 = 0;
bool V_5 = 0;
bool V_4 = 0;
bool V_6 = 0;
for (int k = 0; !(k >= col) && (!V_3); k = (k + 1)) {
if (!(((@this.squares).Get(row, k)) != IL__ldsfld(Empty))) {
V_3 = 1;
}
else {
if (!((!((((@this).squares).Get((row), (k))) != (i)) && ((((@this).safeDiscs).Get((row), (k))))))) {
(V_5 = (1));
if (!(!(((@this.squares).Get(row, k)) != i) && ((@this.safeDiscs).Get(row, k)))) {
V_5 = 1;
}
}
(k = ((k) + (1)));
}
(k = ((col) + (1)));
for (; ((!((k) >= (8)) && (!(V_4))));) {
if (!(((((@this).squares).Get((row), (k))) != IL__ldsfld(Empty)))) {
(V_4 = (1));
k = (col + 1);
for (; !(k >= 8) && (!V_4); k = (k + 1)) {
if (!(((@this.squares).Get(row, k)) != IL__ldsfld(Empty))) {
V_4 = 1;
}
else {
if (!((!((((@this).squares).Get((row), (k))) != (i)) && ((((@this).safeDiscs).Get((row), (k))))))) {
(V_6 = (1));
if (!(!(((@this.squares).Get(row, k)) != i) && ((@this.safeDiscs).Get(row, k)))) {
V_6 = 1;
}
}
(k = ((k) + (1)));
}
if (!((!((!(!(V_3)) && ((V_4))) || (!(!(V_3)) && ((V_6)))) && ((!(V_5)) || (!(V_4)))))) {
return (1);
if (!(!((!(!V_3) && V_4) || (!(!V_3) && V_6)) && ((!V_5) || (!V_4)))) {
return 1;
}
(V_3 = (0));
(V_4 = (0));
(V_5 = (0));
(V_6 = (0));
for (int j = (0); ((!((j) >= (row)) && (!(V_3))));) {
if (!(((((@this).squares).Get((j), (col))) != IL__ldsfld(Empty)))) {
(V_3 = (1));
V_3 = 0;
V_4 = 0;
V_5 = 0;
V_6 = 0;
for (int j = 0; !(j >= row) && (!V_3); j = (j + 1)) {
if (!(((@this.squares).Get(j, col)) != IL__ldsfld(Empty))) {
V_3 = 1;
}
else {
if (!((!((((@this).squares).Get((j), (col))) != (i)) && ((((@this).safeDiscs).Get((j), (col))))))) {
(V_5 = (1));
if (!(!(((@this.squares).Get(j, col)) != i) && ((@this.safeDiscs).Get(j, col)))) {
V_5 = 1;
}
}
(j = ((j) + (1)));
}
(j = ((row) + (1)));
for (; ((!((j) >= (8)) && (!(V_4))));) {
if (!(((((@this).squares).Get((j), (col))) != IL__ldsfld(Empty)))) {
(V_4 = (1));
j = (row + 1);
for (; !(j >= 8) && (!V_4); j = (j + 1)) {
if (!(((@this.squares).Get(j, col)) != IL__ldsfld(Empty))) {
V_4 = 1;
}
else {
if (!((!((((@this).squares).Get((j), (col))) != (i)) && ((((@this).safeDiscs).Get((j), (col))))))) {
(V_6 = (1));
if (!(!(((@this.squares).Get(j, col)) != i) && ((@this.safeDiscs).Get(j, col)))) {
V_6 = 1;
}
}
(j = ((j) + (1)));
}
if (!((!((!(!(V_3)) && ((V_4))) || (!(!(V_3)) && ((V_6)))) && ((!(V_5)) || (!(V_4)))))) {
return (1);
if (!(!((!(!V_3) && V_4) || (!(!V_3) && V_6)) && ((!V_5) || (!V_4)))) {
return 1;
}
(V_3 = (0));
(V_4 = (0));
(V_5 = (0));
(V_6 = (0));
(j = ((row) - (1)));
(k = ((col) - (1)));
for (; ((!(((j) < (0)) || ((k) < (0))) && (!(V_3))));) {
if (!(((((@this).squares).Get((j), (k))) != IL__ldsfld(Empty)))) {
(V_3 = (1));
V_3 = 0;
V_4 = 0;
V_5 = 0;
V_6 = 0;
j = (row - 1);
k = (col - 1);
for (; !((j < 0) || (k < 0)) && (!V_3); k = (k - 1)) {
if (!(((@this.squares).Get(j, k)) != IL__ldsfld(Empty))) {
V_3 = 1;
}
else {
if (!((!((((@this).squares).Get((j), (k))) != (i)) && ((((@this).safeDiscs).Get((j), (k))))))) {
(V_5 = (1));
if (!(!(((@this.squares).Get(j, k)) != i) && ((@this.safeDiscs).Get(j, k)))) {
V_5 = 1;
}
}
(j = ((j) - (1)));
(k = ((k) - (1)));
j = (j - 1);
}
(j = ((row) + (1)));
(k = ((col) + (1)));
for (; ((!(((j) >= (8)) || ((k) >= (8))) && (!(V_4))));) {
if (!(((((@this).squares).Get((j), (k))) != IL__ldsfld(Empty)))) {
(V_4 = (1));
j = (row + 1);
k = (col + 1);
for (; !((j >= 8) || (k >= 8)) && (!V_4); k = (k + 1)) {
if (!(((@this.squares).Get(j, k)) != IL__ldsfld(Empty))) {
V_4 = 1;
}
else {
if (!((!((((@this).squares).Get((j), (k))) != (i)) && ((((@this).safeDiscs).Get((j), (k))))))) {
(V_6 = (1));
if (!(!(((@this.squares).Get(j, k)) != i) && ((@this.safeDiscs).Get(j, k)))) {
V_6 = 1;
}
}
(j = ((j) + (1)));
(k = ((k) + (1)));
j = (j + 1);
}
if (!((!((!(!(V_3)) && ((V_4))) || (!(!(V_3)) && ((V_6)))) && ((!(V_5)) || (!(V_4)))))) {
return (1);
if (!(!((!(!V_3) && V_4) || (!(!V_3) && V_6)) && ((!V_5) || (!V_4)))) {
return 1;
}
(V_3 = (0));
(V_4 = (0));
(V_5 = (0));
(V_6 = (0));
(j = ((row) - (1)));
(k = ((col) + (1)));
for (; ((!(((j) < (0)) || ((k) >= (8))) && (!(V_3))));) {
if (!(((((@this).squares).Get((j), (k))) != IL__ldsfld(Empty)))) {
(V_3 = (1));
V_3 = 0;
V_4 = 0;
V_5 = 0;
V_6 = 0;
j = (row - 1);
k = (col + 1);
for (; !((j < 0) || (k >= 8)) && (!V_3); k = (k + 1)) {
if (!(((@this.squares).Get(j, k)) != IL__ldsfld(Empty))) {
V_3 = 1;
}
else {
if (!((!((((@this).squares).Get((j), (k))) != (i)) && ((((@this).safeDiscs).Get((j), (k))))))) {
(V_5 = (1));
if (!(!(((@this.squares).Get(j, k)) != i) && ((@this.safeDiscs).Get(j, k)))) {
V_5 = 1;
}
}
(j = ((j) - (1)));
(k = ((k) + (1)));
j = (j - 1);
}
(j = ((row) + (1)));
(k = ((col) - (1)));
for (; ((!(((j) >= (8)) || ((k) < (0))) && (!(V_4))));) {
if (!(((((@this).squares).Get((j), (k))) != IL__ldsfld(Empty)))) {
(V_4 = (1));
j = (row + 1);
k = (col - 1);
for (; !((j >= 8) || (k < 0)) && (!V_4); k = (k - 1)) {
if (!(((@this.squares).Get(j, k)) != IL__ldsfld(Empty))) {
V_4 = 1;
}
else {
if (!((!((((@this).squares).Get((j), (k))) != (i)) && ((((@this).safeDiscs).Get((j), (k))))))) {
(V_6 = (1));
if (!(!(((@this.squares).Get(j, k)) != i) && ((@this.safeDiscs).Get(j, k)))) {
V_6 = 1;
}
}
(j = ((j) + (1)));
(k = ((k) - (1)));
j = (j + 1);
}
if (!((!((!(!(V_3)) && ((V_4))) || (!(!(V_3)) && ((V_6)))) && ((!(V_5)) || (!(V_4)))))) {
return (1);
if (!(!((!(!V_3) && V_4) || (!(!V_3) && V_6)) && ((!V_5) || (!V_4)))) {
return 1;
}
return (0);
return 0;
}
}
}

1
src/AstBuilder.cs
View File

@ -34,6 +34,7 @@ namespace Decompiler
astCompileUnit.AcceptVisitor(new Transforms.Ast.SimplifyTypeReferences(), null);
astCompileUnit.AcceptVisitor(new Transforms.Ast.Idioms(), null);
astCompileUnit.AcceptVisitor(new Transforms.Ast.RemoveEmptyElseBody(), null);
astCompileUnit.AcceptVisitor(new Transforms.Ast.RemoveParenthesis(), null);
}
}

54
src/Transforms/Ast/RemoveParenthesis.cs
View File

@ -0,0 +1,54 @@
using System;
using System.Collections.Generic;
using ICSharpCode.NRefactory.Ast;
using ICSharpCode.NRefactory.Visitors;
namespace Decompiler.Transforms.Ast
{
public class RemoveParenthesis: AbstractAstTransformer
{
Expression Deparenthesize(Expression expr)
{
if (expr is ParenthesizedExpression) {
return Deparenthesize(((ParenthesizedExpression)expr).Expression);
} else {
return expr;
}
}
public override object VisitParenthesizedExpression(ParenthesizedExpression parenthesizedExpression, object data)
{
// The following do not need to be parenthesized
if (parenthesizedExpression.Expression is IdentifierExpression ||
parenthesizedExpression.Expression is PrimitiveExpression ||
parenthesizedExpression.Expression is ParenthesizedExpression) {
ReplaceCurrentNode(parenthesizedExpression.Expression);
return null;
}
return base.VisitParenthesizedExpression(parenthesizedExpression, data);
}
public override object VisitBinaryOperatorExpression(BinaryOperatorExpression binaryOperatorExpression, object data)
{
return base.VisitBinaryOperatorExpression(binaryOperatorExpression, data);
}
public override object VisitExpressionStatement(ExpressionStatement expressionStatement, object data)
{
expressionStatement.Expression = Deparenthesize(expressionStatement.Expression);
return base.VisitExpressionStatement(expressionStatement, data);
}
public override object VisitForStatement(ForStatement forStatement, object data)
{
forStatement.Condition = Deparenthesize(forStatement.Condition);
return base.VisitForStatement(forStatement, data);
}
public override object VisitInvocationExpression(InvocationExpression invocationExpression, object data)
{
return base.VisitInvocationExpression(invocationExpression, data);
}
}
}
Write Preview
Loading…
Cancel
Save