diff --git a/javascript/ql/src/semmle/javascript/Expr.qll b/javascript/ql/src/semmle/javascript/Expr.qll index b1cb509edbd..7643cfaec82 100644 --- a/javascript/ql/src/semmle/javascript/Expr.qll +++ b/javascript/ql/src/semmle/javascript/Expr.qll @@ -1717,7 +1717,7 @@ class InstanceofExpr extends @instanceof_expr, BinaryExpr { * x != null && x.f * ``` */ -class LogAndExpr extends @logandexpr, BinaryExpr { +class LogAndExpr extends @logand_expr, BinaryExpr { override string getOperator() { result = "&&" } override ControlFlowNode getFirstControlFlowNode() { result = this } diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme b/javascript/ql/src/semmlecode.javascript.dbscheme index 33c7b4ad154..e870cc8cd35 100644 --- a/javascript/ql/src/semmlecode.javascript.dbscheme +++ b/javascript/ql/src/semmlecode.javascript.dbscheme @@ -280,7 +280,7 @@ case @expr.kind of | 41 = @bitand_expr | 42 = @in_expr | 43 = @instanceof_expr -| 44 = @logandexpr +| 44 = @logand_expr | 45 = @logorexpr | 47 = @assignexpr | 48 = @assignaddexpr @@ -373,7 +373,7 @@ case @expr.kind of @comparison = @equality_test | @lt_expr | @le_expr | @gt_expr | @ge_expr; -@binaryexpr = @comparison | @lshift_expr | @rshift_expr | @urshift_expr | @add_expr | @sub_expr | @mul_expr | @div_expr | @mod_expr | @expexpr | @bitor_expr | @xor_expr | @bitand_expr | @in_expr | @instanceof_expr | @logandexpr | @logorexpr | @nullishcoalescingexpr; +@binaryexpr = @comparison | @lshift_expr | @rshift_expr | @urshift_expr | @add_expr | @sub_expr | @mul_expr | @div_expr | @mod_expr | @expexpr | @bitor_expr | @xor_expr | @bitand_expr | @in_expr | @instanceof_expr | @logand_expr | @logorexpr | @nullishcoalescingexpr; @assignment = @assignexpr | @assignaddexpr | @assignsubexpr | @assignmulexpr | @assigndivexpr | @assignmodexpr | @assignexpexpr | @assignlshiftexpr | @assignrshiftexpr | @assignurshiftexpr | @assignorexpr | @assignxorexpr | @assignandexpr | @assignlogandexpr | @assignlogorexpr | @assignnullishcoalescingexpr; diff --git a/javascript/ql/src/semmlecode.javascript.dbscheme.stats b/javascript/ql/src/semmlecode.javascript.dbscheme.stats index 50fb8ae5789..bf564ea75e6 100644 --- a/javascript/ql/src/semmlecode.javascript.dbscheme.stats +++ b/javascript/ql/src/semmlecode.javascript.dbscheme.stats @@ -366,7 +366,7 @@ 1184 -@logandexpr +@logand_expr 15892