lib: move symbol outside standard

Signed-off-by: Jean Privat <jean@pryen.org>

diff --git a/lib/standard/standard.nit b/lib/standard/standard.nit
index 5eb3fa3..a43e15b 100644 (file)
--- a/lib/standard/standard.nit
+++ b/lib/standard/standard.nit
@@ -22,7 +22,6 @@ import file
 import exec
 import stream
 import hash
-import symbol
 import string
 import collection
 import math

diff --git a/lib/standard/symbol.nit b/lib/symbol.nit
similarity index 97%
rename from lib/standard/symbol.nit
rename to lib/symbol.nit
index e7fefc2..d3a27ec 100644 (file)
--- a/lib/standard/symbol.nit
+++ b/lib/symbol.nit
@@ -14,9 +14,6 @@
 # FIXME: Should be deprecated soon
 package symbol
 
-import string
-private import hash
-
 redef class String
        # Get the unique corresponding to the string
        fun to_symbol: Symbol

diff --git a/src/metamodel/abstractmetamodel.nit b/src/metamodel/abstractmetamodel.nit
index 9b0fc57..a35503a 100644 (file)
--- a/src/metamodel/abstractmetamodel.nit
+++ b/src/metamodel/abstractmetamodel.nit
@@ -20,6 +20,7 @@ package abstractmetamodel
 
 import partial_order
 import location
+import symbol
 
 # The main singleton which knows everything
 abstract class MMContext

diff --git a/src/utils.nit b/src/utils.nit
index 93f3e35..2787b22 100644 (file)
--- a/src/utils.nit
+++ b/src/utils.nit
@@ -18,6 +18,8 @@
 # Various functions for NIT tools
 package utils
 
+import symbol
+
 # Mangle an array of symbol using only alphanums and underscores
 fun cmangle(symbols: Symbol...): String
 do