@@ -519,7 +519,7 @@ literal_pattern[pattern_ty]:
519519literal_expr[expr_ty]:
520520 | signed_number !('+' | '-')
521521 | complex_number
522- | strings
522+ | &(STRING|FSTRING_START|TSTRING_START) strings
523523 | 'None' { _PyAST_Constant(Py_None, NULL, EXTRA) }
524524 | 'True' { _PyAST_Constant(Py_True, NULL, EXTRA) }
525525 | 'False' { _PyAST_Constant(Py_False, NULL, EXTRA) }
@@ -859,7 +859,7 @@ atom[expr_ty]:
859859 | 'True' { _PyAST_Constant(Py_True, NULL, EXTRA) }
860860 | 'False' { _PyAST_Constant(Py_False, NULL, EXTRA) }
861861 | 'None' { _PyAST_Constant(Py_None, NULL, EXTRA) }
862- | &(STRING|FSTRING_START) strings
862+ | &(STRING|FSTRING_START|TSTRING_START ) strings
863863 | NUMBER
864864 | &'(' (tuple | group | genexp)
865865 | &'[' (list | listcomp)
@@ -935,7 +935,7 @@ fstring_middle[expr_ty]:
935935fstring_replacement_field[expr_ty]:
936936 | '{' a=annotated_rhs debug_expr='='? conversion=[fstring_conversion] format=[fstring_full_format_spec] rbrace='}' {
937937 _PyPegen_formatted_value(p, a, debug_expr, conversion, format, rbrace, EXTRA) }
938- | invalid_replacement_field
938+ | invalid_fstring_replacement_field
939939fstring_conversion[ResultTokenWithMetadata*]:
940940 | conv_token="!" conv=NAME { _PyPegen_check_fstring_conversion(p, conv_token, conv) }
941941fstring_full_format_spec[ResultTokenWithMetadata*]:
@@ -946,8 +946,27 @@ fstring_format_spec[expr_ty]:
946946fstring[expr_ty]:
947947 | a=FSTRING_START b=fstring_middle* c=FSTRING_END { _PyPegen_joined_str(p, a, (asdl_expr_seq*)b, c) }
948948
949+ tstring_format_spec_replacement_field[expr_ty]:
950+ | '{' a=annotated_rhs debug_expr='='? conversion=[fstring_conversion] format=[tstring_full_format_spec] rbrace='}' {
951+ _PyPegen_formatted_value(p, a, debug_expr, conversion, format, rbrace, EXTRA) }
952+ | invalid_tstring_replacement_field
953+ tstring_format_spec[expr_ty]:
954+ | t=TSTRING_MIDDLE { _PyPegen_decoded_constant_from_token(p, t) }
955+ | tstring_format_spec_replacement_field
956+ tstring_full_format_spec[ResultTokenWithMetadata*]:
957+ | colon=':' spec=tstring_format_spec* { _PyPegen_setup_full_format_spec(p, colon, (asdl_expr_seq *) spec, EXTRA) }
958+ tstring_replacement_field[expr_ty]:
959+ | '{' a=annotated_rhs debug_expr='='? conversion=[fstring_conversion] format=[tstring_full_format_spec] rbrace='}' {
960+ _PyPegen_interpolation(p, a, debug_expr, conversion, format, rbrace, EXTRA) }
961+ | invalid_tstring_replacement_field
962+ tstring_middle[expr_ty]:
963+ | tstring_replacement_field
964+ | t=TSTRING_MIDDLE { _PyPegen_constant_from_token(p, t) }
965+ tstring[expr_ty] (memo):
966+ | a=TSTRING_START b=tstring_middle* c=TSTRING_END { _PyPegen_template_str(p, a, (asdl_expr_seq*)b, c) }
967+
949968string[expr_ty]: s[Token*]=STRING { _PyPegen_constant_from_string(p, s) }
950- strings[expr_ty] (memo): a[asdl_expr_seq*]=(fstring|string)+ { _PyPegen_concatenate_strings(p, a, EXTRA) }
969+ strings[expr_ty] (memo): a[asdl_expr_seq*]=(fstring|string|tstring )+ { _PyPegen_concatenate_strings(p, a, EXTRA) }
951970
952971list[expr_ty]:
953972 | '[' a=[star_named_expressions] ']' { _PyAST_List(a, Load, EXTRA) }
@@ -1212,6 +1231,8 @@ invalid_expression:
12121231 RAISE_SYNTAX_ERROR_KNOWN_LOCATION (a, "expected expression before 'if', but statement is given") }
12131232 | a='lambda' [lambda_params] b=':' &FSTRING_MIDDLE {
12141233 RAISE_SYNTAX_ERROR_KNOWN_RANGE(a, b, "f-string: lambda expressions are not allowed without parentheses") }
1234+ | a='lambda' [lambda_params] b=':' &TSTRING_MIDDLE {
1235+ RAISE_SYNTAX_ERROR_KNOWN_RANGE(a, b, "t-string: lambda expressions are not allowed without parentheses") }
12151236
12161237invalid_named_expression(memo):
12171238 | a=expression ':=' expression {
@@ -1454,28 +1475,50 @@ invalid_starred_expression_unpacking:
14541475invalid_starred_expression:
14551476 | '*' { RAISE_SYNTAX_ERROR("Invalid star expression") }
14561477
1457- invalid_replacement_field :
1478+ invalid_fstring_replacement_field :
14581479 | '{' a='=' { RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "f-string: valid expression required before '='") }
14591480 | '{' a='!' { RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "f-string: valid expression required before '!'") }
14601481 | '{' a=':' { RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "f-string: valid expression required before ':'") }
14611482 | '{' a='}' { RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "f-string: valid expression required before '}'") }
1462- | '{' !annotated_rhs { RAISE_SYNTAX_ERROR_ON_NEXT_TOKEN("f-string: expecting a valid expression after '{'")}
1483+ | '{' !annotated_rhs { RAISE_SYNTAX_ERROR_ON_NEXT_TOKEN("f-string: expecting a valid expression after '{'") }
14631484 | '{' annotated_rhs !('=' | '!' | ':' | '}') {
14641485 PyErr_Occurred() ? NULL : RAISE_SYNTAX_ERROR_ON_NEXT_TOKEN("f-string: expecting '=', or '!', or ':', or '}'") }
14651486 | '{' annotated_rhs '=' !('!' | ':' | '}') {
14661487 PyErr_Occurred() ? NULL : RAISE_SYNTAX_ERROR_ON_NEXT_TOKEN("f-string: expecting '!', or ':', or '}'") }
1467- | '{' annotated_rhs '='? invalid_conversion_character
1488+ | '{' annotated_rhs '='? invalid_fstring_conversion_character
14681489 | '{' annotated_rhs '='? ['!' NAME] !(':' | '}') {
14691490 PyErr_Occurred() ? NULL : RAISE_SYNTAX_ERROR_ON_NEXT_TOKEN("f-string: expecting ':' or '}'") }
14701491 | '{' annotated_rhs '='? ['!' NAME] ':' fstring_format_spec* !'}' {
14711492 PyErr_Occurred() ? NULL : RAISE_SYNTAX_ERROR_ON_NEXT_TOKEN("f-string: expecting '}', or format specs") }
14721493 | '{' annotated_rhs '='? ['!' NAME] !'}' {
14731494 PyErr_Occurred() ? NULL : RAISE_SYNTAX_ERROR_ON_NEXT_TOKEN("f-string: expecting '}'") }
14741495
1475- invalid_conversion_character :
1496+ invalid_fstring_conversion_character :
14761497 | '!' &(':' | '}') { RAISE_SYNTAX_ERROR_ON_NEXT_TOKEN("f-string: missing conversion character") }
14771498 | '!' !NAME { RAISE_SYNTAX_ERROR_ON_NEXT_TOKEN("f-string: invalid conversion character") }
14781499
1500+ invalid_tstring_replacement_field:
1501+ | '{' a='=' { RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "t-string: valid expression required before '='") }
1502+ | '{' a='!' { RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "t-string: valid expression required before '!'") }
1503+ | '{' a=':' { RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "t-string: valid expression required before ':'") }
1504+ | '{' a='}' { RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "t-string: valid expression required before '}'") }
1505+ | '{' !annotated_rhs { RAISE_SYNTAX_ERROR_ON_NEXT_TOKEN("t-string: expecting a valid expression after '{'") }
1506+ | '{' annotated_rhs !('=' | '!' | ':' | '}') {
1507+ PyErr_Occurred() ? NULL : RAISE_SYNTAX_ERROR_ON_NEXT_TOKEN("t-string: expecting '=', or '!', or ':', or '}'") }
1508+ | '{' annotated_rhs '=' !('!' | ':' | '}') {
1509+ PyErr_Occurred() ? NULL : RAISE_SYNTAX_ERROR_ON_NEXT_TOKEN("t-string: expecting '!', or ':', or '}'") }
1510+ | '{' annotated_rhs '='? invalid_tstring_conversion_character
1511+ | '{' annotated_rhs '='? ['!' NAME] !(':' | '}') {
1512+ PyErr_Occurred() ? NULL : RAISE_SYNTAX_ERROR_ON_NEXT_TOKEN("t-string: expecting ':' or '}'") }
1513+ | '{' annotated_rhs '='? ['!' NAME] ':' fstring_format_spec* !'}' {
1514+ PyErr_Occurred() ? NULL : RAISE_SYNTAX_ERROR_ON_NEXT_TOKEN("t-string: expecting '}', or format specs") }
1515+ | '{' annotated_rhs '='? ['!' NAME] !'}' {
1516+ PyErr_Occurred() ? NULL : RAISE_SYNTAX_ERROR_ON_NEXT_TOKEN("t-string: expecting '}'") }
1517+
1518+ invalid_tstring_conversion_character:
1519+ | '!' &(':' | '}') { RAISE_SYNTAX_ERROR_ON_NEXT_TOKEN("t-string: missing conversion character") }
1520+ | '!' !NAME { RAISE_SYNTAX_ERROR_ON_NEXT_TOKEN("t-string: invalid conversion character") }
1521+
14791522invalid_arithmetic:
14801523 | sum ('+'|'-'|'*'|'/'|'%'|'//'|'@') a='not' b=inversion { RAISE_SYNTAX_ERROR_KNOWN_RANGE(a, b, "'not' after an operator must be parenthesized") }
14811524invalid_factor:
0 commit comments