Merge branch 'timeonly'

1 files changed, 15 insertions, 2 deletions

diff --git a/distamp.ha b/distamp.ha
index acb673f..aa5e7f3 100644
--- a/distamp.ha
+++ b/distamp.ha
@@ -3,9 +3,12 @@ use time;
 use time::date;
 use time::chrono;
 use os;
+use io;
 use strconv;
 use strings;
 use getopt;
+use memio;
+use encoding::utf8;
 
 type parseerror = !strconv::error;
 
@@ -97,11 +100,21 @@ fn printdistamp(i: i64) void = {
 	fmt::printfln("<t:{}:R>", i)!;
 };
 
-fn abs(conf: config, s: str) (i64 | date::error) = {
+fn abs(conf: config, s: str) (i64 | date::error | io::error | utf8::invalid) = {
 	let v = date::newvirtual();
 	v.vloc = conf.tz;
 	v.zoff = date::zflag::LAP_EARLY | date::zflag::GAP_END;
-	date::parse(&v, "%Y-%m-%d %T", s)?;
+	match (date::parse(&v, "%Y-%m-%d %T", s)) {
+	case date::parsefail =>
+		const now = date::localnow();
+		const buf: [10]u8 = [0...];
+		const st = memio::fixed(buf);
+		date::format(&st, "%F", &now)?;
+		date::parse(&v, "%F", memio::string(&st)?)?;
+		date::parse(&v, "%T", s)?;
+	case void =>
+		void;
+	};
 	v.nanosecond = 0;
 	let d = date::realize(v, chrono::LOCAL)?;
 	//date::format(os::stderr, "%Y-%m-%d %T %L", &d)!;