[GR-34604] Improve compatibility with package setuptools

PullRequest: graalpython/2107

Author: cosminbasca

graalpython/com.oracle.graal.python.parser.antlr/postprocess.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2022, 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
@@ -43,7 +43,7 @@
 
 COPYRIGHT_HEADER = """\
 /*
- * Copyright (c) 2017-2021, Oracle and/or its affiliates.
+ * Copyright (c) 2017-2022, Oracle and/or its affiliates.
  * Copyright (c) 2014 by Bart Kiers
  *
  * The MIT License (MIT)

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/parser/FuncDefTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2022, 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
@@ -203,6 +203,11 @@ public void functionDef22() throws Exception {
                                         "print(test())\n");
     }
 
+    @Test
+    public void annotations01() throws Exception {
+        checkScopeAndTree();
+    }
+
     @Test
     public void decorator01() throws Exception {
         checkScopeAndTree();

graalpython/com.oracle.graal.python.test/testData/testFiles/FuncDefTests/annotations01.py

@@ -0,0 +1,9 @@
+from __future__ import annotations
+
+
+def b(x: int | str) -> int | str:
+    return 10
+
+print(b.__annotations__)
+
+x: int | str = 10

graalpython/com.oracle.graal.python.test/testData/testFiles/FuncDefTests/annotations01.scope

@@ -0,0 +1,10 @@
+Scope: []
+    Kind: Module
+    FrameDescriptor: Empty
+    CellVars: Empty
+    FreeVars: Empty
+    Scope: b
+        Kind: Function
+        FrameDescriptor: [x, <return_val>]
+        CellVars: Empty
+        FreeVars: Empty

graalpython/com.oracle.graal.python.test/testData/testFiles/FuncDefTests/annotations01.tast

@@ -0,0 +1,84 @@
+ModuleRootNode Name: <module 'annotations01'> SourceSection: [0,130]`from __future__ impo...`
+  Signature: varArgs=False, varKeywordArgs=False, noArguments=True, positionalOnly=True, requiresKeywordArgs=False
+  FreeVars: None
+  NeedsCellFrame: False
+  FrameDescriptor:  Empty
+  Documentation: None
+  InnerRootNode SourceSection: [0,130]`from __future__ impo...`
+    ExpressionWithSideEffects SourceSection: [0,129]`from __future__ impo...`
+      ImportFromNode SourceSection: [0,34]`from __future__ impo...`
+        Importee: __future__
+        Level: 0
+        FromList: annotations
+        WriteNameNodeGen SourceSection: None
+          Identifier: annotations
+          EmptyNode SourceSection: None
+        IsBuiltinClassProfile SourceSection: None
+          GetClassNodeGen SourceSection: None
+        IsBuiltinClassProfile SourceSection: None
+          GetClassNodeGen SourceSection: None
+      WriteNameNodeGen SourceSection: [37,86]`def b(x: int | str) ...`
+        Identifier: b
+        FunctionDefinitionNode Name: b SourceSection: None
+          Arguments: None
+          KwArguments: None
+          Documentation: None
+          FreeVarSlots: None
+          ExecutionSlots:
+            FreeVarsSlots: None
+            CellVarsSlots: None
+          FunctionRootNode SourceSection: [37,86]`def b(x: int | str) ...`
+            Name: b
+            Signature: varArgs=False, varKeywordArgs=False, noArguments=False, positionalOnly=True, requiresKeywordArgs=False
+              Param Names: x
+            CelVars: None
+            FreeVars: None
+            NeedsCellFrame: False
+            FrameDescriptor: 2 slots [x, <return_val>]
+            ExecutionSlots:
+              FreeVarsSlots: None
+              CellVarsSlots: None
+            InnerRootNode SourceSection: [37,86]`def b(x: int | str) ...`
+              ReturnTargetNode SourceSection: [37,86]`def b(x: int | str) ...`
+                Body: BlockNode SourceSection: None
+                  WriteLocalVariableNodeGen SourceSection: None
+                    Identifier: x
+                    Frame: [0,x,Illegal]
+                    ArgumentExpressionNode SourceSection: None
+                      ReadIndexedArgumentNodeGen SourceSection: None
+                        Index: 0
+                  FunctionBodyNode SourceSection: [75,84]`return 10`
+                    FrameReturnNode SourceSection: [75,84]`return 10`
+                      IntegerLiteralNode SourceSection: [82,84]`10`
+                        Value: 10
+                Return Expresssion: ReadLocalVariableNodeGen SourceSection: None
+                  Frame: [1,<return_val>,Object]
+      ExpressionStatementNode SourceSection: [86,110]`print(b.__annotation...`
+        PythonCallUnary SourceSection: [86,110]`print(b.__annotation...`
+          CallUnaryMethodNodeGen SourceSection: None
+          ReadNameNodeGen SourceSection: [86,91]`print`
+            Identifier: print
+            IsBuiltinClassProfile SourceSection: None
+              GetClassNodeGen SourceSection: None
+          GetAttributeNode SourceSection: [92,109]`b.__annotations__`
+            GetFixedAttributeNodeGen SourceSection: None
+              Key: __annotations__
+              LookupAndCallNonReversibleBinaryNodeGen SourceSection: None
+                Op: __getattribute__
+            ReadNameNodeGen SourceSection: [92,93]`b`
+              Identifier: b
+              IsBuiltinClassProfile SourceSection: None
+                GetClassNodeGen SourceSection: None
+      ExpressionWithSideEffects SourceSection: None
+        WriteNameNodeGen SourceSection: [112,129]`x: int | str = 10`
+          Identifier: x
+          IntegerLiteralNode SourceSection: [127,129]`10`
+            Value: 10
+        SetItemNodeGen SourceSection: [0,0]Empty
+          ReadNameNodeGen SourceSection: None
+            Identifier: __annotations__
+            IsBuiltinClassProfile SourceSection: None
+              GetClassNodeGen SourceSection: None
+          StringLiteralNode SourceSection: [0,0]Empty
+          StringLiteralNode SourceSection: [115,124]`int | str`
+        EmptyNode SourceSection: None

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ThreadModuleBuiltins.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, 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
@@ -269,4 +269,17 @@ Object setSentinel() {
             return sentinelLock;
         }
     }
+
+    @Builtin(name = "interrupt_main", minNumOfPositionalArgs = 1, declaresExplicitSelf = true, doc = "interrupt_main()\n" +
+                    "\n" +
+                    "Raise a KeyboardInterrupt in the main thread.\n" +
+                    "A subthread can use this function to interrupt the main thread.")
+    @GenerateNodeFactory
+    abstract static class InterruptMainThreadNode extends PythonUnaryBuiltinNode {
+        @Specialization
+        Object getCount(@SuppressWarnings("unused") PythonModule self) {
+            // TODO: implement me
+            return PNone.NONE;
+        }
+    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/BuiltinNames.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, 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
@@ -54,6 +54,7 @@ public abstract class BuiltinNames {
     public static final String __MAIN__ = "__main__";
     public static final String __BUILTINS__ = "__builtins__";
     public static final String __DEBUG__ = "__debug__";
+    public static final String __FUTURE__ = "__future__";
 
     // sys
     public static final String TRACEBACKLIMIT = "tracebacklimit";

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/PythonSSTNodeFactory.java

@@ -63,6 +63,7 @@
 import com.oracle.graal.python.parser.ScopeInfo.ScopeKind;
 import com.oracle.graal.python.parser.sst.AnnAssignmentSSTNode;
 import com.oracle.graal.python.parser.sst.AnnotationSSTNode;
+import com.oracle.graal.python.parser.sst.ArgDefListBuilder;
 import com.oracle.graal.python.parser.sst.ArgListBuilder;
 import com.oracle.graal.python.parser.sst.AssignmentSSTNode;
 import com.oracle.graal.python.parser.sst.AugAssignmentSSTNode;
@@ -103,6 +104,8 @@
 import com.oracle.truffle.api.source.Source;
 import com.oracle.truffle.api.source.SourceSection;
 
+import static com.oracle.graal.python.nodes.BuiltinNames.__FUTURE__;
+
 public final class PythonSSTNodeFactory {
 
     /**
@@ -117,6 +120,7 @@ public interface FStringExprParser {
     private final Source source;
     private final PythonParser.ParserErrorCallback errors;
     private FStringExprParser fStringExprParser;
+    private boolean futureAnnotations = false;
 
     public PythonSSTNodeFactory(PythonParser.ParserErrorCallback errors, Source source, FStringExprParser fStringExprParser) {
         this.errors = errors;
@@ -162,6 +166,9 @@ public SSTNode createImport(String name, String asName, int startOffset, int end
     public SSTNode createImportFrom(String from, String[][] asNames, int startOffset, int endOffset) {
         if (asNames != null) {
             for (String[] asName : asNames) {
+                if (__FUTURE__.equals(from) && asName[0].equals("annotations")) {
+                    futureAnnotations = true;
+                }
                 scopeEnvironment.createLocal(asName[1] == null ? asName[0] : asName[1]);
             }
         } else {
@@ -173,6 +180,21 @@ public SSTNode createImportFrom(String from, String[][] asNames, int startOffset
         return new ImportFromSSTNode(scopeEnvironment.getCurrentScope(), from, asNames, startOffset, endOffset);
     }
 
+    public SSTNode createAnnotationType(SSTNode type) {
+        SSTNode annotType = type;
+        if (futureAnnotations && type != null) {
+            final String value = source.getCharacters().subSequence(type.getStartOffset() - 1, type.getEndOffset() + 1).toString();
+            annotType = createStringLiteral(new String[]{value}, type.getStartOffset(), type.getEndOffset());
+        }
+        return annotType;
+    }
+
+    public FunctionDefSSTNode createFunctionDef(ScopeInfo functionScope, String name, String enclosingClassName, ArgDefListBuilder argBuilder, SSTNode body, SSTNode resultAnnotation, int startOffset,
+                    int endOffset) {
+        SSTNode annotation = createAnnotationType(resultAnnotation);
+        return new FunctionDefSSTNode(functionScope, name, enclosingClassName, argBuilder, body, annotation, startOffset, endOffset);
+    }
+
     public String mangleNameInCurrentScope(String name) {
         if (cannotBeMangled(name)) {
             return name;
@@ -339,6 +361,7 @@ public SSTNode createAnnAssignment(AnnotationSSTNode annotation, SSTNode rhs, in
     }
 
     public AnnotationSSTNode createAnnotation(SSTNode lhs, SSTNode type, int start, int end) {
+        SSTNode annotType = createAnnotationType(type);
         // checking if the annotation has the right target
         if (!(lhs instanceof VarLookupSSTNode || lhs instanceof GetAttributeSSTNode || lhs instanceof SubscriptSSTNode)) {
             if (lhs instanceof CollectionSSTNode) {
@@ -354,7 +377,7 @@ public AnnotationSSTNode createAnnotation(SSTNode lhs, SSTNode type, int start,
         if (!scopeEnvironment.getCurrentScope().hasAnnotations()) {
             scopeEnvironment.getCurrentScope().setHasAnnotations(true);
         }
-        return new AnnotationSSTNode(lhs, type, start, end);
+        return new AnnotationSSTNode(lhs, annotType, start, end);
     }
 
     public SSTNode createAugAssignment(SSTNode lhs, String operation, SSTNode rhs, int startOffset, int endOffset) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/antlr/Python3.g4

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2020, Oracle and/or its affiliates.
+ * Copyright (c) 2017-2022, Oracle and/or its affiliates.
  * Copyright (c) 2014 by Bart Kiers
  *
  * The MIT License (MIT)
@@ -580,11 +580,11 @@ funcdef
         }
 	s = suite
 	{ 
-            SSTNode funcDef = new FunctionDefSSTNode(scopeEnvironment.getCurrentScope(), name, enclosingClassName, $parameters.result, optimize($s.result), resultType, getStartIndex(_localctx), getStopIndex(((FuncdefContext)_localctx).s));
-            scopeEnvironment.popScope();
-            loopState = savedLoopState;
-            push(funcDef);
-        }
+        SSTNode funcDef = factory.createFunctionDef(scopeEnvironment.getCurrentScope(), name, enclosingClassName, $parameters.result, optimize($s.result), resultType, getStartIndex(_localctx), getStopIndex(((FuncdefContext)_localctx).s));
+        scopeEnvironment.popScope();
+        loopState = savedLoopState;
+        push(funcDef);
+    }
 ;
 
 parameters returns [ArgDefListBuilder result]
@@ -639,7 +639,7 @@ defparameter [ArgDefListBuilder args]
             if (name != null) {
                 name = factory.mangleNameInCurrentScope(name);
             }
-            ArgDefListBuilder.AddParamResult result = args.addParam(name, type, defValue);
+            ArgDefListBuilder.AddParamResult result = args.addParam(name, factory.createAnnotationType(type), defValue);
             switch(result) {
                 case NONDEFAULT_FOLLOWS_DEFAULT:
                     throw new PythonRecognitionException("non-default argument follows default argument", this, _input, $ctx, getCurrentToken());

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/antlr/Python3Lexer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2021, Oracle and/or its affiliates.
+ * Copyright (c) 2017-2022, Oracle and/or its affiliates.
  * Copyright (c) 2014 by Bart Kiers
  *
  * The MIT License (MIT)