From dbe9711afa4abb6db10886530bcff1463de4563d Mon Sep 17 00:00:00 2001
From: Jean Privat <jean@pryen.org>
Date: Wed, 3 Sep 2014 10:19:04 -0400
Subject: [PATCH] src: cleanup importations

Signed-off-by: Jean Privat <jean@pryen.org>
---
 src/android_annotations.nit   |    3 +--
 src/annotation.nit            |    3 +--
 src/astprinter.nit            |    3 +--
 src/astvalidation.nit         |    1 -
 src/auto_super_init.nit       |    3 +--
 src/cached.nit                |    2 +-
 src/check_annotation.nit      |    2 +-
 src/common_ffi/common_ffi.nit |    1 -
 src/common_ffi/pkgconfig.nit  |    1 +
 src/debugger.nit              |    1 +
 src/div_by_zero.nit           |    1 -
 src/flow.nit                  |    3 ---
 src/literal.nit               |    2 --
 src/local_var_init.nit        |    2 --
 src/markdown.nit              |    1 +
 src/model/model.nit           |    2 --
 src/modelbuilder.nit          |    4 ----
 src/modelize_property.nit     |    2 +-
 src/naive_interpreter.nit     |    4 +---
 src/platform.nit              |    3 +--
 src/rapid_type_analysis.nit   |    6 ++----
 src/scope.nit                 |    2 --
 src/serialization_phase.nit   |    4 ++--
 src/simple_misc_analysis.nit  |    2 --
 src/testing/testing_base.nit  |    2 +-
 src/testing/testing_suite.nit |    1 +
 src/transform.nit             |    2 +-
 src/typing.nit                |    2 --
 28 files changed, 19 insertions(+), 46 deletions(-)

diff --git a/src/android_annotations.nit b/src/android_annotations.nit
index b3ffcee..6ef4e04 100644
--- a/src/android_annotations.nit
+++ b/src/android_annotations.nit
@@ -18,8 +18,7 @@
 # by calling `ModelBuilder::android_project_for`.
 module android_annotations
 
-import parser_util
-import modelbuilder
+private import parser_util
 import modelize
 import literal
 import semantize
diff --git a/src/annotation.nit b/src/annotation.nit
index 8d9ca25..6641280 100644
--- a/src/annotation.nit
+++ b/src/annotation.nit
@@ -15,9 +15,8 @@
 # Management and utilities on annotations
 module annotation
 
-import parser
 import modelbuilder
-import literal
+private import literal
 import model::mmodule_data
 
 redef class Prod
diff --git a/src/astprinter.nit b/src/astprinter.nit
index a1fd48e..e0aceee 100644
--- a/src/astprinter.nit
+++ b/src/astprinter.nit
@@ -17,10 +17,9 @@
 # print AST in an human form
 module astprinter
 
-import phase
 import semantize
 intrude import parser
-import literal
+private import literal
 
 private class ASTPrinterVisitor
 	super Visitor
diff --git a/src/astvalidation.nit b/src/astvalidation.nit
index 913ee21..578f931 100644
--- a/src/astvalidation.nit
+++ b/src/astvalidation.nit
@@ -15,7 +15,6 @@
 # Check the consitency of AST
 module astvalidation
 
-private import typing
 intrude import parser
 import astbuilder
 
diff --git a/src/auto_super_init.nit b/src/auto_super_init.nit
index 8891df3..19d60f5 100644
--- a/src/auto_super_init.nit
+++ b/src/auto_super_init.nit
@@ -19,8 +19,7 @@
 module auto_super_init
 
 import typing
-import modelbuilder
-import phase
+private import annotation
 
 redef class ToolContext
 	var auto_super_init_phase: Phase = new AutoSuperInitPhase(self, [typing_phase])
diff --git a/src/cached.nit b/src/cached.nit
index 67d7b98..830ff66 100644
--- a/src/cached.nit
+++ b/src/cached.nit
@@ -18,8 +18,8 @@
 # complex annotation that modify both the model and the AST of a Nit program
 module cached
 
-import parser_util
 import modelize
+private import parser_util
 import simple_misc_analysis
 private import annotation
 
diff --git a/src/check_annotation.nit b/src/check_annotation.nit
index f91dc55..367ba4d 100644
--- a/src/check_annotation.nit
+++ b/src/check_annotation.nit
@@ -19,7 +19,7 @@
 module check_annotation
 
 import phase
-import annotation
+private import annotation
 
 redef class ToolContext
 	var check_annotation_phase: Phase = new CheckAnnotationPhase(self, null)
