Replace ufmt with simple usort and black chaining.

capstone-engine · Mar 21, 2024 · 11f7cb7 · 11f7cb7
1 parent e5f2ef8
commit 11f7cb7
Show file tree

Hide file tree

Showing 64 changed files with 128 additions and 75 deletions.
diff --git a/.github/workflows/auto-sync.yml b/.github/workflows/auto-sync.yml
@@ -23,7 +23,8 @@ jobs:
           pip install .
       - name: Check formatting
         run: |
-          ufmt check src/autosync
+          python3.11 -m usort check src/autosync
+          python3.11 -m black --check src/autosync
       - name: CppTranslator - Patch tests
         run: |
           python -m unittest discover src/autosync/cpptranslator/Tests/
diff --git a/suite/auto-sync/format_py.sh b/suite/auto-sync/format_py.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/bash
+
+python3.11 -m usort format src/autosync
+python3.11 -m black src/autosync
diff --git a/suite/auto-sync/pyproject.toml b/suite/auto-sync/pyproject.toml
@@ -5,7 +5,6 @@ dependencies = [
   "termcolor >= 2.3.0",
   "tree_sitter < 0.22.0",
   "black >= 24.3.0",
-  "ufmt >= 2.5.1",
   "usort >= 1.0.8",
   "setuptools >= 69.2.0",
 ]

diff --git a/suite/auto-sync/src/autosync/cpptranslator/Patches/AddCSDetail.py b/suite/auto-sync/src/autosync/cpptranslator/Patches/AddCSDetail.py
@@ -1,15 +1,15 @@
 import logging as log
 import re
 
+from tree_sitter import Node
+
 from autosync.cpptranslator.Patches.HelperMethods import (
     get_MCInst_var_name,
     get_text,
     template_param_list_to_dict,
 )
 from autosync.cpptranslator.Patches.Patch import Patch
 
-from tree_sitter import Node
-
 
 class AddCSDetail(Patch):
     """

diff --git a/suite/auto-sync/src/autosync/cpptranslator/Patches/AddOperand.py b/suite/auto-sync/src/autosync/cpptranslator/Patches/AddOperand.py
@@ -1,6 +1,7 @@
+from tree_sitter import Node
+
 from autosync.cpptranslator.Patches.HelperMethods import get_text
 from autosync.cpptranslator.Patches.Patch import Patch
-from tree_sitter import Node
 
 
 class AddOperand(Patch):

diff --git a/suite/auto-sync/src/autosync/cpptranslator/Patches/Assert.py b/suite/auto-sync/src/autosync/cpptranslator/Patches/Assert.py
@@ -1,6 +1,7 @@
-from autosync.cpptranslator.Patches.Patch import Patch
 from tree_sitter import Node
 
+from autosync.cpptranslator.Patches.Patch import Patch
+
 
 class Assert(Patch):
     """

diff --git a/suite/auto-sync/src/autosync/cpptranslator/Patches/BitCastStdArray.py b/suite/auto-sync/src/autosync/cpptranslator/Patches/BitCastStdArray.py
@@ -1,6 +1,7 @@
+from tree_sitter import Node
+
 from autosync.cpptranslator.Patches.HelperMethods import get_text
 from autosync.cpptranslator.Patches.Patch import Patch
-from tree_sitter import Node
 
 
 class BitCastStdArray(Patch):

diff --git a/suite/auto-sync/src/autosync/cpptranslator/Patches/CheckDecoderStatus.py b/suite/auto-sync/src/autosync/cpptranslator/Patches/CheckDecoderStatus.py
@@ -1,6 +1,7 @@
+from tree_sitter import Node
+
 from autosync.cpptranslator.Patches.HelperMethods import get_text
 from autosync.cpptranslator.Patches.Patch import Patch
-from tree_sitter import Node
 
 
 class CheckDecoderStatus(Patch):

