Skip to content

Commit c257f66

Browse files
asgerfasgerf
committed
JS: Capitalize enum members in ScopeKind and TopLevelKind
1 parent c29014f commit c257f66

File tree

7 files changed

+53
-53
lines changed

7 files changed

+53
-53
lines changed

‎javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -704,7 +704,7 @@ public Label visit(Program nd, Context c) {
704704
+ locationManager.getStartLine()
705705
+ ","
706706
+ locationManager.getStartColumn());
707-
Scope moduleScope = scopeManager.enterScope(ScopeKind.module, moduleScopeKey, toplevelLabel);
707+
Scope moduleScope = scopeManager.enterScope(ScopeKind.MODULE, moduleScopeKey, toplevelLabel);
708708
if (sourceType.hasNoGlobalScope()) {
709709
scopeManager.setImplicitVariableScope(moduleScope);
710710
}

‎javascript/extractor/src/com/semmle/js/extractor/HTMLExtractor.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public void handleElement(Element elt, HtmlPopulator.Context context) {
7474
source = source.replace("<![CDATA[", " ").replace("]]>", " ");
7575
if (!source.trim().isEmpty()) {
7676
extractSnippet(
77-
TopLevelKind.inlineScript,
77+
TopLevelKind.INLINE_SCRIPT,
7878
config.withSourceType(sourceType),
7979
scopeManager,
8080
textualExtractor,
@@ -97,7 +97,7 @@ public void handleElement(Element elt, HtmlPopulator.Context context) {
9797
int valueStart = attr.getValueSegment().getBegin();
9898
if (JS_ATTRIBUTE.matcher(attr.getName()).matches()) {
9999
extractSnippet(
100-
TopLevelKind.eventHandler,
100+
TopLevelKind.EVENT_HANDLER,
101101
config,
102102
scopeManager,
103103
textualExtractor,
@@ -118,7 +118,7 @@ public void handleElement(Element elt, HtmlPopulator.Context context) {
118118
}
119119
}
120120
extractSnippet(
121-
TopLevelKind.angularTemplate,
121+
TopLevelKind.ANGULAR_TEMPLATE,
122122
config.withSourceType(SourceType.ANGULAR_TEMPLATE),
123123
scopeManager,
124124
textualExtractor,
@@ -130,7 +130,7 @@ public void handleElement(Element elt, HtmlPopulator.Context context) {
130130
} else if (source.startsWith("javascript:")) {
131131
source = source.substring(11);
132132
extractSnippet(
133-
TopLevelKind.javascriptUrl,
133+
TopLevelKind.JAVASCRIPT_URL,
134134
config,
135135
scopeManager,
136136
textualExtractor,

‎javascript/extractor/src/com/semmle/js/extractor/ScopeKind.java‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,23 @@
44
* A kind of scope, corresponding to the <code>@scope</code> type in the dbscheme.
55
*/
66
public enum ScopeKind {
7-
global(0),
8-
function(1),
9-
catch_(2),
10-
module(3),
11-
block(4),
12-
for_(5),
13-
forIn(6),
14-
comprehensionBlock(7),
15-
classExpr(8),
16-
namespace(9),
17-
classDecl(10),
18-
interface_(11),
19-
typeAlias(12),
20-
mappedType(13),
21-
enum_(14),
22-
externalModule(15),
23-
conditionalType(16);
7+
GLOBAL(0),
8+
FUNCTION(1),
9+
CATCH(2),
10+
MODULE(3),
11+
BLOCK(4),
12+
FOR(5),
13+
FOR_IN(6),
14+
COMPREHENSION_BLOCK(7),
15+
CLASS_EXPR(8),
16+
NAMESPACE(9),
17+
CLASS_DECL(10),
18+
INTERFACE(11),
19+
TYPE_ALIAS(12),
20+
MAPPED_TYPE(13),
21+
ENUM(14),
22+
EXTERNAL_MODULE(15),
23+
CONDITIONAL_TYPE(16);
2424

2525
private int value;
2626

‎javascript/extractor/src/com/semmle/js/extractor/ScopeManager.java‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public Label lookupNamespace(String name) {
106106

107107
public ScopeManager(TrapWriter trapWriter, ECMAVersion ecmaVersion) {
108108
this.trapWriter = trapWriter;
109-
this.toplevelScope = enterScope(ScopeKind.global, trapWriter.globalID("global_scope"), null);
109+
this.toplevelScope = enterScope(ScopeKind.GLOBAL, trapWriter.globalID("global_scope"), null);
110110
this.ecmaVersion = ecmaVersion;
111111
this.implicitVariableScope = toplevelScope;
112112
}
@@ -176,29 +176,29 @@ public Scope getToplevelScope() {
176176
private static final Map<String, ScopeKind> scopeKinds = new LinkedHashMap<String, ScopeKind>();
177177

178178
static {
179-
scopeKinds.put("Program", ScopeKind.global);
180-
scopeKinds.put("FunctionDeclaration", ScopeKind.function);
181-
scopeKinds.put("FunctionExpression", ScopeKind.function);
182-
scopeKinds.put("ArrowFunctionExpression", ScopeKind.function);
183-
scopeKinds.put("CatchClause", ScopeKind.catch_);
184-
scopeKinds.put("Module", ScopeKind.module);
185-
scopeKinds.put("BlockStatement", ScopeKind.block);
186-
scopeKinds.put("SwitchStatement", ScopeKind.block);
187-
scopeKinds.put("ForStatement", ScopeKind.for_);
188-
scopeKinds.put("ForInStatement", ScopeKind.forIn);
189-
scopeKinds.put("ForOfStatement", ScopeKind.forIn);
190-
scopeKinds.put("ComprehensionBlock", ScopeKind.comprehensionBlock);
191-
scopeKinds.put("LetStatement", ScopeKind.block);
192-
scopeKinds.put("LetExpression", ScopeKind.block);
193-
scopeKinds.put("ClassExpression", ScopeKind.classExpr);
194-
scopeKinds.put("NamespaceDeclaration", ScopeKind.namespace);
195-
scopeKinds.put("ClassDeclaration", ScopeKind.classDecl);
196-
scopeKinds.put("InterfaceDeclaration", ScopeKind.interface_);
197-
scopeKinds.put("TypeAliasDeclaration", ScopeKind.typeAlias);
198-
scopeKinds.put("MappedTypeExpr", ScopeKind.mappedType);
199-
scopeKinds.put("EnumDeclaration", ScopeKind.enum_);
200-
scopeKinds.put("ExternalModuleDeclaration", ScopeKind.externalModule);
201-
scopeKinds.put("ConditionalTypeExpr", ScopeKind.conditionalType);
179+
scopeKinds.put("Program", ScopeKind.GLOBAL);
180+
scopeKinds.put("FunctionDeclaration", ScopeKind.FUNCTION);
181+
scopeKinds.put("FunctionExpression", ScopeKind.FUNCTION);
182+
scopeKinds.put("ArrowFunctionExpression", ScopeKind.FUNCTION);
183+
scopeKinds.put("CatchClause", ScopeKind.CATCH);
184+
scopeKinds.put("Module", ScopeKind.MODULE);
185+
scopeKinds.put("BlockStatement", ScopeKind.BLOCK);
186+
scopeKinds.put("SwitchStatement", ScopeKind.BLOCK);
187+
scopeKinds.put("ForStatement", ScopeKind.FOR);
188+
scopeKinds.put("ForInStatement", ScopeKind.FOR_IN);
189+
scopeKinds.put("ForOfStatement", ScopeKind.FOR_IN);
190+
scopeKinds.put("ComprehensionBlock", ScopeKind.COMPREHENSION_BLOCK);
191+
scopeKinds.put("LetStatement", ScopeKind.BLOCK);
192+
scopeKinds.put("LetExpression", ScopeKind.BLOCK);
193+
scopeKinds.put("ClassExpression", ScopeKind.CLASS_EXPR);
194+
scopeKinds.put("NamespaceDeclaration", ScopeKind.NAMESPACE);
195+
scopeKinds.put("ClassDeclaration", ScopeKind.CLASS_DECL);
196+
scopeKinds.put("InterfaceDeclaration", ScopeKind.INTERFACE);
197+
scopeKinds.put("TypeAliasDeclaration", ScopeKind.TYPE_ALIAS);
198+
scopeKinds.put("MappedTypeExpr", ScopeKind.MAPPED_TYPE);
199+
scopeKinds.put("EnumDeclaration", ScopeKind.ENUM);
200+
scopeKinds.put("ExternalModuleDeclaration", ScopeKind.EXTERNAL_MODULE);
201+
scopeKinds.put("ConditionalTypeExpr", ScopeKind.CONDITIONAL_TYPE);
202202
}
203203

204204
/**

‎javascript/extractor/src/com/semmle/js/extractor/ScriptExtractor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public LoCInfo extract(TextualExtractor textualExtractor) {
8282
LoCInfo loc;
8383
try {
8484
Pair<Label, LoCInfo> res =
85-
new JSExtractor(config).extract(textualExtractor, source, TopLevelKind.script, scopeManager);
85+
new JSExtractor(config).extract(textualExtractor, source, TopLevelKind.SCRIPT, scopeManager);
8686
toplevelLabel = res.fst();
8787
loc = res.snd();
8888
} catch (ParseError e) {

‎javascript/extractor/src/com/semmle/js/extractor/TopLevelKind.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
* A kind of top-level, corresponding to the <code>@toplevel</code> type in the dbscheme.
55
*/
66
public enum TopLevelKind {
7-
script(0),
8-
inlineScript(1),
9-
eventHandler(2),
10-
javascriptUrl(3),
11-
angularTemplate(4);
7+
SCRIPT(0),
8+
INLINE_SCRIPT(1),
9+
EVENT_HANDLER(2),
10+
JAVASCRIPT_URL(3),
11+
ANGULAR_TEMPLATE(4);
1212

1313
private int value;
1414

‎javascript/extractor/src/com/semmle/js/extractor/TypeScriptExtractor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public LoCInfo extract(TextualExtractor textualExtractor) {
2727
try {
2828
FileSnippet snippet = state.getSnippets().get(sourceFile.toPath());
2929
SourceType sourceType = snippet != null ? snippet.getSourceType() : jsExtractor.establishSourceType(source, false);
30-
TopLevelKind toplevelKind = snippet != null ? snippet.getTopLevelKind() : TopLevelKind.script;
30+
TopLevelKind toplevelKind = snippet != null ? snippet.getTopLevelKind() : TopLevelKind.SCRIPT;
3131
return jsExtractor.extract(textualExtractor, source, toplevelKind, scopeManager, sourceType, res).snd();
3232
} catch (ParseError e) {
3333
e.setPosition(locationManager.translatePosition(e.getPosition()));

0 commit comments

Comments
 (0)