1.1 --- a/src/Pure/General/path.scala	Tue Jul 05 09:54:39 2011 +0200
     1.2 +++ b/src/Pure/General/path.scala	Tue Jul 05 10:54:05 2011 +0200
     1.3 @@ -138,11 +138,12 @@
     1.4  
     1.5    /* expand */
     1.6  
     1.7 -  def expand(env: String => String): Path =
     1.8 +  def expand: Path =
     1.9    {
    1.10      def eval(elem: Path.Elem): List[Path.Elem] =
    1.11        elem match {
    1.12 -        case Path.Variable(s) => Path.explode(env(s)).elems
    1.13 +        case Path.Variable(s) =>
    1.14 +          Path.explode(Isabelle_System.getenv_strict(s)).elems
    1.15          case x => List(x)
    1.16        }
    1.17  

     2.1 --- a/src/Pure/System/isabelle_system.scala	Tue Jul 05 09:54:39 2011 +0200
     2.2 +++ b/src/Pure/System/isabelle_system.scala	Tue Jul 05 10:54:05 2011 +0200
     2.3 @@ -120,7 +120,7 @@
     2.4  
     2.5    /* path specifications */
     2.6  
     2.7 -  def standard_path(path: Path): String = path.expand(getenv_strict).implode
     2.8 +  def standard_path(path: Path): String = path.expand.implode
     2.9  
    2.10    def platform_path(path: Path): String = standard_system.jvm_path(standard_path(path))
    2.11    def platform_file(path: Path) = new File(platform_path(path))

     3.1 --- a/src/Pure/System/standard_system.scala	Tue Jul 05 09:54:39 2011 +0200
     3.2 +++ b/src/Pure/System/standard_system.scala	Tue Jul 05 10:54:05 2011 +0200
     3.3 @@ -264,8 +264,9 @@
     3.4  
     3.5  class Standard_System
     3.6  {
     3.7 +  /* platform_root */
     3.8 +
     3.9    val platform_root = if (Platform.is_windows) Cygwin.check_root() else "/"
    3.10 -  override def toString = platform_root
    3.11  
    3.12  
    3.13    /* jvm_path */