pimhwang
/
CppSharp
mirror of https://github.com/mono/CppSharp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Changed expressions to use properties. 

Signed-off-by: Dimitar Dobrev <dpldobrev@protonmail.com>
pull/1185/head
Dimitar Dobrev 6 years ago
parent
c9d43f6cc8
commit
01a24182d7
3 changed files with 608 additions and 608 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 896
      src/AST/Expr.cs
  2. 312
      src/AST/Stmt.cs
  3. 8
      src/CppParser/Bootstrap/Bootstrap.cs

896
src/AST/Expr.cs
View File

File diff suppressed because it is too large Load Diff

312
src/AST/Stmt.cs
Unescape View File

@ -146,9 +146,9 @@ namespace CppSharp.AST
{ {
} }
public SourceRange SourceRange; public SourceRange SourceRange { get; set; }
public SourceLocation EndLoc; public SourceLocation EndLoc { get; set; }
public Stmt StripLabelLikeStatements; public Stmt StripLabelLikeStatements { get; set; }
} }
public partial class DeclStmt : Stmt public partial class DeclStmt : Stmt
@ -157,9 +157,9 @@ namespace CppSharp.AST
{ {
} }
public List<Declaration> Decls = new List<Declaration>(); public List<Declaration> Decls { get; private set; } = new List<Declaration>();
public bool IsSingleDecl; public bool IsSingleDecl { get; set; }
public Declaration SingleDecl; public Declaration SingleDecl { get; set; }
} }
public partial class NullStmt : Stmt public partial class NullStmt : Stmt
@ -168,8 +168,8 @@ namespace CppSharp.AST
{ {
} }
public SourceLocation SemiLoc; public SourceLocation SemiLoc { get; set; }
public bool HasLeadingEmptyMacro; public bool HasLeadingEmptyMacro { get; set; }
} }
public partial class CompoundStmt : Stmt public partial class CompoundStmt : Stmt
@ -178,13 +178,13 @@ namespace CppSharp.AST
{ {
} }
public List<Stmt> Body = new List<Stmt>(); public List<Stmt> Body { get; private set; } = new List<Stmt>();
public bool BodyEmpty; public bool BodyEmpty { get; set; }
public uint Size; public uint Size { get; set; }
public Stmt BodyFront; public Stmt BodyFront { get; set; }
public Stmt BodyBack; public Stmt BodyBack { get; set; }
public SourceLocation LBracLoc; public SourceLocation LBracLoc { get; set; }
public SourceLocation RBracLoc; public SourceLocation RBracLoc { get; set; }
} }
public partial class SwitchCase : Stmt public partial class SwitchCase : Stmt
@ -193,9 +193,9 @@ namespace CppSharp.AST
{ {
} }
public SourceLocation KeywordLoc; public SourceLocation KeywordLoc { get; set; }
public SourceLocation ColonLoc; public SourceLocation ColonLoc { get; set; }
public Stmt SubStmt; public Stmt SubStmt { get; set; }
} }
public partial class CaseStmt : SwitchCase public partial class CaseStmt : SwitchCase
@ -204,11 +204,11 @@ namespace CppSharp.AST
{ {
} }
public SourceLocation CaseLoc; public SourceLocation CaseLoc { get; set; }
public SourceLocation EllipsisLoc; public SourceLocation EllipsisLoc { get; set; }
public Expr LHS; public Expr LHS { get; set; }
public Expr RHS; public Expr RHS { get; set; }
public bool CaseStmtIsGNURange; public bool CaseStmtIsGNURange { get; set; }
} }
public partial class DefaultStmt : SwitchCase public partial class DefaultStmt : SwitchCase
@ -217,7 +217,7 @@ namespace CppSharp.AST
{ {
} }
public SourceLocation DefaultLoc; public SourceLocation DefaultLoc { get; set; }
} }
public partial class LabelStmt : Stmt public partial class LabelStmt : Stmt
@ -226,9 +226,9 @@ namespace CppSharp.AST
{ {
} }
public SourceLocation IdentLoc; public SourceLocation IdentLoc { get; set; }
public Stmt SubStmt; public Stmt SubStmt { get; set; }
public string Name; public string Name { get; set; }
} }
public partial class AttributedStmt : Stmt public partial class AttributedStmt : Stmt
@ -237,8 +237,8 @@ namespace CppSharp.AST
{ {
} }
public SourceLocation AttrLoc; public SourceLocation AttrLoc { get; set; }
public Stmt SubStmt; public Stmt SubStmt { get; set; }
} }
public partial class IfStmt : Stmt public partial class IfStmt : Stmt
@ -247,18 +247,18 @@ namespace CppSharp.AST
{ {
} }
public Expr Cond; public Expr Cond { get; set; }
public Stmt Then; public Stmt Then { get; set; }
public Stmt Else; public Stmt Else { get; set; }
public Stmt Init; public Stmt Init { get; set; }
public SourceLocation IfLoc; public SourceLocation IfLoc { get; set; }
public SourceLocation ElseLoc; public SourceLocation ElseLoc { get; set; }
public bool Constexpr; public bool Constexpr { get; set; }
public bool HasInitStorage; public bool HasInitStorage { get; set; }
public bool HasVarStorage; public bool HasVarStorage { get; set; }
public bool HasElseStorage; public bool HasElseStorage { get; set; }
public DeclStmt ConditionVariableDeclStmt; public DeclStmt ConditionVariableDeclStmt { get; set; }
public bool IsObjCAvailabilityCheck; public bool IsObjCAvailabilityCheck { get; set; }
} }
public partial class SwitchStmt : Stmt public partial class SwitchStmt : Stmt
@ -267,14 +267,14 @@ namespace CppSharp.AST
{ {
} }
public Expr Cond; public Expr Cond { get; set; }
public Stmt Body; public Stmt Body { get; set; }
public Stmt Init; public Stmt Init { get; set; }
public SourceLocation SwitchLoc; public SourceLocation SwitchLoc { get; set; }
public bool HasInitStorage; public bool HasInitStorage { get; set; }
public bool HasVarStorage; public bool HasVarStorage { get; set; }
public DeclStmt ConditionVariableDeclStmt; public DeclStmt ConditionVariableDeclStmt { get; set; }
public bool IsAllEnumCasesCovered; public bool IsAllEnumCasesCovered { get; set; }
} }
public partial class WhileStmt : Stmt public partial class WhileStmt : Stmt
@ -283,11 +283,11 @@ namespace CppSharp.AST
{ {
} }
public Expr Cond; public Expr Cond { get; set; }
public Stmt Body; public Stmt Body { get; set; }
public SourceLocation WhileLoc; public SourceLocation WhileLoc { get; set; }
public bool HasVarStorage; public bool HasVarStorage { get; set; }
public DeclStmt ConditionVariableDeclStmt; public DeclStmt ConditionVariableDeclStmt { get; set; }
} }
public partial class DoStmt : Stmt public partial class DoStmt : Stmt
@ -296,11 +296,11 @@ namespace CppSharp.AST
{ {
} }
public Expr Cond; public Expr Cond { get; set; }
public Stmt Body; public Stmt Body { get; set; }
public SourceLocation DoLoc; public SourceLocation DoLoc { get; set; }
public SourceLocation WhileLoc; public SourceLocation WhileLoc { get; set; }
public SourceLocation RParenLoc; public SourceLocation RParenLoc { get; set; }
} }
public partial class ForStmt : Stmt public partial class ForStmt : Stmt
@ -309,14 +309,14 @@ namespace CppSharp.AST
{ {
} }
public Stmt Init; public Stmt Init { get; set; }
public Expr Cond; public Expr Cond { get; set; }
public Expr Inc; public Expr Inc { get; set; }
public Stmt Body; public Stmt Body { get; set; }
public SourceLocation ForLoc; public SourceLocation ForLoc { get; set; }
public SourceLocation LParenLoc; public SourceLocation LParenLoc { get; set; }
public SourceLocation RParenLoc; public SourceLocation RParenLoc { get; set; }
public DeclStmt ConditionVariableDeclStmt; public DeclStmt ConditionVariableDeclStmt { get; set; }
} }
public partial class GotoStmt : Stmt public partial class GotoStmt : Stmt
@ -325,8 +325,8 @@ namespace CppSharp.AST
{ {
} }
public SourceLocation GotoLoc; public SourceLocation GotoLoc { get; set; }
public SourceLocation LabelLoc; public SourceLocation LabelLoc { get; set; }
} }
public partial class IndirectGotoStmt : Stmt public partial class IndirectGotoStmt : Stmt
@ -335,9 +335,9 @@ namespace CppSharp.AST
{ {
} }
public SourceLocation GotoLoc; public SourceLocation GotoLoc { get; set; }
public SourceLocation StarLoc; public SourceLocation StarLoc { get; set; }
public Expr Target; public Expr Target { get; set; }
} }
public partial class ContinueStmt : Stmt public partial class ContinueStmt : Stmt
@ -346,7 +346,7 @@ namespace CppSharp.AST
{ {
} }
public SourceLocation ContinueLoc; public SourceLocation ContinueLoc { get; set; }
} }
public partial class BreakStmt : Stmt public partial class BreakStmt : Stmt
@ -355,7 +355,7 @@ namespace CppSharp.AST
{ {
} }
public SourceLocation BreakLoc; public SourceLocation BreakLoc { get; set; }
} }
public partial class ReturnStmt : Stmt public partial class ReturnStmt : Stmt
@ -364,8 +364,8 @@ namespace CppSharp.AST
{ {
} }
public Expr RetValue; public Expr RetValue { get; set; }
public SourceLocation ReturnLoc; public SourceLocation ReturnLoc { get; set; }
} }
public partial class AsmStmt : Stmt public partial class AsmStmt : Stmt
@ -374,15 +374,15 @@ namespace CppSharp.AST
{ {
} }
public List<Expr> Inputs = new List<Expr>(); public List<Expr> Inputs { get; private set; } = new List<Expr>();
public List<Expr> Outputs = new List<Expr>(); public List<Expr> Outputs { get; private set; } = new List<Expr>();
public SourceLocation AsmLoc; public SourceLocation AsmLoc { get; set; }
public bool Simple; public bool Simple { get; set; }
public bool Volatile; public bool Volatile { get; set; }
public uint NumOutputs; public uint NumOutputs { get; set; }
public uint NumPlusOperands; public uint NumPlusOperands { get; set; }
public uint NumInputs; public uint NumInputs { get; set; }
public uint NumClobbers; public uint NumClobbers { get; set; }
} }
public partial class GCCAsmStmt : AsmStmt public partial class GCCAsmStmt : AsmStmt
@ -399,18 +399,18 @@ namespace CppSharp.AST
{ {
} }
public bool IsString; public bool IsString { get; set; }
public bool IsOperand; public bool IsOperand { get; set; }
public string String; public string String { get; set; }
public uint OperandNo; public uint OperandNo { get; set; }
public sbyte Modifier; public sbyte Modifier { get; set; }
} }
public GCCAsmStmt() public GCCAsmStmt()
{ {
} }
public SourceLocation RParenLoc; public SourceLocation RParenLoc { get; set; }
} }
public partial class MSAsmStmt : AsmStmt public partial class MSAsmStmt : AsmStmt
@ -419,10 +419,10 @@ namespace CppSharp.AST
{ {
} }
public SourceLocation LBraceLoc; public SourceLocation LBraceLoc { get; set; }
public bool HasBraces; public bool HasBraces { get; set; }
public uint NumAsmToks; public uint NumAsmToks { get; set; }
public string AsmString; public string AsmString { get; set; }
} }
public partial class SEHExceptStmt : Stmt public partial class SEHExceptStmt : Stmt
@ -431,9 +431,9 @@ namespace CppSharp.AST
{ {
} }
public SourceLocation ExceptLoc; public SourceLocation ExceptLoc { get; set; }
public Expr FilterExpr; public Expr FilterExpr { get; set; }
public CompoundStmt Block; public CompoundStmt Block { get; set; }
} }
public partial class SEHFinallyStmt : Stmt public partial class SEHFinallyStmt : Stmt
@ -442,8 +442,8 @@ namespace CppSharp.AST
{ {
} }
public SourceLocation FinallyLoc; public SourceLocation FinallyLoc { get; set; }
public CompoundStmt Block; public CompoundStmt Block { get; set; }
} }
public partial class SEHTryStmt : Stmt public partial class SEHTryStmt : Stmt
@ -452,12 +452,12 @@ namespace CppSharp.AST
{ {
} }
public SourceLocation TryLoc; public SourceLocation TryLoc { get; set; }
public bool IsCXXTry; public bool IsCXXTry { get; set; }
public CompoundStmt TryBlock; public CompoundStmt TryBlock { get; set; }
public Stmt Handler; public Stmt Handler { get; set; }
public SEHExceptStmt ExceptHandler; public SEHExceptStmt ExceptHandler { get; set; }
public SEHFinallyStmt FinallyHandler; public SEHFinallyStmt FinallyHandler { get; set; }
} }
public partial class SEHLeaveStmt : Stmt public partial class SEHLeaveStmt : Stmt
@ -466,7 +466,7 @@ namespace CppSharp.AST
{ {
} }
public SourceLocation LeaveLoc; public SourceLocation LeaveLoc { get; set; }
} }
public partial class CapturedStmt : Stmt public partial class CapturedStmt : Stmt
@ -485,21 +485,21 @@ namespace CppSharp.AST
{ {
} }
public CapturedStmt.VariableCaptureKind CaptureKind; public CapturedStmt.VariableCaptureKind CaptureKind { get; set; }
public SourceLocation Location; public SourceLocation Location { get; set; }
public bool CapturesThis; public bool CapturesThis { get; set; }
public bool CapturesVariable; public bool CapturesVariable { get; set; }
public bool CapturesVariableByCopy; public bool CapturesVariableByCopy { get; set; }
public bool CapturesVariableArrayType; public bool CapturesVariableArrayType { get; set; }
} }
public CapturedStmt() public CapturedStmt()
{ {
} }
public List<Expr> CaptureInits = new List<Expr>(); public List<Expr> CaptureInits { get; private set; } = new List<Expr>();
public Stmt capturedStmt; public Stmt capturedStmt { get; set; }
public uint CaptureSize; public uint CaptureSize { get; set; }
} }
public partial class CXXCatchStmt : Stmt public partial class CXXCatchStmt : Stmt
@ -508,9 +508,9 @@ namespace CppSharp.AST
{ {
} }
public SourceLocation CatchLoc; public SourceLocation CatchLoc { get; set; }
public QualifiedType CaughtType; public QualifiedType CaughtType { get; set; }
public Stmt HandlerBlock; public Stmt HandlerBlock { get; set; }
} }
public partial class CXXTryStmt : Stmt public partial class CXXTryStmt : Stmt
@ -519,9 +519,9 @@ namespace CppSharp.AST
{ {
} }
public SourceLocation TryLoc; public SourceLocation TryLoc { get; set; }
public CompoundStmt TryBlock; public CompoundStmt TryBlock { get; set; }
public uint NumHandlers; public uint NumHandlers { get; set; }
} }
public partial class CXXForRangeStmt : Stmt public partial class CXXForRangeStmt : Stmt
@ -530,19 +530,19 @@ namespace CppSharp.AST
{ {
} }
public Stmt Init; public Stmt Init { get; set; }
public Expr RangeInit; public Expr RangeInit { get; set; }
public Expr Cond; public Expr Cond { get; set; }
public Expr Inc; public Expr Inc { get; set; }
public Stmt Body; public Stmt Body { get; set; }
public DeclStmt RangeStmt; public DeclStmt RangeStmt { get; set; }
public DeclStmt BeginStmt; public DeclStmt BeginStmt { get; set; }
public DeclStmt EndStmt; public DeclStmt EndStmt { get; set; }
public DeclStmt LoopVarStmt; public DeclStmt LoopVarStmt { get; set; }
public SourceLocation ForLoc; public SourceLocation ForLoc { get; set; }
public SourceLocation CoawaitLoc; public SourceLocation CoawaitLoc { get; set; }
public SourceLocation ColonLoc; public SourceLocation ColonLoc { get; set; }
public SourceLocation RParenLoc; public SourceLocation RParenLoc { get; set; }
} }
public partial class MSDependentExistsStmt : Stmt public partial class MSDependentExistsStmt : Stmt
@ -551,10 +551,10 @@ namespace CppSharp.AST
{ {
} }
public SourceLocation KeywordLoc; public SourceLocation KeywordLoc { get; set; }
public bool IsIfExists; public bool IsIfExists { get; set; }
public bool IsIfNotExists; public bool IsIfNotExists { get; set; }
public CompoundStmt SubStmt; public CompoundStmt SubStmt { get; set; }
} }
public partial class CoroutineBodyStmt : Stmt public partial class CoroutineBodyStmt : Stmt
@ -601,19 +601,19 @@ namespace CppSharp.AST
{ {
} }
public bool HasDependentPromiseType; public bool HasDependentPromiseType { get; set; }
public Stmt Body; public Stmt Body { get; set; }
public Stmt PromiseDeclStmt; public Stmt PromiseDeclStmt { get; set; }
public Stmt InitSuspendStmt; public Stmt InitSuspendStmt { get; set; }
public Stmt FinalSuspendStmt; public Stmt FinalSuspendStmt { get; set; }
public Stmt ExceptionHandler; public Stmt ExceptionHandler { get; set; }
public Stmt FallthroughHandler; public Stmt FallthroughHandler { get; set; }
public Expr Allocate; public Expr Allocate { get; set; }
public Expr Deallocate; public Expr Deallocate { get; set; }
public Expr ReturnValueInit; public Expr ReturnValueInit { get; set; }
public Stmt ResultDecl; public Stmt ResultDecl { get; set; }
public Stmt ReturnStmt; public Stmt ReturnStmt { get; set; }
public Stmt ReturnStmtOnAllocFailure; public Stmt ReturnStmtOnAllocFailure { get; set; }
} }
public partial class CoreturnStmt : Stmt public partial class CoreturnStmt : Stmt
@ -629,9 +629,9 @@ namespace CppSharp.AST
{ {
} }
public bool IsImplicit; public bool IsImplicit { get; set; }
public SourceLocation KeywordLoc; public SourceLocation KeywordLoc { get; set; }
public Expr Operand; public Expr Operand { get; set; }
public Expr PromiseCall; public Expr PromiseCall { get; set; }
} }
} }

