renamed "regexpConstValue" to "regexp_const_value"

2020-09-04 11:52:10 +02:00 · 2020-09-04 11:52:10 +02:00 · 21733afc32
--- a/javascript/extractor/src/com/semmle/js/extractor/RegExpExtractor.java
+++ b/javascript/extractor/src/com/semmle/js/extractor/RegExpExtractor.java
@ -297,7 +297,7 @@ public class RegExpExtractor {

    private void visit(Literal nd) {
      Label lbl = extractTerm(nd, parent, idx);
-      trapwriter.addTuple("regexpConstValue", lbl, nd.getValue());
+      trapwriter.addTuple("regexp_const_value", lbl, nd.getValue());
    }

    @Override
--- a/javascript/extractor/tests/closure/output/trap/googDotDeclareModuleId.js.trap
+++ b/javascript/extractor/tests/closure/output/trap/googDotDeclareModuleId.js.trap
@ -154,7 +154,7 @@ regexpterm(#20048,14,#20047,0,"test")
 #20049=@"loc,{#10000},1,23,1,26"
 locations_default(#20049,#10000,1,23,1,26)
 hasLocation(#20048,#20049)
-regexpConstValue(#20048,"test")
+regexp_const_value(#20048,"test")
 #20050=*
 stmts(#20050,30,#20001,1,"export let x = 5;")
 hasLocation(#20050,#20007)
--- a/javascript/extractor/tests/closure/output/trap/googDotModule.js.trap
+++ b/javascript/extractor/tests/closure/output/trap/googDotModule.js.trap
@ -191,7 +191,7 @@ regexpterm(#20063,14,#20062,0,"test")
 #20064=@"loc,{#10000},1,14,1,17"
 locations_default(#20064,#10000,1,14,1,17)
 hasLocation(#20063,#20064)
-regexpConstValue(#20063,"test")
+regexp_const_value(#20063,"test")
 #20065=*
 stmts(#20065,18,#20001,1,"var x = 5;")
 hasLocation(#20065,#20005)
--- a/javascript/extractor/tests/closure/output/trap/googDotProvide.js.trap
+++ b/javascript/extractor/tests/closure/output/trap/googDotProvide.js.trap
@ -151,7 +151,7 @@ regexpterm(#20048,14,#20046,0,"test")
 #20049=@"loc,{#10000},1,15,1,18"
 locations_default(#20049,#10000,1,15,1,18)
 hasLocation(#20048,#20049)
-regexpConstValue(#20048,"test")
+regexp_const_value(#20048,"test")
 #20050=*
 regexpterm(#20050,12,#20046,1,".")
 #20051=@"loc,{#10000},1,19,1,19"
@ -162,7 +162,7 @@ regexpterm(#20052,14,#20046,2,"x")
 #20053=@"loc,{#10000},1,20,1,20"
 locations_default(#20053,#10000,1,20,1,20)
 hasLocation(#20052,#20053)
-regexpConstValue(#20052,"x")
+regexp_const_value(#20052,"x")
 #20054=*
 stmts(#20054,2,#20001,1,"test.x = 5;")
 hasLocation(#20054,#20007)
--- a/javascript/extractor/tests/encoding/output/trap/surrogates.js.trap
+++ b/javascript/extractor/tests/encoding/output/trap/surrogates.js.trap
@ -224,7 +224,7 @@ regexpterm(#20076,14,#20075,0,"?")
 #20077=@"loc,{#10000},2,2,2,7"
 locations_default(#20077,#10000,2,2,2,7)
 hasLocation(#20076,#20077)
-regexpConstValue(#20076,"?")
+regexp_const_value(#20076,"?")
 #20078=*
 stmts(#20078,2,#20001,1,"'foo\ud800';")
 hasLocation(#20078,#20012)
@ -240,7 +240,7 @@ regexpterm(#20080,14,#20079,0,"foo?")
 #20081=@"loc,{#10000},3,2,3,10"
 locations_default(#20081,#10000,3,2,3,10)
 hasLocation(#20080,#20081)
-regexpConstValue(#20080,"foo?")
+regexp_const_value(#20080,"foo?")
 #20082=*
 stmts(#20082,2,#20001,2,"'\ud800bar';")
 hasLocation(#20082,#20014)
@ -256,7 +256,7 @@ regexpterm(#20084,14,#20083,0,"?bar")
 #20085=@"loc,{#10000},4,2,4,10"
 locations_default(#20085,#10000,4,2,4,10)
 hasLocation(#20084,#20085)
-regexpConstValue(#20084,"?bar")
+regexp_const_value(#20084,"?bar")
 #20086=*
 stmts(#20086,2,#20001,3,"'foo\ud800bar';")
 hasLocation(#20086,#20016)
@ -272,7 +272,7 @@ regexpterm(#20088,14,#20087,0,"foo?bar")
 #20089=@"loc,{#10000},5,2,5,13"
 locations_default(#20089,#10000,5,2,5,13)
 hasLocation(#20088,#20089)
-regexpConstValue(#20088,"foo?bar")
+regexp_const_value(#20088,"foo?bar")
 #20090=*
 stmts(#20090,2,#20001,4,"/\uD800/;")
 hasLocation(#20090,#20018)
@ -288,7 +288,7 @@ regexpterm(#20092,16,#20091,0,"\uD800")
 #20093=@"loc,{#10000},6,2,6,7"
 locations_default(#20093,#10000,6,2,6,7)
 hasLocation(#20092,#20093)
-regexpConstValue(#20092,"?")
+regexp_const_value(#20092,"?")
 #20094=*
 stmts(#20094,2,#20001,5,"/foo\ud800/;")
 hasLocation(#20094,#20020)
@ -309,13 +309,13 @@ regexpterm(#20098,14,#20096,0,"foo")
 #20099=@"loc,{#10000},7,2,7,4"
 locations_default(#20099,#10000,7,2,7,4)
 hasLocation(#20098,#20099)
-regexpConstValue(#20098,"foo")
+regexp_const_value(#20098,"foo")
 #20100=*
 regexpterm(#20100,16,#20096,1,"\ud800")
 #20101=@"loc,{#10000},7,5,7,10"
 locations_default(#20101,#10000,7,5,7,10)
 hasLocation(#20100,#20101)
-regexpConstValue(#20100,"?")
+regexp_const_value(#20100,"?")
 #20102=*
 stmts(#20102,2,#20001,6,"/\ud800bar/;")
 hasLocation(#20102,#20022)
@ -336,13 +336,13 @@ regexpterm(#20106,16,#20104,0,"\ud800")
 #20107=@"loc,{#10000},8,2,8,7"
 locations_default(#20107,#10000,8,2,8,7)
 hasLocation(#20106,#20107)
-regexpConstValue(#20106,"?")
+regexp_const_value(#20106,"?")
 #20108=*
 regexpterm(#20108,14,#20104,1,"bar")
 #20109=@"loc,{#10000},8,8,8,10"
 locations_default(#20109,#10000,8,8,8,10)
 hasLocation(#20108,#20109)
-regexpConstValue(#20108,"bar")
+regexp_const_value(#20108,"bar")
 #20110=*
 stmts(#20110,2,#20001,7,"/foo\ud800bar/;")
 hasLocation(#20110,#20024)
@ -363,19 +363,19 @@ regexpterm(#20114,14,#20112,0,"foo")
 #20115=@"loc,{#10000},9,2,9,4"
 locations_default(#20115,#10000,9,2,9,4)
 hasLocation(#20114,#20115)
-regexpConstValue(#20114,"foo")
+regexp_const_value(#20114,"foo")
 #20116=*
 regexpterm(#20116,16,#20112,1,"\ud800")
 #20117=@"loc,{#10000},9,5,9,10"
 locations_default(#20117,#10000,9,5,9,10)
 hasLocation(#20116,#20117)
-regexpConstValue(#20116,"?")
+regexp_const_value(#20116,"?")
 #20118=*
 regexpterm(#20118,14,#20112,2,"bar")
 #20119=@"loc,{#10000},9,11,9,13"
 locations_default(#20119,#10000,9,11,9,13)
 hasLocation(#20118,#20119)
-regexpConstValue(#20118,"bar")
+regexp_const_value(#20118,"bar")
 #20120=*
 stmts(#20120,2,#20001,8,"'\udc00\ud800';")
 hasLocation(#20120,#20027)
@ -391,7 +391,7 @@ regexpterm(#20122,14,#20121,0,"??")
 #20123=@"loc,{#10000},11,2,11,13"
 locations_default(#20123,#10000,11,2,11,13)
 hasLocation(#20122,#20123)
-regexpConstValue(#20122,"??")
+regexp_const_value(#20122,"??")
 #20124=*
 stmts(#20124,2,#20001,9,"'\uD834\uDF06';")
 hasLocation(#20124,#20030)
@ -407,7 +407,7 @@ regexpterm(#20126,14,#20125,0,"𝌆")
 #20127=@"loc,{#10000},13,2,13,13"
 locations_default(#20127,#10000,13,2,13,13)
 hasLocation(#20126,#20127)
-regexpConstValue(#20126,"𝌆")
+regexp_const_value(#20126,"𝌆")
 #20128=*
 entry_cfg_node(#20128,#20001)
 #20129=@"loc,{#10000},1,1,1,0"
--- a/javascript/extractor/tests/encoding/output/trap/unicode.js.trap
+++ b/javascript/extractor/tests/encoding/output/trap/unicode.js.trap
@ -40,7 +40,7 @@ regexpterm(#20009,14,#20008,0,"Semmlé")
 #20010=@"loc,{#10000},1,2,1,7"
 locations_default(#20010,#10000,1,2,1,7)
 hasLocation(#20009,#20010)
-regexpConstValue(#20009,"Semmlé")
+regexp_const_value(#20009,"Semmlé")
 #20011=*
 entry_cfg_node(#20011,#20001)
 #20012=@"loc,{#10000},1,1,1,0"
--- a/javascript/extractor/tests/es2015/output/trap/arrowfn.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/arrowfn.js.trap
@ -292,7 +292,7 @@ regexpterm(#20107,14,#20106,0,"a")
 #20108=@"loc,{#10000},1,3,1,3"
 locations_default(#20108,#10000,1,3,1,3)
 hasLocation(#20107,#20108)
-regexpConstValue(#20107,"a")
+regexp_const_value(#20107,"a")
 #20109=*
 exprs(#20109,4,#20104,1,"""ab""")
 hasLocation(#20109,#20015)
@ -304,7 +304,7 @@ regexpterm(#20110,14,#20109,0,"ab")
 #20111=@"loc,{#10000},1,8,1,9"
 locations_default(#20111,#10000,1,8,1,9)
 hasLocation(#20110,#20111)
-regexpConstValue(#20110,"ab")
+regexp_const_value(#20110,"ab")
 #20112=*
 exprs(#20112,4,#20104,2,"""abc""")
 hasLocation(#20112,#20019)
@ -316,7 +316,7 @@ regexpterm(#20113,14,#20112,0,"abc")
 #20114=@"loc,{#10000},1,14,1,16"
 locations_default(#20114,#10000,1,14,1,16)
 hasLocation(#20113,#20114)
-regexpConstValue(#20113,"abc")
+regexp_const_value(#20113,"abc")
 array_size(#20104,3)
 #20115=*
 exprs(#20115,0,#20102,1,"map")
@ -481,7 +481,7 @@ regexpterm(#20155,14,#20154,0,"Wake up!")
 #20156=@"loc,{#10000},3,27,3,34"
 locations_default(#20156,#10000,3,27,3,34)
 hasLocation(#20155,#20156)
-regexpConstValue(#20155,"Wake up!")
+regexp_const_value(#20155,"Wake up!")
 #20157=*
 exprs(#20157,3,#20139,1,"60000")
 hasLocation(#20157,#20091)
--- a/javascript/extractor/tests/es2015/output/trap/class_static.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/class_static.js.trap
@ -182,7 +182,7 @@ regexpterm(#20057,14,#20056,0,"A")
 #20058=@"loc,{#10000},3,13,3,13"
 locations_default(#20058,#10000,3,13,3,13)
 hasLocation(#20057,#20058)
-regexpConstValue(#20057,"A")
+regexp_const_value(#20057,"A")
 is_method(#20045)
 is_static(#20045)
 #20059=*
--- a/javascript/extractor/tests/es2015/output/trap/export6.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/export6.js.trap
@ -68,7 +68,7 @@ regexpterm(#20019,14,#20018,0,"foo")
 #20020=@"loc,{#10000},1,16,1,18"
 locations_default(#20020,#10000,1,16,1,18)
 hasLocation(#20019,#20020)
-regexpConstValue(#20019,"foo")
+regexp_const_value(#20019,"foo")
 #20021=*
 entry_cfg_node(#20021,#20001)
 #20022=@"loc,{#10000},1,1,1,0"
--- a/javascript/extractor/tests/es2015/output/trap/export7.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/export7.js.trap
@ -98,7 +98,7 @@ regexpterm(#20031,14,#20030,0,"foo")
 #20032=@"loc,{#10000},1,28,1,30"
 locations_default(#20032,#10000,1,28,1,30)
 hasLocation(#20031,#20032)
-regexpConstValue(#20031,"foo")
+regexp_const_value(#20031,"foo")
 #20033=*
 exprs(#20033,86,#20029,0,"x")
 hasLocation(#20033,#20009)
--- a/javascript/extractor/tests/es2015/output/trap/import1.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/import1.js.trap
@ -77,7 +77,7 @@ regexpterm(#20022,14,#20021,0,"foo")
 #20023=@"loc,{#10000},1,16,1,18"
 locations_default(#20023,#10000,1,16,1,18)
 hasLocation(#20022,#20023)
-regexpConstValue(#20022,"foo")
+regexp_const_value(#20022,"foo")
 #20024=*
 exprs(#20024,84,#20020,0,"x")
 hasLocation(#20024,#20007)
--- a/javascript/extractor/tests/es2015/output/trap/import2.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/import2.js.trap
@ -87,7 +87,7 @@ regexpterm(#20026,14,#20025,0,"foo")
 #20027=@"loc,{#10000},1,20,1,22"
 locations_default(#20027,#10000,1,20,1,22)
 hasLocation(#20026,#20027)
-regexpConstValue(#20026,"foo")
+regexp_const_value(#20026,"foo")
 #20028=*
 exprs(#20028,83,#20024,0,"y")
 hasLocation(#20028,#20009)
--- a/javascript/extractor/tests/es2015/output/trap/import3.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/import3.js.trap
@ -97,7 +97,7 @@ regexpterm(#20030,14,#20029,0,"foo")
 #20031=@"loc,{#10000},1,25,1,27"
 locations_default(#20031,#10000,1,25,1,27)
 hasLocation(#20030,#20031)
-regexpConstValue(#20030,"foo")
+regexp_const_value(#20030,"foo")
 #20032=*
 exprs(#20032,83,#20028,0,"y as z")
 #20033=@"loc,{#10000},1,10,1,15"
--- a/javascript/extractor/tests/es2015/output/trap/import4.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/import4.js.trap
@ -116,7 +116,7 @@ regexpterm(#20037,14,#20036,0,"foo")
 #20038=@"loc,{#10000},1,28,1,30"
 locations_default(#20038,#10000,1,28,1,30)
 hasLocation(#20037,#20038)
-regexpConstValue(#20037,"foo")
+regexp_const_value(#20037,"foo")
 #20039=*
 exprs(#20039,84,#20035,0,"x")
 hasLocation(#20039,#20007)
--- a/javascript/extractor/tests/es2015/output/trap/import5.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/import5.js.trap
@ -87,7 +87,7 @@ regexpterm(#20026,14,#20025,0,"foo")
 #20027=@"loc,{#10000},1,23,1,25"
 locations_default(#20027,#10000,1,23,1,25)
 hasLocation(#20026,#20027)
-regexpConstValue(#20026,"foo")
+regexp_const_value(#20026,"foo")
 #20028=*
 exprs(#20028,85,#20024,0,"* as foo")
 #20029=@"loc,{#10000},1,8,1,15"
--- a/javascript/extractor/tests/es2015/output/trap/import6.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/import6.js.trap
@ -58,7 +58,7 @@ regexpterm(#20015,14,#20014,0,"foo")
 #20016=@"loc,{#10000},1,9,1,11"
 locations_default(#20016,#10000,1,9,1,11)
 hasLocation(#20015,#20016)
-regexpConstValue(#20015,"foo")
+regexp_const_value(#20015,"foo")
 #20017=*
 entry_cfg_node(#20017,#20001)
 #20018=@"loc,{#10000},1,1,1,0"
--- a/javascript/extractor/tests/es2015/output/trap/import7.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/import7.js.trap
@ -160,7 +160,7 @@ regexpterm(#20054,14,#20053,0,"foo")
 #20055=@"loc,{#10000},1,16,1,18"
 locations_default(#20055,#10000,1,16,1,18)
 hasLocation(#20054,#20055)
-regexpConstValue(#20054,"foo")
+regexp_const_value(#20054,"foo")
 #20056=*
 exprs(#20056,84,#20052,0,"x")
 hasLocation(#20056,#20011)
@ -190,7 +190,7 @@ regexpterm(#20060,14,#20059,0,"bar")
 #20061=@"loc,{#10000},2,9,2,11"
 locations_default(#20061,#10000,2,9,2,11)
 hasLocation(#20060,#20061)
-regexpConstValue(#20060,"bar")
+regexp_const_value(#20060,"bar")
 #20062=*
 stmts(#20062,27,#20001,2,"import  ...  'baz';")
 hasLocation(#20062,#20007)
@ -206,7 +206,7 @@ regexpterm(#20064,14,#20063,0,"baz")
 #20065=@"loc,{#10000},3,25,3,27"
 locations_default(#20065,#10000,3,25,3,27)
 hasLocation(#20064,#20065)
-regexpConstValue(#20064,"baz")
+regexp_const_value(#20064,"baz")
 #20066=*
 exprs(#20066,83,#20062,0,"y as z")
 #20067=@"loc,{#10000},3,10,3,15"
--- a/javascript/extractor/tests/es2015/output/trap/nested_import.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/nested_import.js.trap
@ -210,7 +210,7 @@ regexpterm(#20073,14,#20072,0,"m")
 #20074=@"loc,{#10000},1,20,1,20"
 locations_default(#20074,#10000,1,20,1,20)
 hasLocation(#20073,#20074)
-regexpConstValue(#20073,"m")
+regexp_const_value(#20073,"m")
 #20075=*
 exprs(#20075,83,#20071,0,"x")
 hasLocation(#20075,#20017)
@ -284,7 +284,7 @@ regexpterm(#20092,14,#20091,0,"m")
 #20093=@"loc,{#10000},3,22,3,22"
 locations_default(#20093,#10000,3,22,3,22)
 hasLocation(#20092,#20093)
-regexpConstValue(#20092,"m")
+regexp_const_value(#20092,"m")
 #20094=*
 exprs(#20094,83,#20089,0,"y")
 hasLocation(#20094,#20043)
--- a/javascript/extractor/tests/es2015/output/trap/properties.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/properties.js.trap
@ -291,7 +291,7 @@ regexpterm(#20098,14,#20097,0,"prop")
 #20099=@"loc,{#10000},3,11,3,14"
 locations_default(#20099,#10000,3,11,3,14)
 hasLocation(#20098,#20099)
-regexpConstValue(#20098,"prop")
+regexp_const_value(#20098,"prop")
 #20100=*
 exprs(#20100,13,#20095,1,"Math.random()")
 #20101=@"loc,{#10000},3,19,3,31"
--- a/javascript/extractor/tests/es2015/output/trap/templates.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/templates.js.trap
@ -472,7 +472,7 @@ regexpterm(#20173,14,#20172,0,"values: ")
 #20174=@"loc,{#10000},2,11,2,18"
 locations_default(#20174,#10000,2,11,2,18)
 hasLocation(#20173,#20174)
-regexpConstValue(#20173,"values: ")
+regexp_const_value(#20173,"values: ")
 #20175=*
 exprs(#20175,13,#20170,1,"values.join(', ')")
 #20176=@"loc,{#10000},2,23,2,39"
@ -511,7 +511,7 @@ regexpterm(#20182,14,#20181,0,", ")
 #20183=@"loc,{#10000},2,36,2,37"
 locations_default(#20183,#10000,2,36,2,37)
 hasLocation(#20182,#20183)
-regexpConstValue(#20182,", ")
+regexp_const_value(#20182,", ")
 #20184=*
 stmts(#20184,18,#20001,1,"var x = 23;")
 hasLocation(#20184,#20011)
--- a/javascript/extractor/tests/es2016/output/trap/usestrict.js.trap
+++ b/javascript/extractor/tests/es2016/output/trap/usestrict.js.trap
@ -132,7 +132,7 @@ regexpterm(#20041,14,#20040,0,"use strict")
 #20042=@"loc,{#10000},1,20,1,29"
 locations_default(#20042,#10000,1,20,1,29)
 hasLocation(#20041,#20042)
-regexpConstValue(#20041,"use strict")
+regexp_const_value(#20041,"use strict")
 #20043=*
 entry_cfg_node(#20043,#20001)
 #20044=@"loc,{#10000},1,1,1,0"
--- a/javascript/extractor/tests/es2019/output/trap/json-superset.js.trap
+++ b/javascript/extractor/tests/es2019/output/trap/json-superset.js.trap
@ -124,7 +124,7 @@ regexpterm(#20040,14,#20039,0,"ab c")
 #20041=@"loc,{#10000},1,11,1,14"
 locations_default(#20041,#10000,1,11,1,14)
 hasLocation(#20040,#20041)
-regexpConstValue(#20040,"ab c")
+regexp_const_value(#20040,"ab c")
 #20042=*
 stmts(#20042,18,#20001,1,"var s2 = ""ab\u2029c"";")
 #20043=@"loc,{#10000},2,1,2,16"
@ -156,7 +156,7 @@ regexpterm(#20048,14,#20047,0,"ab c")
 #20049=@"loc,{#10000},2,11,2,14"
 locations_default(#20049,#10000,2,11,2,14)
 hasLocation(#20048,#20049)
-regexpConstValue(#20048,"ab c")
+regexp_const_value(#20048,"ab c")
 #20050=*
 entry_cfg_node(#20050,#20001)
 #20051=@"loc,{#10000},1,1,1,0"
--- a/javascript/extractor/tests/esnext/output/trap/dynamic-import.js.trap
+++ b/javascript/extractor/tests/esnext/output/trap/dynamic-import.js.trap
@ -215,7 +215,7 @@ regexpterm(#20076,14,#20075,0,"m")
 #20077=@"loc,{#10000},1,9,1,9"
 locations_default(#20077,#10000,1,9,1,9)
 hasLocation(#20076,#20077)
-regexpConstValue(#20076,"m")
+regexp_const_value(#20076,"m")
 #20078=*
 stmts(#20078,2,#20001,1,"b ? imp ... ) : {};")
 hasLocation(#20078,#20005)
@ -254,7 +254,7 @@ regexpterm(#20086,14,#20085,0,"n")
 #20087=@"loc,{#10000},2,13,2,13"
 locations_default(#20087,#10000,2,13,2,13)
 hasLocation(#20086,#20087)
-regexpConstValue(#20086,"n")
+regexp_const_value(#20086,"n")
 #20088=*
 exprs(#20088,8,#20079,2,"{}")
 #20089=@"loc,{#10000},2,19,2,20"
@ -298,7 +298,7 @@ regexpterm(#20098,14,#20097,0,"o")
 #20099=@"loc,{#10000},3,9,3,9"
 locations_default(#20099,#10000,3,9,3,9)
 hasLocation(#20098,#20099)
-regexpConstValue(#20098,"o")
+regexp_const_value(#20098,"o")
 #20100=*
 exprs(#20100,0,#20093,1,"then")
 hasLocation(#20100,#20049)
--- a/javascript/extractor/tests/esnext/output/trap/top-level-await.js.trap
+++ b/javascript/extractor/tests/esnext/output/trap/top-level-await.js.trap
@ -173,7 +173,7 @@ regexpterm(#20060,14,#20059,0,"settings")
 #20061=@"loc,{#10000},1,27,1,34"
 locations_default(#20061,#10000,1,27,1,34)
 hasLocation(#20060,#20061)
-regexpConstValue(#20060,"settings")
+regexp_const_value(#20060,"settings")
 #20062=*
 exprs(#20062,83,#20058,0,"language")
 hasLocation(#20062,#20011)
--- a/javascript/extractor/tests/esnext/output/trap/yield-import.js.trap
+++ b/javascript/extractor/tests/esnext/output/trap/yield-import.js.trap
@ -153,7 +153,7 @@ regexpterm(#20048,14,#20047,0,"foo")
 #20049=@"loc,{#10000},2,17,2,19"
 locations_default(#20049,#10000,2,17,2,19)
 hasLocation(#20048,#20049)
-regexpConstValue(#20048,"foo")
+regexp_const_value(#20048,"foo")
 #20050=*
 entry_cfg_node(#20050,#20001)
 #20051=@"loc,{#10000},1,1,1,0"
--- a/javascript/extractor/tests/exprs/output/trap/binary.js.trap
+++ b/javascript/extractor/tests/exprs/output/trap/binary.js.trap
@ -689,7 +689,7 @@ regexpterm(#20216,14,#20215,0,"prototype")
 #20217=@"loc,{#10000},12,2,12,10"
 locations_default(#20217,#10000,12,2,12,10)
 hasLocation(#20216,#20217)
-regexpConstValue(#20216,"prototype")
+regexp_const_value(#20216,"prototype")
 #20218=*
 exprs(#20218,79,#20213,1,"Object")
 hasLocation(#20218,#20125)
--- a/javascript/extractor/tests/exprs/output/trap/primaries.js.trap
+++ b/javascript/extractor/tests/exprs/output/trap/primaries.js.trap
@ -957,7 +957,7 @@ regexpterm(#20345,14,#20344,0,"Hello")
 #20346=@"loc,{#10000},10,2,10,6"
 locations_default(#20346,#10000,10,2,10,6)
 hasLocation(#20345,#20346)
-regexpConstValue(#20345,"Hello")
+regexp_const_value(#20345,"Hello")
 #20347=*
 stmts(#20347,2,#20001,10,"'world';")
 hasLocation(#20347,#20023)
@ -973,7 +973,7 @@ regexpterm(#20349,14,#20348,0,"world")
 #20350=@"loc,{#10000},11,2,11,6"
 locations_default(#20350,#10000,11,2,11,6)
 hasLocation(#20349,#20350)
-regexpConstValue(#20349,"world")
+regexp_const_value(#20349,"world")
 #20351=*
 stmts(#20351,2,#20001,11,"""'what?'\x0a"";")
 hasLocation(#20351,#20025)
@ -996,7 +996,7 @@ regexpterm(#20355,14,#20353,0,"'wha")
 #20356=@"loc,{#10000},12,2,12,5"
 locations_default(#20356,#10000,12,2,12,5)
 hasLocation(#20355,#20356)
-regexpConstValue(#20355,"'wha")
+regexp_const_value(#20355,"'wha")
 #20357=*
 regexpterm(#20357,10,#20353,1,"t?")
 #20358=@"loc,{#10000},12,6,12,7"
@ -1008,14 +1008,14 @@ regexpterm(#20359,14,#20357,0,"t")
 #20360=@"loc,{#10000},12,6,12,6"
 locations_default(#20360,#10000,12,6,12,6)
 hasLocation(#20359,#20360)
-regexpConstValue(#20359,"t")
+regexp_const_value(#20359,"t")
 #20361=*
 regexpterm(#20361,14,#20353,2,"'
 ")
 #20362=@"loc,{#10000},12,8,12,12"
 locations_default(#20362,#10000,12,8,12,12)
 hasLocation(#20361,#20362)
-regexpConstValue(#20361,"'
+regexp_const_value(#20361,"'
 ")
 #20363=*
 stmts(#20363,2,#20001,12,"'""why?""\n';")
@ -1039,7 +1039,7 @@ regexpterm(#20367,14,#20365,0,"""wh")
 #20368=@"loc,{#10000},13,2,13,4"
 locations_default(#20368,#10000,13,2,13,4)
 hasLocation(#20367,#20368)
-regexpConstValue(#20367,"""wh")
+regexp_const_value(#20367,"""wh")
 #20369=*
 regexpterm(#20369,10,#20365,1,"y?")
 #20370=@"loc,{#10000},13,5,13,6"
@ -1051,14 +1051,14 @@ regexpterm(#20371,14,#20369,0,"y")
 #20372=@"loc,{#10000},13,5,13,5"
 locations_default(#20372,#10000,13,5,13,5)
 hasLocation(#20371,#20372)
-regexpConstValue(#20371,"y")
+regexp_const_value(#20371,"y")
 #20373=*
 regexpterm(#20373,14,#20365,2,"""
 ")
 #20374=@"loc,{#10000},13,7,13,9"
 locations_default(#20374,#10000,13,7,13,9)
 hasLocation(#20373,#20374)
-regexpConstValue(#20373,"""
+regexp_const_value(#20373,"""
 ")
 #20375=*
 stmts(#20375,2,#20001,13,"/^(need?le)+/gi;")
@ -1102,7 +1102,7 @@ regexpterm(#20387,14,#20385,0,"nee")
 #20388=@"loc,{#10000},14,4,14,6"
 locations_default(#20388,#10000,14,4,14,6)
 hasLocation(#20387,#20388)
-regexpConstValue(#20387,"nee")
+regexp_const_value(#20387,"nee")
 #20389=*
 regexpterm(#20389,10,#20385,1,"d?")
 #20390=@"loc,{#10000},14,7,14,8"
@ -1114,13 +1114,13 @@ regexpterm(#20391,14,#20389,0,"d")
 #20392=@"loc,{#10000},14,7,14,7"
 locations_default(#20392,#10000,14,7,14,7)
 hasLocation(#20391,#20392)
-regexpConstValue(#20391,"d")
+regexp_const_value(#20391,"d")
 #20393=*
 regexpterm(#20393,14,#20385,2,"le")
 #20394=@"loc,{#10000},14,9,14,10"
 locations_default(#20394,#10000,14,9,14,10)
 hasLocation(#20393,#20394)
-regexpConstValue(#20393,"le")
+regexp_const_value(#20393,"le")
 #20395=*
 stmts(#20395,2,#20001,14,"(23);")
 hasLocation(#20395,#20031)
@ -1172,7 +1172,7 @@ regexpterm(#20405,14,#20404,0,"hi")
 #20406=@"loc,{#10000},16,13,16,14"
 locations_default(#20406,#10000,16,13,16,14)
 hasLocation(#20405,#20406)
-regexpConstValue(#20405,"hi")
+regexp_const_value(#20405,"hi")
 array_size(#20400,4)
 #20407=*
 stmts(#20407,2,#20001,16,"({ x: 2 ... ) {}});")
@ -1399,7 +1399,7 @@ regexpterm(#20466,14,#20465,0,"hi")
 #20467=@"loc,{#10000},24,13,24,14"
 locations_default(#20467,#10000,24,13,24,14)
 hasLocation(#20466,#20467)
-regexpConstValue(#20466,"hi")
+regexp_const_value(#20466,"hi")
 #20468=*
 stmts(#20468,2,#20001,20,"String("""");")
 hasLocation(#20468,#20051)
@ -1510,7 +1510,7 @@ regexpterm(#20493,14,#20492,0,"epytotorp")
 #20494=@"loc,{#10000},27,9,27,17"
 locations_default(#20494,#10000,27,9,27,17)
 hasLocation(#20493,#20494)
-regexpConstValue(#20493,"epytotorp")
+regexp_const_value(#20493,"epytotorp")
 #20495=*
 exprs(#20495,0,#20490,1,"reverse")
 hasLocation(#20495,#20275)
--- a/javascript/extractor/tests/exprs/output/trap/regexp.js.trap
+++ b/javascript/extractor/tests/exprs/output/trap/regexp.js.trap
@ -737,7 +737,7 @@ regexpterm(#20271,14,#20270,0,"t")
 #20272=@"loc,{#10000},1,2,1,2"
 locations_default(#20272,#10000,1,2,1,2)
 hasLocation(#20271,#20272)
-regexpConstValue(#20271,"t")
+regexp_const_value(#20271,"t")
 #20273=*
 stmts(#20273,2,#20001,1,"/foo|bar/;")
 hasLocation(#20273,#20005)
@ -758,13 +758,13 @@ regexpterm(#20277,14,#20275,0,"foo")
 #20278=@"loc,{#10000},2,2,2,4"
 locations_default(#20278,#10000,2,2,2,4)
 hasLocation(#20277,#20278)
-regexpConstValue(#20277,"foo")
+regexp_const_value(#20277,"foo")
 #20279=*
 regexpterm(#20279,14,#20275,1,"bar")
 #20280=@"loc,{#10000},2,6,2,8"
 locations_default(#20280,#10000,2,6,2,8)
 hasLocation(#20279,#20280)
-regexpConstValue(#20279,"bar")
+regexp_const_value(#20279,"bar")
 #20281=*
 stmts(#20281,2,#20001,2,"/(?:)/;")
 hasLocation(#20281,#20007)
@ -810,7 +810,7 @@ regexpterm(#20293,14,#20289,1,"abc")
 #20294=@"loc,{#10000},4,3,4,5"
 locations_default(#20294,#10000,4,3,4,5)
 hasLocation(#20293,#20294)
-regexpConstValue(#20293,"abc")
+regexp_const_value(#20293,"abc")
 #20295=*
 regexpterm(#20295,3,#20289,2,"$")
 #20296=@"loc,{#10000},4,6,4,6"
@ -841,7 +841,7 @@ regexpterm(#20303,14,#20299,1,"x")
 #20304=@"loc,{#10000},5,4,5,4"
 locations_default(#20304,#10000,5,4,5,4)
 hasLocation(#20303,#20304)
-regexpConstValue(#20303,"x")
+regexp_const_value(#20303,"x")
 #20305=*
 regexpterm(#20305,4,#20299,2,"\b")
 #20306=@"loc,{#10000},5,5,5,6"
@ -872,7 +872,7 @@ regexpterm(#20313,14,#20309,1,"x")
 #20314=@"loc,{#10000},6,4,6,4"
 locations_default(#20314,#10000,6,4,6,4)
 hasLocation(#20313,#20314)
-regexpConstValue(#20313,"x")
+regexp_const_value(#20313,"x")
 #20315=*
 regexpterm(#20315,5,#20309,2,"\B")
 #20316=@"loc,{#10000},6,5,6,6"
@ -898,7 +898,7 @@ regexpterm(#20321,14,#20319,0,"x")
 #20322=@"loc,{#10000},7,2,7,2"
 locations_default(#20322,#10000,7,2,7,2)
 hasLocation(#20321,#20322)
-regexpConstValue(#20321,"x")
+regexp_const_value(#20321,"x")
 #20323=*
 regexpterm(#20323,6,#20319,1,"(?=y)")
 #20324=@"loc,{#10000},7,3,7,7"
@ -909,7 +909,7 @@ regexpterm(#20325,14,#20323,0,"y")
 #20326=@"loc,{#10000},7,6,7,6"
 locations_default(#20326,#10000,7,6,7,6)
 hasLocation(#20325,#20326)
-regexpConstValue(#20325,"y")
+regexp_const_value(#20325,"y")
 #20327=*
 stmts(#20327,2,#20001,7,"/x(?!z)/;")
 hasLocation(#20327,#20017)
@ -930,7 +930,7 @@ regexpterm(#20331,14,#20329,0,"x")
 #20332=@"loc,{#10000},8,2,8,2"
 locations_default(#20332,#10000,8,2,8,2)
 hasLocation(#20331,#20332)
-regexpConstValue(#20331,"x")
+regexp_const_value(#20331,"x")
 #20333=*
 regexpterm(#20333,7,#20329,1,"(?!z)")
 #20334=@"loc,{#10000},8,3,8,7"
@ -941,7 +941,7 @@ regexpterm(#20335,14,#20333,0,"z")
 #20336=@"loc,{#10000},8,6,8,6"
 locations_default(#20336,#10000,8,6,8,6)
 hasLocation(#20335,#20336)
-regexpConstValue(#20335,"z")
+regexp_const_value(#20335,"z")
 #20337=*
 stmts(#20337,2,#20001,8,"/a*/;")
 hasLocation(#20337,#20019)
@ -963,7 +963,7 @@ regexpterm(#20341,14,#20339,0,"a")
 #20342=@"loc,{#10000},9,2,9,2"
 locations_default(#20342,#10000,9,2,9,2)
 hasLocation(#20341,#20342)
-regexpConstValue(#20341,"a")
+regexp_const_value(#20341,"a")
 #20343=*
 stmts(#20343,2,#20001,9,"/a*?/;")
 hasLocation(#20343,#20021)
@ -984,7 +984,7 @@ regexpterm(#20347,14,#20345,0,"a")
 #20348=@"loc,{#10000},10,2,10,2"
 locations_default(#20348,#10000,10,2,10,2)
 hasLocation(#20347,#20348)
-regexpConstValue(#20347,"a")
+regexp_const_value(#20347,"a")
 #20349=*
 stmts(#20349,2,#20001,10,"/a+/;")
 hasLocation(#20349,#20023)
@ -1006,7 +1006,7 @@ regexpterm(#20353,14,#20351,0,"a")
 #20354=@"loc,{#10000},11,2,11,2"
 locations_default(#20354,#10000,11,2,11,2)
 hasLocation(#20353,#20354)
-regexpConstValue(#20353,"a")
+regexp_const_value(#20353,"a")
 #20355=*
 stmts(#20355,2,#20001,11,"/a+?/;")
 hasLocation(#20355,#20025)
@ -1027,7 +1027,7 @@ regexpterm(#20359,14,#20357,0,"a")
 #20360=@"loc,{#10000},12,2,12,2"
 locations_default(#20360,#10000,12,2,12,2)
 hasLocation(#20359,#20360)
-regexpConstValue(#20359,"a")
+regexp_const_value(#20359,"a")
 #20361=*
 stmts(#20361,2,#20001,12,"/a?/;")
 hasLocation(#20361,#20027)
@ -1049,7 +1049,7 @@ regexpterm(#20365,14,#20363,0,"a")
 #20366=@"loc,{#10000},13,2,13,2"
 locations_default(#20366,#10000,13,2,13,2)
 hasLocation(#20365,#20366)
-regexpConstValue(#20365,"a")
+regexp_const_value(#20365,"a")
 #20367=*
 stmts(#20367,2,#20001,13,"/a??/;")
 hasLocation(#20367,#20029)
@ -1070,7 +1070,7 @@ regexpterm(#20371,14,#20369,0,"a")
 #20372=@"loc,{#10000},14,2,14,2"
 locations_default(#20372,#10000,14,2,14,2)
 hasLocation(#20371,#20372)
-regexpConstValue(#20371,"a")
+regexp_const_value(#20371,"a")
 #20373=*
 stmts(#20373,2,#20001,14,"/a{1}/;")
 hasLocation(#20373,#20031)
@ -1094,7 +1094,7 @@ regexpterm(#20377,14,#20375,0,"a")
 #20378=@"loc,{#10000},15,2,15,2"
 locations_default(#20378,#10000,15,2,15,2)
 hasLocation(#20377,#20378)
-regexpConstValue(#20377,"a")
+regexp_const_value(#20377,"a")
 #20379=*
 stmts(#20379,2,#20001,15,"/a{1,}/;")
 hasLocation(#20379,#20033)
@ -1117,7 +1117,7 @@ regexpterm(#20383,14,#20381,0,"a")
 #20384=@"loc,{#10000},16,2,16,2"
 locations_default(#20384,#10000,16,2,16,2)
 hasLocation(#20383,#20384)
-regexpConstValue(#20383,"a")
+regexp_const_value(#20383,"a")
 #20385=*
 stmts(#20385,2,#20001,16,"/a{1,2}/;")
 hasLocation(#20385,#20035)
@ -1141,7 +1141,7 @@ regexpterm(#20389,14,#20387,0,"a")
 #20390=@"loc,{#10000},17,2,17,2"
 locations_default(#20390,#10000,17,2,17,2)
 hasLocation(#20389,#20390)
-regexpConstValue(#20389,"a")
+regexp_const_value(#20389,"a")
 #20391=*
 stmts(#20391,2,#20001,17,"/a{1}?/;")
 hasLocation(#20391,#20037)
@ -1164,7 +1164,7 @@ regexpterm(#20395,14,#20393,0,"a")
 #20396=@"loc,{#10000},18,2,18,2"
 locations_default(#20396,#10000,18,2,18,2)
 hasLocation(#20395,#20396)
-regexpConstValue(#20395,"a")
+regexp_const_value(#20395,"a")
 #20397=*
 stmts(#20397,2,#20001,18,"/a{1,}?/;")
 hasLocation(#20397,#20039)
@ -1186,7 +1186,7 @@ regexpterm(#20401,14,#20399,0,"a")
 #20402=@"loc,{#10000},19,2,19,2"
 locations_default(#20402,#10000,19,2,19,2)
 hasLocation(#20401,#20402)
-regexpConstValue(#20401,"a")
+regexp_const_value(#20401,"a")
 #20403=*
 stmts(#20403,2,#20001,19,"/a{1,2}?/;")
 hasLocation(#20403,#20041)
@ -1209,7 +1209,7 @@ regexpterm(#20407,14,#20405,0,"a")
 #20408=@"loc,{#10000},20,2,20,2"
 locations_default(#20408,#10000,20,2,20,2)
 hasLocation(#20407,#20408)
-regexpConstValue(#20407,"a")
+regexp_const_value(#20407,"a")
 #20409=*
 stmts(#20409,2,#20001,20,"/./;")
 hasLocation(#20409,#20043)
@ -1246,7 +1246,7 @@ regexpterm(#20417,14,#20415,0,"abc")
 #20418=@"loc,{#10000},22,3,22,5"
 locations_default(#20418,#10000,22,3,22,5)
 hasLocation(#20417,#20418)
-regexpConstValue(#20417,"abc")
+regexp_const_value(#20417,"abc")
 #20419=*
 stmts(#20419,2,#20001,22,"/(?:abc)/;")
 hasLocation(#20419,#20047)
@ -1267,7 +1267,7 @@ regexpterm(#20423,14,#20421,0,"abc")
 #20424=@"loc,{#10000},23,5,23,7"
 locations_default(#20424,#10000,23,5,23,7)
 hasLocation(#20423,#20424)
-regexpConstValue(#20423,"abc")
+regexp_const_value(#20423,"abc")
 #20425=*
 stmts(#20425,2,#20001,23,"/\x0a/;")
 hasLocation(#20425,#20049)
@ -1283,7 +1283,7 @@ regexpterm(#20427,15,#20426,0,"\x0a")
 #20428=@"loc,{#10000},24,2,24,5"
 locations_default(#20428,#10000,24,2,24,5)
 hasLocation(#20427,#20428)
-regexpConstValue(#20427,"
+regexp_const_value(#20427,"
 ")
 #20429=*
 stmts(#20429,2,#20001,24,"/\u000a/;")
@ -1300,7 +1300,7 @@ regexpterm(#20431,16,#20430,0,"\u000a")
 #20432=@"loc,{#10000},25,2,25,7"
 locations_default(#20432,#10000,25,2,25,7)
 hasLocation(#20431,#20432)
-regexpConstValue(#20431,"
+regexp_const_value(#20431,"
 ")
 #20433=*
 stmts(#20433,2,#20001,25,"/\10/;")
@ -1341,32 +1341,32 @@ regexpterm(#20442,19,#20440,0,"\t")
 #20443=@"loc,{#10000},27,2,27,3"
 locations_default(#20443,#10000,27,2,27,3)
 hasLocation(#20442,#20443)
-regexpConstValue(#20442,"	")
+regexp_const_value(#20442,"	")
 #20444=*
 regexpterm(#20444,19,#20440,1,"\n")
 #20445=@"loc,{#10000},27,4,27,5"
 locations_default(#20445,#10000,27,4,27,5)
 hasLocation(#20444,#20445)
-regexpConstValue(#20444,"
+regexp_const_value(#20444,"
 ")
 #20446=*
 regexpterm(#20446,19,#20440,2,"\r")
 #20447=@"loc,{#10000},27,6,27,7"
 locations_default(#20447,#10000,27,6,27,7)
 hasLocation(#20446,#20447)
-regexpConstValue(#20446,"
")
+regexp_const_value(#20446,"
")
 #20448=*
 regexpterm(#20448,19,#20440,3,"\f")
 #20449=@"loc,{#10000},27,8,27,9"
 locations_default(#20449,#10000,27,8,27,9)
 hasLocation(#20448,#20449)
-regexpConstValue(#20448,"")
+regexp_const_value(#20448,"")
 #20450=*
 regexpterm(#20450,19,#20440,4,"\v")
 #20451=@"loc,{#10000},27,10,27,11"
 locations_default(#20451,#10000,27,10,27,11)
 hasLocation(#20450,#20451)
-regexpConstValue(#20450,"")
+regexp_const_value(#20450,"")
 #20452=*
 stmts(#20452,2,#20001,27,"/\ca\cN/;")
 hasLocation(#20452,#20057)
@ -1387,13 +1387,13 @@ regexpterm(#20456,19,#20454,0,"\ca")
 #20457=@"loc,{#10000},28,2,28,4"
 locations_default(#20457,#10000,28,2,28,4)
 hasLocation(#20456,#20457)
-regexpConstValue(#20456,"")
+regexp_const_value(#20456,"")
 #20458=*
 regexpterm(#20458,19,#20454,1,"\cN")
 #20459=@"loc,{#10000},28,5,28,7"
 locations_default(#20459,#10000,28,5,28,7)
 hasLocation(#20458,#20459)
-regexpConstValue(#20458,"")
+regexp_const_value(#20458,"")
 #20460=*
 stmts(#20460,2,#20001,28,"/\w\S/;")
 hasLocation(#20460,#20059)
@ -1436,7 +1436,7 @@ regexpterm(#20470,21,#20469,0,"\\")
 #20471=@"loc,{#10000},30,2,30,3"
 locations_default(#20471,#10000,30,2,30,3)
 hasLocation(#20470,#20471)
-regexpConstValue(#20470,"\")
+regexp_const_value(#20470,"\")
 #20472=*
 stmts(#20472,2,#20001,30,"/[abc]/;")
 hasLocation(#20472,#20063)
@ -1457,19 +1457,19 @@ regexpterm(#20476,14,#20474,0,"a")
 #20477=@"loc,{#10000},31,3,31,3"
 locations_default(#20477,#10000,31,3,31,3)
 hasLocation(#20476,#20477)
-regexpConstValue(#20476,"a")
+regexp_const_value(#20476,"a")
 #20478=*
 regexpterm(#20478,14,#20474,1,"b")
 #20479=@"loc,{#10000},31,4,31,4"
 locations_default(#20479,#10000,31,4,31,4)
 hasLocation(#20478,#20479)
-regexpConstValue(#20478,"b")
+regexp_const_value(#20478,"b")
 #20480=*
 regexpterm(#20480,14,#20474,2,"c")
 #20481=@"loc,{#10000},31,5,31,5"
 locations_default(#20481,#10000,31,5,31,5)
 hasLocation(#20480,#20481)
-regexpConstValue(#20480,"c")
+regexp_const_value(#20480,"c")
 #20482=*
 stmts(#20482,2,#20001,31,"/[a-z]/;")
 hasLocation(#20482,#20065)
@ -1495,13 +1495,13 @@ regexpterm(#20488,14,#20486,0,"a")
 #20489=@"loc,{#10000},32,3,32,3"
 locations_default(#20489,#10000,32,3,32,3)
 hasLocation(#20488,#20489)
-regexpConstValue(#20488,"a")
+regexp_const_value(#20488,"a")
 #20490=*
 regexpterm(#20490,14,#20486,1,"z")
 #20491=@"loc,{#10000},32,5,32,5"
 locations_default(#20491,#10000,32,5,32,5)
 hasLocation(#20490,#20491)
-regexpConstValue(#20490,"z")
+regexp_const_value(#20490,"z")
 #20492=*
 stmts(#20492,2,#20001,32,"/[a-zA-Z]/;")
 hasLocation(#20492,#20067)
@ -1527,13 +1527,13 @@ regexpterm(#20498,14,#20496,0,"a")
 #20499=@"loc,{#10000},33,3,33,3"
 locations_default(#20499,#10000,33,3,33,3)
 hasLocation(#20498,#20499)
-regexpConstValue(#20498,"a")
+regexp_const_value(#20498,"a")
 #20500=*
 regexpterm(#20500,14,#20496,1,"z")
 #20501=@"loc,{#10000},33,5,33,5"
 locations_default(#20501,#10000,33,5,33,5)
 hasLocation(#20500,#20501)
-regexpConstValue(#20500,"z")
+regexp_const_value(#20500,"z")
 #20502=*
 regexpterm(#20502,24,#20494,1,"A-Z")
 #20503=@"loc,{#10000},33,6,33,8"
@ -1544,13 +1544,13 @@ regexpterm(#20504,14,#20502,0,"A")
 #20505=@"loc,{#10000},33,6,33,6"
 locations_default(#20505,#10000,33,6,33,6)
 hasLocation(#20504,#20505)
-regexpConstValue(#20504,"A")
+regexp_const_value(#20504,"A")
 #20506=*
 regexpterm(#20506,14,#20502,1,"Z")
 #20507=@"loc,{#10000},33,8,33,8"
 locations_default(#20507,#10000,33,8,33,8)
 hasLocation(#20506,#20507)
-regexpConstValue(#20506,"Z")
+regexp_const_value(#20506,"Z")
 #20508=*
 stmts(#20508,2,#20001,33,"/[-a-z]/;")
 hasLocation(#20508,#20069)
@ -1571,7 +1571,7 @@ regexpterm(#20512,14,#20510,0,"-")
 #20513=@"loc,{#10000},34,3,34,3"
 locations_default(#20513,#10000,34,3,34,3)
 hasLocation(#20512,#20513)
-regexpConstValue(#20512,"-")
+regexp_const_value(#20512,"-")
 #20514=*
 regexpterm(#20514,24,#20510,1,"a-z")
 #20515=@"loc,{#10000},34,4,34,6"
@ -1582,13 +1582,13 @@ regexpterm(#20516,14,#20514,0,"a")
 #20517=@"loc,{#10000},34,4,34,4"
 locations_default(#20517,#10000,34,4,34,4)
 hasLocation(#20516,#20517)
-regexpConstValue(#20516,"a")
+regexp_const_value(#20516,"a")
 #20518=*
 regexpterm(#20518,14,#20514,1,"z")
 #20519=@"loc,{#10000},34,6,34,6"
 locations_default(#20519,#10000,34,6,34,6)
 hasLocation(#20518,#20519)
-regexpConstValue(#20518,"z")
+regexp_const_value(#20518,"z")
 #20520=*
 stmts(#20520,2,#20001,34,"/[^a-z]/;")
 hasLocation(#20520,#20071)
@ -1615,13 +1615,13 @@ regexpterm(#20526,14,#20524,0,"a")
 #20527=@"loc,{#10000},35,4,35,4"
 locations_default(#20527,#10000,35,4,35,4)
 hasLocation(#20526,#20527)
-regexpConstValue(#20526,"a")
+regexp_const_value(#20526,"a")
 #20528=*
 regexpterm(#20528,14,#20524,1,"z")
 #20529=@"loc,{#10000},35,6,35,6"
 locations_default(#20529,#10000,35,6,35,6)
 hasLocation(#20528,#20529)
-regexpConstValue(#20528,"z")
+regexp_const_value(#20528,"z")
 #20530=*
 stmts(#20530,2,#20001,35,"/[a\b\x0c]/;")
 hasLocation(#20530,#20073)
@ -1642,19 +1642,19 @@ regexpterm(#20534,14,#20532,0,"a")
 #20535=@"loc,{#10000},36,3,36,3"
 locations_default(#20535,#10000,36,3,36,3)
 hasLocation(#20534,#20535)
-regexpConstValue(#20534,"a")
+regexp_const_value(#20534,"a")
 #20536=*
 regexpterm(#20536,19,#20532,1,"\b")
 #20537=@"loc,{#10000},36,4,36,5"
 locations_default(#20537,#10000,36,4,36,5)
 hasLocation(#20536,#20537)
-regexpConstValue(#20536,"")
+regexp_const_value(#20536,"")
 #20538=*
 regexpterm(#20538,15,#20532,2,"\x0c")
 #20539=@"loc,{#10000},36,6,36,9"
 locations_default(#20539,#10000,36,6,36,9)
 hasLocation(#20538,#20539)
-regexpConstValue(#20538,"")
+regexp_const_value(#20538,"")
 #20540=*
 stmts(#20540,2,#20001,36,"/a{/;")
 hasLocation(#20540,#20075)
@ -1678,7 +1678,7 @@ regexpterm(#20544,14,#20542,0,"a")
 #20545=@"loc,{#10000},37,2,37,2"
 locations_default(#20545,#10000,37,2,37,2)
 hasLocation(#20544,#20545)
-regexpConstValue(#20544,"a")
+regexp_const_value(#20544,"a")
 #20546=*
 regexp_parse_errors(#20546,#20542,"expected digit")
 #20547=@"loc,{#10000},37,4,37,4"
@ -1717,19 +1717,19 @@ regexpterm(#20556,14,#20554,0,"a")
 #20557=@"loc,{#10000},38,2,38,2"
 locations_default(#20557,#10000,38,2,38,2)
 hasLocation(#20556,#20557)
-regexpConstValue(#20556,"a")
+regexp_const_value(#20556,"a")
 #20558=*
 regexpterm(#20558,14,#20552,1,"b")
 #20559=@"loc,{#10000},38,4,38,4"
 locations_default(#20559,#10000,38,4,38,4)
 hasLocation(#20558,#20559)
-regexpConstValue(#20558,"b")
+regexp_const_value(#20558,"b")
 #20560=*
 regexpterm(#20560,14,#20552,2,"}")
 #20561=@"loc,{#10000},38,5,38,5"
 locations_default(#20561,#10000,38,5,38,5)
 hasLocation(#20560,#20561)
-regexpConstValue(#20560,"}")
+regexp_const_value(#20560,"}")
 #20562=*
 regexp_parse_errors(#20562,#20552,"expected digit")
 hasLocation(#20562,#20559)
@ -1764,7 +1764,7 @@ regexpterm(#20570,14,#20568,0,"a")
 #20571=@"loc,{#10000},39,2,39,2"
 locations_default(#20571,#10000,39,2,39,2)
 hasLocation(#20570,#20571)
-regexpConstValue(#20570,"a")
+regexp_const_value(#20570,"a")
 #20572=*
 regexp_parse_errors(#20572,#20568,"expected '}'")
 #20573=@"loc,{#10000},39,4,39,4"
@ -1785,7 +1785,7 @@ regexpterm(#20576,15,#20575,0,"\xa")
 #20577=@"loc,{#10000},40,2,40,4"
 locations_default(#20577,#10000,40,2,40,4)
 hasLocation(#20576,#20577)
-regexpConstValue(#20576,"
+regexp_const_value(#20576,"
 ")
 #20578=*
 regexp_parse_errors(#20578,#20576,"unexpected end of regular expression")
@ -1807,7 +1807,7 @@ regexpterm(#20582,19,#20581,0,"\c0")
 #20583=@"loc,{#10000},41,2,41,4"
 locations_default(#20583,#10000,41,2,41,4)
 hasLocation(#20582,#20583)
-regexpConstValue(#20582,"")
+regexp_const_value(#20582,"")
 #20584=*
 regexp_parse_errors(#20584,#20582,"expected control letter")
 #20585=@"loc,{#10000},41,4,41,4"
@ -1864,7 +1864,7 @@ regexpterm(#20598,14,#20596,0,"<tpl")
 #20599=@"loc,{#10000},44,2,44,5"
 locations_default(#20599,#10000,44,2,44,5)
 hasLocation(#20598,#20599)
-regexpConstValue(#20598,"<tpl")
+regexp_const_value(#20598,"<tpl")
 #20600=*
 regexpterm(#20600,4,#20596,1,"\b")
 #20601=@"loc,{#10000},44,6,44,7"
@ -1887,13 +1887,13 @@ regexpterm(#20606,14,#20604,0,">")
 #20607=@"loc,{#10000},44,10,44,10"
 locations_default(#20607,#10000,44,10,44,10)
 hasLocation(#20606,#20607)
-regexpConstValue(#20606,">")
+regexp_const_value(#20606,">")
 #20608=*
 regexpterm(#20608,14,#20596,3,">")
 #20609=@"loc,{#10000},44,13,44,13"
 locations_default(#20609,#10000,44,13,44,13)
 hasLocation(#20608,#20609)
-regexpConstValue(#20608,">")
+regexp_const_value(#20608,">")
 #20610=*
 regexpterm(#20610,13,#20596,4,"((?:(?=([^<]+))\2|<(?!tpl\b[^>]*>))*?)")
 #20611=@"loc,{#10000},44,14,44,51"
@ -1948,7 +1948,7 @@ regexpterm(#20628,14,#20626,0,"<")
 #20629=@"loc,{#10000},44,24,44,24"
 locations_default(#20629,#10000,44,24,44,24)
 hasLocation(#20628,#20629)
-regexpConstValue(#20628,"<")
+regexp_const_value(#20628,"<")
 #20630=*
 regexpterm(#20630,22,#20618,1,"\2")
 #20631=@"loc,{#10000},44,29,44,30"
@ -1965,7 +1965,7 @@ regexpterm(#20634,14,#20632,0,"<")
 #20635=@"loc,{#10000},44,32,44,32"
 locations_default(#20635,#10000,44,32,44,32)
 hasLocation(#20634,#20635)
-regexpConstValue(#20634,"<")
+regexp_const_value(#20634,"<")
 #20636=*
 regexpterm(#20636,7,#20632,1,"(?!tpl\b[^>]*>)")
 #20637=@"loc,{#10000},44,33,44,47"
@ -1981,7 +1981,7 @@ regexpterm(#20640,14,#20638,0,"tpl")
 #20641=@"loc,{#10000},44,36,44,38"
 locations_default(#20641,#10000,44,36,44,38)
 hasLocation(#20640,#20641)
-regexpConstValue(#20640,"tpl")
+regexp_const_value(#20640,"tpl")
 #20642=*
 regexpterm(#20642,4,#20638,1,"\b")
 #20643=@"loc,{#10000},44,39,44,40"
@ -2004,31 +2004,31 @@ regexpterm(#20648,14,#20646,0,">")
 #20649=@"loc,{#10000},44,43,44,43"
 locations_default(#20649,#10000,44,43,44,43)
 hasLocation(#20648,#20649)
-regexpConstValue(#20648,">")
+regexp_const_value(#20648,">")
 #20650=*
 regexpterm(#20650,14,#20638,3,">")
 #20651=@"loc,{#10000},44,46,44,46"
 locations_default(#20651,#10000,44,46,44,46)
 hasLocation(#20650,#20651)
-regexpConstValue(#20650,">")
+regexp_const_value(#20650,">")
 #20652=*
 regexpterm(#20652,14,#20596,5,"<")
 #20653=@"loc,{#10000},44,52,44,52"
 locations_default(#20653,#10000,44,52,44,52)
 hasLocation(#20652,#20653)
-regexpConstValue(#20652,"<")
+regexp_const_value(#20652,"<")
 #20654=*
 regexpterm(#20654,21,#20596,6,"\/")
 #20655=@"loc,{#10000},44,53,44,54"
 locations_default(#20655,#10000,44,53,44,54)
 hasLocation(#20654,#20655)
-regexpConstValue(#20654,"/")
+regexp_const_value(#20654,"/")
 #20656=*
 regexpterm(#20656,14,#20596,7,"tpl>")
 #20657=@"loc,{#10000},44,55,44,58"
 locations_default(#20657,#10000,44,55,44,58)
 hasLocation(#20656,#20657)
-regexpConstValue(#20656,"tpl>")
+regexp_const_value(#20656,"tpl>")
 #20658=*
 entry_cfg_node(#20658,#20001)
 #20659=@"loc,{#10000},1,1,1,0"
--- a/javascript/extractor/tests/extensions/output/trap/tst.es6.trap
+++ b/javascript/extractor/tests/extensions/output/trap/tst.es6.trap
@ -110,7 +110,7 @@ regexpterm(#20031,14,#20030,0,"Hello ES6")
 #20032=@"loc,{#10000},1,14,1,22"
 locations_default(#20032,#10000,1,14,1,22)
 hasLocation(#20031,#20032)
-regexpConstValue(#20031,"Hello ES6")
+regexp_const_value(#20031,"Hello ES6")
 #20033=*
 entry_cfg_node(#20033,#20001)
 #20034=@"loc,{#10000},1,1,1,0"
--- a/javascript/extractor/tests/extensions/output/trap/tst2.es.trap
+++ b/javascript/extractor/tests/extensions/output/trap/tst2.es.trap
@ -110,7 +110,7 @@ regexpterm(#20031,14,#20030,0,"Hello ES")
 #20032=@"loc,{#10000},1,14,1,21"
 locations_default(#20032,#10000,1,14,1,21)
 hasLocation(#20031,#20032)
-regexpConstValue(#20031,"Hello ES")
+regexp_const_value(#20031,"Hello ES")
 #20033=*
 entry_cfg_node(#20033,#20001)
 #20034=@"loc,{#10000},1,1,1,0"
--- a/javascript/extractor/tests/extensions/output/trap/tst4.cjs.trap
+++ b/javascript/extractor/tests/extensions/output/trap/tst4.cjs.trap
@ -127,7 +127,7 @@ regexpterm(#20040,14,#20039,0,"Hello CommonJS")
 #20041=@"loc,{#10000},1,14,1,27"
 locations_default(#20041,#10000,1,14,1,27)
 hasLocation(#20040,#20041)
-regexpConstValue(#20040,"Hello CommonJS")
+regexp_const_value(#20040,"Hello CommonJS")
 #20042=*
 entry_cfg_node(#20042,#20001)
 #20043=@"loc,{#10000},1,1,1,0"
--- a/javascript/extractor/tests/externs/output/trap/Point.js.trap
+++ b/javascript/extractor/tests/externs/output/trap/Point.js.trap
@ -839,7 +839,7 @@ regexpterm(#20266,14,#20265,0,"final")
 #20267=@"loc,{#10000},15,18,15,22"
 locations_default(#20267,#10000,15,18,15,22)
 hasLocation(#20266,#20267)
-regexpConstValue(#20266,"final")
+regexp_const_value(#20266,"final")
 #20268=*
 stmts(#20268,2,#20001,9,"'use strict';")
 hasLocation(#20268,#20036)
@ -855,7 +855,7 @@ regexpterm(#20270,14,#20269,0,"use strict")
 #20271=@"loc,{#10000},17,2,17,11"
 locations_default(#20271,#10000,17,2,17,11)
 hasLocation(#20270,#20271)
-regexpConstValue(#20270,"use strict")
+regexp_const_value(#20270,"use strict")
 #20272=*
 entry_cfg_node(#20272,#20001)
 #20273=@"loc,{#10000},1,1,1,0"
--- a/javascript/extractor/tests/flow/output/trap/export.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/export.js.trap
@ -239,7 +239,7 @@ regexpterm(#20086,14,#20085,0,"m")
 #20087=@"loc,{#10000},1,20,1,20"
 locations_default(#20087,#10000,1,20,1,20)
 hasLocation(#20086,#20087)
-regexpConstValue(#20086,"m")
+regexp_const_value(#20086,"m")
 #20088=*
 exprs(#20088,86,#20084,0,"a")
 hasLocation(#20088,#20017)
@ -272,7 +272,7 @@ regexpterm(#20093,14,#20092,0,"m")
 #20094=@"loc,{#10000},2,16,2,16"
 locations_default(#20094,#10000,2,16,2,16)
 hasLocation(#20093,#20094)
-regexpConstValue(#20093,"m")
+regexp_const_value(#20093,"m")
 #20095=*
 entry_cfg_node(#20095,#20001)
 #20096=@"loc,{#10000},1,1,1,0"
--- a/javascript/extractor/tests/flow/output/trap/importType.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/importType.js.trap
@ -211,7 +211,7 @@ regexpterm(#20075,14,#20074,0,"m")
 #20076=@"loc,{#10000},1,43,1,43"
 locations_default(#20076,#10000,1,43,1,43)
 hasLocation(#20075,#20076)
-regexpConstValue(#20075,"m")
+regexp_const_value(#20075,"m")
 #20077=*
 exprs(#20077,83,#20073,0,"type")
 hasLocation(#20077,#20013)
--- a/javascript/extractor/tests/flow/output/trap/notExplicitTypeParameters3.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/notExplicitTypeParameters3.js.trap
@ -91,7 +91,7 @@ regexpterm(#20028,14,#20027,0,"x")
 #20029=@"loc,{#10000},1,2,1,2"
 locations_default(#20029,#10000,1,2,1,2)
 hasLocation(#20028,#20029)
-regexpConstValue(#20028,"x")
+regexp_const_value(#20028,"x")
 #20030=*
 exprs(#20030,3,#20025,1,"2")
 hasLocation(#20030,#20009)
--- a/javascript/extractor/tests/functionbind/output/trap/tst.js.trap
+++ b/javascript/extractor/tests/functionbind/output/trap/tst.js.trap
@ -450,7 +450,7 @@ regexpterm(#20139,14,#20138,0,"x")
 #20140=@"loc,{#10000},5,18,5,18"
 locations_default(#20140,#10000,5,18,5,18)
 hasLocation(#20139,#20140)
-regexpConstValue(#20139,"x")
+regexp_const_value(#20139,"x")
 #20141=*
 entry_cfg_node(#20141,#20001)
 #20142=@"loc,{#10000},1,1,1,0"
--- a/javascript/extractor/tests/helloworld/output/trap/hello.js.trap
+++ b/javascript/extractor/tests/helloworld/output/trap/hello.js.trap
@ -78,7 +78,7 @@ regexpterm(#20022,14,#20021,0,"Hello, world!")
 #20023=@"loc,{#10000},1,8,1,20"
 locations_default(#20023,#10000,1,8,1,20)
 hasLocation(#20022,#20023)
-regexpConstValue(#20022,"Hello, world!")
+regexp_const_value(#20022,"Hello, world!")
 #20024=*
 entry_cfg_node(#20024,#20001)
 #20025=@"loc,{#10000},1,1,1,0"
--- a/javascript/extractor/tests/html/output/trap/entities.html.trap
+++ b/javascript/extractor/tests/html/output/trap/entities.html.trap
@ -100,7 +100,7 @@ regexpterm(#20029,14,#20028,0,"Nope!")
 #20030=@"loc,{#10000},6,41,6,45"
 locations_default(#20030,#10000,6,41,6,45)
 hasLocation(#20029,#20030)
-regexpConstValue(#20029,"Nope!")
+regexp_const_value(#20029,"Nope!")
 #20031=*
 entry_cfg_node(#20031,#20001)
 #20032=@"loc,{#10000},6,29,6,28"
--- a/javascript/extractor/tests/html/output/trap/module.html.trap
+++ b/javascript/extractor/tests/html/output/trap/module.html.trap
@ -131,7 +131,7 @@ regexpterm(#20042,14,#20041,0,"bar")
 #20043=@"loc,{#10000},5,30,5,32"
 locations_default(#20043,#10000,5,30,5,32)
 hasLocation(#20042,#20043)
-regexpConstValue(#20042,"bar")
+regexp_const_value(#20042,"bar")
 #20044=*
 exprs(#20044,84,#20039,0,"foo")
 hasLocation(#20044,#20013)
--- a/javascript/extractor/tests/html/output/trap/tst.html.trap
+++ b/javascript/extractor/tests/html/output/trap/tst.html.trap
@ -95,7 +95,7 @@ regexpterm(#20028,14,#20027,0,"Hello, world!")
 #20029=@"loc,{#10000},6,20,6,32"
 locations_default(#20029,#10000,6,20,6,32)
 hasLocation(#20028,#20029)
-regexpConstValue(#20028,"Hello, world!")
+regexp_const_value(#20028,"Hello, world!")
 #20030=*
 entry_cfg_node(#20030,#20001)
 hasLocation(#20030,#20003)
@ -228,7 +228,7 @@ regexpterm(#20069,14,#20068,0,"Nope!")
 #20070=@"loc,{#10000},11,41,11,45"
 locations_default(#20070,#10000,11,41,11,45)
 hasLocation(#20069,#20070)
-regexpConstValue(#20069,"Nope!")
+regexp_const_value(#20069,"Nope!")
 #20071=*
 entry_cfg_node(#20071,#20042)
 #20072=@"loc,{#10000},11,29,11,28"
@ -305,7 +305,7 @@ regexpterm(#20091,14,#20090,0,"I said don't click!")
 #20092=@"loc,{#10000},12,30,12,49"
 locations_default(#20092,#10000,12,30,12,49)
 hasLocation(#20091,#20092)
-regexpConstValue(#20091,"I said don't click!")
+regexp_const_value(#20091,"I said don't click!")
 #20093=*
 entry_cfg_node(#20093,#20074)
 #20094=@"loc,{#10000},12,23,12,22"
--- a/javascript/extractor/tests/html/output/trap/tst2.html.trap
+++ b/javascript/extractor/tests/html/output/trap/tst2.html.trap
@ -287,7 +287,7 @@ regexpterm(#20086,14,#20085,0,"f")
 #20087=@"loc,{#10000},8,22,8,22"
 locations_default(#20087,#10000,8,22,8,22)
 hasLocation(#20086,#20087)
-regexpConstValue(#20086,"f")
+regexp_const_value(#20086,"f")
 #20088=*
 exprs(#20088,84,#20083,0,"f")
 hasLocation(#20088,#20071)
--- a/javascript/extractor/tests/jsx/output/trap/tst.js.trap
+++ b/javascript/extractor/tests/jsx/output/trap/tst.js.trap
@ -545,7 +545,7 @@ regexpterm(#20192,14,#20191,0,"b&r")
 #20193=@"loc,{#10000},3,9,3,11"
 locations_default(#20193,#10000,3,9,3,11)
 hasLocation(#20192,#20193)
-regexpConstValue(#20192,"b&r")
+regexp_const_value(#20192,"b&r")
 #20194=*
 properties(#20194,#20182,1,3,"i={""a""+""b""}")
 #20195=@"loc,{#10000},3,18,3,28"
@ -575,7 +575,7 @@ regexpterm(#20200,14,#20199,0,"a")
 #20201=@"loc,{#10000},3,22,3,22"
 locations_default(#20201,#10000,3,22,3,22)
 hasLocation(#20200,#20201)
-regexpConstValue(#20200,"a")
+regexp_const_value(#20200,"a")
 #20202=*
 exprs(#20202,4,#20197,1,"""b""")
 hasLocation(#20202,#20067)
@ -587,7 +587,7 @@ regexpterm(#20203,14,#20202,0,"b")
 #20204=@"loc,{#10000},3,26,3,26"
 locations_default(#20204,#10000,3,26,3,26)
 hasLocation(#20203,#20204)
-regexpConstValue(#20203,"b")
+regexp_const_value(#20203,"b")
 #20205=*
 exprs(#20205,79,#20182,-2,"j")
 hasLocation(#20205,#20075)
--- a/javascript/extractor/tests/mozilla/output/trap/exprfns.js.trap
+++ b/javascript/extractor/tests/mozilla/output/trap/exprfns.js.trap
@ -245,7 +245,7 @@ regexpterm(#20084,14,#20083,0,"result")
 #20085=@"loc,{#10000},1,16,1,21"
 locations_default(#20085,#10000,1,16,1,21)
 hasLocation(#20084,#20085)
-regexpConstValue(#20084,"result")
+regexp_const_value(#20084,"result")
 #20086=*
 stmts(#20086,2,#20001,1,"functio ... )\n  }\n}")
 #20087=@"loc,{#10000},3,1,7,1"
@ -342,7 +342,7 @@ regexpterm(#20111,14,#20110,0,"other result")
 #20112=@"loc,{#10000},5,20,5,31"
 locations_default(#20112,#10000,5,20,5,31)
 hasLocation(#20111,#20112)
-regexpConstValue(#20111,"other result")
+regexp_const_value(#20111,"other result")
 #20113=*
 entry_cfg_node(#20113,#20001)
 #20114=@"loc,{#10000},1,1,1,0"
--- a/javascript/extractor/tests/mozilla/output/trap/guardedCatch.js.trap
+++ b/javascript/extractor/tests/mozilla/output/trap/guardedCatch.js.trap
@ -456,7 +456,7 @@ regexpterm(#20150,14,#20149,0,"error!")
 #20151=@"loc,{#10000},5,16,5,21"
 locations_default(#20151,#10000,5,16,5,21)
 hasLocation(#20150,#20151)
-regexpConstValue(#20150,"error!")
+regexp_const_value(#20150,"error!")
 #20152=*
 stmts(#20152,20,#20119,2,"catch ( ... !"");\n\t}")
 #20153=@"loc,{#10000},6,4,8,2"
@ -526,7 +526,7 @@ regexpterm(#20168,14,#20167,0,"something else!")
 #20169=@"loc,{#10000},7,16,7,30"
 locations_default(#20169,#10000,7,16,7,30)
 hasLocation(#20168,#20169)
-regexpConstValue(#20168,"something else!")
+regexp_const_value(#20168,"something else!")
 #20170=*
 entry_cfg_node(#20170,#20001)
 #20171=@"loc,{#10000},1,1,1,0"
--- a/javascript/extractor/tests/mozilla/output/trap/new-with-trailing-arg.js.trap
+++ b/javascript/extractor/tests/mozilla/output/trap/new-with-trailing-arg.js.trap
@ -184,7 +184,7 @@ regexpterm(#20059,14,#20058,0,"bar")
 #20060=@"loc,{#10000},2,17,2,19"
 locations_default(#20060,#10000,2,17,2,19)
 hasLocation(#20059,#20060)
-regexpConstValue(#20059,"bar")
+regexp_const_value(#20059,"bar")
 #20061=*
 stmts(#20061,2,#20001,1,"new A()")
 hasLocation(#20061,#20013)
--- a/javascript/extractor/tests/node/output/trap/hello.trap
+++ b/javascript/extractor/tests/node/output/trap/hello.trap
@ -127,7 +127,7 @@ regexpterm(#20039,14,#20038,0,"Hello, world!")
 #20040=@"loc,{#10000},2,14,2,26"
 locations_default(#20040,#10000,2,14,2,26)
 hasLocation(#20039,#20040)
-regexpConstValue(#20039,"Hello, world!")
+regexp_const_value(#20039,"Hello, world!")
 #20041=*
 entry_cfg_node(#20041,#20001)
 #20042=@"loc,{#10000},2,1,2,0"
--- a/javascript/extractor/tests/node/output/trap/tst.js.trap
+++ b/javascript/extractor/tests/node/output/trap/tst.js.trap
@ -237,7 +237,7 @@ regexpterm(#20083,14,#20082,0,"fs")
 #20084=@"loc,{#10000},1,19,1,20"
 locations_default(#20084,#10000,1,19,1,20)
 hasLocation(#20083,#20084)
-regexpConstValue(#20083,"fs")
+regexp_const_value(#20083,"fs")
 #20085=*
 stmts(#20085,2,#20001,1,"y = 42;")
 hasLocation(#20085,#20005)
--- a/javascript/extractor/tests/regexp/output/trap/nonstandard.js.trap
+++ b/javascript/extractor/tests/regexp/output/trap/nonstandard.js.trap
@ -47,7 +47,7 @@ regexpterm(#20012,14,#20011,0,"dice")
 #20013=@"loc,{#10000},1,2,1,5"
 locations_default(#20013,#10000,1,2,1,5)
 hasLocation(#20012,#20013)
-regexpConstValue(#20012,"dice")
+regexp_const_value(#20012,"dice")
 #20014=*
 entry_cfg_node(#20014,#20001)
 #20015=@"loc,{#10000},1,1,1,0"
--- a/javascript/extractor/tests/regexp/output/trap/odasa-1934.js.trap
+++ b/javascript/extractor/tests/regexp/output/trap/odasa-1934.js.trap
@ -244,7 +244,7 @@ regexpterm(#20082,14,#20081,0,"x")
 #20083=@"loc,{#10000},4,4,4,4"
 locations_default(#20083,#10000,4,4,4,4)
 hasLocation(#20082,#20083)
-regexpConstValue(#20082,"x")
+regexp_const_value(#20082,"x")
 #20084=*
 exprs(#20084,44,#20077,1,"(r = /[ ... && r[0]")
 #20085=@"loc,{#10000},5,3,5,33"
@ -309,7 +309,7 @@ regexpterm(#20100,15,#20098,0,"\x")
 #20101=@"loc,{#10000},5,10,5,11"
 locations_default(#20101,#10000,5,10,5,11)
 hasLocation(#20100,#20101)
-regexpConstValue(#20100,"")
+regexp_const_value(#20100,"")
 #20102=*
 regexp_parse_errors(#20102,#20096,"expected hexadecimal digit")
 #20103=@"loc,{#10000},5,12,5,12"
@ -335,7 +335,7 @@ regexpterm(#20107,14,#20106,0,"x")
 #20108=@"loc,{#10000},5,22,5,22"
 locations_default(#20108,#10000,5,22,5,22)
 hasLocation(#20107,#20108)
-regexpConstValue(#20107,"x")
+regexp_const_value(#20107,"x")
 #20109=*
 exprs(#20109,15,#20084,1,"r[0]")
 #20110=@"loc,{#10000},5,30,5,33"
@ -367,7 +367,7 @@ regexpterm(#20114,14,#20113,0,"Section 1")
 #20115=@"loc,{#10000},6,4,6,12"
 locations_default(#20115,#10000,6,4,6,12)
 hasLocation(#20114,#20115)
-regexpConstValue(#20114,"Section 1")
+regexp_const_value(#20114,"Section 1")
 #20116=*
 entry_cfg_node(#20116,#20001)
 #20117=@"loc,{#10000},1,1,1,0"
--- a/javascript/extractor/tests/regexp/output/trap/tst.js.trap
+++ b/javascript/extractor/tests/regexp/output/trap/tst.js.trap
--- a/javascript/extractor/tests/shebang/output/trap/tst.js.trap
+++ b/javascript/extractor/tests/shebang/output/trap/tst.js.trap
@ -103,7 +103,7 @@ regexpterm(#20033,14,#20032,0,"Hi!")
 #20034=@"loc,{#10000},2,8,2,10"
 locations_default(#20034,#10000,2,8,2,10)
 hasLocation(#20033,#20034)
-regexpConstValue(#20033,"Hi!")
+regexp_const_value(#20033,"Hi!")
 #20035=*
 entry_cfg_node(#20035,#20001)
 #20036=@"loc,{#10000},2,1,2,0"
--- a/javascript/extractor/tests/stmts/output/trap/try.js.trap
+++ b/javascript/extractor/tests/stmts/output/trap/try.js.trap
@ -238,7 +238,7 @@ regexpterm(#20086,14,#20085,0,"!")
 #20087=@"loc,{#10000},2,12,2,12"
 locations_default(#20087,#10000,2,12,2,12)
 hasLocation(#20086,#20087)
-regexpConstValue(#20086,"!")
+regexp_const_value(#20086,"!")
 #20088=*
 stmts(#20088,20,#20079,1,"catch(x) { ; }")
 #20089=@"loc,{#10000},3,3,3,16"
--- a/javascript/extractor/tests/strictmode/output/trap/assignargs.js.trap
+++ b/javascript/extractor/tests/strictmode/output/trap/assignargs.js.trap
@ -144,7 +144,7 @@ regexpterm(#20046,14,#20045,0,"use strict")
 #20047=@"loc,{#10000},2,4,2,13"
 locations_default(#20047,#10000,2,4,2,13)
 hasLocation(#20046,#20047)
-regexpConstValue(#20046,"use strict")
+regexp_const_value(#20046,"use strict")
 #20048=*
 stmts(#20048,2,#20041,1,"arguments = 42;")
 #20049=@"loc,{#10000},3,3,3,17"
--- a/javascript/extractor/tests/strictmode/output/trap/tst.js.trap
+++ b/javascript/extractor/tests/strictmode/output/trap/tst.js.trap
@ -58,7 +58,7 @@ regexpterm(#20016,14,#20015,0,"use strict")
 #20017=@"loc,{#10000},1,2,1,11"
 locations_default(#20017,#10000,1,2,1,11)
 hasLocation(#20016,#20017)
-regexpConstValue(#20016,"use strict")
+regexp_const_value(#20016,"use strict")
 #20018=*
 stmts(#20018,0,#20001,1,";")
 hasLocation(#20018,#20005)
--- a/javascript/extractor/tests/ts/output/trap/externalmodule.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/externalmodule.ts.trap
@ -246,7 +246,7 @@ regexpterm(#20085,14,#20084,0,"X")
 #20086=@"loc,{#10000},1,17,1,17"
 locations_default(#20086,#10000,1,17,1,17)
 hasLocation(#20085,#20086)
-regexpConstValue(#20085,"X")
+regexp_const_value(#20085,"X")
 #20087=*
 scopes(#20087,15)
 scopenodes(#20082,#20087)
--- a/javascript/extractor/tests/ts/output/trap/hello.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/hello.ts.trap
@ -239,7 +239,7 @@ regexpterm(#20080,14,#20079,0,"Hello, ")
 #20081=@"loc,{#10000},2,13,2,19"
 locations_default(#20081,#10000,2,13,2,19)
 hasLocation(#20080,#20081)
-regexpConstValue(#20080,"Hello, ")
+regexp_const_value(#20080,"Hello, ")
 #20082=*
 exprs(#20082,79,#20077,1,"person")
 hasLocation(#20082,#20035)
@ -258,7 +258,7 @@ regexpterm(#20084,14,#20083,0,"!")
 #20085=@"loc,{#10000},2,34,2,34"
 locations_default(#20085,#10000,2,34,2,34)
 hasLocation(#20084,#20085)
-regexpConstValue(#20084,"!")
+regexp_const_value(#20084,"!")
 #20086=*
 stmts(#20086,2,#20001,1,"alert(g ... rld""));")
 hasLocation(#20086,#20011)
@ -304,7 +304,7 @@ regexpterm(#20095,14,#20094,0,"world")
 #20096=@"loc,{#10000},5,16,5,20"
 locations_default(#20096,#10000,5,16,5,20)
 hasLocation(#20095,#20096)
-regexpConstValue(#20095,"world")
+regexp_const_value(#20095,"world")
 #20097=*
 entry_cfg_node(#20097,#20001)
 #20098=@"loc,{#10000},1,1,1,0"
--- a/javascript/extractor/tests/ts/output/trap/importExport.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/importExport.ts.trap
@ -151,7 +151,7 @@ regexpterm(#20050,14,#20049,0,"somewhere")
 #20051=@"loc,{#10000},1,29,1,37"
 locations_default(#20051,#10000,1,29,1,37)
 hasLocation(#20050,#20051)
-regexpConstValue(#20050,"somewhere")
+regexp_const_value(#20050,"somewhere")
 #20052=*
 exprs(#20052,85,#20048,0,"* as Something")
 #20053=@"loc,{#10000},1,8,1,21"
--- a/javascript/extractor/tests/ts/output/trap/importassign.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/importassign.ts.trap
@ -121,7 +121,7 @@ regexpterm(#20036,14,#20032,1,"/exportassign")
 #20037=@"loc,{#10000},1,22,1,34"
 locations_default(#20037,#10000,1,22,1,34)
 hasLocation(#20036,#20037)
-regexpConstValue(#20036,"/exportassign")
+regexp_const_value(#20036,"/exportassign")
 #20038=*
 entry_cfg_node(#20038,#20001)
 #20039=@"loc,{#10000},1,1,1,0"
--- a/javascript/extractor/tests/ts/output/trap/regexp.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/regexp.ts.trap
@ -40,7 +40,7 @@ regexpterm(#20009,14,#20008,0,"a")
 #20010=@"loc,{#10000},1,2,1,2"
 locations_default(#20010,#10000,1,2,1,2)
 hasLocation(#20009,#20010)
-regexpConstValue(#20009,"a")
+regexp_const_value(#20009,"a")
 #20011=*
 entry_cfg_node(#20011,#20001)
 #20012=@"loc,{#10000},1,1,1,0"
--- a/javascript/extractor/tests/ts/output/trap/tsx.tsx.trap
+++ b/javascript/extractor/tests/ts/output/trap/tsx.tsx.trap
@ -277,7 +277,7 @@ regexpterm(#20093,14,#20091,0,"
 #20094=@"loc,{#10000},2,4,2,6"
 locations_default(#20094,#10000,2,4,2,6)
 hasLocation(#20093,#20094)
-regexpConstValue(#20093,"
+regexp_const_value(#20093,"
  ")
 #20095=*
 exprs(#20095,89,#20079,-3,"<this.props.icon/>")
@ -332,7 +332,7 @@ regexpterm(#20106,14,#20104,0,"
 #20107=@"loc,{#10000},3,4,3,6"
 locations_default(#20107,#10000,3,4,3,6)
 hasLocation(#20106,#20107)
-regexpConstValue(#20106,"
+regexp_const_value(#20106,"
  ")
 #20108=*
 exprs(#20108,89,#20079,-5,"<name-with-dashes/>")
@ -364,7 +364,7 @@ regexpterm(#20114,14,#20112,0,"
 #20115=@"loc,{#10000},4,2,4,2"
 locations_default(#20115,#10000,4,2,4,2)
 hasLocation(#20114,#20115)
-regexpConstValue(#20114,"
+regexp_const_value(#20114,"
 ")
 #20116=*
 entry_cfg_node(#20116,#20001)
--- a/javascript/ql/src/semmle/javascript/Aliases.qll
+++ b/javascript/ql/src/semmle/javascript/Aliases.qll
@ -255,3 +255,8 @@ deprecated predicate isNamedCapture(RegExpGroup id, string name) { is_named_capt
 * Use `RegExpCharacterClass#isInverted()` instead.
 */ 
 deprecated predicate isInverted(RegExpCharacterClass id) { is_inverted(id) }
+/**
+ * Alias for the predicate `regexp_const_value` defined in the .dbscheme.
+ * Use `RegExpConstant#getValue()` instead.
+ */ 
+deprecated predicate regexpConstValue(RegExpConstant id, string value) { regexp_const_value(id, value) }
--- a/javascript/ql/src/semmle/javascript/Regexp.qll
+++ b/javascript/ql/src/semmle/javascript/Regexp.qll
@ -216,7 +216,7 @@ class RegExpEscape extends RegExpTerm, @regexp_escape { }
 */
 class RegExpConstant extends RegExpTerm, @regexp_constant {
  /** Gets the string matched by this constant term. */
-  string getValue() { regexpConstValue(this, result) }
+  string getValue() { regexp_const_value(this, result) }

  /**
   * Holds if this constant represents a valid Unicode character (as opposed
--- a/javascript/ql/src/semmlecode.javascript.dbscheme
+++ b/javascript/ql/src/semmlecode.javascript.dbscheme
@ -883,7 +883,7 @@ range_quantifier_upper_bound (unique int id: @regexp_range ref, int hi: int ref)
 is_capture (unique int id: @regexp_group ref, int number: int ref);
 is_named_capture (unique int id: @regexp_group ref, string name: string ref);
 is_inverted (int id: @regexp_char_class ref);
-regexpConstValue (unique int id: @regexp_constant ref, varchar(1) value: string ref);
+regexp_const_value (unique int id: @regexp_constant ref, varchar(1) value: string ref);
 charClassEscape (unique int id: @regexp_char_class_escape ref, varchar(1) value: string ref);
 backref (unique int id: @regexp_backref ref, int value: int ref);
 namedBackref (unique int id: @regexp_backref ref, string name: string ref);
--- a/javascript/ql/src/semmlecode.javascript.dbscheme.stats
+++ b/javascript/ql/src/semmlecode.javascript.dbscheme.stats
@ -20447,7 +20447,7 @@
 <dependencies/>
 </relation>
 <relation>
-<name>regexpConstValue</name>
+<name>regexp_const_value</name>
 <cardinality>19032</cardinality>
 <columnsizes>
 <e>
--- a/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties
+++ b/javascript/upgrades/c73fbfca57f3d593b9ff50c6aa3a886d6888efec/upgrade.properties
@ -76,3 +76,5 @@ is_named_capture.rel: reorder isNamedCapture.rel(int id, string name) id name
 isNamedCapture.rel: delete
 is_inverted.rel: reorder isInverted.rel(int id) id
 isInverted.rel: delete
+regexp_const_value.rel: reorder regexpConstValue.rel(int id, string value) id value
+regexpConstValue.rel: delete