Aaaand rewrite the parser entirely, yet again, based on the tools giv…

…en by fsutil.

sources.cm

@@ -1,17 +1,17 @@
 Group is
    $/basis.cm
    util/sources.cm
+   src/fsutil.sml
 
    (* Smackage data types *)
    src/protocol.sml
    src/semver.sml
    src/spec.sml
 
    (* Managing local data *)
-   src/fsutil.sml
    src/version-index.sml
    src/configure.sml
-   src/install.sml
+   (* src/install.sml *)
 
    (* Obtaining and manipulating code and packages *)
    src/get-git.sml

sources.mlb

@@ -1,17 +1,17 @@
 
    $(SML_LIB)/basis/basis.mlb
    util/sources.mlb
+   src/fsutil.sml
 
    (* Smackage data types *)
    src/protocol.sml
    src/semver.sml
    src/spec.sml
 
    (* Managing local data *)
-   src/fsutil.sml
    src/version-index.sml
    src/configure.sml
-   src/install.sml
+   (* src/install.sml *)
 
    (* Obtaining and manipulating code and packages *)
    src/get-git.sml

src/fsutil.sml

@@ -38,19 +38,22 @@ struct
          | trimStart (#"\t"::t) = trimStart t
          | trimStart l = l
 
-       fun trimEnd (#"#"::t) = []
-         | trimEnd (#"\n"::t) = []
-         | trimEnd (h::t) = h :: trimEnd t
-         | trimEnd [] = []
+       fun trimEnd (#"#"::t) accum = rev accum
+         | trimEnd (#"\n"::t) accum = rev accum
+         | trimEnd (h::t) accum = trimEnd t (h :: accum)
+         | trimEnd [] accum = rev accum
    in
-       String.implode (trimEnd (trimStart (String.explode s)))
+       String.implode (trimEnd (trimStart (String.explode s)) [])
    end
 
    fun getLines' trimmer splitter file = 
    let 
       fun loop accum stanzas = 
          case TextIO.inputLine file of 
-            NONE => rev (rev accum :: stanzas) before TextIO.closeIn file
+            NONE => 
+               if null accum
+               then (rev stanzas before TextIO.closeIn file)
+               else (rev (rev accum :: stanzas) before TextIO.closeIn file)
           | SOME s => 
                if splitter s 
                then (if null accum

src/main.sml

@@ -27,7 +27,9 @@ struct
        ( if null deps then raise NoDeps else ()
        ; if length deps = 1 then print "Resolving 1 dependency\n"
          else print ("Resolving " ^ ltoi deps ^ "dependencies\n")
-       ; app (fn (pkg, spec) => install pkg (SOME spec) true) deps 
+       (* XXX here's the place to shortcut-stop if we have an acceptable
+        * version installed (issue #4) *)
+       ; app (fn (pkg, spec, _) => install pkg (SOME spec) true) deps 
        ; print ("Done resolving dependencies for `" ^ pkg ^ "`\n"))
     end handle NoDeps => () end
 
@@ -77,7 +79,7 @@ struct
         if SmackLib.download (!Configure.smackHome) (pkg,ver,proto)
         then print ( "Package `" ^ name ^ "` already installed.\n") 
         else ( print ( "Package `" ^ name ^ "` downloaded.\n")
-             ; resolveDependencies pkg ver 
+             ; resolveDependencies pkg ver (*
              ; (if runHooks then
                 (SmackLib.build 
                 (!Configure.smackHome) 
@@ -87,7 +89,7 @@ struct
                 (!Configure.smackHome)
                 (!Configure.platform,!Configure.compilers)
                 (pkg,ver)) else ())
-             )
+             *))
     end
 
     (** Uninstall a package with a given name and version.
@@ -132,9 +134,11 @@ struct
         val res = VersionIndex.search name
         val _ = if length res = 0 then print "No packages found.\n" else ()
         val _ = List.app 
-            (fn (n,v,p) => 
-                print (n ^ " " ^ SemVer.toString v ^ " (from " ^ 
-                    Protocol.toString p ^ ")\n")) res
+            (fn (n,dict) =>
+                SemVerDict.app 
+                   (fn (v, p) =>  
+                       print (n ^ " " ^ SemVer.toString v ^ " (from " ^ 
+                              Protocol.toString p ^ ")\n")) dict) res
     in
         ()
     end
@@ -335,6 +339,8 @@ struct
        end handle (SmackExn s) => 
            (TextIO.output (TextIO.stdErr, s ^ "\n"); OS.Process.failure)
                 | (Fail s) => 
+           (TextIO.output (TextIO.stdErr, s ^ "\n"); OS.Process.failure)
+                | (Spec.SpecError s) => 
            (TextIO.output (TextIO.stdErr, s ^ "\n"); OS.Process.failure)
                 | exn =>
            (TextIO.output (TextIO.stdErr, "UNEXPECTED ERROR: " 

src/semver.sml

@@ -1,6 +1,7 @@
 signature SEMVER =
 sig
     eqtype semver     (* v0.2.4beta, v1.2.3, etc... *)
+    type t = semver
     type constraint (* v1, v1.2, v2.3.6, v3.1.6, etc... *)
 
     exception InvalidVersion
@@ -40,6 +41,7 @@ end
 structure SemVer:> SEMVER =
 struct
     type semver = int * int * int * string option
+    type t = semver
     type constraint = int * int option * int option * string option
 
     exception InvalidVersion
@@ -53,12 +55,18 @@ struct
 
     fun fromString' s =
     let
-        val s' = if String.sub (s,0) = #"v" 
-                    then String.extract (s, 1, NONE)
-                    else s
+        fun fail () = raise Fail ("`" ^ s ^ "` not a valid semantic version")
+
+        val s' = 
+           case String.tokens Char.isSpace s of 
+              [ s ] => 
+                 if String.sub (s,0) = #"v" 
+                 then String.extract (s, 1, NONE)
+                 else s
+            | _ => fail ()
+
         val f = String.fields (fn #"." => true | _ => false) s'
 
-        fun fail () = raise Fail ("`" ^ s ^ "` not a valid semantic version")
         fun vtoi i = 
             case Int.fromString i of 
                NONE => fail ()

src/smackage-path.sml

@@ -56,7 +56,7 @@ struct
             then raise Metadata ("Spec file not found: " ^ specFile)  else
         if not (OS.FileSys.access (specFile, [ OS.FileSys.A_READ ]))
             then raise Metadata "Spec file exists but can't be read"
-        else Spec.fromFile specFile 
+        else Spec.fromFile specFile
             handle (Spec.SpecError s) => raise Fail ("Spec error: " ^ s)
     end
 

src/smacklib.sml

@@ -4,6 +4,7 @@ sig
      ** was already there *)
     val download : string -> string * SemVer.semver * Protocol.protocol -> bool
 
+(*
     (** Build a previously downloaded package by invoking a command
         specified as 'build:' in the spec file. *)
     val build : string -> (string * string list) -> 
@@ -13,6 +14,7 @@ sig
         specified as 'install:' in the spec file. *)
     val install : string -> (string * string list) -> 
                         (string * SemVer.semver) -> unit;
+*)
 
     (** Returns a list of installed versions *)
     (* XXX should probably be sorted, relies on the filesystem for this now *)
@@ -45,6 +47,7 @@ struct
             ; SmackagePath.createVersionLinks smackage_root (pkg,ver)
             ; false)
 
+(*
     fun build smackage_root host (pkg,ver) =
     let
         val pkgDir = (smackage_root // "lib" // pkg // "v"^SemVer.toString ver)
@@ -68,6 +71,7 @@ struct
     end handle (Spec.SpecError _) => () (* Silently fail if there is no spec. *)
 
     fun uninstall smackage_root (pkg,ver) = raise Fail "Not implemented"
+*)
 
     fun versions smackage_root pkg = 
        let
@@ -87,11 +91,14 @@ struct
        end
 
     fun info smackage_root (pkg,ver) = 
-        Spec.fromFile 
-            ( smackage_root
-            // "lib"
-            // pkg 
-            // ("v" ^ SemVer.toString ver)
-            // (pkg ^ ".smackspec"))
-        handle (Spec.SpecError s) => raise Fail ("Spec error: " ^ s)
+    let  
+       val file = 
+          ( smackage_root
+          // "lib"
+          // pkg 
+          // ("v" ^ SemVer.toString ver)
+          // (pkg ^ ".smackspec"))
+    in
+       Spec.fromFile file
+    end handle (Spec.SpecError s) => raise Fail ("Spec error: " ^ s)
 end