Add && and || operators to Soy.

PiperOrigin-RevId: 575902499
google · Oct 23, 2023 · b97cdba · b97cdba
1 parent 1ca3f4f
commit b97cdba
Show file tree

Hide file tree

Showing 19 changed files with 265 additions and 23 deletions.
diff --git a/java/src/com/google/template/soy/exprtree/AbstractExprNodeVisitor.java b/java/src/com/google/template/soy/exprtree/AbstractExprNodeVisitor.java
@@ -21,8 +21,10 @@
 import com.google.template.soy.exprtree.ExprNode.OperatorNode;
 import com.google.template.soy.exprtree.ExprNode.ParentExprNode;
 import com.google.template.soy.exprtree.ExprNode.PrimitiveNode;
+import com.google.template.soy.exprtree.OperatorNodes.AmpAmpOpNode;
 import com.google.template.soy.exprtree.OperatorNodes.AndOpNode;
 import com.google.template.soy.exprtree.OperatorNodes.AssertNonNullOpNode;
+import com.google.template.soy.exprtree.OperatorNodes.BarBarOpNode;
 import com.google.template.soy.exprtree.OperatorNodes.BitwiseAndOpNode;
 import com.google.template.soy.exprtree.OperatorNodes.BitwiseOrOpNode;
 import com.google.template.soy.exprtree.OperatorNodes.BitwiseXorOpNode;
