mirrors/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix code style

Browse source
This commit is contained in:
Thog 2018-09-13 23:48:42 +02:00
commit 2299ef0565
No known key found for this signature in database
GPG key ID: 0CD291558FAFDBC6
46 changed files with 1246 additions and 455 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/ArrayType.cs
View file

@ -39,14 +39,21 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
{
// FIXME: detect if previous char was a ].
Writer.Write(" ");
Writer.Write("[");
if (DimensionString != null)
Writer.Write(DimensionString);
else if (DimensionExpression != null)
DimensionExpression.Print(Writer);
Writer.Write("]");
Base.PrintRight(Writer);
Writer.Write("[");
if (DimensionString != null)
{
Writer.Write(DimensionString);
}
else if (DimensionExpression != null)
{
DimensionExpression.Print(Writer);
}
Writer.Write("]");
Base.PrintRight(Writer);
}
}
}

5
Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/BaseNode.cs
View file

@ -70,9 +70,12 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
public virtual void Print(TextWriter Writer)
{
PrintLeft(Writer);
if (HasRightPart())
{
PrintRight(Writer);
}
}
public abstract void PrintLeft(TextWriter Writer);
@ -101,7 +104,9 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
public override string ToString()
{
StringWriter Writer = new StringWriter();
Print(Writer);
return Writer.ToString();
}
}

7
Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/BinaryExpression.cs
View file

@ -18,19 +18,24 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
public override void PrintLeft(TextWriter Writer)
{
if (Name.Equals(">"))
{
Writer.Write("(");
}
Writer.Write("(");
LeftPart.Print(Writer);
Writer.Write(") ");
Writer.Write(Name);
Writer.Write(" (");
RightPart.Print(Writer);
Writer.Write(")");
if (Name.Equals(">"))
{
Writer.Write(")");
}
}
}
}

2
Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/BracedExpression.cs
View file

@ -33,7 +33,9 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
{
Writer.Write(" = ");
}
Expression.Print(Writer);
}
}
}

1
Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/BracedRangeExpression.cs
View file

@ -27,6 +27,7 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
{
Writer.Write(" = ");
}
Expression.Print(Writer);
}

1
Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/CallExpression.cs
View file

