Changeset 4046

Timestamp:

09/25/03 01:07:49 (20 years ago)

Author:

piso

Message:

USER-HOMEDIR-PATHNAME

Location:

trunk/j/src/org/armedbear/lisp

Files:

• Autoload.java (modified) (2 diffs)
• Pathname.java (modified) (2 diffs)

trunk/j/src/org/armedbear/lisp/Autoload.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: Autoload.java,v 1.73 2003-09-23 16:32:35 piso Exp $
+ * $Id: Autoload.java,v 1.74 2003-09-25 01:07:49 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -231 +231 @@
         autoload("unexport", "PackageFunctions");
         autoload("unuse-package", "PackageFunctions");
+        autoload("user-homedir-pathname", "Pathname");
         autoload(PACKAGE_SYS, "%define-condition", "define_condition");
         autoload(PACKAGE_SYS, "%defpackage", "PackageFunctions");

trunk/j/src/org/armedbear/lisp/Pathname.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: Pathname.java,v 1.14 2003-09-19 14:44:10 piso Exp $
+ * $Id: Pathname.java,v 1.15 2003-09-25 01:07:26 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -200 +200 @@
         }
     };
+
+    // ### user-homedir-pathname
+    // user-homedir-pathname &optional host => pathname
+    private static final Primitive USER_HOMEDIR_PATHNAME =
+        new Primitive("user-homedir-pathname")
+    {
+        public LispObject execute(LispObject[] args) throws ConditionThrowable
+        {
+            switch (args.length) {
+                case 0: {
+                    String s = System.getProperty("user.home");
+                    // For compatibility with SBCL and ACL (and maybe other
+                    // Lisps), we want the namestring of a directory to end
+                    // with a '/' on Unix.
+                    // FIXME Do we need to do something similar on Windows?
+                    if (s.startsWith("/") {
+                        // Unix.
+                        if (!s.endsWith("/"))
+                            s = s.concat("/");
+                    }
+                    return new Pathname(s);
+                }
+                case 1:
+                    return NIL;
+                default:
+                    throw new ConditionThrowable(new WrongNumberOfArgumentsException(this));
+            }
+        }
+    };
 }