diff --git a/src/common_ffi/common_ffi.nit b/src/common_ffi/common_ffi.nit
index 302c472..cb9c244 100644
--- a/src/common_ffi/common_ffi.nit
+++ b/src/common_ffi/common_ffi.nit
@@ -19,7 +19,6 @@
 # to wrap foreign code in Nit methods.
 module common_ffi
 
-import parser
 import modelbuilder
 
 import nitni
diff --git a/src/common_ffi/pkgconfig.nit b/src/common_ffi/pkgconfig.nit
index 5306b97..aa9add3 100644
--- a/src/common_ffi/pkgconfig.nit
+++ b/src/common_ffi/pkgconfig.nit
@@ -20,6 +20,7 @@ module pkgconfig
 
 import c
 private import annotation
+private import literal
 
 redef class ToolContext
 	var pkgconfig_phase: Phase = new PkgconfigPhase(self, [literal_phase])
diff --git a/src/debugger.nit b/src/debugger.nit
index 24df936..0f211e6 100644
--- a/src/debugger.nit
+++ b/src/debugger.nit
@@ -23,6 +23,7 @@ import nitx
 intrude import local_var_init
 intrude import scope
 intrude import toolcontext
+private import parser_util
 
 redef class Model
 	# Cleans the model to remove a module and what it defines when semantic analysis fails on injected code
diff --git a/src/div_by_zero.nit b/src/div_by_zero.nit
index 318b33e..5833009 100644
--- a/src/div_by_zero.nit
+++ b/src/div_by_zero.nit
@@ -16,7 +16,6 @@
 # This module is only an example of how to implements a simple phase in the nit tools
 module div_by_zero
 
-import phase
 import literal # Because we need the real value of literal in the AST
 import semantize # Because we need the static type of receivers
 
diff --git a/src/flow.nit b/src/flow.nit
index bbee8bb..4717d9b 100644
--- a/src/flow.nit
+++ b/src/flow.nit
@@ -17,10 +17,7 @@
 # Intraprocedural static flow.
 module flow
 
-import parser
-import toolcontext
 import scope
-import phase
 
 redef class ToolContext
 	var flow_phase: Phase = new FlowPhase(self, [scope_phase])
diff --git a/src/literal.nit b/src/literal.nit
index 0395299..ef4851b 100644
--- a/src/literal.nit
+++ b/src/literal.nit
@@ -17,8 +17,6 @@
 # Parsing of literal values in the abstract syntax tree.
 module literal
 
-import parser
-import toolcontext
 import phase
 
 redef class ToolContext
diff --git a/src/local_var_init.nit b/src/local_var_init.nit
index 4ed1ff8..4b9a4ab 100644
--- a/src/local_var_init.nit
+++ b/src/local_var_init.nit
@@ -18,9 +18,7 @@
 # Require that the scope and the flow analaysis are already performed
 module local_var_init
 
-import scope
 import flow
-import phase
 
 redef class ToolContext
 	var local_var_init_phase: Phase = new LocalVarInitPhase(self, [flow_phase])
diff --git a/src/markdown.nit b/src/markdown.nit
index 90cb227..01a054c 100644
--- a/src/markdown.nit
+++ b/src/markdown.nit
@@ -18,6 +18,7 @@ module markdown
 private import parser
 import html
 private import highlight
+private import parser_util
 
 # The class that does the convertion from a `ADoc` to HTML
 private class Doc2Mdwn
diff --git a/src/model/model.nit b/src/model/model.nit
index f3c3164..d4d2c1c 100644
--- a/src/model/model.nit
+++ b/src/model/model.nit
@@ -25,8 +25,6 @@
 # FIXME: better handling of the types
 module model
 
-import poset
-import location
 import mmodule
 import mdoc
 import ordered_tree
diff --git a/src/modelbuilder.nit b/src/modelbuilder.nit
index cebbe1b..eac98df 100644
--- a/src/modelbuilder.nit
+++ b/src/modelbuilder.nit
@@ -22,11 +22,7 @@
 # FIXME add missing error checks
 module modelbuilder
 
-import parser
 import model
-import poset
-import opts
-import toolcontext
 import phase
 
 private import more_collections
diff --git a/src/modelize_property.nit b/src/modelize_property.nit
index 146125b..57e847b 100644
--- a/src/modelize_property.nit
+++ b/src/modelize_property.nit
@@ -18,7 +18,7 @@
 module modelize_property
 
 import modelize_class
