nitstats: renamed in nitmetrics

Signed-off-by: Alexandre Terrasa <alexadre@moz-code.org>

diff --git a/.gitignore b/.gitignore
index 267f8ae..f054c74 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,7 @@
 nitc
 nitdoc
 nits
-nitstats
+nitmetrics
 doc/stdlib
 
 *.aux

diff --git a/src/Makefile b/src/Makefile
index d5b8e18..1801a9b 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -16,7 +16,7 @@
 
 NITCOPT=
 
-all: ../bin/nitc ../bin/nitdoc ../bin/nits ../bin/nitstats ../bin/nitg ../bin/nit
+all: ../bin/nitc ../bin/nitdoc ../bin/nits ../bin/nitmetrics ../bin/nitg ../bin/nit
 
 ../bin/nitc: ../c_src/nitc parser/parser.nit
        @echo '***************************************************************'
@@ -39,12 +39,12 @@ all: ../bin/nitc ../bin/nitdoc ../bin/nits ../bin/nitstats ../bin/nitg ../bin/ni
        ./git-gen-version.sh
        ../bin/nitc ${NITCOPT} -o ../bin/nits -O -v nits.nit
 
-../bin/nitstats: ../bin/nitc
+../bin/nitmetrics: ../bin/nitc
        @echo '***************************************************************'
-       @echo '* Compile nitstats from NIT source files                      *'
+       @echo '* Compile nitmetrics from NIT source files                      *'
        @echo '***************************************************************'
        ./git-gen-version.sh
-       ../bin/nitc ${NITCOPT} -o ../bin/nitstats -O -v nitstats.nit
+       ../bin/nitc ${NITCOPT} -o ../bin/nitmetrics -O -v nitmetrics.nit
 
 ../bin/nitg: ../bin/nitc
        @echo '***************************************************************'

diff --git a/src/stats/count_ntypes.nit b/src/metrics/count_ntypes.nit
similarity index 99%
rename from src/stats/count_ntypes.nit
rename to src/metrics/count_ntypes.nit
index 3d81aad..c74a37b 100644 (file)
--- a/src/stats/count_ntypes.nit
+++ b/src/metrics/count_ntypes.nit
@@ -17,7 +17,7 @@
 # Statistics on the usage of explicit static types.
 module count_ntypes
 
-private import stats_base
+private import metrics_base
 import modelbuilder
 
 # The job of this visitor is to resolve all types found

diff --git a/src/stats/generate_hierarchies.nit b/src/metrics/generate_hierarchies.nit
similarity index 99%
rename from src/stats/generate_hierarchies.nit
rename to src/metrics/generate_hierarchies.nit
index 759f32e..8f6d894 100644 (file)
--- a/src/stats/generate_hierarchies.nit
+++ b/src/metrics/generate_hierarchies.nit
@@ -20,7 +20,7 @@ module generate_hierarchies
 
 import model
 
-private import stats_base
+private import metrics_base
 
 # Create a dot file representing the module hierarchy of a model.
 # Importation relation is represented with arrow

diff --git a/src/stats/stats.nit b/src/metrics/metrics.nit
similarity index 96%
rename from src/stats/stats.nit
rename to src/metrics/metrics.nit
index eab6275..159368a 100644 (file)
--- a/src/stats/stats.nit
+++ b/src/metrics/metrics.nit
@@ -15,9 +15,9 @@
 # limitations under the License.
 
 # Various statistics about Nit models and programs
-module stats
+module metrics
 
-import stats_base
+import metrics_base
 import count_ntypes
 import visit_nullable_sends
 import visit_self

diff --git a/src/stats/stats_base.nit b/src/metrics/metrics_base.nit
similarity index 99%
rename from src/stats/stats_base.nit
rename to src/metrics/metrics_base.nit
index b2183df..aaeb6ea 100644 (file)
--- a/src/stats/stats_base.nit
+++ b/src/metrics/metrics_base.nit
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 # Helpers for various statistics tools.
-module stats_base
+module metrics_base
 
 import modelbuilder
 

diff --git a/src/stats/model_hyperdoc.nit b/src/metrics/model_hyperdoc.nit
similarity index 99%
rename from src/stats/model_hyperdoc.nit
rename to src/metrics/model_hyperdoc.nit
index 1c0cc20..8d8a10e 100644 (file)
--- a/src/stats/model_hyperdoc.nit
+++ b/src/metrics/model_hyperdoc.nit
@@ -18,7 +18,7 @@
 module model_hyperdoc
 
 import model
