Merge pull request #3176 from masatake/python-pep604

Python: PEP 604 -- allow writing union types as X | Y

Author: masatake

Units/parser-python.r/pep604-bar-operator-for-union.d/args.ctags

@@ -0,0 +1,2 @@
+--sort=no
+--kinds-Python=+z

Units/parser-python.r/pep604-bar-operator-for-union.d/expected.tags

@@ -0,0 +1,4 @@
+v	input.py	/^v: float | str = 'a'$/;"	v	typeref:typename:float|str
+f	input.py	/^def f(list: List[int|str], param: int | None) -> float|str:$/;"	f	typeref:typename:float|str
+list	input.py	/^def f(list: List[int|str], param: int | None) -> float|str:$/;"	z	function:f	typeref:typename:List[int|str]	file:
+param	input.py	/^def f(list: List[int|str], param: int | None) -> float|str:$/;"	z	function:f	typeref:typename:int|None	file:

Units/parser-python.r/pep604-bar-operator-for-union.d/input.py

@@ -0,0 +1,6 @@
+from typing import List, Union
+v: float | str = 'a'
+
+# Taken from https://www.python.org/dev/peps/pep-0604/
+def f(list: List[int|str], param: int | None) -> float|str:
+    pass

parsers/python.c

@@ -1228,12 +1228,17 @@ static bool skipVariableTypeAnnotation (tokenInfo *const token, vString *const r
 	if (readNext)
 		readToken (token);
 	/* skip subscripts and calls */
-	while (token->type == '[' || token->type == '(' || token->type == '.')
+	while (token->type == '[' || token->type == '(' || token->type == '.' || token->type == '|')
 	{
 		switch (token->type)
 		{
 			case '[': readNext = skipOverPair (token, '[', ']', repr, true); break;
 			case '(': readNext = skipOverPair (token, '(', ')', repr, true); break;
+			case '|':
+				reprCat (repr, token);
+				skipVariableTypeAnnotation (token, repr);
+				readNext = false;
+				break;
 			case '.':
 				reprCat (repr, token);
 				readToken (token);