[Truffle] Implemented 2-arg version of File.basename.

jruby · Feb 3, 2015 · 4614c64 · 4614c64 · eregon · Feb 3, 2015
1 parent c95a0ec
commit 4614c64
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 9 deletions.
diff --git a/spec/truffle/tags/core/file/basename_tags.txt b/spec/truffle/tags/core/file/basename_tags.txt
@@ -1,13 +1,6 @@
 fails:File.basename returns the basename of a path (basic cases)
 fails:File.basename returns the last component of the filename
-fails:File.basename returns an string
-fails:File.basename returns the basename for unix format
-fails:File.basename returns the basename for edge cases
-fails:File.basename ignores a trailing directory separator
-fails:File.basename returns the basename for unix suffix
-fails:File.basename raises a TypeError if the arguments are not String types
 fails:File.basename accepts an object that has a #to_path method
-fails:File.basename raises an ArgumentError if passed more than two arguments
 fails:File.basename returns the extension for a multibyte filename
 fails(windows):File.basename returns the basename for windows
 fails(windows):File.basename returns basename windows unc

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/FileNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/FileNodes.java
@@ -52,7 +52,7 @@ public RubyString absolutePath(RubyString path) {
 
     }
 
-    @CoreMethod(names = "basename", onSingleton = true, required = 1)
+    @CoreMethod(names = "basename", onSingleton = true, required = 1, optional = 1)
     public abstract static class BasenameNode extends CoreMethodNode {
 
         public BasenameNode(RubyContext context, SourceSection sourceSection) {
@@ -64,12 +64,30 @@ public BasenameNode(BasenameNode prev) {
         }
 
         @Specialization
-        public RubyString basename(RubyString path) {
+        public RubyString basename(RubyString path, @SuppressWarnings("unused") UndefinedPlaceholder extension) {
             notDesignedForCompilation();
 
             return getContext().makeString(new File(path.toString()).getName());
         }
 
+        @Specialization
+        public RubyString basename(RubyString path, RubyString extension) {
+            notDesignedForCompilation();
+
+            final String extensionAsString = extension.toString();
+            final String name = new File(path.toString()).getName();
+            final String basename;
+
+            if (extensionAsString.equals(".*") && name.indexOf('.') != -1) {
+                basename = name.substring(0, name.lastIndexOf('.'));
+            } else if (name.endsWith(extensionAsString)) {
+                basename = name.substring(0, name.lastIndexOf(extensionAsString));
+            } else {
+                basename = name;
+            }
+
+            return getContext().makeString(basename);
+        }
     }
 
     @CoreMethod(names = "close")