C#: Resolve merge conflicts.

calumgrant · calumgrant · commit 02fd51ae612b · 2019-08-30T10:11:00.000+01:00
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Field.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Field.cs
@@ -71,7 +71,7 @@ public override void Populate(TextWriter trapFile)
                     var simpleAssignExpr = new Expression(new ExpressionInfo(Context, Type, loc, ExprKind.SIMPLE_ASSIGN, this, child++, false, null));
                     Expression.CreateFromNode(new ExpressionNodeInfo(Context, initializer.Initializer.Value, simpleAssignExpr, 0));
                     var access = new Expression(new ExpressionInfo(Context, Type, Location, ExprKind.FIELD_ACCESS, simpleAssignExpr, 1, false, null));
-                    Context.Emit(Tuples.expr_access(access, this));
+                    trapFile.expr_access(access, this);
                     if (!symbol.IsStatic)
                     {
                         This.CreateImplicit(Context, Entities.Type.Create(Context, symbol.ContainingType), Location, access, -1);
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Property.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Property.cs
@@ -79,7 +79,7 @@ public override void Populate(TextWriter trapFile)
                         var simpleAssignExpr = new Expression(new ExpressionInfo(Context, annotatedType, loc, ExprKind.SIMPLE_ASSIGN, this, child++, false, null));
                         Expression.CreateFromNode(new ExpressionNodeInfo(Context, initializer.Value, simpleAssignExpr, 0));
                         var access = new Expression(new ExpressionInfo(Context, annotatedType, Location, ExprKind.PROPERTY_ACCESS, simpleAssignExpr, 1, false, null));
-                        Context.Emit(Tuples.expr_access(access, this));
+                        trapFile.expr_access(access, this);
                         if (!symbol.IsStatic)
                         {
                             This.CreateImplicit(Context, Type.Create(Context, symbol.ContainingType), Location, access, -1);

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public override void Populate(TextWriter trapFile)`
`71`	`71`	`var simpleAssignExpr = new Expression(new ExpressionInfo(Context, Type, loc, ExprKind.SIMPLE_ASSIGN, this, child++, false, null));`
`72`	`72`	`Expression.CreateFromNode(new ExpressionNodeInfo(Context, initializer.Initializer.Value, simpleAssignExpr, 0));`
`73`	`73`	`var access = new Expression(new ExpressionInfo(Context, Type, Location, ExprKind.FIELD_ACCESS, simpleAssignExpr, 1, false, null));`
`74`		`- Context.Emit(Tuples.expr_access(access, this));`
	`74`	`+ trapFile.expr_access(access, this);`
`75`	`75`	`if (!symbol.IsStatic)`
`76`	`76`	`{`
`77`	`77`	`This.CreateImplicit(Context, Entities.Type.Create(Context, symbol.ContainingType), Location, access, -1);`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ public override void Populate(TextWriter trapFile)`
`79`	`79`	`var simpleAssignExpr = new Expression(new ExpressionInfo(Context, annotatedType, loc, ExprKind.SIMPLE_ASSIGN, this, child++, false, null));`
`80`	`80`	`Expression.CreateFromNode(new ExpressionNodeInfo(Context, initializer.Value, simpleAssignExpr, 0));`
`81`	`81`	`var access = new Expression(new ExpressionInfo(Context, annotatedType, Location, ExprKind.PROPERTY_ACCESS, simpleAssignExpr, 1, false, null));`
`82`		`- Context.Emit(Tuples.expr_access(access, this));`
	`82`	`+ trapFile.expr_access(access, this);`
`83`	`83`	`if (!symbol.IsStatic)`
`84`	`84`	`{`
`85`	`85`	`This.CreateImplicit(Context, Type.Create(Context, symbol.ContainingType), Location, access, -1);`