diff --git a/suite/auto-sync/src/autosync/cpptranslator/Patches/ClassConstructorDef.py b/suite/auto-sync/src/autosync/cpptranslator/Patches/ClassConstructorDef.py
@@ -1,6 +1,7 @@
-from autosync.cpptranslator.Patches.Patch import Patch
 from tree_sitter import Node
 
+from autosync.cpptranslator.Patches.Patch import Patch
+
 
 class ClassConstructorDef(Patch):
     """

diff --git a/suite/auto-sync/src/autosync/cpptranslator/Patches/ClassesDef.py b/suite/auto-sync/src/autosync/cpptranslator/Patches/ClassesDef.py
@@ -1,11 +1,11 @@
 import logging as log
 import re
 
+from tree_sitter import Node
+
 from autosync.cpptranslator.Patches.HelperMethods import get_text
 from autosync.cpptranslator.Patches.Patch import Patch
 
-from tree_sitter import Node
-
 
 class ClassesDef(Patch):
     """

diff --git a/suite/auto-sync/src/autosync/cpptranslator/Patches/ConstMCInstParameter.py b/suite/auto-sync/src/autosync/cpptranslator/Patches/ConstMCInstParameter.py
@@ -1,6 +1,7 @@
+from tree_sitter import Node
+
 from autosync.cpptranslator.Patches.HelperMethods import get_text
 from autosync.cpptranslator.Patches.Patch import Patch
-from tree_sitter import Node
 
 
 class ConstMCInstParameter(Patch):

diff --git a/suite/auto-sync/src/autosync/cpptranslator/Patches/ConstMCOperand.py b/suite/auto-sync/src/autosync/cpptranslator/Patches/ConstMCOperand.py
@@ -1,6 +1,7 @@
+from tree_sitter import Node
+
 from autosync.cpptranslator.Patches.HelperMethods import get_text
 from autosync.cpptranslator.Patches.Patch import Patch
-from tree_sitter import Node
 
 
 class ConstMCOperand(Patch):

diff --git a/suite/auto-sync/src/autosync/cpptranslator/Patches/CppInitCast.py b/suite/auto-sync/src/autosync/cpptranslator/Patches/CppInitCast.py
@@ -1,6 +1,7 @@
+from tree_sitter import Node
+
 from autosync.cpptranslator.Patches.HelperMethods import get_text
 from autosync.cpptranslator.Patches.Patch import Patch
-from tree_sitter import Node
 
 
 class CppInitCast(Patch):

diff --git a/suite/auto-sync/src/autosync/cpptranslator/Patches/CreateOperand0.py b/suite/auto-sync/src/autosync/cpptranslator/Patches/CreateOperand0.py
@@ -1,10 +1,10 @@
 import re
 
+from tree_sitter import Node
+
 from autosync.cpptranslator.Patches.HelperMethods import get_text
 from autosync.cpptranslator.Patches.Patch import Patch
 
-from tree_sitter import Node
-
 
 class CreateOperand0(Patch):
     """

diff --git a/suite/auto-sync/src/autosync/cpptranslator/Patches/CreateOperand1.py b/suite/auto-sync/src/autosync/cpptranslator/Patches/CreateOperand1.py
@@ -1,10 +1,10 @@
 import re
 
+from tree_sitter import Node
+
 from autosync.cpptranslator.Patches.HelperMethods import get_MCInst_var_name, get_text
 from autosync.cpptranslator.Patches.Patch import Patch
 
-from tree_sitter import Node
-
 
 class CreateOperand1(Patch):
     """

diff --git a/suite/auto-sync/src/autosync/cpptranslator/Patches/DeclarationInConditionClause.py b/suite/auto-sync/src/autosync/cpptranslator/Patches/DeclarationInConditionClause.py
@@ -1,6 +1,7 @@
+from tree_sitter import Node
+
 from autosync.cpptranslator.Patches.HelperMethods import get_capture_node, get_text
 from autosync.cpptranslator.Patches.Patch import Patch
-from tree_sitter import Node
 
 
 class DeclarationInConditionalClause(Patch):

