[GR-23201] Call literal `**' binary operation with two arguments only

timfel · timfel · commit e7d34fdf8ca3 · 2020-05-13T09:27:30.000Z
PullRequest: graalpython/947
diff --git a/docs/contributor/CONTRIBUTING.md b/docs/contributor/CONTRIBUTING.md
@@ -168,6 +168,14 @@ print its path as the last output, if successful.
 
     mx python-svm
 
+If you made changes to the parser, you may have to regenerate the golden files
+like so:
+
+    find graalpython -name *.scope -delete
+    find graalpython -name *.tast -delete
+    mx punittest com.oracle.graal.python.test.parser
+
+
 ### Benchmarking
 
 We use the `mx` facilities for benchmarking. Use this to list the available
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_augassign.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_augassign.txt
@@ -1,6 +0,0 @@
-*AugAssignTest.testBasic
-*AugAssignTest.testCustomMethods1
-*AugAssignTest.testInDict
-*AugAssignTest.testInList
-*AugAssignTest.testSequences
-*AugAssignTest.test_with_unpacking
diff --git a/graalpython/com.oracle.graal.python.test/testData/goldenFiles/BasicTests/binaryOp03.tast b/graalpython/com.oracle.graal.python.test/testData/goldenFiles/BasicTests/binaryOp03.tast
@@ -5,9 +5,9 @@ ModuleRootNode Name: <module 'binaryOp03'> SourceSection: [0,6]`3 ** 2`
   FrameDescriptor:  Empty
   Documentation: None
   InnerRootNode SourceSection: [0,6]`3 ** 2`
-    TernaryArithmeticExpression SourceSection: [0,6]`3 ** 2`
-      LookupAndCallTernaryNodeGen SourceSection: None
-        CallTernaryMethodCachedNodeGen SourceSection: None
+    BinaryArithmeticExpression SourceSection: [0,6]`3 ** 2`
+      LookupAndCallBinaryNodeGen SourceSection: None
+        Op: __pow__
       IntegerLiteralNode SourceSection: [0,1]`3`
         Value: 3
       IntegerLiteralNode SourceSection: [5,6]`2`
diff --git a/graalpython/com.oracle.graal.python.test/testData/goldenFiles/BasicTests/binaryOp04.tast b/graalpython/com.oracle.graal.python.test/testData/goldenFiles/BasicTests/binaryOp04.tast
@@ -5,14 +5,14 @@ ModuleRootNode Name: <module 'binaryOp04'> SourceSection: [0,11]`3 ** 2 ** 2`
   FrameDescriptor:  Empty
   Documentation: None
   InnerRootNode SourceSection: [0,11]`3 ** 2 ** 2`
-    TernaryArithmeticExpression SourceSection: [0,11]`3 ** 2 ** 2`
-      LookupAndCallTernaryNodeGen SourceSection: None
-        CallTernaryMethodCachedNodeGen SourceSection: None
+    BinaryArithmeticExpression SourceSection: [0,11]`3 ** 2 ** 2`
+      LookupAndCallBinaryNodeGen SourceSection: None
+        Op: __pow__
       IntegerLiteralNode SourceSection: [0,1]`3`
         Value: 3
-      TernaryArithmeticExpression SourceSection: [5,11]`2 ** 2`
-        LookupAndCallTernaryNodeGen SourceSection: None
-          CallTernaryMethodCachedNodeGen SourceSection: None
+      BinaryArithmeticExpression SourceSection: [5,11]`2 ** 2`
+        LookupAndCallBinaryNodeGen SourceSection: None
+          Op: __pow__
         IntegerLiteralNode SourceSection: [5,6]`2`
           Value: 2
         IntegerLiteralNode SourceSection: [10,11]`2`
diff --git a/graalpython/com.oracle.graal.python.test/testData/goldenFiles/ExpressionsFromCPTests/dictComprehensions02.tast b/graalpython/com.oracle.graal.python.test/testData/goldenFiles/ExpressionsFromCPTests/dictComprehensions02.tast
@@ -45,9 +45,9 @@ ModuleRootNode Name: <module 'dictComprehensions02'> SourceSection: [0,40]`{x**2
                     YieldNode SourceSection: None
                       flagSlot: 0
                       TupleLiteralNode SourceSection: None
-                        TernaryArithmeticExpression SourceSection: [1,5]`x**2`
-                          LookupAndCallTernaryNodeGen SourceSection: None
-                            CallTernaryMethodCachedNodeGen SourceSection: None
+                        BinaryArithmeticExpression SourceSection: [1,5]`x**2`
+                          LookupAndCallBinaryNodeGen SourceSection: None
+                            Op: __pow__
                           ReadGeneratorFrameVariableNode SourceSection: [1,2]`x`
                             Frame: [0,x,Illegal]
                             ReadVariableFromFrameNodeGen SourceSection: None
diff --git a/graalpython/com.oracle.graal.python.test/testData/goldenFiles/ExpressionsFromCPTests/generator01.tast b/graalpython/com.oracle.graal.python.test/testData/goldenFiles/ExpressionsFromCPTests/generator01.tast
@@ -33,9 +33,9 @@ ModuleRootNode Name: <module 'generator01'> SourceSection: [0,25]`[x**3 for x in
                 ExpressionStatementNode SourceSection: [1,5]`x**3`
                   YieldNode SourceSection: [1,5]`x**3`
                     flagSlot: 0
-                    TernaryArithmeticExpression SourceSection: [1,5]`x**3`
-                      LookupAndCallTernaryNodeGen SourceSection: None
-                        CallTernaryMethodCachedNodeGen SourceSection: None
+                    BinaryArithmeticExpression SourceSection: [1,5]`x**3`
+                      LookupAndCallBinaryNodeGen SourceSection: None
+                        Op: __pow__
                       ReadGeneratorFrameVariableNode SourceSection: [1,2]`x`
                         Frame: [0,x,Illegal]
                         ReadVariableFromFrameNodeGen SourceSection: None
diff --git a/graalpython/com.oracle.graal.python.test/testData/goldenFiles/ExpressionsFromCPTests/generator02.tast b/graalpython/com.oracle.graal.python.test/testData/goldenFiles/ExpressionsFromCPTests/generator02.tast
@@ -44,9 +44,9 @@ ModuleRootNode Name: <module 'generator02'> SourceSection: [0,34]`[x**3 for x in
                   ExpressionStatementNode SourceSection: [1,5]`x**3`
                     YieldNode SourceSection: [1,5]`x**3`
                       flagSlot: 0
-                      TernaryArithmeticExpression SourceSection: [1,5]`x**3`
-                        LookupAndCallTernaryNodeGen SourceSection: None
-                          CallTernaryMethodCachedNodeGen SourceSection: None
+                      BinaryArithmeticExpression SourceSection: [1,5]`x**3`
+                        LookupAndCallBinaryNodeGen SourceSection: None
+                          Op: __pow__
                         ReadGeneratorFrameVariableNode SourceSection: [1,2]`x`
                           Frame: [0,x,Illegal]
                           ReadVariableFromFrameNodeGen SourceSection: None
diff --git a/graalpython/com.oracle.graal.python.test/testData/goldenFiles/ExpressionsFromCPTests/generator03.tast b/graalpython/com.oracle.graal.python.test/testData/goldenFiles/ExpressionsFromCPTests/generator03.tast
@@ -54,9 +54,9 @@ ModuleRootNode Name: <module 'generator03'> SourceSection: [0,43]`[x**3 for x in
                   ExpressionStatementNode SourceSection: [1,5]`x**3`
                     YieldNode SourceSection: [1,5]`x**3`
                       flagSlot: 0
-                      TernaryArithmeticExpression SourceSection: [1,5]`x**3`
-                        LookupAndCallTernaryNodeGen SourceSection: None
-                          CallTernaryMethodCachedNodeGen SourceSection: None
+                      BinaryArithmeticExpression SourceSection: [1,5]`x**3`
+                        LookupAndCallBinaryNodeGen SourceSection: None
+                          Op: __pow__
                         ReadGeneratorFrameVariableNode SourceSection: [1,2]`x`
                           Frame: [0,x,Illegal]
                           ReadVariableFromFrameNodeGen SourceSection: None
diff --git a/graalpython/com.oracle.graal.python.test/testData/goldenFiles/ExpressionsFromCPTests/generator04.tast b/graalpython/com.oracle.graal.python.test/testData/goldenFiles/ExpressionsFromCPTests/generator04.tast
@@ -33,9 +33,9 @@ ModuleRootNode Name: <module 'generator04'> SourceSection: [0,29]`list(x**3 for
                 ExpressionStatementNode SourceSection: [5,9]`x**3`
                   YieldNode SourceSection: [5,9]`x**3`
                     flagSlot: 0
-                    TernaryArithmeticExpression SourceSection: [5,9]`x**3`
-                      LookupAndCallTernaryNodeGen SourceSection: None
-                        CallTernaryMethodCachedNodeGen SourceSection: None
+                    BinaryArithmeticExpression SourceSection: [5,9]`x**3`
+                      LookupAndCallBinaryNodeGen SourceSection: None
+                        Op: __pow__
                       ReadGeneratorFrameVariableNode SourceSection: [5,6]`x`
                         Frame: [0,x,Illegal]
                         ReadVariableFromFrameNodeGen SourceSection: None
diff --git a/graalpython/com.oracle.graal.python.test/testData/goldenFiles/ExpressionsFromCPTests/generator05.tast b/graalpython/com.oracle.graal.python.test/testData/goldenFiles/ExpressionsFromCPTests/generator05.tast
@@ -44,9 +44,9 @@ ModuleRootNode Name: <module 'generator05'> SourceSection: [0,38]`list(x**3 for
                   ExpressionStatementNode SourceSection: [5,9]`x**3`
                     YieldNode SourceSection: [5,9]`x**3`
                       flagSlot: 0
-                      TernaryArithmeticExpression SourceSection: [5,9]`x**3`
-                        LookupAndCallTernaryNodeGen SourceSection: None
-                          CallTernaryMethodCachedNodeGen SourceSection: None
+                      BinaryArithmeticExpression SourceSection: [5,9]`x**3`
+                        LookupAndCallBinaryNodeGen SourceSection: None
+                          Op: __pow__
                         ReadGeneratorFrameVariableNode SourceSection: [5,6]`x`
                           Frame: [0,x,Illegal]
                           ReadVariableFromFrameNodeGen SourceSection: None
diff --git a/graalpython/com.oracle.graal.python.test/testData/goldenFiles/ExpressionsFromCPTests/generator06.tast b/graalpython/com.oracle.graal.python.test/testData/goldenFiles/ExpressionsFromCPTests/generator06.tast
@@ -54,9 +54,9 @@ ModuleRootNode Name: <module 'generator06'> SourceSection: [0,47]`list(x**3 for
                   ExpressionStatementNode SourceSection: [5,9]`x**3`
                     YieldNode SourceSection: [5,9]`x**3`
                       flagSlot: 0
-                      TernaryArithmeticExpression SourceSection: [5,9]`x**3`
-                        LookupAndCallTernaryNodeGen SourceSection: None
-                          CallTernaryMethodCachedNodeGen SourceSection: None
+                      BinaryArithmeticExpression SourceSection: [5,9]`x**3`
+                        LookupAndCallBinaryNodeGen SourceSection: None
+                          Op: __pow__
                         ReadGeneratorFrameVariableNode SourceSection: [5,6]`x`
                           Frame: [0,x,Illegal]
                           ReadVariableFromFrameNodeGen SourceSection: None
diff --git a/graalpython/com.oracle.graal.python.test/testData/goldenFiles/GeneratorAndCompForTests/list01.tast b/graalpython/com.oracle.graal.python.test/testData/goldenFiles/GeneratorAndCompForTests/list01.tast
@@ -33,9 +33,9 @@ ModuleRootNode Name: <module 'list01'> SourceSection: [0,25]`[x**y for x in rang
                 ExpressionStatementNode SourceSection: [1,5]`x**y`
                   YieldNode SourceSection: [1,5]`x**y`
                     flagSlot: 0
-                    TernaryArithmeticExpression SourceSection: [1,5]`x**y`
-                      LookupAndCallTernaryNodeGen SourceSection: None
-                        CallTernaryMethodCachedNodeGen SourceSection: None
+                    BinaryArithmeticExpression SourceSection: [1,5]`x**y`
+                      LookupAndCallBinaryNodeGen SourceSection: None
+                        Op: __pow__
                       ReadGeneratorFrameVariableNode SourceSection: [1,2]`x`
                         Frame: [0,x,Illegal]
                         ReadVariableFromFrameNodeGen SourceSection: None
diff --git a/graalpython/com.oracle.graal.python.test/testData/goldenFiles/GeneratorAndCompForTests/list02.tast b/graalpython/com.oracle.graal.python.test/testData/goldenFiles/GeneratorAndCompForTests/list02.tast
@@ -50,9 +50,9 @@ ModuleRootNode Name: <module 'list02'> SourceSection: [0,36]`[x**y for x in rang
                   ExpressionStatementNode SourceSection: [1,5]`x**y`
                     YieldNode SourceSection: [1,5]`x**y`
                       flagSlot: 0
-                      TernaryArithmeticExpression SourceSection: [1,5]`x**y`
-                        LookupAndCallTernaryNodeGen SourceSection: None
-                          CallTernaryMethodCachedNodeGen SourceSection: None
+                      BinaryArithmeticExpression SourceSection: [1,5]`x**y`
+                        LookupAndCallBinaryNodeGen SourceSection: None
+                          Op: __pow__
                         ReadGeneratorFrameVariableNode SourceSection: [1,2]`x`
                           Frame: [0,x,Illegal]
                           ReadVariableFromFrameNodeGen SourceSection: None
diff --git a/graalpython/com.oracle.graal.python.test/testData/goldenFiles/GeneratorAndCompForTests/set01.tast b/graalpython/com.oracle.graal.python.test/testData/goldenFiles/GeneratorAndCompForTests/set01.tast
@@ -33,9 +33,9 @@ ModuleRootNode Name: <module 'set01'> SourceSection: [0,25]`{x**y for x in range
                 ExpressionStatementNode SourceSection: [1,5]`x**y`
                   YieldNode SourceSection: [1,5]`x**y`
                     flagSlot: 0
-                    TernaryArithmeticExpression SourceSection: [1,5]`x**y`
-                      LookupAndCallTernaryNodeGen SourceSection: None
-                        CallTernaryMethodCachedNodeGen SourceSection: None
+                    BinaryArithmeticExpression SourceSection: [1,5]`x**y`
+                      LookupAndCallBinaryNodeGen SourceSection: None
+                        Op: __pow__
                       ReadGeneratorFrameVariableNode SourceSection: [1,2]`x`
                         Frame: [0,x,Illegal]
                         ReadVariableFromFrameNodeGen SourceSection: None
diff --git a/graalpython/com.oracle.graal.python.test/testData/testFiles/RuntimeFileTests/enumt.tast b/graalpython/com.oracle.graal.python.test/testData/testFiles/RuntimeFileTests/enumt.tast
@@ -6706,9 +6706,9 @@ ModuleRootNode Name: <module 'enumt'> SourceSection: [0,34561]`import sys↵from
                                         Identifier: <return_val>
                                         WriteLocalFrameSlotNodeGen SourceSection: None
                                           Frame: [7,<return_val>,Illegal]
-                                        TernaryArithmeticExpression SourceSection: [26602,26619]`2 ** (high_bit+1)`
-                                          LookupAndCallTernaryNodeGen SourceSection: None
-                                            CallTernaryMethodCachedNodeGen SourceSection: None
+                                        BinaryArithmeticExpression SourceSection: [26602,26619]`2 ** (high_bit+1)`
+                                          LookupAndCallBinaryNodeGen SourceSection: None
+                                            Op: __pow__
                                           IntegerLiteralNode SourceSection: [26602,26603]`2`
                                             Value: 2
                                           BinaryArithmeticExpression SourceSection: [26608,26618]`high_bit+1`
@@ -8569,9 +8569,9 @@ ModuleRootNode Name: <module 'enumt'> SourceSection: [0,34561]`import sys↵from
                                                     Identifier: flag_value
                                                     WriteLocalFrameSlotNodeGen SourceSection: None
                                                       Frame: [7,flag_value,Illegal]
-                                                    TernaryArithmeticExpression SourceSection: [30753,30761]`2 ** bit`
-                                                      LookupAndCallTernaryNodeGen SourceSection: None
-                                                        CallTernaryMethodCachedNodeGen SourceSection: None
+                                                    BinaryArithmeticExpression SourceSection: [30753,30761]`2 ** bit`
+                                                      LookupAndCallBinaryNodeGen SourceSection: None
+                                                        Op: __pow__
                                                       IntegerLiteralNode SourceSection: [30753,30754]`2`
                                                         Value: 2
                                                       ReadLocalVariableNode SourceSection: [30758,30761]`bit`
@@ -10131,9 +10131,9 @@ ModuleRootNode Name: <module 'enumt'> SourceSection: [0,34561]`import sys↵from
                               ReadLocalVariableNode SourceSection: [34530,34535]`value`
                                 Frame: [0,value,Illegal]
                                 ReadVariableFromFrameNodeGen SourceSection: None
-                              TernaryArithmeticExpression SourceSection: [34539,34560]`2 ** _high_bit(value...`
-                                LookupAndCallTernaryNodeGen SourceSection: None
-                                  CallTernaryMethodCachedNodeGen SourceSection: None
+                              BinaryArithmeticExpression SourceSection: [34539,34560]`2 ** _high_bit(value...`
+                                LookupAndCallBinaryNodeGen SourceSection: None
+                                  Op: __pow__
                                 IntegerLiteralNode SourceSection: [34539,34540]`2`
                                   Value: 2
                                 PythonCallNodeGen SourceSection: [34544,34560]`_high_bit(value)`
diff --git a/graalpython/com.oracle.graal.python.test/testData/testFiles/RuntimeFileTests/operator.tast b/graalpython/com.oracle.graal.python.test/testData/testFiles/RuntimeFileTests/operator.tast
@@ -1357,9 +1357,9 @@ ModuleRootNode Name: <module 'operator'> SourceSection: [0,10863]`"""↵Operator
                         Identifier: <return_val>
                         WriteLocalFrameSlotNodeGen SourceSection: None
                           Frame: [2,<return_val>,Illegal]
-                        TernaryArithmeticExpression SourceSection: [2608,2614]`a ** b`
-                          LookupAndCallTernaryNodeGen SourceSection: None
-                            CallTernaryMethodCachedNodeGen SourceSection: None
+                        BinaryArithmeticExpression SourceSection: [2608,2614]`a ** b`
+                          LookupAndCallBinaryNodeGen SourceSection: None
+                            Op: __pow__
                           ReadLocalVariableNode SourceSection: [2608,2609]`a`
                             Frame: [0,a,Illegal]
                             ReadVariableFromFrameNodeGen SourceSection: None
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/NodeFactory.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/NodeFactory.java
@@ -58,7 +58,6 @@
 import com.oracle.graal.python.nodes.expression.InplaceArithmetic;
 import com.oracle.graal.python.nodes.expression.IsExpressionNode;
 import com.oracle.graal.python.nodes.expression.OrNode;
-import com.oracle.graal.python.nodes.expression.TernaryArithmetic;
 import com.oracle.graal.python.nodes.expression.TernaryIfNode;
 import com.oracle.graal.python.nodes.expression.UnaryArithmetic;
 import com.oracle.graal.python.nodes.frame.DeleteGlobalNode;
@@ -357,7 +356,7 @@ public ExpressionNode createBinaryOperation(String string, ExpressionNode left,
             case "%":
                 return BinaryArithmetic.Mod.create(left, right);
             case "**":
-                return TernaryArithmetic.Pow.create(left, right);
+                return BinaryArithmetic.Pow.create(left, right);
             case "<<":
                 return BinaryArithmetic.LShift.create(left, right);
             case ">>":
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/expression/BinaryArithmetic.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/expression/BinaryArithmetic.java
@@ -42,12 +42,11 @@
 
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.TypeError;
 
-import com.oracle.graal.python.util.Supplier;
-
 import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.nodes.SpecialMethodNames;
 import com.oracle.graal.python.nodes.call.special.LookupAndCallBinaryNode;
 import com.oracle.graal.python.nodes.call.special.LookupAndCallBinaryNode.NotImplementedHandler;
+import com.oracle.graal.python.util.Supplier;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.NodeCost;
 
@@ -63,7 +62,8 @@ public enum BinaryArithmetic {
     And(SpecialMethodNames.__AND__, "&"),
     Or(SpecialMethodNames.__OR__, "|"),
     Xor(SpecialMethodNames.__XOR__, "^"),
-    MatMul(SpecialMethodNames.__MATMUL__, "@");
+    MatMul(SpecialMethodNames.__MATMUL__, "@"),
+    Pow(SpecialMethodNames.__POW__, "**");
 
     private final String methodName;
     private final String operator;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/antlr/Python3.g4 b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/antlr/Python3.g4
@@ -1176,7 +1176,7 @@ power returns [SSTNode result]
 :
 	atom_expr { $result = $atom_expr.result; }
 	(
-		'**' factor { $result = new TernaryArithmeticSSTNode($result, $factor.result, getStartIndex($ctx), getStopIndex($factor.stop)); }
+		'**' factor { $result = new BinaryArithmeticSSTNode(BinaryArithmetic.Pow, $result, $factor.result, getStartIndex($ctx), getStopIndex($factor.stop)); }
 	)?
 ;
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/antlr/Python3Parser.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/antlr/Python3Parser.java
@@ -6361,7 +6361,7 @@ public final PowerContext power() throws RecognitionException {
 				match(POWER);
 				setState(1228);
 				_localctx.factor = factor();
-				 _localctx.result =  new TernaryArithmeticSSTNode(_localctx.result, _localctx.factor.result, getStartIndex(_localctx), getStopIndex((_localctx.factor!=null?(_localctx.factor.stop):null))); 
+				 _localctx.result =  new BinaryArithmeticSSTNode(BinaryArithmetic.Pow, _localctx.result, _localctx.factor.result, getStartIndex(_localctx), getStopIndex((_localctx.factor!=null?(_localctx.factor.stop):null))); 
 				}
 			}
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/sst/FactorySSTVisitor.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/sst/FactorySSTVisitor.java
@@ -77,7 +77,6 @@
 import com.oracle.graal.python.nodes.expression.CoerceToBooleanNode;
 import com.oracle.graal.python.nodes.expression.ExpressionNode;
 import com.oracle.graal.python.nodes.expression.OrNode;
-import com.oracle.graal.python.nodes.expression.TernaryArithmetic;
 import com.oracle.graal.python.nodes.frame.ReadGlobalOrBuiltinNode;
 import com.oracle.graal.python.nodes.frame.ReadLocalNode;
 import com.oracle.graal.python.nodes.frame.ReadLocalVariableNode;
@@ -1142,15 +1141,6 @@ public PNode visit(SubscriptSSTNode node) {
         return result;
     }
 
-    @Override
-    public PNode visit(TernaryArithmeticSSTNode node) {
-        ExpressionNode left = (ExpressionNode) node.left.accept(this);
-        ExpressionNode right = (ExpressionNode) node.right.accept(this);
-        ExpressionNode result = TernaryArithmetic.Pow.create(left, right);
-        result.assignSourceSection(createSourceSection(node.startOffset, node.endOffset));
-        return result;
-    }
-
     @Override
     public PNode visit(TernaryIfSSTNode node) {
         ExpressionNode test = (ExpressionNode) node.test.accept(this);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/sst/SSTreeVisitor.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/sst/SSTreeVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -114,8 +114,6 @@ public interface SSTreeVisitor<T> {
 
     T visit(SubscriptSSTNode node);
 
-    T visit(TernaryArithmeticSSTNode node);
-
     T visit(TernaryIfSSTNode node);
 
     T visit(TrySSTNode node);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/sst/TernaryArithmeticSSTNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/sst/TernaryArithmeticSSTNode.java
