Simplify expression numbering logic in CelExprFactory

PiperOrigin-RevId: 844507936

Author: Stephen Roberts

common/src/main/java/dev/cel/common/ast/CelExprFactory.java

@@ -264,12 +264,5 @@ protected long nextExprId() {
     return ++exprId;
   }
 
-  /** Attempts to decrement the next expr ID if possible. */
-  protected void maybeDeleteId(long id) {
-    if (id == exprId - 1) {
-      exprId--;
-    }
-  }
-
   protected CelExprFactory() {}
 }

parser/src/main/java/dev/cel/parser/Parser.java

@@ -686,7 +686,7 @@ private Optional<CelExpr> visitMacro(
           CelExpr.newBuilder().setCall(callExpr.build()).build());
     }
 
-    exprFactory.maybeDeleteId(expr.id());
+    sourceInfo.removePositions(expr.id());
     return expandedMacro;
   }
 
@@ -1165,12 +1165,6 @@ private long nextExprId(int position) {
       return exprId;
     }
 
-    @Override
-    protected void maybeDeleteId(long id) {
-      sourceInfo.removePositions(id);
-      super.maybeDeleteId(id);
-    }
-
     @Override
     public long copyExprId(long id) {
       return nextExprId(getPosition(id));