Example: clean code

2 files changed, 98 insertions, 104 deletions

diff --git a/example/expression/access_c.py b/example/expression/access_c.py
index 8a1e2962..9ba33822 100644
--- a/example/expression/access_c.py
+++ b/example/expression/access_c.py
@@ -127,62 +127,60 @@ class MyCHandler(CHandler):
     exprToAccessC_cls = MyExprToAccessC
 
 
-def test(data):
-    # Digest C informations
-    text = """
-    struct human {
-            unsigned short age;
-            unsigned int height;
-            char name[50];
-    };
-
-    struct ll_human {
-            struct ll_human* next;
-            struct human human;
-    };
-    """
-
-    base_types = CTypeAMD64_unk()
-    types_ast = CAstTypes()
-    types_ast.add_c_decl(text)
-
-    types_mngr = CTypesManagerNotPacked(types_ast, base_types)
-
-    # Analyze binary
-    cont = Container.fallback_container(data, None, addr=0)
-
-    machine = Machine("x86_64")
-    dis_engine, ira = machine.dis_engine, machine.ira
-
-    mdis = dis_engine(cont.bin_stream, symbol_pool=cont.symbol_pool)
-    addr_head = 0
-    blocks = mdis.dis_multibloc(addr_head)
-    lbl_head = mdis.symbol_pool.getby_offset(addr_head)
-
-    ir_arch_a = ira(mdis.symbol_pool)
-    for block in blocks:
-        ir_arch_a.add_bloc(block)
-
-    open('graph_irflow.dot', 'w').write(ir_arch_a.graph.dot())
-
-    # Main function's first argument's type is "struct ll_human*"
-    ptr_llhuman = types_mngr.get_objc(CTypePtr(CTypeStruct('ll_human')))
-    arg0 = ExprId('ptr', 64)
-    ctx = {ir_arch_a.arch.regs.RDI: arg0}
-    expr_types = {arg0.name: ptr_llhuman}
-
-    mychandler = MyCHandler(types_mngr, expr_types)
-
-    for expr in get_funcs_arg0(ctx, ir_arch_a, lbl_head):
-        print "Access:", expr
-        target_types = mychandler.expr_to_types(expr)
-        for target_type in target_types:
-            print '\tType:', target_type
-        c_strs = mychandler.expr_to_c(expr)
-        for c_str in c_strs:
-            print "\tC access:", c_str
-        print
-
-
-if __name__ == '__main__':
-    test(open(sys.argv[1]).read())
+
+data = open(sys.argv[1]).read()
+# Digest C informations
+text = """
+struct human {
+        unsigned short age;
+        unsigned int height;
+        char name[50];
+};
+
+struct ll_human {
+        struct ll_human* next;
+        struct human human;
+};
+"""
+
+base_types = CTypeAMD64_unk()
+types_ast = CAstTypes()
+types_ast.add_c_decl(text)
+
+types_mngr = CTypesManagerNotPacked(types_ast, base_types)
+
+# Analyze binary
+cont = Container.fallback_container(data, None, addr=0)
+
+machine = Machine("x86_64")
+dis_engine, ira = machine.dis_engine, machine.ira
+
+mdis = dis_engine(cont.bin_stream, symbol_pool=cont.symbol_pool)
+addr_head = 0
+blocks = mdis.dis_multibloc(addr_head)
+lbl_head = mdis.symbol_pool.getby_offset(addr_head)
+
+ir_arch_a = ira(mdis.symbol_pool)
+for block in blocks:
+    ir_arch_a.add_bloc(block)
+
+open('graph_irflow.dot', 'w').write(ir_arch_a.graph.dot())
+
+# Main function's first argument's type is "struct ll_human*"
+ptr_llhuman = types_mngr.get_objc(CTypePtr(CTypeStruct('ll_human')))
+arg0 = ExprId('ptr', 64)
+ctx = {ir_arch_a.arch.regs.RDI: arg0}
+expr_types = {arg0.name: ptr_llhuman}
+
+mychandler = MyCHandler(types_mngr, expr_types)
+
+for expr in get_funcs_arg0(ctx, ir_arch_a, lbl_head):
+    print "Access:", expr
+    target_types = mychandler.expr_to_types(expr)
+    for target_type in target_types:
+        print '\tType:', target_type
+    c_strs = mychandler.expr_to_c(expr)
+    for c_str in c_strs:
+        print "\tC access:", c_str
+    print
+
diff --git a/example/expression/expr_c.py b/example/expression/expr_c.py
index e2986c55..7adc7b50 100644
--- a/example/expression/expr_c.py
+++ b/example/expression/expr_c.py
@@ -10,57 +10,53 @@ from miasm2.core.objc import CTypesManagerNotPacked, CHandler
 from miasm2.expression.expression import ExprId
 
 
-def test():
-    """
-    C manipulation example
-    """
-
-    # Digest C informations
-    text = """
-    struct line {
-            char color[20];
-            int size;
-    };
-
-    struct rectangle {
-            unsigned int width;
-            unsigned int length;
-            struct line* line;
-    };
-    """
+"""
+C manipulation example
+"""
 
-    # Type manager for x86 64: structures not packed
-    base_types = CTypeAMD64_unk()
-    types_ast = CAstTypes()
+# Digest C informations
+text = """
+struct line {
+        char color[20];
+        int size;
+};
+
+struct rectangle {
+        unsigned int width;
+        unsigned int length;
+        struct line* line;
+};
+"""
 
-    # Add C types definition
-    types_ast.add_c_decl(text)
+# Type manager for x86 64: structures not packed
+base_types = CTypeAMD64_unk()
+types_ast = CAstTypes()
 
-    types_mngr = CTypesManagerNotPacked(types_ast, base_types)
+# Add C types definition
+types_ast.add_c_decl(text)
 
-    # Create the ptr variable with type "struct rectangle*"
-    ptr_rectangle = types_mngr.get_objc(CTypePtr(CTypeStruct('rectangle')))
+types_mngr = CTypesManagerNotPacked(types_ast, base_types)
 
-    ptr = ExprId('ptr', 64)
-    expr_types = {ptr.name: ptr_rectangle}
+# Create the ptr variable with type "struct rectangle*"
+ptr_rectangle = types_mngr.get_objc(CTypePtr(CTypeStruct('rectangle')))
 
-    mychandler = CHandler(types_mngr, expr_types)
+ptr = ExprId('ptr', 64)
+expr_types = {ptr.name: ptr_rectangle}
 
-    # Parse some C accesses
-    c_acceses = ["ptr->width",
-                 "ptr->length",
-                 "ptr->line",
-                 "ptr->line->color",
-                 "ptr->line->color[3]",
-                 "ptr->line->size"
-                ]
+mychandler = CHandler(types_mngr, expr_types)
 
-    for c_str in c_acceses:
-        expr = mychandler.c_to_expr(c_str)
-        c_type = mychandler.c_to_type(c_str)
-        print 'C access:', c_str
-        print '\tExpr:', expr
-        print '\tType:', c_type
+# Parse some C accesses
+c_acceses = ["ptr->width",
+             "ptr->length",
+             "ptr->line",
+             "ptr->line->color",
+             "ptr->line->color[3]",
+             "ptr->line->size"
+            ]
 
-if __name__ == '__main__':
-    test()
+for c_str in c_acceses:
+    expr = mychandler.c_to_expr(c_str)
+    c_type = mychandler.c_to_type(c_str)
+    print 'C access:', c_str
+    print '\tExpr:', expr
+    print '\tType:', c_type