Move the host count to the beginning: [count*]...

Author: wavexx

base/client.jl

@@ -330,13 +330,11 @@ end
 function load_machine_file(path::String)
     machines = String[]
     for line in split(readall(path),'\n',false)
-        m = match(r"^([^\s*]+)\*(\d+)(.*)",line)
-        if m == nothing
-            push!(machines,line)
+        s = split(line,'*',false)
+        if length(s) > 1
+            append!(machines,fill(s[2],int(s[1])))
         else
-            (host, count, rest) = m.captures
-            count = (count != nothing) ? int(count) : 1
-            append!(machines,fill(string(host,rest),count))
+            push!(machines,line)
         end
     end
     return machines

doc/manual/getting-started.rst

@@ -71,7 +71,7 @@ processes, while ``--machinefile file`` will launch a worker for each line in
 file ``file``. The machines defined in ``file`` must be accessible via a
 passwordless ``ssh`` login, with Julia installed at the same location as the
 current host. Each machine definition takes the form
-``[user@]host[:port][*count] [bind_addr]`` . ``user`` defaults to current user,
+``[count*][user@]host[:port] [bind_addr]`` . ``user`` defaults to current user,
 ``port`` to the standard ssh port. ``count`` is the number of workers to spawn
 on the node, and defaults to 1. Optionally, in case of multi-homed hosts,
 ``bind_addr`` may be used to explicitly specify an interface.