June 2018 Update

Task/Variadic-function/Aime/variadic-function-2.aime

@@ -1,17 +1,7 @@
 void
 output_date(date d)
 {
-    o_integer(d_year(d));
-    o_byte('/');
-    o_finteger(2, d_y_month(d));
-    o_byte('/');
-    o_finteger(2, d_m_day(d));
-}
-
-void
-output_real(real x)
-{
-    o_real(8, x);
+    o_form("~%//f2/%//f2/", d.year, d.y_month, d.m_day);
 }
 
 void
@@ -20,33 +10,23 @@ g(...)
     integer i;
     record r;
 
-    r_put(r, "integer", o_integer);
-    r_put(r, "real", output_real);
-    r_put(r, "text", o_text);
-    r_put(r, "date", output_date);
+    r["integer"] = o_integer;
+    r["real"] = o_;
+    r["text"] = o_text;
+    r["date"] = output_date;
 
     i = 0;
     while (i < count()) {
-	call(r_query(r, __type($i)), $i);
-	o_byte('\n');
-	i += 1;
+        r[__type($i)]($i);
+        o_byte('\n');
+        i += 1;
     }
 }
 
-date
-now(void)
-{
-    date d;
-
-    d_now(d);
-
-    return d;
-}
-
 integer
 main(void)
 {
-    g("X.1", 707, .5, now());
+    g("X.1", 707, .5, date().now);
 
     return 0;
 }