From 2039bb5b644ce6eda439e01b7bf85c1e6f0862f1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexis=20Laferri=C3=A8re?= Date: Sat, 18 Jul 2015 09:43:53 -0400 Subject: [PATCH] src & lib: use the default behavior of `basename` where applicable MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Alexis Laferrière --- contrib/nitiwiki/src/wiki_base.nit | 2 +- lib/curl/curl.nit | 2 +- lib/linux/data_store.nit | 2 +- lib/standard/file.nit | 4 ++-- src/c_tools.nit | 2 +- src/compiler/abstract_compiler.nit | 10 +++++----- src/ffi/cpp.nit | 4 ++-- src/ffi/extra_java_files.nit | 2 +- src/ffi/java.nit | 2 +- src/ffi/objc.nit | 2 +- src/loader.nit | 2 +- src/nitserial.nit | 2 +- src/platform/android.nit | 4 ++-- src/platform/ios.nit | 2 +- src/platform/pnacl.nit | 2 +- src/toolcontext.nit | 2 +- 16 files changed, 23 insertions(+), 23 deletions(-) diff --git a/contrib/nitiwiki/src/wiki_base.nit b/contrib/nitiwiki/src/wiki_base.nit index 62dee9c..8257091 100644 --- a/contrib/nitiwiki/src/wiki_base.nit +++ b/contrib/nitiwiki/src/wiki_base.nit @@ -151,7 +151,7 @@ class Nitiwiki path = path.simplify_path if entries.has_key(path) then return entries[path].as(WikiSection) var root = expand_path(config.root_dir, config.source_dir) - var name = path.basename("") + var name = path.basename var section = new WikiSection(self, name) entries[path] = section if path == root then return section diff --git a/lib/curl/curl.nit b/lib/curl/curl.nit index b68623b..11c39bf 100644 --- a/lib/curl/curl.nit +++ b/lib/curl/curl.nit @@ -165,7 +165,7 @@ class CurlHTTPRequest if not output_file_name == null then opt_name = output_file_name else if not self.url.substring(self.url.length-1, self.url.length) == "/" then - opt_name = self.url.basename("") + opt_name = self.url.basename else return answer_failure(0, "Unable to extract file name, please specify one") end diff --git a/lib/linux/data_store.nit b/lib/linux/data_store.nit index 8291616..4d7ff2b 100644 --- a/lib/linux/data_store.nit +++ b/lib/linux/data_store.nit @@ -45,7 +45,7 @@ private class LinuxStore # Find DB path var config_home = xdg_basedir.config_home.to_s - var config_dir = config_home.join_path(sys.program_name.basename("")) + var config_dir = config_home.join_path(sys.program_name.basename) if not config_dir.file_exists then config_dir.mkdir var db_path = config_dir.join_path(db_file) diff --git a/lib/standard/file.nit b/lib/standard/file.nit index bc93bdd..2a36c83 100644 --- a/lib/standard/file.nit +++ b/lib/standard/file.nit @@ -366,7 +366,7 @@ class Path # var path = "/tmp/somefile".to_path # assert path.filename == "somefile" # ~~~ - var filename: String = path.basename("") is lazy + var filename: String = path.basename is lazy # Does the file at `path` exists? fun exists: Bool do return stat != null @@ -920,7 +920,7 @@ redef class String # In other cases, parts of the current directory may be exhibited: # # var p = "../foo/bar".relpath("baz") - # var c = getcwd.basename("") + # var c = getcwd.basename # assert p == "../../{c}/baz" # # For path resolution independent of the current directory (eg. for paths in URL), diff --git a/src/c_tools.nit b/src/c_tools.nit index 50bbcd3..24bdf23 100644 --- a/src/c_tools.nit +++ b/src/c_tools.nit @@ -142,7 +142,7 @@ class ExternCFile end redef fun makefile_rule_content do - var ff = filename.basename("") + var ff = filename.basename var o = makefile_rule_name var pkg = "" if not pkgconfigs.is_empty then diff --git a/src/compiler/abstract_compiler.nit b/src/compiler/abstract_compiler.nit index 9601c1d..43686ae 100644 --- a/src/compiler/abstract_compiler.nit +++ b/src/compiler/abstract_compiler.nit @@ -220,7 +220,7 @@ class MakefileToolchain # Copy original .[ch] files to compile_dir for src in compiler.files_to_copy do - var basename = src.basename("") + var basename = src.basename var dst = "{compile_dir}/{basename}" src.file_copy_to dst end @@ -444,7 +444,7 @@ endif # Compile each required extern body into a specific .o for f in compiler.extern_bodies do var o = f.makefile_rule_name - var ff = f.filename.basename("") + var ff = f.filename.basename makefile.write("{o}: {ff}\n") makefile.write("\t{f.makefile_rule_content}\n\n") dep_rules.add(f.makefile_rule_name) @@ -1598,12 +1598,12 @@ abstract class AbstractCompilerVisitor file = file.strip_extension(".nit") var tryfile = file + ".nit.h" if tryfile.file_exists then - self.declare_once("#include \"{tryfile.basename("")}\"") + self.declare_once("#include \"{tryfile.basename}\"") self.compiler.files_to_copy.add(tryfile) end tryfile = file + "_nit.h" if tryfile.file_exists then - self.declare_once("#include \"{tryfile.basename("")}\"") + self.declare_once("#include \"{tryfile.basename}\"") self.compiler.files_to_copy.add(tryfile) end @@ -1614,7 +1614,7 @@ abstract class AbstractCompilerVisitor tryfile = file + "_nit.c" if not tryfile.file_exists then return end - var f = new ExternCFile(tryfile.basename(""), "") + var f = new ExternCFile(tryfile.basename, "") self.compiler.extern_bodies.add(f) self.compiler.files_to_copy.add(tryfile) end diff --git a/src/ffi/cpp.nit b/src/ffi/cpp.nit index 7a5dec0..b96c600 100644 --- a/src/ffi/cpp.nit +++ b/src/ffi/cpp.nit @@ -180,8 +180,8 @@ class ExternCppFile var mmodule: MModule - redef fun makefile_rule_name do return "{filename.basename("")}.o" - redef fun makefile_rule_content do return "$(CXX) $(CFLAGS) {mmodule.cppflags[""].join(" ")} -c {filename.basename("")} -o {filename.basename("")}.o" + redef fun makefile_rule_name do return "{filename.basename}.o" + redef fun makefile_rule_content do return "$(CXX) $(CFLAGS) {mmodule.cppflags[""].join(" ")} -c {filename.basename} -o {filename.basename}.o" redef fun compiles_to_o_file do return true end diff --git a/src/ffi/extra_java_files.nit b/src/ffi/extra_java_files.nit index 71485cc..0e093a0 100644 --- a/src/ffi/extra_java_files.nit +++ b/src/ffi/extra_java_files.nit @@ -97,7 +97,7 @@ redef class JavaLanguage var extra_java_files = mmodule.extra_java_files if extra_java_files != null then for file in extra_java_files do var path = file.filename - path.file_copy_to("{compdir}/{path.basename("")}") + path.file_copy_to("{compdir}/{path.basename}") end end end diff --git a/src/ffi/java.nit b/src/ffi/java.nit index 74d421e..da641a5 100644 --- a/src/ffi/java.nit +++ b/src/ffi/java.nit @@ -362,7 +362,7 @@ class JavaFile super ExternFile redef fun makefile_rule_name do return "{filename.basename(".java")}.class" - redef fun makefile_rule_content do return "javac {filename.basename("")} -d ." + redef fun makefile_rule_content do return "javac {filename.basename} -d ." redef fun add_to_jar do return true end diff --git a/src/ffi/objc.nit b/src/ffi/objc.nit index 4aafb91..7c293cf 100644 --- a/src/ffi/objc.nit +++ b/src/ffi/objc.nit @@ -169,7 +169,7 @@ class ExternObjCFile redef fun makefile_rule_name do return "{filename.basename(".m")}_m.o" redef fun makefile_rule_content do - return "clang $(CFLAGS) -c {filename.basename("")} -o {makefile_rule_name}" + return "clang $(CFLAGS) -c {filename.basename} -o {makefile_rule_name}" end redef fun compiles_to_o_file do return true end diff --git a/src/loader.nit b/src/loader.nit index 5d20c9c..4aaa72d 100644 --- a/src/loader.nit +++ b/src/loader.nit @@ -431,7 +431,7 @@ redef class ModelBuilder if pn == "src" then # With a src directory, the group name is the name of the parent directory dirpath2 = rdp.dirname - pn = dirpath2.basename("") + pn = dirpath2.basename else # Check a `src` subdirectory dirpath = dirpath2 / "src" diff --git a/src/nitserial.nit b/src/nitserial.nit index 83c4c6c..2a416ef 100644 --- a/src/nitserial.nit +++ b/src/nitserial.nit @@ -152,7 +152,7 @@ for mmodule in mmodules do else if module_path.has_suffix(".nit") then module_name = module_path.basename(".nit") else - module_name = module_path.basename("") + module_name = module_path.basename module_path += ".nit" end diff --git a/src/platform/android.nit b/src/platform/android.nit index 6627d3e..f001cd3 100644 --- a/src/platform/android.nit +++ b/src/platform/android.nit @@ -109,7 +109,7 @@ class AndroidToolchain # Gather extra C files generated elsewhere than in super for f in compiler.extern_bodies do - if f isa ExternCFile then cfiles.add(f.filename.basename("")) + if f isa ExternCFile then cfiles.add(f.filename.basename) end # Is there an icon? @@ -134,7 +134,7 @@ class AndroidToolchain var extra_java_files = mmodule.extra_java_files if extra_java_files != null then for file in extra_java_files do var path = file.filename - path.file_copy_to(dir/path.basename("")) + path.file_copy_to(dir/path.basename) end end diff --git a/src/platform/ios.nit b/src/platform/ios.nit index 77564f1..9972ea6 100644 --- a/src/platform/ios.nit +++ b/src/platform/ios.nit @@ -83,7 +83,7 @@ private class IOSToolchain ## Register all source files for file in cfiles do pbx.add_file new PbxFile(file) for file in compiler.extern_bodies do - pbx.add_file new PbxFile(file.filename.basename("")) + pbx.add_file new PbxFile(file.filename.basename) end ## TODO Register asset files diff --git a/src/platform/pnacl.nit b/src/platform/pnacl.nit index 8136187..f994c45 100644 --- a/src/platform/pnacl.nit +++ b/src/platform/pnacl.nit @@ -56,7 +56,7 @@ class PnaclToolchain # Gather extra C files generated elsewhere than in super for f in compiler.extern_bodies do - if f isa ExternCFile then cfiles.add(f.filename.basename("")) + if f isa ExternCFile then cfiles.add(f.filename.basename) end # Outname diff --git a/src/toolcontext.nit b/src/toolcontext.nit index 4468d91..47366b3 100644 --- a/src/toolcontext.nit +++ b/src/toolcontext.nit @@ -515,7 +515,7 @@ The Nit language documentation and the source code of its tools and libraries ma if opt_set_dummy_tool.value then return "DUMMY_TOOL" end - return sys.program_name.basename("") + return sys.program_name.basename end # The identified root directory of the Nit project -- 1.7.9.5