@@ -1636,7 +1636,7 @@ class StepsExpressionImpl extends SimpleReferenceExpressionImpl {
16361636 exists ( string expr |
16371637 (
16381638 exists ( getAJsonReferenceExpression ( expression , _) ) and
1639- expr = normalizeExpr ( expression ) .regexpCapture ( "(?i)fromjson \\((.*)\\).*" , 1 )
1639+ expr = normalizeExpr ( expression ) .regexpCapture ( "(?i)(from|to)json \\((.*)\\).*" , 2 )
16401640 or
16411641 exists ( getASimpleReferenceExpression ( expression , _) ) and
16421642 expr = normalizeExpr ( expression )
@@ -1677,7 +1677,7 @@ class NeedsExpressionImpl extends SimpleReferenceExpressionImpl {
16771677 exists ( string expr |
16781678 (
16791679 exists ( getAJsonReferenceExpression ( expression , _) ) and
1680- expr = normalizeExpr ( expression ) .regexpCapture ( "(?i)fromjson \\((.*)\\).*" , 1 )
1680+ expr = normalizeExpr ( expression ) .regexpCapture ( "(?i)(from|to)json \\((.*)\\).*" , 2 )
16811681 or
16821682 exists ( getASimpleReferenceExpression ( expression , _) ) and
16831683 expr = normalizeExpr ( expression )
@@ -1721,7 +1721,7 @@ class JobsExpressionImpl extends SimpleReferenceExpressionImpl {
17211721 exists ( string expr |
17221722 (
17231723 exists ( getAJsonReferenceExpression ( expression , _) ) and
1724- expr = normalizeExpr ( expression ) .regexpCapture ( "(?i)fromjson \\((.*)\\).*" , 1 )
1724+ expr = normalizeExpr ( expression ) .regexpCapture ( "(?i)(from|to)json \\((.*)\\).*" , 2 )
17251725 or
17261726 exists ( getASimpleReferenceExpression ( expression , _) ) and
17271727 expr = normalizeExpr ( expression )
@@ -1780,7 +1780,7 @@ class EnvExpressionImpl extends SimpleReferenceExpressionImpl {
17801780 exists ( string expr |
17811781 (
17821782 exists ( getAJsonReferenceExpression ( expression , _) ) and
1783- expr = normalizeExpr ( expression ) .regexpCapture ( "(?i)fromjson \\((.*)\\).*" , 1 )
1783+ expr = normalizeExpr ( expression ) .regexpCapture ( "(?i)(from|to)json \\((.*)\\).*" , 2 )
17841784 or
17851785 exists ( getASimpleReferenceExpression ( expression , _) ) and
17861786 expr = normalizeExpr ( expression )
@@ -1815,7 +1815,7 @@ class MatrixExpressionImpl extends SimpleReferenceExpressionImpl {
18151815 exists ( string expr |
18161816 (
18171817 exists ( getAJsonReferenceExpression ( expression , _) ) and
1818- expr = normalizeExpr ( expression ) .regexpCapture ( "(?i)fromjson \\((.*)\\).*" , 1 )
1818+ expr = normalizeExpr ( expression ) .regexpCapture ( "(?i)(from|to)json \\((.*)\\).*" , 2 )
18191819 or
18201820 exists ( getASimpleReferenceExpression ( expression , _) ) and
18211821 expr = normalizeExpr ( expression )
0 commit comments