Bläddra i källkod

[cli] fix semver nonsense when ADD_REVISION=0

Simon Krajewski 7 år sedan
förälder
incheckning
8e1ecb05a3
1 ändrade filer med 2 tillägg och 9 borttagningar
  1. 2 9
      src/compiler/server.ml

+ 2 - 9
src/compiler/server.ml

@@ -28,15 +28,8 @@ type context = {
 }
 
 let s_version =
-	let pre,build = match Version.version_extra with
-		| None -> "",""
-		| Some(_,build) ->
-			let pre = match version_pre with
-				| None -> ""
-				| Some pre -> "-" ^ pre
-			in
-			pre,"+" ^ build
-	in
+	let pre = Option.map_default (fun pre -> "-" ^ pre) "" version_pre in
+	let build = Option.map_default (fun (_,build) -> "+" ^ build) "" Version.version_extra in
 	Printf.sprintf "%d.%d.%d%s%s" version_major version_minor version_revision pre build
 
 let default_flush ctx = match ctx.com.json_out with