hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-28 10:15:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

JS: Add ScopeKind enum

Browse Source
This commit is contained in:
Asger Feldthaus
2020-12-17 21:19:00 +00:00
parent 07cfceee19
commit faad466aa8
3 changed files with 72 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java
View File

@@ -704,7 +704,7 @@ public class ASTExtractor {
+ locationManager.getStartLine()
+ ","
+ locationManager.getStartColumn());
scopeManager.enterScope(3, moduleScopeKey, toplevelLabel);
scopeManager.enterScope(ScopeKind.module, moduleScopeKey, toplevelLabel);
scopeManager.addVariables(
sourceType.getPredefinedLocals(platform, locationManager.getSourceFileExtension()));
trapwriter.addTuple("is_module", toplevelLabel);

35
javascript/extractor/src/com/semmle/js/extractor/ScopeKind.java Normal file
View File

@@ -0,0 +1,35 @@
package com.semmle.js.extractor;
/**
* A kind of scope, corresponding to the <code>@scope</code> type in the dbscheme.
*/
public enum ScopeKind {
global(0),
function(1),
catch_(2),
module(3),
block(4),
for_(5),
forIn(6),
comprehensionBlock(7),
classExpr(8),
namespace(9),
classDecl(10),
interface_(11),
typeAlias(12),
mappedType(13),
enum_(14),
externalModule(15),
conditionalType(16);
private int value;
private ScopeKind(int value) {
this.value = value;
}
/** Returns the value identifying this scope kind in the database. */
public int getValue() {
return value;
}
}

71
javascript/extractor/src/com/semmle/js/extractor/ScopeManager.java
View File

@@ -1,5 +1,14 @@
package com.semmle.js.extractor;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import com.semmle.js.ast.ArrayPattern;
import com.semmle.js.ast.BlockStatement;
import com.semmle.js.ast.CatchClause;
@@ -54,14 +63,6 @@ import com.semmle.ts.ast.TypeAliasDeclaration;
import com.semmle.ts.ast.UnionTypeExpr;
import com.semmle.util.trap.TrapWriter;
import com.semmle.util.trap.TrapWriter.Label;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
/** Class for maintaining scoping information during extraction. */
public class ScopeManager {
@@ -104,7 +105,7 @@ public class ScopeManager {
public ScopeManager(TrapWriter trapWriter, ECMAVersion ecmaVersion) {
this.trapWriter = trapWriter;
this.toplevelScope = enterScope(0, trapWriter.globalID("global_scope"), null);
this.toplevelScope = enterScope(ScopeKind.global, trapWriter.globalID("global_scope"), null);
this.ecmaVersion = ecmaVersion;
}
@@ -115,12 +116,12 @@ public class ScopeManager {
* @param scopeLabel the label of the scope itself
* @param scopeNodeLabel the label of the AST node inducing this scope; may be null
*/
public Scope enterScope(int scopeKind, Label scopeLabel, Label scopeNodeLabel) {
public Scope enterScope(ScopeKind scopeKind, Label scopeLabel, Label scopeNodeLabel) {
Label outerScopeLabel = curScope == null ? null : curScope.scopeLabel;
curScope = new Scope(curScope, scopeLabel);
trapWriter.addTuple("scopes", curScope.scopeLabel, scopeKind);
trapWriter.addTuple("scopes", curScope.scopeLabel, scopeKind.getValue());
if (scopeNodeLabel != null)
trapWriter.addTuple("scopenodes", scopeNodeLabel, curScope.scopeLabel);
if (outerScopeLabel != null)
@@ -162,32 +163,32 @@ public class ScopeManager {
return toplevelScope;
}
private static final Map<String, Integer> scopeKinds = new LinkedHashMap<String, Integer>();
private static final Map<String, ScopeKind> scopeKinds = new LinkedHashMap<String, ScopeKind>();
static {
scopeKinds.put("Program", 0);
scopeKinds.put("FunctionDeclaration", 1);
scopeKinds.put("FunctionExpression", 1);
scopeKinds.put("ArrowFunctionExpression", 1);
scopeKinds.put("CatchClause", 2);
scopeKinds.put("Module", 3);
scopeKinds.put("BlockStatement", 4);
scopeKinds.put("SwitchStatement", 4);
scopeKinds.put("ForStatement", 5);
scopeKinds.put("ForInStatement", 6);
scopeKinds.put("ForOfStatement", 6);
scopeKinds.put("ComprehensionBlock", 7);
scopeKinds.put("LetStatement", 4);
scopeKinds.put("LetExpression", 4);
scopeKinds.put("ClassExpression", 8);
scopeKinds.put("NamespaceDeclaration", 9);
scopeKinds.put("ClassDeclaration", 10);
scopeKinds.put("InterfaceDeclaration", 11);
scopeKinds.put("TypeAliasDeclaration", 12);
scopeKinds.put("MappedTypeExpr", 13);
scopeKinds.put("EnumDeclaration", 14);
scopeKinds.put("ExternalModuleDeclaration", 15);
scopeKinds.put("ConditionalTypeExpr", 16);
scopeKinds.put("Program", ScopeKind.global);
scopeKinds.put("FunctionDeclaration", ScopeKind.function);
scopeKinds.put("FunctionExpression", ScopeKind.function);
scopeKinds.put("ArrowFunctionExpression", ScopeKind.function);
scopeKinds.put("CatchClause", ScopeKind.catch_);
scopeKinds.put("Module", ScopeKind.module);
scopeKinds.put("BlockStatement", ScopeKind.block);
scopeKinds.put("SwitchStatement", ScopeKind.block);
scopeKinds.put("ForStatement", ScopeKind.for_);
scopeKinds.put("ForInStatement", ScopeKind.forIn);
scopeKinds.put("ForOfStatement", ScopeKind.forIn);
scopeKinds.put("ComprehensionBlock", ScopeKind.comprehensionBlock);
scopeKinds.put("LetStatement", ScopeKind.block);
scopeKinds.put("LetExpression", ScopeKind.block);
scopeKinds.put("ClassExpression", ScopeKind.classExpr);
scopeKinds.put("NamespaceDeclaration", ScopeKind.namespace);
scopeKinds.put("ClassDeclaration", ScopeKind.classDecl);
scopeKinds.put("InterfaceDeclaration", ScopeKind.interface_);
scopeKinds.put("TypeAliasDeclaration", ScopeKind.typeAlias);
scopeKinds.put("MappedTypeExpr", ScopeKind.mappedType);
scopeKinds.put("EnumDeclaration", ScopeKind.enum_);
scopeKinds.put("ExternalModuleDeclaration", ScopeKind.externalModule);
scopeKinds.put("ConditionalTypeExpr", ScopeKind.conditionalType);
}
/**