renamed "hasRestParameter" to "has_rest_parameter"

erik-krogh · erik-krogh · commit ba645b555f47 · 2020-09-04T11:52:15.000+02:00
diff --git a/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java b/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java
@@ -890,7 +890,7 @@ public Label visit(FunctionDeclaration nd, Context c) {
 
     private void extractFunctionAttributes(IFunction nd, Label key) {
       if (nd.isGenerator()) trapwriter.addTuple("is_generator", key);
-      if (nd.hasRest()) trapwriter.addTuple("hasRestParameter", key);
+      if (nd.hasRest()) trapwriter.addTuple("has_rest_parameter", key);
       if (nd.isAsync()) trapwriter.addTuple("isAsync", key);
     }
 
diff --git a/javascript/extractor/tests/cfg/output/trap/classexpr3.js.trap b/javascript/extractor/tests/cfg/output/trap/classexpr3.js.trap
@@ -115,7 +115,7 @@ decl(#20033,#20032)
 #20034=@"var;{arguments};{#20031}"
 variables(#20034,"arguments",#20031)
 is_arguments_object(#20034)
-hasRestParameter(#20030)
+has_rest_parameter(#20030)
 #20035=*
 stmts(#20035,1,#20030,-2,"{ super(...args); }")
 hasLocation(#20035,#20028)
diff --git a/javascript/extractor/tests/cfg/output/trap/classexpr4.js.trap b/javascript/extractor/tests/cfg/output/trap/classexpr4.js.trap
@@ -136,7 +136,7 @@ decl(#20039,#20038)
 #20040=@"var;{arguments};{#20037}"
 variables(#20040,"arguments",#20037)
 is_arguments_object(#20040)
-hasRestParameter(#20036)
+has_rest_parameter(#20036)
 #20041=*
 stmts(#20041,1,#20036,-2,"{ super(...args); }")
 hasLocation(#20041,#20034)
diff --git a/javascript/extractor/tests/es2015/output/trap/class_extends.js.trap b/javascript/extractor/tests/es2015/output/trap/class_extends.js.trap
@@ -112,7 +112,7 @@ decl(#20031,#20030)
 #20032=@"var;{arguments};{#20029}"
 variables(#20032,"arguments",#20029)
 is_arguments_object(#20032)
-hasRestParameter(#20028)
+has_rest_parameter(#20028)
 #20033=*
 stmts(#20033,1,#20028,-2,"{ super(...args); }")
 hasLocation(#20033,#20026)
diff --git a/javascript/extractor/tests/es2015/output/trap/class_extends2.js.trap b/javascript/extractor/tests/es2015/output/trap/class_extends2.js.trap
@@ -214,7 +214,7 @@ decl(#20064,#20063)
 #20065=@"var;{arguments};{#20062}"
 variables(#20065,"arguments",#20062)
 is_arguments_object(#20065)
-hasRestParameter(#20061)
+has_rest_parameter(#20061)
 #20066=*
 stmts(#20066,1,#20061,-2,"{ super(...args); }")
 hasLocation(#20066,#20059)
diff --git a/javascript/extractor/tests/es2015/output/trap/restparms.js.trap b/javascript/extractor/tests/es2015/output/trap/restparms.js.trap
@@ -113,7 +113,7 @@ decl(#20035,#20034)
 #20036=@"var;{arguments};{#20031}"
 variables(#20036,"arguments",#20031)
 is_arguments_object(#20036)
-hasRestParameter(#20029)
+has_rest_parameter(#20029)
 #20037=*
 stmts(#20037,1,#20029,-2,"{\n}")
 #20038=@"loc,{#10000},1,22,2,1"
diff --git a/javascript/extractor/tests/es2015/output/trap/super_call.js.trap b/javascript/extractor/tests/es2015/output/trap/super_call.js.trap
@@ -285,7 +285,7 @@ decl(#20087,#20086)
 #20088=@"var;{arguments};{#20085}"
 variables(#20088,"arguments",#20085)
 is_arguments_object(#20088)
-hasRestParameter(#20084)
+has_rest_parameter(#20084)
 #20089=*
 stmts(#20089,1,#20084,-2,"{ super(...args); }")
 hasLocation(#20089,#20082)
diff --git a/javascript/extractor/tests/es2015/output/trap/templates.js.trap b/javascript/extractor/tests/es2015/output/trap/templates.js.trap
@@ -441,7 +441,7 @@ decl(#20164,#20163)
 #20165=@"var;{arguments};{#20160}"
 variables(#20165,"arguments",#20160)
 is_arguments_object(#20165)
-hasRestParameter(#20157)
+has_rest_parameter(#20157)
 #20166=*
 stmts(#20166,1,#20157,-2,"{\n  ret ... , ');\n}")
 #20167=@"loc,{#10000},1,34,3,1"
diff --git a/javascript/extractor/tests/esnext/output/trap/fields.js.trap b/javascript/extractor/tests/esnext/output/trap/fields.js.trap
@@ -377,7 +377,7 @@ decl(#20120,#20119)
 #20121=@"var;{arguments};{#20118}"
 variables(#20121,"arguments",#20118)
 is_arguments_object(#20121)
-hasRestParameter(#20109)
+has_rest_parameter(#20109)
 #20122=*
 stmts(#20122,1,#20109,-2,"{ super(...args); }")
 hasLocation(#20122,#20116)
diff --git a/javascript/extractor/tests/ts/output/trap/classes.ts.trap b/javascript/extractor/tests/ts/output/trap/classes.ts.trap
@@ -179,7 +179,7 @@ decl(#20053,#20052)
 #20054=@"var;{arguments};{#20051}"
 variables(#20054,"arguments",#20051)
 is_arguments_object(#20054)
-hasRestParameter(#20050)
+has_rest_parameter(#20050)
 #20055=*
 stmts(#20055,1,#20050,-2,"{ super(...args); }")
 hasLocation(#20055,#20048)
diff --git a/javascript/extractor/tests/ts/output/trap/conditionalTypes.ts.trap b/javascript/extractor/tests/ts/output/trap/conditionalTypes.ts.trap
@@ -8401,7 +8401,7 @@ typeexprs(#22802,2,#22800,0,"any")
 hasLocation(#22802,#21449)
 expr_containers(#22802,#22791)
 literals("any","any",#22802)
-hasRestParameter(#22791)
+has_rest_parameter(#22791)
 #22803=*
 typeexprs(#22803,0,#22784,2,"R")
 hasLocation(#22803,#21465)
@@ -8631,7 +8631,7 @@ typeexprs(#22864,2,#22862,0,"any")
 hasLocation(#22864,#21526)
 expr_containers(#22864,#22853)
 literals("any","any",#22864)
-hasRestParameter(#22853)
+has_rest_parameter(#22853)
 #22865=*
 typeexprs(#22865,0,#22846,2,"U")
 hasLocation(#22865,#21542)
@@ -9940,7 +9940,7 @@ typeexprs(#23169,2,#23167,0,"any")
 hasLocation(#23169,#22110)
 expr_containers(#23169,#23161)
 literals("any","any",#23169)
-hasRestParameter(#23161)
+has_rest_parameter(#23161)
 #23170=*
 stmts(#23170,35,#22805,18,"type Re ...  : any;")
 #23171=@"loc,{#10000},100,3,100,91"
@@ -10055,7 +10055,7 @@ typeexprs(#23197,2,#23195,0,"any")
 hasLocation(#23197,#22152)
 expr_containers(#23197,#23186)
 literals("any","any",#23197)
-hasRestParameter(#23186)
+has_rest_parameter(#23186)
 #23198=*
 typeexprs(#23198,0,#23179,2,"R")
 hasLocation(#23198,#22168)
diff --git a/javascript/ql/src/semmle/javascript/Aliases.qll b/javascript/ql/src/semmle/javascript/Aliases.qll
@@ -285,3 +285,8 @@ deprecated predicate unicodePropertyEscapeValue(RegExpUnicodePropertyEscape id,
  * Use `Function#isGenerator()` instead.
  */ 
 deprecated predicate isGenerator(Function fun) { is_generator(fun) }
+/**
+ * Alias for the predicate `has_rest_parameter` defined in the .dbscheme.
+ * Use `Function#hasRestParameter()` instead.
+ */ 
+deprecated predicate hasRestParameter(Function fun) { has_rest_parameter(fun) }
diff --git a/javascript/ql/src/semmle/javascript/Functions.qll b/javascript/ql/src/semmle/javascript/Functions.qll
@@ -171,7 +171,7 @@ class Function extends @function, Parameterized, TypeParameterized, StmtContaine
   }
 
   /** Holds if the last parameter of this function is a rest parameter. */
-  predicate hasRestParameter() { hasRestParameter(this) }
+  predicate hasRestParameter() { has_rest_parameter(this) }
 
   /**
    * Gets the last token of this function's parameter list, not including
diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme b/javascript/ql/src/semmlecode.javascript.dbscheme
@@ -440,7 +440,7 @@ scopenesting (unique int inner: @scope ref,
 @type_parameterized = @function | @classorinterface | @typealiasdeclaration | @mappedtypeexpr | @infertypeexpr;
 
 is_generator (int fun: @function ref);
-hasRestParameter (int fun: @function ref);
+has_rest_parameter (int fun: @function ref);
 isAsync (int fun: @function ref);
 
 // variables and lexically scoped type names
diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme.stats b/javascript/ql/src/semmlecode.javascript.dbscheme.stats
@@ -11698,7 +11698,7 @@
 <dependencies/>
 </relation>
 <relation>
-<name>hasRestParameter</name>
+<name>has_rest_parameter</name>
 <cardinality>33</cardinality>
 <columnsizes>
 <e>
diff --git a/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties b/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties
@@ -88,3 +88,5 @@ unicode_property_escapevalue.rel: reorder unicodePropertyEscapeValue.rel(int id,
 unicodePropertyEscapeValue.rel: delete
 is_generator.rel: reorder isGenerator.rel(int fun) fun
 isGenerator.rel: delete
+has_rest_parameter.rel: reorder hasRestParameter.rel(int fun) fun
+hasRestParameter.rel: delete

Original file line number	Diff line number	Diff line change
`@@ -890,7 +890,7 @@ public Label visit(FunctionDeclaration nd, Context c) {`
`890`	`890`
`891`	`891`	`private void extractFunctionAttributes(IFunction nd, Label key) {`
`892`	`892`	`if (nd.isGenerator()) trapwriter.addTuple("is_generator", key);`
`893`		`- if (nd.hasRest()) trapwriter.addTuple("hasRestParameter", key);`
	`893`	`+ if (nd.hasRest()) trapwriter.addTuple("has_rest_parameter", key);`
`894`	`894`	`if (nd.isAsync()) trapwriter.addTuple("isAsync", key);`
`895`	`895`	`}`
`896`	`896`