diff --git a/suite/auto-sync/src/autosync/cpptranslator/Patches/DecodeInstruction.py b/suite/auto-sync/src/autosync/cpptranslator/Patches/DecodeInstruction.py
@@ -1,6 +1,7 @@
+from tree_sitter import Node
+
 from autosync.cpptranslator.Patches.HelperMethods import get_text
 from autosync.cpptranslator.Patches.Patch import Patch
-from tree_sitter import Node
 
 
 class DecodeInstruction(Patch):

diff --git a/suite/auto-sync/src/autosync/cpptranslator/Patches/DecoderCast.py b/suite/auto-sync/src/autosync/cpptranslator/Patches/DecoderCast.py
@@ -1,6 +1,7 @@
-from autosync.cpptranslator.Patches.Patch import Patch
 from tree_sitter import Node
 
+from autosync.cpptranslator.Patches.Patch import Patch
+
 
 class DecoderCast(Patch):
     """

diff --git a/suite/auto-sync/src/autosync/cpptranslator/Patches/DecoderParameter.py b/suite/auto-sync/src/autosync/cpptranslator/Patches/DecoderParameter.py
@@ -1,6 +1,7 @@
-from autosync.cpptranslator.Patches.Patch import Patch
 from tree_sitter import Node
 
+from autosync.cpptranslator.Patches.Patch import Patch
+
 
 class DecoderParameter(Patch):
     """

diff --git a/suite/auto-sync/src/autosync/cpptranslator/Patches/FallThrough.py b/suite/auto-sync/src/autosync/cpptranslator/Patches/FallThrough.py
@@ -1,6 +1,7 @@
-from autosync.cpptranslator.Patches.Patch import Patch
 from tree_sitter import Node
 
+from autosync.cpptranslator.Patches.Patch import Patch
+
 
 class FallThrough(Patch):
     """

diff --git a/suite/auto-sync/src/autosync/cpptranslator/Patches/FeatureBits.py b/suite/auto-sync/src/autosync/cpptranslator/Patches/FeatureBits.py
@@ -1,6 +1,7 @@
+from tree_sitter import Node
+
 from autosync.cpptranslator.Patches.HelperMethods import get_MCInst_var_name, get_text
 from autosync.cpptranslator.Patches.Patch import Patch
-from tree_sitter import Node
 
 
 class FeatureBits(Patch):

diff --git a/suite/auto-sync/src/autosync/cpptranslator/Patches/FeatureBitsDecl.py b/suite/auto-sync/src/autosync/cpptranslator/Patches/FeatureBitsDecl.py
@@ -1,6 +1,7 @@
-from autosync.cpptranslator.Patches.Patch import Patch
 from tree_sitter import Node
 
+from autosync.cpptranslator.Patches.Patch import Patch
+
 
 class FeatureBitsDecl(Patch):
     """

diff --git a/suite/auto-sync/src/autosync/cpptranslator/Patches/FieldFromInstr.py b/suite/auto-sync/src/autosync/cpptranslator/Patches/FieldFromInstr.py
@@ -1,14 +1,14 @@
 import logging as log
 import re
 
+from tree_sitter import Node
+
 from autosync.cpptranslator.Patches.HelperMethods import (
     get_function_params_of_node,
     get_text,
 )
 from autosync.cpptranslator.Patches.Patch import Patch
 