@@ -191,9 +193,15 @@ protected final void visit(ExprNode node) {
       case AND_OP_NODE:
         visitAndOpNode((AndOpNode) node);
         break;
+      case AMP_AMP_OP_NODE:
+        visitAmpAmpOpNode((AmpAmpOpNode) node);
+        break;
       case OR_OP_NODE:
         visitOrOpNode((OrOpNode) node);
         break;
+      case BAR_BAR_OP_NODE:
+        visitBarBarOpNode((BarBarOpNode) node);
+        break;
       case NULL_COALESCING_OP_NODE:
         visitNullCoalescingOpNode((NullCoalescingOpNode) node);
         break;
@@ -427,10 +435,18 @@ protected void visitAndOpNode(AndOpNode node) {
     visitOperatorNode(node);
   }
 
+  protected void visitAmpAmpOpNode(AmpAmpOpNode node) {
+    visitOperatorNode(node);
+  }
+
   protected void visitOrOpNode(OrOpNode node) {
     visitOperatorNode(node);
   }
 
+  protected void visitBarBarOpNode(BarBarOpNode node) {
+    visitOperatorNode(node);
+  }
+
   protected void visitNullCoalescingOpNode(NullCoalescingOpNode node) {
     visitOperatorNode(node);
   }

diff --git a/java/src/com/google/template/soy/exprtree/AbstractReturningExprNodeVisitor.java b/java/src/com/google/template/soy/exprtree/AbstractReturningExprNodeVisitor.java
@@ -21,8 +21,10 @@
 import com.google.template.soy.exprtree.ExprNode.OperatorNode;
 import com.google.template.soy.exprtree.ExprNode.ParentExprNode;
 import com.google.template.soy.exprtree.ExprNode.PrimitiveNode;
+import com.google.template.soy.exprtree.OperatorNodes.AmpAmpOpNode;
 import com.google.template.soy.exprtree.OperatorNodes.AndOpNode;
 import com.google.template.soy.exprtree.OperatorNodes.AssertNonNullOpNode;
+import com.google.template.soy.exprtree.OperatorNodes.BarBarOpNode;
 import com.google.template.soy.exprtree.OperatorNodes.BitwiseAndOpNode;
 import com.google.template.soy.exprtree.OperatorNodes.BitwiseOrOpNode;
 import com.google.template.soy.exprtree.OperatorNodes.BitwiseXorOpNode;
@@ -161,8 +163,12 @@ protected R visit(ExprNode node) {
         return visitTripleNotEqualOpNode((TripleNotEqualOpNode) node);
       case AND_OP_NODE:
         return visitAndOpNode((AndOpNode) node);
+      case AMP_AMP_OP_NODE:
+        return visitAmpAmpOpNode((AmpAmpOpNode) node);
       case OR_OP_NODE:
         return visitOrOpNode((OrOpNode) node);
+      case BAR_BAR_OP_NODE:
+        return visitBarBarOpNode((BarBarOpNode) node);
       case NULL_COALESCING_OP_NODE:
         return visitNullCoalescingOpNode((NullCoalescingOpNode) node);
       case CONDITIONAL_OP_NODE:
@@ -371,10 +377,18 @@ protected R visitAndOpNode(AndOpNode node) {
     return visitOperatorNode(node);
   }
 
+  protected R visitAmpAmpOpNode(AmpAmpOpNode node) {
+    return visitOperatorNode(node);
+  }
+
   protected R visitOrOpNode(OrOpNode node) {
     return visitOperatorNode(node);
   }
 
+  protected R visitBarBarOpNode(BarBarOpNode node) {
+    return visitOperatorNode(node);
+  }
+
   protected R visitConditionalOpNode(ConditionalOpNode node) {
     return visitOperatorNode(node);
   }

diff --git a/java/src/com/google/template/soy/exprtree/ExprNode.java b/java/src/com/google/template/soy/exprtree/ExprNode.java
@@ -85,7 +85,9 @@ enum Kind {
     TRIPLE_EQUAL_OP_NODE,
     TRIPLE_NOT_EQUAL_OP_NODE,
     AND_OP_NODE,
+    AMP_AMP_OP_NODE,
     OR_OP_NODE,
+    BAR_BAR_OP_NODE,
     NULL_COALESCING_OP_NODE,
     CONDITIONAL_OP_NODE,
     ASSERT_NON_NULL_OP_NODE,

diff --git a/java/src/com/google/template/soy/exprtree/Operator.java b/java/src/com/google/template/soy/exprtree/Operator.java
@@ -30,8 +30,10 @@
 import com.google.errorprone.annotations.Immutable;
 import com.google.template.soy.base.SourceLocation;
 import com.google.template.soy.exprtree.ExprNode.OperatorNode;
+import com.google.template.soy.exprtree.OperatorNodes.AmpAmpOpNode;
 import com.google.template.soy.exprtree.OperatorNodes.AndOpNode;
 import com.google.template.soy.exprtree.OperatorNodes.AssertNonNullOpNode;
+import com.google.template.soy.exprtree.OperatorNodes.BarBarOpNode;
 import com.google.template.soy.exprtree.OperatorNodes.BitwiseAndOpNode;
 import com.google.template.soy.exprtree.OperatorNodes.BitwiseOrOpNode;
 import com.google.template.soy.exprtree.OperatorNodes.BitwiseXorOpNode;
@@ -229,12 +231,27 @@ public OperatorNode createNode(SourceLocation location, SourceLocation operatorL
     }
   },
 
+  AMP_AMP(ImmutableList.of(OPERAND_0, SP, new Token("&&"), SP, OPERAND_1), SoyPrecedence.P3, LEFT) {
+    @Override
+    public OperatorNode createNode(SourceLocation location, SourceLocation operatorLocation) {
+      return new AmpAmpOpNode(location, operatorLocation);
+    }
+  },
+
   OR(ImmutableList.of(OPERAND_0, SP, new Token("or"), SP, OPERAND_1), SoyPrecedence.P2, LEFT) {
     @Override
     public OperatorNode createNode(SourceLocation location, SourceLocation operatorLocation) {
       return new OrOpNode(location, operatorLocation);
     }
   },
+
+  BAR_BAR(ImmutableList.of(OPERAND_0, SP, new Token("||"), SP, OPERAND_1), SoyPrecedence.P2, LEFT) {
+    @Override
+    public OperatorNode createNode(SourceLocation location, SourceLocation operatorLocation) {
+      return new BarBarOpNode(location, operatorLocation);
+    }
+  },
+
   NULL_COALESCING(
       ImmutableList.of(OPERAND_0, SP, new Token("??"), SP, OPERAND_1), SoyPrecedence.P2, LEFT) {
     @Override

diff --git a/java/src/com/google/template/soy/exprtree/OperatorNodes.java b/java/src/com/google/template/soy/exprtree/OperatorNodes.java
@@ -405,6 +405,50 @@ public OrOpNode copy(CopyState copyState) {
     }
   }
 
+  /** Node representing the '&&' operator. */
+  public static final class AmpAmpOpNode extends AbstractOperatorNode {
+
+    public AmpAmpOpNode(SourceLocation sourceLocation, SourceLocation operatorLocation) {
+      super(sourceLocation, Operator.AMP_AMP, operatorLocation);
+    }
+
+    private AmpAmpOpNode(AmpAmpOpNode orig, CopyState copyState) {
+      super(orig, copyState);
+    }
+
+    @Override
+    public Kind getKind() {
+      return Kind.AMP_AMP_OP_NODE;
+    }
+
+    @Override
+    public AmpAmpOpNode copy(CopyState copyState) {
+      return new AmpAmpOpNode(this, copyState);
+    }
+  }
+
+  /** Node representing the '||' operator. */
+  public static final class BarBarOpNode extends AbstractOperatorNode {
+
+    public BarBarOpNode(SourceLocation sourceLocation, SourceLocation operatorLocation) {
+      super(sourceLocation, Operator.BAR_BAR, operatorLocation);
+    }
+
+    private BarBarOpNode(BarBarOpNode orig, CopyState copyState) {
+      super(orig, copyState);
+    }
+
+    @Override
+    public Kind getKind() {
+      return Kind.BAR_BAR_OP_NODE;
+    }
+
+    @Override
+    public BarBarOpNode copy(CopyState copyState) {
+      return new BarBarOpNode(this, copyState);
+    }
+  }
+
   /** Node representing the '?:' (null-coalescing) operator. */
   public static final class NullCoalescingOpNode extends AbstractOperatorNode {
 

diff --git a/java/src/com/google/template/soy/jbcsrc/ExpressionCompiler.java b/java/src/com/google/template/soy/jbcsrc/ExpressionCompiler.java
@@ -57,8 +57,10 @@
 import com.google.template.soy.exprtree.MethodCallNode;
 import com.google.template.soy.exprtree.NullNode;
 import com.google.template.soy.exprtree.NullSafeAccessNode;
+import com.google.template.soy.exprtree.OperatorNodes.AmpAmpOpNode;
 import com.google.template.soy.exprtree.OperatorNodes.AndOpNode;
 import com.google.template.soy.exprtree.OperatorNodes.AssertNonNullOpNode;
+import com.google.template.soy.exprtree.OperatorNodes.BarBarOpNode;
 import com.google.template.soy.exprtree.OperatorNodes.BitwiseAndOpNode;
 import com.google.template.soy.exprtree.OperatorNodes.BitwiseOrOpNode;
 import com.google.template.soy.exprtree.OperatorNodes.BitwiseXorOpNode;
@@ -1086,6 +1088,17 @@ protected SoyExpression visitAndOpNode(AndOpNode node) {
           Branch.and(left.compileToBranch(), right.compileToBranch()).asBoolean());
     }
 
+    @Override
+    protected SoyExpression visitAmpAmpOpNode(AmpAmpOpNode node) {
+      SoyExpression left = visit(node.getChild(0)).box();
+      SoyExpression right = visit(node.getChild(1)).box();
+      Branch condition = left.coerceToBoolean().compileToBranch();
+      return SoyExpression.forSoyValue(
+          node.getType(),
+          condition.ternary(
+              SoyRuntimeType.getBoxedType(node.getType()).runtimeType(), right, left));
+    }
+
     @Override
     protected SoyExpression visitOrOpNode(OrOpNode node) {
       SoyExpression left = visit(node.getChild(0));
@@ -1094,6 +1107,17 @@ protected SoyExpression visitOrOpNode(OrOpNode node) {
           Branch.or(left.compileToBranch(), right.compileToBranch()).asBoolean());
     }
 
+    @Override
+    protected SoyExpression visitBarBarOpNode(BarBarOpNode node) {
+      SoyExpression left = visit(node.getChild(0)).box();
+      SoyExpression right = visit(node.getChild(1)).box();
+      Branch condition = left.coerceToBoolean().compileToBranch();
+      return SoyExpression.forSoyValue(
+          node.getType(),
+          condition.ternary(
+              SoyRuntimeType.getBoxedType(node.getType()).runtimeType(), left, right));
+    }
+
     // Null coalescing operator
 
     @Override

diff --git a/java/src/com/google/template/soy/jbcsrc/TemplateAnalysisImpl.java b/java/src/com/google/template/soy/jbcsrc/TemplateAnalysisImpl.java
@@ -43,8 +43,10 @@
 import com.google.template.soy.exprtree.MapLiteralFromListNode;
 import com.google.template.soy.exprtree.MapLiteralNode;
 import com.google.template.soy.exprtree.NullSafeAccessNode;
+import com.google.template.soy.exprtree.OperatorNodes.AmpAmpOpNode;
 import com.google.template.soy.exprtree.OperatorNodes.AndOpNode;
 import com.google.template.soy.exprtree.OperatorNodes.AssertNonNullOpNode;
+import com.google.template.soy.exprtree.OperatorNodes.BarBarOpNode;
 import com.google.template.soy.exprtree.OperatorNodes.ConditionalOpNode;
 import com.google.template.soy.exprtree.OperatorNodes.NullCoalescingOpNode;
 import com.google.template.soy.exprtree.OperatorNodes.OrOpNode;
@@ -852,12 +854,24 @@ protected void visitOrOpNode(OrOpNode node) {
       executeInBranch(node.getChild(1));
     }
 
+    @Override
+    protected void visitBarBarOpNode(BarBarOpNode node) {
+      visit(node.getChild(0));
+      executeInBranch(node.getChild(1));
+    }
+
     @Override
     protected void visitAndOpNode(AndOpNode node) {
       visit(node.getChild(0));
       executeInBranch(node.getChild(1));
     }
 
+    @Override
+    protected void visitAmpAmpOpNode(AmpAmpOpNode node) {
+      visit(node.getChild(0));
+      executeInBranch(node.getChild(1));
+    }
+
     /** Evaluates the given node in an optional branch. */
     private void executeInBranch(ExprNode expr) {
       Block prev = current;

diff --git a/java/src/com/google/template/soy/jssrc/dsl/Operation.java b/java/src/com/google/template/soy/jssrc/dsl/Operation.java
@@ -28,8 +28,10 @@ public static String getOperatorToken(Operator soyOperator) {
       case NOT:
         return "!";
       case AND:
+      case AMP_AMP:
         return "&&";
       case OR:
+      case BAR_BAR:
         return "||";
       case NULL_COALESCING:
       case LEGACY_NULL_COALESCING:

diff --git a/java/src/com/google/template/soy/jssrc/dsl/Precedence.java b/java/src/com/google/template/soy/jssrc/dsl/Precedence.java
@@ -86,8 +86,10 @@ public static Precedence forSoyOperator(Operator soyOperator) {
       case BITWISE_OR:
         return P5;
       case AND:
+      case AMP_AMP:
         return P4;
       case OR:
+      case BAR_BAR:
       case NULL_COALESCING:
       case LEGACY_NULL_COALESCING:
         return P3;

diff --git a/java/src/com/google/template/soy/passes/ResolveExpressionTypesPass.java b/java/src/com/google/template/soy/passes/ResolveExpressionTypesPass.java
@@ -102,8 +102,10 @@
 import com.google.template.soy.exprtree.NullNode;
 import com.google.template.soy.exprtree.NullSafeAccessNode;
 import com.google.template.soy.exprtree.Operator;
+import com.google.template.soy.exprtree.OperatorNodes.AmpAmpOpNode;
 import com.google.template.soy.exprtree.OperatorNodes.AndOpNode;
 import com.google.template.soy.exprtree.OperatorNodes.AssertNonNullOpNode;
+import com.google.template.soy.exprtree.OperatorNodes.BarBarOpNode;
 import com.google.template.soy.exprtree.OperatorNodes.BitwiseAndOpNode;
 import com.google.template.soy.exprtree.OperatorNodes.BitwiseOrOpNode;
 import com.google.template.soy.exprtree.OperatorNodes.BitwiseXorOpNode;
@@ -1838,6 +1840,17 @@ protected void visitTripleNotEqualOpNode(TripleNotEqualOpNode node) {
 
     @Override
     protected void visitAndOpNode(AndOpNode node) {
+      processAnd(node);
+      node.setType(BoolType.getInstance());
+    }
+
+    @Override
+    protected void visitAmpAmpOpNode(AmpAmpOpNode node) {
+      processAnd(node);
+      node.setType(UnionType.of(node.getChild(0).getType(), node.getChild(1).getType()));
+    }
+
+    private void processAnd(AbstractOperatorNode node) {
       visit(node.getChild(0)); // Assign normal types to left child
 
       // Save the state of substitutions.
@@ -1854,12 +1867,21 @@ protected void visitAndOpNode(AndOpNode node) {
 
       // Restore substitutions to previous state
       substitutions.restore(savedSubstitutionState);
+    }
 
+    @Override
+    protected void visitOrOpNode(OrOpNode node) {
+      processOr(node);
       node.setType(BoolType.getInstance());
     }
 
     @Override
-    protected void visitOrOpNode(OrOpNode node) {
+    protected void visitBarBarOpNode(BarBarOpNode node) {
+      processOr(node);
+      node.setType(UnionType.of(node.getChild(0).getType(), node.getChild(1).getType()));
+    }
+
+    private void processOr(AbstractOperatorNode node) {
       ExprNode lhs = node.getChild(0);
       if (SoyTreeUtils.isConstantExpr(lhs)) {
         errorReporter.warn(
@@ -1886,8 +1908,6 @@ protected void visitOrOpNode(OrOpNode node) {
 
       // Restore substitutions to previous state
       substitutions.restore(savedSubstitutionState);
-
-      node.setType(BoolType.getInstance());
     }
 
     @Override