-import stats_base
+import metrics_base
 
 # Genetate a HTML file for the model.
 # The generated file contains the description of each entity of the model

diff --git a/src/stats/model_stats.nit b/src/metrics/model_stats.nit
similarity index 99%
rename from src/stats/model_stats.nit
rename to src/metrics/model_stats.nit
index 37e248c..b12cc2d 100644 (file)
--- a/src/stats/model_stats.nit
+++ b/src/metrics/model_stats.nit
@@ -18,7 +18,7 @@
 module model_stats
 
 import model
-private import stats_base
+private import metrics_base
 
 # Print general statistics on a model
 fun compute_statistics(model: Model)

diff --git a/src/stats/rta_stats.nit b/src/metrics/rta_stats.nit
similarity index 100%
rename from src/stats/rta_stats.nit
rename to src/metrics/rta_stats.nit

diff --git a/src/stats/visit_nullable_sends.nit b/src/metrics/visit_nullable_sends.nit
similarity index 98%
rename from src/stats/visit_nullable_sends.nit
rename to src/metrics/visit_nullable_sends.nit
index 5e468d0..3cffc9c 100644 (file)
--- a/src/stats/visit_nullable_sends.nit
+++ b/src/metrics/visit_nullable_sends.nit
@@ -19,7 +19,7 @@ module visit_nullable_sends
 
 import modelbuilder
 private import typing
-private import stats_base
+private import metrics_base
 
 private class NullableSends
        super Visitor

diff --git a/src/stats/visit_self.nit b/src/metrics/visit_self.nit
similarity index 98%
rename from src/stats/visit_self.nit
rename to src/metrics/visit_self.nit
index 1ddf5de..cc064e7 100644 (file)
--- a/src/stats/visit_self.nit
+++ b/src/metrics/visit_self.nit
@@ -18,7 +18,7 @@
 module visit_self
 
 import modelbuilder
-private import stats_base
+private import metrics_base
 
 private class ASelfVisitor
        super Visitor

diff --git a/src/nitstats.nit b/src/nitmetrics.nit
similarity index 95%
rename from src/nitstats.nit
rename to src/nitmetrics.nit
index ec42284..1b2ebd1 100644 (file)
--- a/src/nitstats.nit
+++ b/src/nitmetrics.nit
@@ -14,12 +14,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# A program that collects various data about nit programs and libraries
-module nitstats
+# A program that collects various metrics on nit programs and libraries
+module nitmetrics
 
 import modelbuilder
 import exprbuilder
-import stats
+import metrics
 
 # Create a tool context to handle options and paths
 var toolcontext = new ToolContext

diff --git a/tests/Makefile b/tests/Makefile
index bc325ae..3220876 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,5 +1,5 @@
 
-PROGS=*.nit ../examples/*.nit ../examples/leapfrog/leapfrog.nit ../examples/shoot/shoot_logic.nit ../lib/*.nit ../src/nitdoc.nit ../src/nits.nit ../src/nitc.nit ../src/test_parser.nit ../src/nit.nit ../src/nitstats.nit ../src/nitg.nit
+PROGS=*.nit ../examples/*.nit ../examples/leapfrog/leapfrog.nit ../examples/shoot/shoot_logic.nit ../lib/*.nit ../src/nitdoc.nit ../src/nits.nit ../src/nitc.nit ../src/test_parser.nit ../src/nit.nit ../src/nitmetrics.nit ../src/nitg.nit
 
 all: separate global niti nitg icode
 

diff --git a/tests/nitmetrics.args b/tests/nitmetrics.args
new file mode 100644 (file)
index 0000000..b1e7e65
--- /dev/null
+++ b/tests/nitmetrics.args
@@ -0,0 +1 @@
+base_simple3.nit -d out/nitmetrics_args1.write

diff --git a/tests/nitstats.args b/tests/nitstats.args
deleted file mode 100644 (file)
index 9ac0102..0000000
--- a/tests/nitstats.args
+++ /dev/null
@@ -1 +0,0 @@
-base_simple3.nit -d out/nitstats_args1.write