-import annotation
+private import annotation
 
 redef class ToolContext
 	var modelize_property_phase: Phase = new ModelizePropertyPhase(self, [modelize_class_phase])
diff --git a/src/naive_interpreter.nit b/src/naive_interpreter.nit
index c741f04..291f222 100644
--- a/src/naive_interpreter.nit
+++ b/src/naive_interpreter.nit
@@ -18,10 +18,8 @@
 module naive_interpreter
 
 import literal
-import typing
-import auto_super_init
-import frontend
 import common_ffi
+import semantize
 private import parser::tables
 
 redef class ToolContext
diff --git a/src/platform.nit b/src/platform.nit
index 99d67a0..80aab8b 100644
--- a/src/platform.nit
+++ b/src/platform.nit
@@ -16,9 +16,8 @@
 # to the target platform. Also detects conflicts between targetted platforms.
 module platform
 
-import parser_util
-import modelbuilder
 import modelize
+private import parser_util
 private import annotation
 
 redef class ToolContext
diff --git a/src/rapid_type_analysis.nit b/src/rapid_type_analysis.nit
index 418bc15..ea0dcaf 100644
--- a/src/rapid_type_analysis.nit
+++ b/src/rapid_type_analysis.nit
@@ -23,12 +23,10 @@
 # It is quite efficient but the type set is global and pollutes each call site.
 module rapid_type_analysis
 
-import model
-import modelbuilder
 import semantize
 
-import csv # for live_types_to_csv
-import ordered_tree # for live_methods_to_tree
+private import csv # for live_types_to_csv
+private import ordered_tree # for live_methods_to_tree
 
 private import more_collections
 
diff --git a/src/scope.nit b/src/scope.nit
index 2d2c00a..83c5fe4 100644
--- a/src/scope.nit
+++ b/src/scope.nit
@@ -17,8 +17,6 @@
 # Identification and scping of local variables and labels.
 module scope
 
-import parser
-import toolcontext
 import phase
 
 redef class ToolContext
diff --git a/src/serialization_phase.nit b/src/serialization_phase.nit
index 1847298..25574e7 100644
--- a/src/serialization_phase.nit
+++ b/src/serialization_phase.nit
@@ -19,9 +19,9 @@
 # Phase generating methods to serialize Nit objects to different formats
 module serialization_phase
 
-import phase
-import parser_util
+private import parser_util
 import modelize
+private import annotation
 
 redef class ToolContext
 	var serialization_phase_pre_model: Phase = new SerializationPhasePreModel(self, null)
diff --git a/src/simple_misc_analysis.nit b/src/simple_misc_analysis.nit
index 35fa66c..26d6710 100644
--- a/src/simple_misc_analysis.nit
+++ b/src/simple_misc_analysis.nit
@@ -21,8 +21,6 @@
 #  * use of "while true" instead of "loop"
 module simple_misc_analysis
 
-import toolcontext
-import parser
 import phase
 
 redef class ToolContext
diff --git a/src/testing/testing_base.nit b/src/testing/testing_base.nit
index ef9e7fe..62cfb08 100644
--- a/src/testing/testing_base.nit
+++ b/src/testing/testing_base.nit
@@ -15,8 +15,8 @@
 # Base options for testing tools.
 module testing_base
 
-import parser_util
 import modelize
+private import parser_util
 
 redef class ToolContext
 	# opt --full
diff --git a/src/testing/testing_suite.nit b/src/testing/testing_suite.nit
index acf5650..30cbed5 100644
--- a/src/testing/testing_suite.nit
+++ b/src/testing/testing_suite.nit
@@ -17,6 +17,7 @@ module testing_suite
 
 import testing_base
 import html
+private import annotation
 
 redef class ToolContext
 	# -- target-file
diff --git a/src/transform.nit b/src/transform.nit
index 6829d75..6a209c3 100644
--- a/src/transform.nit
+++ b/src/transform.nit
@@ -17,8 +17,8 @@
 module transform
 
 import astbuilder
-import auto_super_init
 import astvalidation
+import semantize
 
 redef class ToolContext
 	var transform_phase: Phase = new TransformPhase(self, [typing_phase, auto_super_init_phase])
diff --git a/src/typing.nit b/src/typing.nit
index 3dd9024..462fe04 100644
--- a/src/typing.nit
+++ b/src/typing.nit
@@ -18,8 +18,6 @@
 # By OO-services we mean message sending, attribute access, instantiation, etc.
 module typing
 
-import flow
-import phase
 import modelize
 import local_var_init
 
-- 
1.7.9.5