Skip to content

Commit 69d27d9

Browse files
youknowoneyouknowone
authored
Rename unconventional nodes (#74)
1 parent 5270020 commit 69d27d9

19 files changed

+1303
-1198
lines changed

‎ast-pyo3/src/gen/to_py_ast.rs‎

Lines changed: 71 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -520,23 +520,23 @@ impl PyNode for ast::ExprContextDel {
520520
}
521521
}
522522

523-
impl PyNode for ast::Boolop {
523+
impl PyNode for ast::BoolOp {
524524
#[inline]
525525
fn py_type_cache() -> &'static OnceCell<(Py<PyAny>, Py<PyAny>)> {
526526
static PY_TYPE: OnceCell<(Py<PyAny>, Py<PyAny>)> = OnceCell::new();
527527
&PY_TYPE
528528
}
529529
}
530530

531-
impl PyNode for ast::BoolopAnd {
531+
impl PyNode for ast::BoolOpAnd {
532532
#[inline]
533533
fn py_type_cache() -> &'static OnceCell<(Py<PyAny>, Py<PyAny>)> {
534534
static PY_TYPE: OnceCell<(Py<PyAny>, Py<PyAny>)> = OnceCell::new();
535535
&PY_TYPE
536536
}
537537
}
538538

539-
impl PyNode for ast::BoolopOr {
539+
impl PyNode for ast::BoolOpOr {
540540
#[inline]
541541
fn py_type_cache() -> &'static OnceCell<(Py<PyAny>, Py<PyAny>)> {
542542
static PY_TYPE: OnceCell<(Py<PyAny>, Py<PyAny>)> = OnceCell::new();
@@ -656,127 +656,127 @@ impl PyNode for ast::OperatorFloorDiv {
656656
}
657657
}
658658

659-
impl PyNode for ast::Unaryop {
659+
impl PyNode for ast::UnaryOp {
660660
#[inline]
661661
fn py_type_cache() -> &'static OnceCell<(Py<PyAny>, Py<PyAny>)> {
662662
static PY_TYPE: OnceCell<(Py<PyAny>, Py<PyAny>)> = OnceCell::new();
663663
&PY_TYPE
664664
}
665665
}
666666

667-
impl PyNode for ast::UnaryopInvert {
667+
impl PyNode for ast::UnaryOpInvert {
668668
#[inline]
669669
fn py_type_cache() -> &'static OnceCell<(Py<PyAny>, Py<PyAny>)> {
670670
static PY_TYPE: OnceCell<(Py<PyAny>, Py<PyAny>)> = OnceCell::new();
671671
&PY_TYPE
672672
}
673673
}
674674

675-
impl PyNode for ast::UnaryopNot {
675+
impl PyNode for ast::UnaryOpNot {
676676
#[inline]
677677
fn py_type_cache() -> &'static OnceCell<(Py<PyAny>, Py<PyAny>)> {
678678
static PY_TYPE: OnceCell<(Py<PyAny>, Py<PyAny>)> = OnceCell::new();
679679
&PY_TYPE
680680
}
681681
}
682682

683-
impl PyNode for ast::UnaryopUAdd {
683+
impl PyNode for ast::UnaryOpUAdd {
684684
#[inline]
685685
fn py_type_cache() -> &'static OnceCell<(Py<PyAny>, Py<PyAny>)> {
686686
static PY_TYPE: OnceCell<(Py<PyAny>, Py<PyAny>)> = OnceCell::new();
687687
&PY_TYPE
688688
}
689689
}
690690

691-
impl PyNode for ast::UnaryopUSub {
691+
impl PyNode for ast::UnaryOpUSub {
692692
#[inline]
693693
fn py_type_cache() -> &'static OnceCell<(Py<PyAny>, Py<PyAny>)> {
694694
static PY_TYPE: OnceCell<(Py<PyAny>, Py<PyAny>)> = OnceCell::new();
695695
&PY_TYPE
696696
}
697697
}
698698

699-
impl PyNode for ast::Cmpop {
699+
impl PyNode for ast::CmpOp {
700700
#[inline]
701701
fn py_type_cache() -> &'static OnceCell<(Py<PyAny>, Py<PyAny>)> {
702702
static PY_TYPE: OnceCell<(Py<PyAny>, Py<PyAny>)> = OnceCell::new();
703703
&PY_TYPE
704704
}
705705
}
706706

707-
impl PyNode for ast::CmpopEq {
707+
impl PyNode for ast::CmpOpEq {
708708
#[inline]
709709
fn py_type_cache() -> &'static OnceCell<(Py<PyAny>, Py<PyAny>)> {
710710
static PY_TYPE: OnceCell<(Py<PyAny>, Py<PyAny>)> = OnceCell::new();
711711
&PY_TYPE
712712
}
713713
}
714714

715-
impl PyNode for ast::CmpopNotEq {
715+
impl PyNode for ast::CmpOpNotEq {
716716
#[inline]
717717
fn py_type_cache() -> &'static OnceCell<(Py<PyAny>, Py<PyAny>)> {
718718
static PY_TYPE: OnceCell<(Py<PyAny>, Py<PyAny>)> = OnceCell::new();
719719
&PY_TYPE
720720
}
721721
}
722722

723-
impl PyNode for ast::CmpopLt {
723+
impl PyNode for ast::CmpOpLt {
724724
#[inline]
725725
fn py_type_cache() -> &'static OnceCell<(Py<PyAny>, Py<PyAny>)> {
726726
static PY_TYPE: OnceCell<(Py<PyAny>, Py<PyAny>)> = OnceCell::new();
727727
&PY_TYPE
728728
}
729729
}
730730

731-
impl PyNode for ast::CmpopLtE {
731+
impl PyNode for ast::CmpOpLtE {
732732
#[inline]
733733
fn py_type_cache() -> &'static OnceCell<(Py<PyAny>, Py<PyAny>)> {
734734
static PY_TYPE: OnceCell<(Py<PyAny>, Py<PyAny>)> = OnceCell::new();
735735
&PY_TYPE
736736
}
737737
}
738738

739-
impl PyNode for ast::CmpopGt {
739+
impl PyNode for ast::CmpOpGt {
740740
#[inline]
741741
fn py_type_cache() -> &'static OnceCell<(Py<PyAny>, Py<PyAny>)> {
742742
static PY_TYPE: OnceCell<(Py<PyAny>, Py<PyAny>)> = OnceCell::new();
743743
&PY_TYPE
744744
}
745745
}
746746

747-
impl PyNode for ast::CmpopGtE {
747+
impl PyNode for ast::CmpOpGtE {
748748
#[inline]
749749
fn py_type_cache() -> &'static OnceCell<(Py<PyAny>, Py<PyAny>)> {
750750
static PY_TYPE: OnceCell<(Py<PyAny>, Py<PyAny>)> = OnceCell::new();
751751
&PY_TYPE
752752
}
753753
}
754754

755-
impl PyNode for ast::CmpopIs {
755+
impl PyNode for ast::CmpOpIs {
756756
#[inline]
757757
fn py_type_cache() -> &'static OnceCell<(Py<PyAny>, Py<PyAny>)> {
758758
static PY_TYPE: OnceCell<(Py<PyAny>, Py<PyAny>)> = OnceCell::new();
759759
&PY_TYPE
760760
}
761761
}
762762

763-
impl PyNode for ast::CmpopIsNot {
763+
impl PyNode for ast::CmpOpIsNot {
764764
#[inline]
765765
fn py_type_cache() -> &'static OnceCell<(Py<PyAny>, Py<PyAny>)> {
766766
static PY_TYPE: OnceCell<(Py<PyAny>, Py<PyAny>)> = OnceCell::new();
767767
&PY_TYPE
768768
}
769769
}
770770

771-
impl PyNode for ast::CmpopIn {
771+
impl PyNode for ast::CmpOpIn {
772772
#[inline]
773773
fn py_type_cache() -> &'static OnceCell<(Py<PyAny>, Py<PyAny>)> {
774774
static PY_TYPE: OnceCell<(Py<PyAny>, Py<PyAny>)> = OnceCell::new();
775775
&PY_TYPE
776776
}
777777
}
778778

779-
impl PyNode for ast::CmpopNotIn {
779+
impl PyNode for ast::CmpOpNotIn {
780780
#[inline]
781781
fn py_type_cache() -> &'static OnceCell<(Py<PyAny>, Py<PyAny>)> {
782782
static PY_TYPE: OnceCell<(Py<PyAny>, Py<PyAny>)> = OnceCell::new();
@@ -792,15 +792,15 @@ impl<R> PyNode for ast::Comprehension<R> {
792792
}
793793
}
794794

795-
impl<R> PyNode for ast::Excepthandler<R> {
795+
impl<R> PyNode for ast::ExceptHandler<R> {
796796
#[inline]
797797
fn py_type_cache() -> &'static OnceCell<(Py<PyAny>, Py<PyAny>)> {
798798
static PY_TYPE: OnceCell<(Py<PyAny>, Py<PyAny>)> = OnceCell::new();
799799
&PY_TYPE
800800
}
801801
}
802802

803-
impl<R> PyNode for ast::ExcepthandlerExceptHandler<R> {
803+
impl<R> PyNode for ast::ExceptHandlerExceptHandler<R> {
804804
#[inline]
805805
fn py_type_cache() -> &'static OnceCell<(Py<PyAny>, Py<PyAny>)> {
806806
static PY_TYPE: OnceCell<(Py<PyAny>, Py<PyAny>)> = OnceCell::new();
@@ -840,7 +840,7 @@ impl<R> PyNode for ast::Alias<R> {
840840
}
841841
}
842842

843-
impl<R> PyNode for ast::Withitem<R> {
843+
impl<R> PyNode for ast::WithItem<R> {
844844
#[inline]
845845
fn py_type_cache() -> &'static OnceCell<(Py<PyAny>, Py<PyAny>)> {
846846
static PY_TYPE: OnceCell<(Py<PyAny>, Py<PyAny>)> = OnceCell::new();
@@ -956,12 +956,12 @@ impl ToPyAst for ast::ExprContext {
956956
}
957957
}
958958

959-
impl ToPyAst for ast::Boolop {
959+
impl ToPyAst for ast::BoolOp {
960960
#[inline]
961961
fn to_py_ast<'py>(&self, py: Python<'py>) -> PyResult<&'py PyAny> {
962962
let cell = match &self {
963-
ast::Boolop::And => ast::BoolopAnd::py_type_cache(),
964-
ast::Boolop::Or => ast::BoolopOr::py_type_cache(),
963+
ast::BoolOp::And => ast::BoolOpAnd::py_type_cache(),
964+
ast::BoolOp::Or => ast::BoolOpOr::py_type_cache(),
965965
};
966966
Ok(Py::<PyAny>::as_ref(&cell.get().unwrap().1, py))
967967
}
@@ -989,33 +989,33 @@ impl ToPyAst for ast::Operator {
989989
}
990990
}
991991

992-
impl ToPyAst for ast::Unaryop {
992+
impl ToPyAst for ast::UnaryOp {
993993
#[inline]
994994
fn to_py_ast<'py>(&self, py: Python<'py>) -> PyResult<&'py PyAny> {
995995
let cell = match &self {
996-
ast::Unaryop::Invert => ast::UnaryopInvert::py_type_cache(),
997-
ast::Unaryop::Not => ast::UnaryopNot::py_type_cache(),
998-
ast::Unaryop::UAdd => ast::UnaryopUAdd::py_type_cache(),
999-
ast::Unaryop::USub => ast::UnaryopUSub::py_type_cache(),
996+
ast::UnaryOp::Invert => ast::UnaryOpInvert::py_type_cache(),
997+
ast::UnaryOp::Not => ast::UnaryOpNot::py_type_cache(),
998+
ast::UnaryOp::UAdd => ast::UnaryOpUAdd::py_type_cache(),
999+
ast::UnaryOp::USub => ast::UnaryOpUSub::py_type_cache(),
10001000
};
10011001
Ok(Py::<PyAny>::as_ref(&cell.get().unwrap().1, py))
10021002
}
10031003
}
10041004

1005-
impl ToPyAst for ast::Cmpop {
1005+
impl ToPyAst for ast::CmpOp {
10061006
#[inline]
10071007
fn to_py_ast<'py>(&self, py: Python<'py>) -> PyResult<&'py PyAny> {
10081008
let cell = match &self {
1009-
ast::Cmpop::Eq => ast::CmpopEq::py_type_cache(),
1010-
ast::Cmpop::NotEq => ast::CmpopNotEq::py_type_cache(),
1011-
ast::Cmpop::Lt => ast::CmpopLt::py_type_cache(),
1012-
ast::Cmpop::LtE => ast::CmpopLtE::py_type_cache(),
1013-
ast::Cmpop::Gt => ast::CmpopGt::py_type_cache(),
1014-
ast::Cmpop::GtE => ast::CmpopGtE::py_type_cache(),
1015-
ast::Cmpop::Is => ast::CmpopIs::py_type_cache(),
1016-
ast::Cmpop::IsNot => ast::CmpopIsNot::py_type_cache(),
1017-
ast::Cmpop::In => ast::CmpopIn::py_type_cache(),
1018-
ast::Cmpop::NotIn => ast::CmpopNotIn::py_type_cache(),
1009+
ast::CmpOp::Eq => ast::CmpOpEq::py_type_cache(),
1010+
ast::CmpOp::NotEq => ast::CmpOpNotEq::py_type_cache(),
1011+
ast::CmpOp::Lt => ast::CmpOpLt::py_type_cache(),
1012+
ast::CmpOp::LtE => ast::CmpOpLtE::py_type_cache(),
1013+
ast::CmpOp::Gt => ast::CmpOpGt::py_type_cache(),
1014+
ast::CmpOp::GtE => ast::CmpOpGtE::py_type_cache(),
1015+
ast::CmpOp::Is => ast::CmpOpIs::py_type_cache(),
1016+
ast::CmpOp::IsNot => ast::CmpOpIsNot::py_type_cache(),
1017+
ast::CmpOp::In => ast::CmpOpIn::py_type_cache(),
1018+
ast::CmpOp::NotIn => ast::CmpOpNotIn::py_type_cache(),
10191019
};
10201020
Ok(Py::<PyAny>::as_ref(&cell.get().unwrap().1, py))
10211021
}
@@ -2256,17 +2256,17 @@ impl ToPyAst for ast::Comprehension<TextRange> {
22562256
}
22572257
}
22582258

2259-
impl ToPyAst for ast::Excepthandler<TextRange> {
2259+
impl ToPyAst for ast::ExceptHandler<TextRange> {
22602260
#[inline]
22612261
fn to_py_ast<'py>(&self, py: Python<'py>) -> PyResult<&'py PyAny> {
22622262
let instance = match &self {
2263-
ast::Excepthandler::ExceptHandler(cons) => cons.to_py_ast(py)?,
2263+
ast::ExceptHandler::ExceptHandler(cons) => cons.to_py_ast(py)?,
22642264
};
22652265
Ok(instance)
22662266
}
22672267
}
22682268