-from tree_sitter import Node
-
 
 class FieldFromInstr(Patch):
     """

diff --git a/suite/auto-sync/src/autosync/cpptranslator/Patches/GetNumOperands.py b/suite/auto-sync/src/autosync/cpptranslator/Patches/GetNumOperands.py
@@ -1,6 +1,7 @@
+from tree_sitter import Node
+
 from autosync.cpptranslator.Patches.HelperMethods import get_text
 from autosync.cpptranslator.Patches.Patch import Patch
-from tree_sitter import Node
 
 
 class GetNumOperands(Patch):

diff --git a/suite/auto-sync/src/autosync/cpptranslator/Patches/GetOpcode.py b/suite/auto-sync/src/autosync/cpptranslator/Patches/GetOpcode.py
@@ -1,6 +1,7 @@
+from tree_sitter import Node
+
 from autosync.cpptranslator.Patches.HelperMethods import get_text
 from autosync.cpptranslator.Patches.Patch import Patch
-from tree_sitter import Node
 
 
 class GetOpcode(Patch):

diff --git a/suite/auto-sync/src/autosync/cpptranslator/Patches/GetOperand.py b/suite/auto-sync/src/autosync/cpptranslator/Patches/GetOperand.py
@@ -1,6 +1,7 @@
+from tree_sitter import Node
+
 from autosync.cpptranslator.Patches.HelperMethods import get_text
 from autosync.cpptranslator.Patches.Patch import Patch
-from tree_sitter import Node
 
 
 class GetOperand(Patch):

diff --git a/suite/auto-sync/src/autosync/cpptranslator/Patches/GetOperandRegImm.py b/suite/auto-sync/src/autosync/cpptranslator/Patches/GetOperandRegImm.py
@@ -1,6 +1,7 @@
+from tree_sitter import Node
+
 from autosync.cpptranslator.Patches.HelperMethods import get_capture_node, get_text
 from autosync.cpptranslator.Patches.Patch import Patch
-from tree_sitter import Node
 
 
 class GetOperandRegImm(Patch):

diff --git a/suite/auto-sync/src/autosync/cpptranslator/Patches/GetRegClass.py b/suite/auto-sync/src/autosync/cpptranslator/Patches/GetRegClass.py
@@ -1,10 +1,11 @@
+from tree_sitter import Node
+
 from autosync.cpptranslator.Patches.HelperMethods import (
     get_capture_node,
     get_MCInst_var_name,
     get_text,
 )
 from autosync.cpptranslator.Patches.Patch import Patch
-from tree_sitter import Node
 
 
 class GetRegClass(Patch):

diff --git a/suite/auto-sync/src/autosync/cpptranslator/Patches/GetRegFromClass.py b/suite/auto-sync/src/autosync/cpptranslator/Patches/GetRegFromClass.py
@@ -1,6 +1,7 @@
+from tree_sitter import Node
+
 from autosync.cpptranslator.Patches.HelperMethods import get_capture_node, get_text
 from autosync.cpptranslator.Patches.Patch import Patch
-from tree_sitter import Node
 
 
 class GetRegFromClass(Patch):

diff --git a/suite/auto-sync/src/autosync/cpptranslator/Patches/GetSubReg.py b/suite/auto-sync/src/autosync/cpptranslator/Patches/GetSubReg.py
@@ -1,6 +1,7 @@
+from tree_sitter import Node
+
 from autosync.cpptranslator.Patches.HelperMethods import get_MCInst_var_name, get_text
 from autosync.cpptranslator.Patches.Patch import Patch
-from tree_sitter import Node
 
 
 class GetSubReg(Patch):

diff --git a/suite/auto-sync/src/autosync/cpptranslator/Patches/HelperMethods.py b/suite/auto-sync/src/autosync/cpptranslator/Patches/HelperMethods.py
@@ -1,10 +1,10 @@
 import logging as log
 import re
 
-from autosync.Helper import fail_exit
-
 from tree_sitter import Node
 
+from autosync.Helper import fail_exit
+
 
 def get_function_params_of_node(n: Node) -> Node:
     """

diff --git a/suite/auto-sync/src/autosync/cpptranslator/Patches/Includes.py b/suite/auto-sync/src/autosync/cpptranslator/Patches/Includes.py
@@ -1,10 +1,10 @@
 import logging as log
 
+from tree_sitter import Node
+
 from autosync.cpptranslator.Patches.HelperMethods import get_text
 from autosync.cpptranslator.Patches.Patch import Patch
 
