Parse type vars (work in progress).

fabioz · Oct 19, 2024 · efed81e · efed81e
1 parent 58d774c
commit efed81e
Show file tree

Hide file tree

Showing 40 changed files with 5,886 additions and 2,250 deletions.
diff --git a/...rg.python.pydev.ast/src/org/python/pydev/ast/adapters/context/AbstractContextVisitor.java b/...rg.python.pydev.ast/src/org/python/pydev/ast/adapters/context/AbstractContextVisitor.java
@@ -14,12 +14,12 @@
 * Contributors:
 *     Fabio Zadrozny <fabiofz@gmail.com> - initial implementation
 ******************************************************************************/
-/* 
+/*
  * Copyright (C) 2006, 2007  Dennis Hunziker, Ueli Kistler
  * Copyright (C) 2007  Reto Schuettel, Robin Stocker
  *
  * IFS Institute for Software, HSR Rapperswil, Switzerland
- * 
+ *
  */
 
 package org.python.pydev.ast.adapters.context;
@@ -162,6 +162,9 @@ public void traverse(FunctionDef node) throws Exception {
             visit(node.decs);
         }
         visit(node.name);
+        if (node.type_params != null) {
+            visit(node.type_params);
+        }
         visit(node.args);
         visit(node.body);
     }

diff --git a/...rg.python.pydev.ast/src/org/python/pydev/ast/adapters/visitors/FindDuplicatesVisitor.java b/...rg.python.pydev.ast/src/org/python/pydev/ast/adapters/visitors/FindDuplicatesVisitor.java
@@ -61,6 +61,7 @@
 import org.python.pydev.parser.jython.ast.NamedExpr;
 import org.python.pydev.parser.jython.ast.NonLocal;
 import org.python.pydev.parser.jython.ast.Num;
+import org.python.pydev.parser.jython.ast.ParamSpec;
 import org.python.pydev.parser.jython.ast.Pass;
 import org.python.pydev.parser.jython.ast.Print;
 import org.python.pydev.parser.jython.ast.Raise;
@@ -76,6 +77,9 @@
 import org.python.pydev.parser.jython.ast.Suite;
 import org.python.pydev.parser.jython.ast.TryExcept;
 import org.python.pydev.parser.jython.ast.TryFinally;
+import org.python.pydev.parser.jython.ast.TypeParamsSuite;
+import org.python.pydev.parser.jython.ast.TypeVar;
+import org.python.pydev.parser.jython.ast.TypeVarTuple;
 import org.python.pydev.parser.jython.ast.UnaryOp;
 import org.python.pydev.parser.jython.ast.VisitorIF;
 import org.python.pydev.parser.jython.ast.While;
@@ -846,4 +850,40 @@ public Object visitMatchKeyVal(MatchKeyVal node) throws Exception {
         }
         return null;
     }
+
+    @Override
+    public Object visitTypeVar(TypeVar node) throws Exception {
+        boolean ret = unhandled_node(node);
+        if (ret) {
+            traverse(node);
+        }
+        return null;
+    }
+
+    @Override
+    public Object visitParamSpec(ParamSpec node) throws Exception {
+        boolean ret = unhandled_node(node);
+        if (ret) {
+            traverse(node);
+        }
+        return null;
+    }
+
+    @Override
+    public Object visitTypeVarTuple(TypeVarTuple node) throws Exception {
+        boolean ret = unhandled_node(node);
+        if (ret) {
+            traverse(node);
+        }
+        return null;
+    }
+
+    @Override
+    public Object visitTypeParamsSuite(TypeParamsSuite node) throws Exception {
+        boolean ret = unhandled_node(node);
+        if (ret) {
+            traverse(node);
+        }
+        return null;
+    }
 }
