src: cleanup importations

[nit.git] / src / flow.nit

diff --git a/src/flow.nit b/src/flow.nit
index ffd103f..4717d9b 100644 (file)
--- a/src/flow.nit
+++ b/src/flow.nit
@@ -17,10 +17,18 @@
 # Intraprocedural static flow.
 module flow
 
-import parser
-import toolcontext
 import scope
 
+redef class ToolContext
+       var flow_phase: Phase = new FlowPhase(self, [scope_phase])
+end
+
+private class FlowPhase
+       super Phase
+
+       redef fun process_npropdef(npropdef) do npropdef.do_flow(toolcontext)
+end
+
 # The visitor that derermine flowcontext for nodes
 private class FlowVisitor
        super Visitor
@@ -41,28 +49,28 @@ private class FlowVisitor
 
        redef fun visit(node)
        do
-               if node != null then
-                       if first == null then first = node
-
-                       if current_flow_context.node == null then current_flow_context.node = node
-                       node.accept_flow_visitor(self)
-                       if node isa AExpr then
-                               var flow = self.current_flow_context
-                               node.after_flow_context = flow
-                               if flow.when_true != flow or flow.when_false != flow then
-                                       #self.make_sub_flow
-                               end
+               if first == null then first = node
+
+               if current_flow_context.node == null then current_flow_context.node = node
+               node.accept_flow_visitor(self)
+               if node isa AExpr then
+                       var flow = self.current_flow_context
+                       node.after_flow_context = flow
+                       # Force the creation of a specific merge after the analysis of the node.
+                       if flow.when_true != flow or flow.when_false != flow then
+                               self.make_sub_flow
+                               self.current_flow_context.name = "AUTOSUB"
                        end
+               end
 
-                       if first == node then
-                               #self.printflow
-                       end
+               if first == node then
+                       #self.printflow
                end
        end
 
        fun visit_expr(node: AExpr): FlowContext
        do
-               self.visit(node)
+               self.enter_visit(node)
                return node.after_flow_context.as(not null)
        end
 
@@ -88,7 +96,7 @@ private class FlowVisitor
                                file.write "F{f.object_id} -> F{f.when_false.object_id}[label=FALSE,style=dotted];\n"
                        end
                end
-               file.write("\n")
+               file.write("\}\n")
                file.close
        end
 
@@ -176,13 +184,13 @@ private class FlowVisitor
 end
 
 # A Node in the static flow graph.
-# A same FlowContext can be shared by more than one ANode.
+# A same `FlowContext` can be shared by more than one `ANode`.
 class FlowContext
        # The reachable previous flow
        var previous: Array[FlowContext] = new Array[FlowContext]
 
        # Additional reachable flow that loop up to self.
-       # Loops apears in 'loop', 'while', 'for', closure and with 'continue'
+       # Loops apears in `loop`, `while`, `for`, and with `continue`
        var loops: Array[FlowContext] = new Array[FlowContext]
 
        private var is_marked_unreachable: Bool = false
@@ -474,6 +482,21 @@ redef class AOrExpr
        end
 end
 
+redef class AImpliesExpr
+       redef fun accept_flow_visitor(v)
+       do
+               var after_expr = v.visit_expr(self.n_expr)
+
+               v.current_flow_context = after_expr.when_true
+               var after_expr2 = v.visit_expr(self.n_expr2)
+
+               var merge_true = v.make_merge_flow(after_expr.when_false, after_expr2.when_true)
+               merge_true.name = "OR TRUE"
+
+               v.make_true_false_flow(merge_true, after_expr2.when_false)
+       end
+end
+
 redef class AAndExpr
        redef fun accept_flow_visitor(v)
        do
@@ -522,33 +545,18 @@ redef class ANeExpr
        end
 end
 
-redef class AClosureCallExpr
+redef class AIsaExpr
        redef fun accept_flow_visitor(v)
        do
                super
-               # FIXME: break closure call?
-               # v.make_unreachable_flow
-       end
-end
-
-redef class AClosureDef
-       redef fun accept_flow_visitor(v)
-       do
-               var before_loop = v.make_sub_flow
-
-               v.enter_visit(self.n_expr)
-
-               var after_block = v.current_flow_context
-               before_loop.add_loop(after_block)
-
-               v.make_merge_flow(v.current_flow_context, before_loop)
+               v.make_sub_true_false_flow
        end
 end
 
-redef class AIsaExpr
+redef class AProxyExpr
        redef fun accept_flow_visitor(v)
        do
-               super
-               v.make_sub_true_false_flow
+               var after_expr = v.visit_expr(self.n_expr)
+               v.current_flow_context = after_expr
        end
 end