@ -16,6 +16,7 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
public override void PrintLeft(TextWriter Writer)
{
Callee.Print(Writer);
Writer.Write("(");
Writer.Write(string.Join<BaseNode>(", ", Nodes.ToArray()));
Writer.Write(")");

5
Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/ConversionOperatorType.cs
View file

@ -4,10 +4,7 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
{
public class ConversionOperatorType : ParentNode
{
public ConversionOperatorType(BaseNode Child) : base(NodeType.ConversionOperatorType, Child)
{
}
public ConversionOperatorType(BaseNode Child) : base(NodeType.ConversionOperatorType, Child) { }
public override void PrintLeft(TextWriter Writer)
{

6
Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/CtorDtorNameType.cs
View file

@ -4,7 +4,8 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
{
public class CtorDtorNameType : ParentNode
{
bool IsDestructor;
private bool IsDestructor;
public CtorDtorNameType(BaseNode Name, bool IsDestructor) : base(NodeType.CtorDtorNameType, Name)
{
this.IsDestructor = IsDestructor;
@ -13,7 +14,10 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
public override void PrintLeft(TextWriter Writer)
{
if (IsDestructor)
{
Writer.Write("~");
}
Writer.Write(Child.GetName());
}
}

7
Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/DeleteExpression.cs
View file

@ -16,10 +16,17 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
public override void PrintLeft(TextWriter Writer)
{
if (IsGlobal)
{
Writer.Write("::");
}
Writer.Write("delete");
if (IsArrayExpression)
{
Writer.Write("[] ");
}
Child.Print(Writer);
}
}

4
Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/DtorName.cs
View file

@ -4,9 +4,7 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
{
public class DtorName : ParentNode
{
public DtorName(BaseNode Name) : base(NodeType.DtOrName, Name)
{
}
public DtorName(BaseNode Name) : base(NodeType.DtOrName, Name) { }
public override void PrintLeft(TextWriter Writer)
{

4
Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/DynamicExceptionSpec.cs
View file

@ -4,9 +4,7 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
{
public class DynamicExceptionSpec : ParentNode
{
public DynamicExceptionSpec(BaseNode Child) : base(NodeType.DynamicExceptionSpec, Child)
{
}
public DynamicExceptionSpec(BaseNode Child) : base(NodeType.DynamicExceptionSpec, Child) { }
public override void PrintLeft(TextWriter Writer)
{

1
Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/ElaboratedType.cs
View file

@ -5,6 +5,7 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
public class ElaboratedType : ParentNode
{
private string Elaborated;
public ElaboratedType(string Elaborated, BaseNode Type) : base(NodeType.ElaboratedType, Type)
{
this.Elaborated = Elaborated;

18
Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/EncodedFunction.cs
View file

@ -10,6 +10,7 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
private BaseNode Ref;
private BaseNode Attrs;
private BaseNode Ret;
public EncodedFunction(BaseNode Name, BaseNode Params, BaseNode CV, BaseNode Ref, BaseNode Attrs, BaseNode Ret) : base(NodeType.NameType)
{
this.Name = Name;
@ -25,10 +26,15 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
if (Ret != null)
{
Ret.PrintLeft(Writer);
if (!Ret.HasRightPart())
{
Writer.Write(" ");
}
}
Name.Print(Writer);
}
public override bool HasRightPart()
@ -39,21 +45,33 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
public override void PrintRight(TextWriter Writer)
{
Writer.Write("(");
if (Params != null)
{
Params.Print(Writer);
}
Writer.Write(")");
if (Ret != null)
{
Ret.PrintRight(Writer);
}
if (CV != null)
{
CV.Print(Writer);
}
if (Ref != null)
{
Ref.Print(Writer);
}
if (Attrs != null)
{
Attrs.Print(Writer);
}
}
}
}

1
Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/FoldExpression.cs
View file

@ -5,7 +5,6 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
public class FoldExpression : BaseNode
{
private bool IsLeftFold;
private string OperatorName;
private BaseNode Expression;
private BaseNode Initializer;

6
Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/ForwardTemplateReference.cs
View file

@ -4,11 +4,11 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
{
public class ForwardTemplateReference : BaseNode
{
private int Index;
// TOOD: Compute inside the Demangler
// TODO: Compute inside the Demangler
public BaseNode Reference;
private int Index;
public ForwardTemplateReference(int Index) : base(NodeType.ForwardTemplateReference)
{
this.Index = Index;

3
Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/FunctionParameter.cs
View file

@ -14,8 +14,11 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
public override void PrintLeft(TextWriter Writer)
{
Writer.Write("fp ");
if (Number != null)
{
Writer.Write(Number);
}
}
}
}

4
Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/FunctionType.cs
View file

@ -9,6 +9,7 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
private BaseNode CVQualifier;
private SimpleReferenceType ReferenceQualifier;
private BaseNode ExceptionSpec;
public FunctionType(BaseNode ReturnType, BaseNode Params, BaseNode CVQualifier, SimpleReferenceType ReferenceQualifier, BaseNode ExceptionSpec) : base(NodeType.FunctionType)
{
this.ReturnType = ReturnType;
@ -29,8 +30,11 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
Writer.Write("(");
Params.Print(Writer);
Writer.Write(")");
ReturnType.PrintRight(Writer);
CVQualifier.Print(Writer);
if (ReferenceQualifier.Qualifier != Reference.None)
{
Writer.Write(" ");

3
Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/InitListExpression.cs
View file

@ -18,7 +18,10 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
public override void PrintLeft(TextWriter Writer)
{
if (TypeNode != null)
{
TypeNode.Print(Writer);
}
Writer.Write("{");
Writer.Write(string.Join<BaseNode>(", ", Nodes.ToArray()));
Writer.Write("}");

1
Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/IntegerCastExpression.cs
View file

@ -5,6 +5,7 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
public class IntegerCastExpression : ParentNode
{
private string Number;
public IntegerCastExpression(BaseNode Type, string Number) : base(NodeType.IntegerCastExpression, Type)
{
this.Number = Number;

5
Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/LiteralOperator.cs
View file

@ -4,10 +4,7 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
{
public class LiteralOperator : ParentNode
{
public LiteralOperator(BaseNode Child) : base(NodeType.LiteralOperator, Child)
{
}
public LiteralOperator(BaseNode Child) : base(NodeType.LiteralOperator, Child) { }
public override void PrintLeft(TextWriter Writer)
{

3
Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/MemberExpression.cs
View file

@ -5,9 +5,8 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
public class MemberExpression : BaseNode
{
private BaseNode LeftNode;
private BaseNode RightNode;
private string Kind;
private BaseNode RightNode;
public MemberExpression(BaseNode LeftNode, string Kind, BaseNode RightNode) : base(NodeType.MemberExpression)
{

1
Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/NameType.cs
View file

@ -10,6 +10,7 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
{
this.NameValue = NameValue;
}
public NameType(string NameValue) : base(NodeType.NameType)
{
this.NameValue = NameValue;

1
Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/NameTypeWithTemplateArguments.cs
View file

@ -6,6 +6,7 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
{
private BaseNode Prev;
private BaseNode TemplateArgument;
public NameTypeWithTemplateArguments(BaseNode Prev, BaseNode TemplateArgument) : base(NodeType.NameTypeWithTemplateArguments)
{
this.Prev = Prev;

1
Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/NestedName.cs
View file

@ -5,6 +5,7 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
public class NestedName : ParentNode
{
private BaseNode Name;
public NestedName(BaseNode Name, BaseNode Type) : base(NodeType.NestedName, Type)
{
this.Name = Name;

6
Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/NewExpression.cs
View file

@ -16,6 +16,7 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
this.Expressions = Expressions;
this.TypeNode = TypeNode;
this.Initializers = Initializers;
this.IsGlobal = IsGlobal;
this.IsArrayExpression = IsArrayExpression;
}
@ -23,11 +24,16 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
public override void PrintLeft(TextWriter Writer)
{
if (IsGlobal)
{
Writer.Write("::operator ");
}
Writer.Write("new ");
if (IsArrayExpression)
{
Writer.Write("[] ");
}
if (Expressions.Nodes.Count != 0)
{

5
Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/PackedTemplateParameter.cs
View file

@ -5,10 +5,8 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
{
public class PackedTemplateParameter : NodeArray
{
public PackedTemplateParameter(List<BaseNode> Nodes) : base(Nodes, NodeType.PackedTemplateParameter)
{
public PackedTemplateParameter(List<BaseNode> Nodes) : base(Nodes, NodeType.PackedTemplateParameter) { }
}
public override void PrintLeft(TextWriter Writer)
{
foreach (BaseNode Node in Nodes)
@ -34,6 +32,7 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
return true;
}
}
return false;
}
}

5
Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/PackedTemplateParameterExpansion.cs
View file

@ -4,10 +4,7 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
{
public class PackedTemplateParameterExpansion : ParentNode
{
public PackedTemplateParameterExpansion(BaseNode Child) : base(NodeType.PackedTemplateParameterExpansion, Child)
{
}
public PackedTemplateParameterExpansion(BaseNode Child) : base(NodeType.PackedTemplateParameterExpansion, Child) {}
public override void PrintLeft(TextWriter Writer)
{

1
Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/ParentNode.cs
View file

@ -3,6 +3,7 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
public abstract class ParentNode : BaseNode
{
public BaseNode Child { get; private set; }
public ParentNode(NodeType Type, BaseNode Child) : base(Type)
{
this.Child = Child;

11
Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/PointerType.cs
View file

@ -5,6 +5,7 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
public class PointerType : BaseNode
{
private BaseNode Child;
public PointerType(BaseNode Child) : base(NodeType.PointerType)
{
this.Child = Child;
@ -19,15 +20,25 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
{
Child.PrintLeft(Writer);
if (Child.IsArray())
{
Writer.Write(" ");
}
if (Child.IsArray() || Child.HasFunctions())
{
Writer.Write("(");
}
Writer.Write("*");
}
public override void PrintRight(TextWriter Writer)
{
if (Child.IsArray() || Child.HasFunctions())
{
Writer.Write(")");
}
Child.PrintRight(Writer);
}
}

1
Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/PostfixExpression.cs
View file

@ -5,6 +5,7 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
public class PostfixExpression : ParentNode
{
private string Operator;
public PostfixExpression(BaseNode Type, string Operator) : base(NodeType.PostfixExpression, Type)
{
this.Operator = Operator;

1
Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/PostfixQualifiedType.cs
View file

@ -5,6 +5,7 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
public class PostfixQualifiedType : ParentNode
{
private string PostfixQualifier;
public PostfixQualifiedType(string PostfixQualifier, BaseNode Type) : base(NodeType.PostfixQualifiedType, Type)
{
this.PostfixQualifier = PostfixQualifier;

17
Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/Qualifier.cs
View file

@ -8,7 +8,7 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
Const,
Volatile,
Restricted = 4
};
}
public enum Reference
{
@ -32,10 +32,12 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
{
Writer.Write(" const");
}
if ((Qualifier & CV.Volatile) != 0)
{
Writer.Write(" volatile");
}
if ((Qualifier & CV.Restricted) != 0)
{
Writer.Write(" restrict");
@ -45,7 +47,10 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
public override void PrintLeft(TextWriter Writer)
{
if (Child != null)
{
Child.PrintLeft(Writer);
}
PrintQualifier(Writer);
}
@ -57,9 +62,11 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
public override void PrintRight(TextWriter Writer)
{
if (Child != null)
{
Child.PrintRight(Writer);
}
}
}
public class SimpleReferenceType : ParentNode
{
@ -76,6 +83,7 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
{
Writer.Write("&");
}
if ((Qualifier & Reference.RValue) != 0)
{
Writer.Write("&&");
@ -85,9 +93,14 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
public override void PrintLeft(TextWriter Writer)
{
if (Child != null)
{
Child.PrintLeft(Writer);
}
else if (Qualifier != Reference.None)
{
Writer.Write(" ");
}
PrintQualifier(Writer);
}
@ -99,7 +112,9 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
public override void PrintRight(TextWriter Writer)
{
if (Child != null)
{
Child.PrintRight(Writer);
}
}
}
}

10
Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/ReferenceType.cs
View file

@ -21,16 +21,26 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
public override void PrintLeft(TextWriter Writer)
{
Child.PrintLeft(Writer);
if (Child.IsArray())
{
Writer.Write(" ");
}
if (Child.IsArray() || Child.HasFunctions())
{
Writer.Write("(");
}
Writer.Write(Reference);
}
public override void PrintRight(TextWriter Writer)
{
if (Child.IsArray() || Child.HasFunctions())
{
Writer.Write(")");
}
Child.PrintRight(Writer);
}
}

1
Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/SpecialName.cs
View file

@ -5,6 +5,7 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
public class SpecialName : ParentNode
{
private string SpecialValue;
public SpecialName(string SpecialValue, BaseNode Type) : base(NodeType.SpecialName, Type)
{
this.SpecialValue = SpecialValue;

7
Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/SpecialSubstitution.cs
View file

@ -12,8 +12,8 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
IStream,
OStream,
IOStream,
}
private SpecialType SpecialSubstitutionKey;
public SpecialSubstitution(SpecialType SpecialSubstitutionKey) : base(NodeType.SpecialSubstitution)
@ -36,7 +36,10 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
return "basic_string";
case SpecialType.String:
if (Type == NodeType.ExpandedSpecialSubstitution)
{
return "basic_string";
}
return "string";
case SpecialType.IStream:
return "istream";
@ -45,6 +48,7 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
case SpecialType.IOStream:
return "iostream";
}
return null;
}
@ -65,6 +69,7 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
case SpecialType.IOStream:
return "std::basic_iostream<char, std::char_traits<char> >";
}
return null;
}

11
Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/TemplateArguments.cs
View file

@ -6,17 +6,20 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
{
public class TemplateArguments : NodeArray
{
public TemplateArguments(List<BaseNode> Nodes) : base(Nodes, NodeType.TemplateArguments)
{
}
public TemplateArguments(List<BaseNode> Nodes) : base(Nodes, NodeType.TemplateArguments) { }
public override void PrintLeft(TextWriter Writer)
{
string Params = string.Join<BaseNode>(", ", Nodes.ToArray());
Writer.Write("<");
Writer.Write(Params);
if (Params.EndsWith(">"))
{
Writer.Write(" ");
}
Writer.Write(">");
}
}

1364
Ryujinx.HLE/HOS/Diagnostics/Demangler/Demangler.cs
View file

File diff suppressed because it is too large Load diff