-from tree_sitter import Node
-
 
 class Includes(Patch):
     """

diff --git a/suite/auto-sync/src/autosync/cpptranslator/Patches/InlineToStaticInline.py b/suite/auto-sync/src/autosync/cpptranslator/Patches/InlineToStaticInline.py
@@ -1,6 +1,7 @@
+from tree_sitter import Node
+
 from autosync.cpptranslator.Patches.HelperMethods import get_text
 from autosync.cpptranslator.Patches.Patch import Patch
-from tree_sitter import Node
 
 
 class InlineToStaticInline(Patch):

diff --git a/suite/auto-sync/src/autosync/cpptranslator/Patches/IsOptionalDef.py b/suite/auto-sync/src/autosync/cpptranslator/Patches/IsOptionalDef.py
@@ -1,6 +1,7 @@
+from tree_sitter import Node
+
 from autosync.cpptranslator.Patches.HelperMethods import get_text
 from autosync.cpptranslator.Patches.Patch import Patch
-from tree_sitter import Node
 
 
 class IsOptionalDef(Patch):

diff --git a/suite/auto-sync/src/autosync/cpptranslator/Patches/IsPredicate.py b/suite/auto-sync/src/autosync/cpptranslator/Patches/IsPredicate.py
@@ -1,6 +1,7 @@
+from tree_sitter import Node
+
 from autosync.cpptranslator.Patches.HelperMethods import get_text
 from autosync.cpptranslator.Patches.Patch import Patch
-from tree_sitter import Node
 
 
 class IsPredicate(Patch):

diff --git a/suite/auto-sync/src/autosync/cpptranslator/Patches/IsRegImm.py b/suite/auto-sync/src/autosync/cpptranslator/Patches/IsRegImm.py
@@ -1,6 +1,7 @@
+from tree_sitter import Node
+
 from autosync.cpptranslator.Patches.HelperMethods import get_text
 from autosync.cpptranslator.Patches.Patch import Patch
-from tree_sitter import Node
 
 
 class IsOperandRegImm(Patch):

diff --git a/suite/auto-sync/src/autosync/cpptranslator/Patches/LLVMFallThrough.py b/suite/auto-sync/src/autosync/cpptranslator/Patches/LLVMFallThrough.py
@@ -1,6 +1,7 @@
-from autosync.cpptranslator.Patches.Patch import Patch
 from tree_sitter import Node
 
+from autosync.cpptranslator.Patches.Patch import Patch
+
 
 class LLVMFallThrough(Patch):
     """

diff --git a/suite/auto-sync/src/autosync/cpptranslator/Patches/LLVMunreachable.py b/suite/auto-sync/src/autosync/cpptranslator/Patches/LLVMunreachable.py
@@ -1,6 +1,7 @@
+from tree_sitter import Node
+
 from autosync.cpptranslator.Patches.HelperMethods import get_text
 from autosync.cpptranslator.Patches.Patch import Patch
-from tree_sitter import Node
 
 
 class LLVMUnreachable(Patch):

diff --git a/suite/auto-sync/src/autosync/cpptranslator/Patches/MethodToFunctions.py b/suite/auto-sync/src/autosync/cpptranslator/Patches/MethodToFunctions.py
@@ -1,6 +1,7 @@
+from tree_sitter import Node
+
 from autosync.cpptranslator.Patches.HelperMethods import get_text
 from autosync.cpptranslator.Patches.Patch import Patch
-from tree_sitter import Node
 
 
 class MethodToFunction(Patch):

diff --git a/suite/auto-sync/src/autosync/cpptranslator/Patches/MethodTypeQualifier.py b/suite/auto-sync/src/autosync/cpptranslator/Patches/MethodTypeQualifier.py
@@ -1,6 +1,7 @@
+from tree_sitter import Node
+
 from autosync.cpptranslator.Patches.HelperMethods import get_text
 from autosync.cpptranslator.Patches.Patch import Patch
-from tree_sitter import Node
 
 
 class MethodTypeQualifier(Patch):