From 2e0890c9068a2a493e21d63f67885741c41f28e8 Mon Sep 17 00:00:00 2001 From: Jean Privat Date: Thu, 26 Apr 2012 14:01:55 -0400 Subject: [PATCH] lib: move "environ" from Symbol to String Signed-off-by: Jean Privat --- lib/standard/environ.nit | 6 +++--- src/mmloader.nit | 4 ++-- src/modelbuilder.nit | 4 ++-- src/naive_interpreter.nit | 2 +- src/nitc.nit | 6 +++--- src/nitdoc.nit | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/standard/environ.nit b/lib/standard/environ.nit index 2617852..f24d7bf 100644 --- a/lib/standard/environ.nit +++ b/lib/standard/environ.nit @@ -14,16 +14,16 @@ # Access to the environment variables of the process module environ -import symbol +import string # TODO prevoir une structure pour recup tout un environ, le modifier et le passer a process -redef class Symbol +redef class String # Return environment value for this symbol # If there is no such environment value, then return "" fun environ: String do - var res = to_s.to_cstring.get_environ + var res = self.to_cstring.get_environ # FIXME: There is no proper way to handle NULL C string yet. What a pitty. var nulstr = once ("".to_cstring.get_environ) if res != nulstr then diff --git a/src/mmloader.nit b/src/mmloader.nit index 189a46b..c59b30c 100644 --- a/src/mmloader.nit +++ b/src/mmloader.nit @@ -55,12 +55,12 @@ redef class ToolContext # Setup the paths value paths.append(opt_path.value) - var path_env = once ("NIT_PATH".to_symbol).environ + var path_env = "NIT_PATH".environ if not path_env.is_empty then paths.append(path_env.split_with(':')) end - path_env = once ("NIT_DIR".to_symbol).environ + path_env = "NIT_DIR".environ if not path_env.is_empty then var libname = "{path_env}/lib" if libname.file_exists then paths.add(libname) diff --git a/src/modelbuilder.nit b/src/modelbuilder.nit index 7d00c2a..a6efbe2 100644 --- a/src/modelbuilder.nit +++ b/src/modelbuilder.nit @@ -67,12 +67,12 @@ class ModelBuilder # Setup the paths value paths.append(toolcontext.opt_path.value) - var path_env = once ("NIT_PATH".to_symbol).environ + var path_env = "NIT_PATH".environ if not path_env.is_empty then paths.append(path_env.split_with(':')) end - path_env = once ("NIT_DIR".to_symbol).environ + path_env = "NIT_DIR".environ if not path_env.is_empty then var libname = "{path_env}/lib" if libname.file_exists then paths.add(libname) diff --git a/src/naive_interpreter.nit b/src/naive_interpreter.nit index 9cda9a4..abb0189 100644 --- a/src/naive_interpreter.nit +++ b/src/naive_interpreter.nit @@ -720,7 +720,7 @@ redef class AExternMethPropdef recvval.to_s.mkdir return null else if pname == "get_environ" then - var txt = args.first.val.as(Buffer).to_s.to_symbol.environ + var txt = args.first.val.as(Buffer).to_s.environ return v.native_string_instance(txt) end else if pname == "native_argc" then diff --git a/src/nitc.nit b/src/nitc.nit index e8f7d80..803f637 100644 --- a/src/nitc.nit +++ b/src/nitc.nit @@ -59,7 +59,7 @@ class NitCompiler if ext != null then ext_prefix = ext else ext_prefix = "" compdir = opt_compdir.value if compdir == null then - var dir = once ("NIT_COMPDIR".to_symbol).environ + var dir = "NIT_COMPDIR".environ if not dir.is_empty then compdir = dir end @@ -72,7 +72,7 @@ class NitCompiler clibdir = opt_clibdir.value if clibdir == null then - var dir = once ("NIT_DIR".to_symbol).environ + var dir = "NIT_DIR".environ if dir.is_empty then dir = "{sys.program_name.dirname}/../clib" if dir.file_exists then clibdir = dir @@ -88,7 +88,7 @@ class NitCompiler bindir = opt_bindir.value if bindir == null then - var dir = once ("NIT_DIR".to_symbol).environ + var dir = "NIT_DIR".environ if dir.is_empty then dir = "{sys.program_name.dirname}/../bin" if dir.file_exists then bindir = dir diff --git a/src/nitdoc.nit b/src/nitdoc.nit index edf64f2..07227ab 100644 --- a/src/nitdoc.nit +++ b/src/nitdoc.nit @@ -334,7 +334,7 @@ class DocContext sharedir = opt_sharedir.value if sharedir == null then - var dir = once ("NIT_DIR".to_symbol).environ + var dir = "NIT_DIR".environ if dir.is_empty then dir = "{sys.program_name.dirname}/../share/nitdoc" if dir.file_exists then sharedir = dir -- 1.7.9.5