diff --git a/...ev.ast/src/org/python/pydev/ast/adapters/visitors/selection/SelectionExtenderVisitor.java b/...ev.ast/src/org/python/pydev/ast/adapters/visitors/selection/SelectionExtenderVisitor.java
@@ -306,6 +306,9 @@ private Object visitAliasType(aliasType node) throws Exception {
     @Override
     public Object visitFunctionDef(FunctionDef node) throws Exception {
         visit(node.name);
+        if (node.type_params != null) {
+            visit(node.type_params);
+        }
         visit(node.args);
         visit(node.body);
         extendLast(node);
@@ -316,6 +319,9 @@ public Object visitFunctionDef(FunctionDef node) throws Exception {
     @Override
     public Object visitClassDef(ClassDef node) throws Exception {
         visit(node.name);
+        if (node.type_params != null) {
+            node.type_params.accept(this);
+        }
         visit(node.bases);
         visit(node.body);
         extendLast(node);

diff --git a/...org.python.pydev.parser/src/org/python/pydev/parser/fastparser/FastDefinitionsParser.java b/...org.python.pydev.parser/src/org/python/pydev/parser/fastparser/FastDefinitionsParser.java
@@ -587,7 +587,8 @@ private void startClass(String name, int startClassRow, int startClassCol, int n
         nameTok.beginLine = startClassRow;
         nameTok.beginColumn = nameCol;
 
-        ClassDef classDef = new ClassDef(nameTok, null, null, null, null, null, null);
+        ClassDef classDef = new ClassDef(nameTok, null, null, null, null, null, null,
+                null);
         classDef.beginLine = startClassRow;
         classDef.beginColumn = startClassCol;
 

diff --git a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/fastparser/FastParser.java b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/fastparser/FastParser.java
@@ -336,7 +336,8 @@ private FunctionDef createFunctionDef(int lastReturnedLine, NameTok nameTok, int
     }
 
     private ClassDef createClassDef(int lastReturnedLine, NameTok nameTok, int matchedCol) {
-        ClassDef classDef = new ClassDef(nameTok, PyAstFactory.EMPTY_EXPR_TYPE, PyAstFactory.EMPTY_STMT_TYPE, null,
+        ClassDef classDef = new ClassDef(nameTok, null, PyAstFactory.EMPTY_EXPR_TYPE,
+                PyAstFactory.EMPTY_STMT_TYPE, null,
                 null, null,
                 null);
         classDef.beginLine = lastReturnedLine + 1;

diff --git a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar30/TreeBuilder30.java b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar30/TreeBuilder30.java
@@ -266,7 +266,7 @@ public final SimpleNode onCloseNode(SimpleNode n, int arity) throws Exception {
                 exprType[] bases = makeExprs(nodeArity);
                 nameTok = makeNameTok(NameTok.ClassName);
                 //decorator is always null at this point... it's decorated later on
-                ClassDef classDef = new ClassDef(nameTok, bases, body, null,
+                ClassDef classDef = new ClassDef(nameTok, null, bases, body, null,
                         classDefKeywords.toArray(new keywordType[classDefKeywords.size()]), starargs, kwargs);
 
                 addSpecialsAndClearOriginal(suite, classDef);

diff --git a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar310/TreeBuilder310.java b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar310/TreeBuilder310.java
@@ -283,7 +283,7 @@ public final SimpleNode onCloseNode(SimpleNode n, int arity) throws Exception {
                 exprType[] bases = makeExprs(nodeArity);
                 nameTok = makeNameTok(NameTok.ClassName);
                 //decorator is always null at this point... it's decorated later on
-                ClassDef classDef = new ClassDef(nameTok, bases, body, null,
+                ClassDef classDef = new ClassDef(nameTok, null, bases, body, null,
                         classDefKeywords.toArray(new keywordType[classDefKeywords.size()]), starargs, kwargs);
 
                 addSpecialsAndClearOriginal(suite, classDef);

diff --git a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar311/TreeBuilder311.java b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar311/TreeBuilder311.java
@@ -283,7 +283,7 @@ public final SimpleNode onCloseNode(SimpleNode n, int arity) throws Exception {
                 exprType[] bases = makeExprs(nodeArity);
                 nameTok = makeNameTok(NameTok.ClassName);
                 //decorator is always null at this point... it's decorated later on
-                ClassDef classDef = new ClassDef(nameTok, bases, body, null,
+                ClassDef classDef = new ClassDef(nameTok, null, bases, body, null,
                         classDefKeywords.toArray(new keywordType[classDefKeywords.size()]), starargs, kwargs);
 
                 addSpecialsAndClearOriginal(suite, classDef);

diff --git a/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar311/grammar310 b/plugins/org.python.pydev.parser/src/org/python/pydev/parser/grammar311/grammar310