2269-
impl ToPyAst for ast::ExcepthandlerExceptHandler<TextRange> {
2269+
impl ToPyAst for ast::ExceptHandlerExceptHandler<TextRange> {
22702270
#[inline]
22712271
fn to_py_ast<'py>(&self, py: Python<'py>) -> PyResult<&'py PyAny> {
22722272
let cache = Self::py_type_cache().get().unwrap();
@@ -2376,7 +2376,7 @@ impl ToPyAst for ast::Alias<TextRange> {
23762376
}
23772377
}
23782378

2379-
impl ToPyAst for ast::Withitem<TextRange> {
2379+
impl ToPyAst for ast::WithItem<TextRange> {
23802380
#[inline]
23812381
fn to_py_ast<'py>(&self, py: Python<'py>) -> PyResult<&'py PyAny> {
23822382
let cache = Self::py_type_cache().get().unwrap();
@@ -4272,17 +4272,17 @@ impl ToPyAst for ast::Comprehension<SourceRange> {
42724272
}
42734273
}
42744274

4275-
impl ToPyAst for ast::Excepthandler<SourceRange> {
4275+
impl ToPyAst for ast::ExceptHandler<SourceRange> {
42764276
#[inline]
42774277
fn to_py_ast<'py>(&self, py: Python<'py>) -> PyResult<&'py PyAny> {
42784278
let instance = match &self {
4279-
ast::Excepthandler::ExceptHandler(cons) => cons.to_py_ast(py)?,
4279+
ast::ExceptHandler::ExceptHandler(cons) => cons.to_py_ast(py)?,
42804280
};
42814281
Ok(instance)
42824282
}
42834283
}
42844284

