Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit ffb22bf

Browse files
author
AndreiDiaconu1
committed
Locatable -> Language::AST
1 parent 9105641 commit ffb22bf

9 files changed

Lines changed: 23 additions & 18 deletions

File tree

‎csharp/ql/src/semmle/code/csharp/ir/Util.qll‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
import csharp
66

7-
class Locatable extends Element { }
8-
97
class ArrayInitWithMod extends ArrayInitializer {
108
predicate isInitialized(int entry) { entry in [0 .. this.getNumberOfElements() - 1] }
119

‎csharp/ql/src/semmle/code/csharp/ir/implementation/raw/internal/IRConstruction.qll‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ private import TranslatedExpr
99
private import TranslatedStmt
1010
private import TranslatedFunction
1111
private import semmle.code.csharp.ir.Util
12+
private import semmle.code.csharp.ir.internal.IRCSharpLanguage as Language
1213

1314
TranslatedElement getInstructionTranslatedElement(Instruction instruction) {
1415
instruction = MkInstruction(result, _)
@@ -34,7 +35,7 @@ cached private module Cached {
3435
getTranslatedFunction(callable).hasUserVariable(var, type)
3536
}
3637

37-
cached predicate hasTempVariable(Callable callable, Locatable ast, TempVariableTag tag,
38+
cached predicate hasTempVariable(Callable callable, Language::AST ast, TempVariableTag tag,
3839
Type type) {
3940
exists(TranslatedElement element |
4041
element.getAST() = ast and
@@ -190,7 +191,7 @@ cached private module Cached {
190191
goto.getLocation().getEndLine() < goto.getTarget().getLocation().getStartLine()
191192
}
192193

193-
cached Locatable getInstructionAST(Instruction instruction) {
194+
cached Language::AST getInstructionAST(Instruction instruction) {
194195
result = getInstructionTranslatedElement(instruction).getAST()
195196
}
196197

‎csharp/ql/src/semmle/code/csharp/ir/implementation/raw/internal/TranslatedCondition.qll‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ private import semmle.code.csharp.ir.implementation.internal.OperandTag
44
private import InstructionTag
55
private import TranslatedElement
66
private import TranslatedExpr
7-
private import semmle.code.csharp.ir.Util
7+
private import semmle.code.csharp.ir.internal.IRCSharpLanguage as Language
88

99
abstract class ConditionContext extends TranslatedElement {
1010
abstract Instruction getChildTrueSuccessor(TranslatedCondition child);
@@ -23,7 +23,7 @@ abstract class TranslatedCondition extends TranslatedElement {
2323
result = expr.toString()
2424
}
2525

26-
override final Locatable getAST() {
26+
override final Language::AST getAST() {
2727
result = expr
2828
}
2929

‎csharp/ql/src/semmle/code/csharp/ir/implementation/raw/internal/TranslatedDeclarationEntry.qll‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ private import InstructionTag
66
private import TranslatedElement
77
private import TranslatedExpr
88
private import TranslatedInitialization
9+
private import semmle.code.csharp.ir.internal.IRCSharpLanguage as Language
910

1011
/**
1112
* Gets the `TranslatedDeclarationEntry` that represents the declaration
@@ -40,7 +41,7 @@ abstract class TranslatedDeclarationEntry extends TranslatedElement, TTranslated
4041
result = entry.toString()
4142
}
4243

43-
override final Locatable getAST() {
44+
override final Language::AST getAST() {
4445
result = entry
4546
}
4647
}

‎csharp/ql/src/semmle/code/csharp/ir/implementation/raw/internal/TranslatedElement.qll‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ private import TranslatedFunction
1010
private import TranslatedStmt
1111
private import IRConstruction
1212
private import semmle.code.csharp.ir.Util
13+
private import semmle.code.csharp.ir.internal.IRCSharpLanguage as Language
1314

1415
/**
1516
* Gets the built-in `int` type.
@@ -380,7 +381,7 @@ abstract class TranslatedElement extends TTranslatedElement {
380381
/**
381382
* Gets the AST node being translated.
382383
*/
383-
abstract Locatable getAST();
384+
abstract Language::AST getAST();
384385

385386
/**
386387
* Get the first instruction to be executed in the evaluation of this element.

‎csharp/ql/src/semmle/code/csharp/ir/implementation/raw/internal/TranslatedExpr.qll‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ private import TranslatedFunction
1212
private import TranslatedStmt
1313
import TranslatedCall
1414
private import semmle.code.csharp.ir.Util
15+
private import semmle.code.csharp.ir.internal.IRCSharpLanguage as Language
1516

1617
/**
1718
* Gets the TranslatedExpr for the specified expression. If `expr` is a load,
@@ -59,7 +60,7 @@ abstract class TranslatedExpr extends TranslatedElement {
5960
result = expr.getType()
6061
}
6162

62-
override final Locatable getAST() {
63+
override final Language::AST getAST() {
6364
result = expr
6465
}
6566

‎csharp/ql/src/semmle/code/csharp/ir/implementation/raw/internal/TranslatedFunction.qll‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ private import TranslatedElement
99
private import TranslatedExpr
1010
private import TranslatedInitialization
1111
private import TranslatedStmt
12+
private import semmle.code.csharp.ir.internal.IRCSharpLanguage as Language
1213

1314
//TODO: Reason about constructors and destructors
1415

@@ -35,7 +36,7 @@ class TranslatedFunction extends TranslatedElement,
3536
result = callable.toString()
3637
}
3738

38-
override final Locatable getAST() {
39+
override final Language::AST getAST() {
3940
result = callable
4041
}
4142

@@ -361,7 +362,7 @@ class TranslatedParameter extends TranslatedElement, TTranslatedParameter {
361362
result = param.toString()
362363
}
363364

364-
override final Locatable getAST() {
365+
override final Language::AST getAST() {
365366
result = param
366367
}
367368

@@ -456,7 +457,7 @@ class TranslatedConstructorInitList extends TranslatedElement,
456457
result = "ctor init: " + callable.toString()
457458
}
458459

459-
override Locatable getAST() {
460+
override Language::AST getAST() {
460461
result = callable
461462
}
462463

@@ -538,7 +539,7 @@ class TranslatedDestructorDestructionList extends TranslatedElement,
538539
result = "dtor destruction: " + callable.toString()
539540
}
540541

541-
override Locatable getAST() {
542+
override Language::AST getAST() {
542543
result = callable
543544
}
544545

‎csharp/ql/src/semmle/code/csharp/ir/implementation/raw/internal/TranslatedInitialization.qll‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ private import TranslatedElement
66
private import TranslatedExpr
77
private import TranslatedFunction
88
private import semmle.code.csharp.ir.Util
9+
private import IRInternal
910

1011
/**
1112
* Gets the `TranslatedInitialization` for the expression `expr`.
@@ -51,7 +52,7 @@ abstract class TranslatedInitialization extends TranslatedElement, TTranslatedIn
5152
result = expr.getEnclosingCallable()
5253
}
5354

54-
override final Locatable getAST() {
55+
override final Language::AST getAST() {
5556
result = expr
5657
}
5758

@@ -263,7 +264,7 @@ abstract class TranslatedFieldInitialization extends TranslatedElement {
263264
result = ast.toString() + "." + field.toString()
264265
}
265266

266-
override final Locatable getAST() {
267+
override final Language::AST getAST() {
267268
result = ast
268269
}
269270

@@ -455,7 +456,7 @@ abstract class TranslatedElementInitialization extends TranslatedElement {
455456
result = initList.toString() + "[" + getElementIndex().toString() + "]"
456457
}
457458

458-
override final Locatable getAST() {
459+
override final Language::AST getAST() {
459460
result = initList
460461
}
461462

@@ -690,7 +691,7 @@ class TranslatedElementValueInitialization extends TranslatedElementInitializati
690691
abstract class TranslatedStructorCallFromStructor extends TranslatedElement, StructorCallContext {
691692
Call call;
692693

693-
override final Locatable getAST() {
694+
override final Language::AST getAST() {
694695
result = call
695696
}
696697

‎csharp/ql/src/semmle/code/csharp/ir/implementation/raw/internal/TranslatedStmt.qll‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ private import TranslatedElement
88
private import TranslatedExpr
99
private import TranslatedFunction
1010
private import TranslatedInitialization
11+
private import IRInternal
1112

1213
TranslatedStmt getTranslatedStmt(Stmt stmt) {
1314
result.getAST() = stmt
@@ -24,7 +25,7 @@ abstract class TranslatedStmt extends TranslatedElement, TTranslatedStmt {
2425
result = stmt.toString()
2526
}
2627

27-
override final Locatable getAST() {
28+
override final Language::AST getAST() {
2829
result = stmt
2930
}
3031

0 commit comments

Comments
 (0)