8
src/CppParser/Bootstrap/Bootstrap.cs
Unescape View File

@ -49,7 +49,7 @@ namespace CppSharp
module.Defines.Add("__STDC_CONSTANT_MACROS"); module.Defines.Add("__STDC_CONSTANT_MACROS");
var basePath = Path.Combine(GetSourceDirectory("build"), "scripts"); var basePath = Path.Combine(GetSourceDirectory("build"), "scripts");
var llvmPath = Path.Combine(basePath, "llvm-981341-windows-vs2017-x86-RelWithDebInfo"); var llvmPath = Path.Combine(basePath, "..", "..", "deps", "llvm");
var clangPath = Path.Combine(llvmPath, "tools", "clang"); var clangPath = Path.Combine(llvmPath, "tools", "clang");
module.IncludeDirs.AddRange(new[] module.IncludeDirs.AddRange(new[]
@ -522,8 +522,8 @@ namespace CppSharp
var iteratorTypeName = GetIteratorTypeName(iteratorType, TypePrinter); var iteratorTypeName = GetIteratorTypeName(iteratorType, TypePrinter);
var declName = GetDeclName(method, GeneratorKind.CSharp); var declName = GetDeclName(method, GeneratorKind.CSharp);
WriteLine($"public List<{iteratorTypeName}> {declName} = " + WriteLine($@"public List<{iteratorTypeName}> {
$"new List<{iteratorTypeName}>();"); declName} {{ get; private set; }} = new List<{iteratorTypeName}>();");
} }
foreach (var property in @class.Properties) foreach (var property in @class.Properties)
@ -535,7 +535,7 @@ namespace CppSharp
property.Type, TypePrinter)); property.Type, TypePrinter));
string propertyName = GetDeclName(property, GeneratorKind.CSharp); string propertyName = GetDeclName(property, GeneratorKind.CSharp);
WriteLine($"public {typeName} {propertyName};"); WriteLine($"public {typeName} {propertyName} {{ get; set; }}");
} }
UnindentAndWriteCloseBrace(); UnindentAndWriteCloseBrace();

Write Preview
Loading…
Cancel
Save