4285-
impl ToPyAst for ast::ExcepthandlerExceptHandler<SourceRange> {
4285+
impl ToPyAst for ast::ExceptHandlerExceptHandler<SourceRange> {
42864286
#[inline]
42874287
fn to_py_ast<'py>(&self, py: Python<'py>) -> PyResult<&'py PyAny> {
42884288
let cache = Self::py_type_cache().get().unwrap();
@@ -4424,7 +4424,7 @@ impl ToPyAst for ast::Alias<SourceRange> {
44244424
}
44254425
}
44264426

4427-
impl ToPyAst for ast::Withitem<SourceRange> {
4427+
impl ToPyAst for ast::WithItem<SourceRange> {
44284428
#[inline]
44294429
fn to_py_ast<'py>(&self, py: Python<'py>) -> PyResult<&'py PyAny> {
44304430
let cache = Self::py_type_cache().get().unwrap();
@@ -4784,9 +4784,9 @@ fn init_types(py: Python) -> PyResult<()> {
47844784
cache_py_type::<ast::ExprContextLoad>(ast_module)?;
47854785
cache_py_type::<ast::ExprContextStore>(ast_module)?;
47864786
cache_py_type::<ast::ExprContextDel>(ast_module)?;
4787-
cache_py_type::<ast::Boolop>(ast_module)?;
4788-
cache_py_type::<ast::BoolopAnd>(ast_module)?;
4789-
cache_py_type::<ast::BoolopOr>(ast_module)?;
4787+
cache_py_type::<ast::BoolOp>(ast_module)?;
4788+
cache_py_type::<ast::BoolOpAnd>(ast_module)?;
4789+
cache_py_type::<ast::BoolOpOr>(ast_module)?;
47904790
cache_py_type::<ast::Operator>(ast_module)?;
47914791
cache_py_type::<ast::OperatorAdd>(ast_module)?;
47924792
cache_py_type::<ast::OperatorSub>(ast_module)?;
@@ -4801,30 +4801,30 @@ fn init_types(py: Python) -> PyResult<()> {
48014801
cache_py_type::<ast::OperatorBitXor>(ast_module)?;
48024802
cache_py_type::<ast::OperatorBitAnd>(ast_module)?;
48034803
cache_py_type::<ast::OperatorFloorDiv>(ast_module)?;
4804-
cache_py_type::<ast::Unaryop>(ast_module)?;
4805-
cache_py_type::<ast::UnaryopInvert>(ast_module)?;
4806-
cache_py_type::<ast::UnaryopNot>(ast_module)?;
4807-
cache_py_type::<ast::UnaryopUAdd>(ast_module)?;
4808-
cache_py_type::<ast::UnaryopUSub>(ast_module)?;
4809-
cache_py_type::<ast::Cmpop>(ast_module)?;
4810-
cache_py_type::<ast::CmpopEq>(ast_module)?;
4811-
cache_py_type::<ast::CmpopNotEq>(ast_module)?;
4812-
cache_py_type::<ast::CmpopLt>(ast_module)?;
4813-
cache_py_type::<ast::CmpopLtE>(ast_module)?;
4814-
cache_py_type::<ast::CmpopGt>(ast_module)?;
4815-
cache_py_type::<ast::CmpopGtE>(ast_module)?;
4816-
cache_py_type::<ast::CmpopIs>(ast_module)?;
4817-
cache_py_type::<ast::CmpopIsNot>(ast_module)?;
4818-
cache_py_type::<ast::CmpopIn>(ast_module)?;
4819-
cache_py_type::<ast::CmpopNotIn>(ast_module)?;
4804+
cache_py_type::<ast::UnaryOp>(ast_module)?;
4805+
cache_py_type::<ast::UnaryOpInvert>(ast_module)?;
4806+
cache_py_type::<ast::UnaryOpNot>(ast_module)?;
4807+
cache_py_type::<ast::UnaryOpUAdd>(ast_module)?;
4808+
cache_py_type::<ast::UnaryOpUSub>(ast_module)?;
4809+
cache_py_type::<ast::CmpOp>(ast_module)?;
4810+
cache_py_type::<ast::CmpOpEq>(ast_module)?;
4811+
cache_py_type::<ast::CmpOpNotEq>(ast_module)?;
4812+
cache_py_type::<ast::CmpOpLt>(ast_module)?;
4813+
cache_py_type::<ast::CmpOpLtE>(ast_module)?;
4814+
cache_py_type::<ast::CmpOpGt>(ast_module)?;
4815+
cache_py_type::<ast::CmpOpGtE>(ast_module)?;
4816+
cache_py_type::<ast::CmpOpIs>(ast_module)?;
4817+
cache_py_type::<ast::CmpOpIsNot>(ast_module)?;
4818+
cache_py_type::<ast::CmpOpIn>(ast_module)?;
4819+
cache_py_type::<ast::CmpOpNotIn>(ast_module)?;
48204820
cache_py_type::<ast::Comprehension>(ast_module)?;
4821-
cache_py_type::<ast::Excepthandler>(ast_module)?;
4822-
cache_py_type::<ast::ExcepthandlerExceptHandler>(ast_module)?;
4821+
cache_py_type::<ast::ExceptHandler>(ast_module)?;
4822+
cache_py_type::<ast::ExceptHandlerExceptHandler>(ast_module)?;
48234823
cache_py_type::<ast::PythonArguments>(ast_module)?;
48244824
cache_py_type::<ast::Arg>(ast_module)?;
48254825
cache_py_type::<ast::Keyword>(ast_module)?;
48264826
cache_py_type::<ast::Alias>(ast_module)?;
4827-
cache_py_type::<ast::Withitem>(ast_module)?;
4827+
cache_py_type::<ast::WithItem>(ast_module)?;
48284828
cache_py_type::<ast::MatchCase>(ast_module)?;
48294829
cache_py_type::<ast::Pattern>(ast_module)?;
48304830
cache_py_type::<ast::PatternMatchValue>(ast_module)?;

0 commit comments

Comments
 (0)