https://github.com/manifold-systems/manifold/issues/573

- fix issue with using a binding expression in a ternary expression

manifold-core-parent/manifold/src/main/java/manifold/internal/javac/ManAttr.java

@@ -874,7 +874,7 @@ default void setResult( JCTree.JCExpression tree, Type owntype, String valVar )
 
   default ArrayList<Node<JCExpression, Tag>> getBindingOperands( JCExpression tree, ArrayList<Node<JCExpression, Tag>> operands )
   {
-    if( tree instanceof JCBinary && tree.getTag() == Tag.APPLY )
+    if( tree instanceof JCBinary && tree.getTag() == Tag.NO_TAG )
     {
       // Binding expr
 

manifold-core-parent/manifold/src/main/java/manifold/internal/javac/ManAttr_11.java11

@@ -919,7 +919,7 @@ public class ManAttr_11 extends Attr implements ManAttr
       return;
     }
 
-    if( tree.getTag() == JCTree.Tag.APPLY ) // binding expr
+    if( tree.getTag() == JCTree.Tag.NO_TAG ) // binding expr
     {
       // Handle binding expressions
 

manifold-core-parent/manifold/src/main/java/manifold/internal/javac/ManAttr_17.java17

@@ -939,7 +939,7 @@ public class ManAttr_17 extends Attr implements ManAttr
       return;
     }
 
-    if( tree.getTag() == JCTree.Tag.APPLY ) // binding expr
+    if( tree.getTag() == JCTree.Tag.NO_TAG ) // binding expr
     {
       // Handle binding expressions
 

manifold-core-parent/manifold/src/main/java/manifold/internal/javac/ManAttr_8.java

@@ -905,7 +905,7 @@ public void visitBinary( JCTree.JCBinary tree )
       return;
     }
 
-    if( tree.getTag() == JCTree.Tag.APPLY ) // binding expr
+    if( tree.getTag() == JCTree.Tag.NO_TAG ) // binding expr
     {
       // Handle binding expressions
 

manifold-core-parent/manifold/src/main/java/manifold/internal/javac/ManJavacParser.java_

@@ -470,10 +470,10 @@ public class ManJavacParser extends JavacParser
                               JCExpression od1,
                               JCExpression od2)
   {
-    //Manifold: use APPLY for binding op.
+    //Manifold: use NO_TAG for binding op.
     //It is later changed to MUL after ManAttr processing so the expr will pass safely through javac until it is
     //transformed to a pre/postBind() call.
-    JCTree.Tag optag = topOp == null ? JCTree.Tag.APPLY : optag( topOp );
+    JCTree.Tag optag = topOp == null ? JCTree.Tag.NO_TAG : optag( topOp );
 
     return F.at( pos ).Binary( optag, od1, od2 );
   }

manifold-deps-parent/manifold-science-test/src/test/java/manifold/science/TestMe.java

@@ -63,12 +63,6 @@ public void testInArgOfOverload()
     assertEquals( Rational.get( 5 ).toString(), (5r).toString() );
   }
 
-  @Test
-  public void testCanBeStatement()
-  {
-    10 k;
-  }
-
   @Test
   public void testStorage()
   {

manifold-deps-parent/manifold-science-test/src/test/java/manifold/science/regression/UnitExpressionInTernaryBranchTest.java

@@ -0,0 +1,27 @@
+package manifold.science.regression;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class UnitExpressionInTernaryBranchTest
+{
+  @Test
+  public void testUnitExpressionInTernaryBranch()
+  {
+    ByteCoercion bt = ByteCoercion.INSTANCE;
+    int i = 1;
+    byte bb = i > 0 ? 2bt : (byte)1;
+    assertEquals( 2bt, bb );
+  }
+
+  public static class ByteCoercion
+  {
+    static final ByteCoercion INSTANCE = new ByteCoercion();
+
+    public byte postfixBind( int value )
+    {
+      return (byte)value;
+    }
+  }
+}