From 7c358cb996e2cb3999427735dd210fb8ace42fe0 Mon Sep 17 00:00:00 2001
From: John Kerl <kerl.john.r@gmail.com>
Date: Fri, 26 Feb 2016 09:12:13 -0500
Subject: [PATCH] uninit-disposition iterate

---
 c/containers/mlrval.c | 28 +++++++++++++++++++++-------
 doc/mlr.1             |  4 ++--
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/c/containers/mlrval.c b/c/containers/mlrval.c
index c5216f099..c3951ef87 100644
--- a/c/containers/mlrval.c
+++ b/c/containers/mlrval.c
@@ -1101,15 +1101,29 @@ mv_t x_xx_times_func(mv_t* pval1, mv_t* pval2) { return (times_dispositions[pval
 
 // ----------------------------------------------------------------
 // xxx pick up from here tomorrow
-static mv_t divide_a_xx(mv_t* pa, mv_t* pb) {
-	return mv_absent();
-}
 static mv_t divide_v_xx(mv_t* pa, mv_t* pb) {
 	return mv_void();
 }
 static mv_t divide_e_xx(mv_t* pa, mv_t* pb) {
 	return mv_error();
 }
+
+static mv_t divide_f_uf(mv_t* pa, mv_t* pb) {
+    return mv_from_float(0.0);
+}
+static mv_t divide_f_fu(mv_t* pa, mv_t* pb) {
+    return mv_void();
+}
+static mv_t divide_i_ui(mv_t* pa, mv_t* pb) {
+    return mv_from_int(0LL);
+}
+static mv_t divide_i_iu(mv_t* pa, mv_t* pb) {
+    return *pa;
+}
+static mv_t divide_i_uu(mv_t* pa, mv_t* pb) {
+    return mv_void();
+}
+
 static mv_t divide_f_ff(mv_t* pa, mv_t* pb) {
 	double a = pa->u.fltv;
 	double b = pb->u.fltv;
@@ -1140,12 +1154,12 @@ static mv_t divide_i_ii(mv_t* pa, mv_t* pb) {
 static mv_binary_func_t* divide_dispositions[MT_DIM][MT_DIM] = {
 	//         ERROR         ABSENT       UNINIT       VOID         STRING       INT          FLOAT        BOOL
 	/*ERROR*/  {divide_e_xx, divide_e_xx, divide_e_xx, divide_e_xx, divide_e_xx, divide_e_xx, divide_e_xx, divide_e_xx},
-	/*ABSENT*/ {divide_e_xx, divide_a_xx, divide_v_xx, divide_v_xx, divide_e_xx, divide_e_xx, divide_e_xx, divide_e_xx},
-	/*UNINIT*/ {divide_e_xx, divide_v_xx, divide_v_xx, divide_v_xx, divide_e_xx, divide_e_xx, divide_e_xx, divide_e_xx},
+	/*ABSENT*/ {divide_e_xx, divide_v_xx, divide_v_xx, divide_v_xx, divide_e_xx, divide_v_xx, divide_v_xx, divide_e_xx},
+	/*UNINIT*/ {divide_e_xx, divide_v_xx, divide_i_uu, divide_v_xx, divide_e_xx, divide_i_ui, divide_f_uf, divide_e_xx},
 	/*VOID*/   {divide_e_xx, divide_v_xx, divide_v_xx, divide_v_xx, divide_e_xx, divide_e_xx, divide_e_xx, divide_e_xx},
 	/*STRING*/ {divide_e_xx, divide_e_xx, divide_e_xx, divide_e_xx, divide_e_xx, divide_e_xx, divide_e_xx, divide_e_xx},
-	/*INT*/    {divide_e_xx, divide_e_xx, divide_v_xx, divide_v_xx, divide_e_xx, divide_i_ii, divide_f_if, divide_e_xx},
-	/*FLOAT*/  {divide_e_xx, divide_e_xx, divide_v_xx, divide_v_xx, divide_e_xx, divide_f_fi, divide_f_ff, divide_e_xx},
+	/*INT*/    {divide_e_xx, divide_v_xx, divide_i_iu, divide_v_xx, divide_e_xx, divide_i_ii, divide_f_if, divide_e_xx},
+	/*FLOAT*/  {divide_e_xx, divide_v_xx, divide_f_fu, divide_v_xx, divide_e_xx, divide_f_fi, divide_f_ff, divide_e_xx},
 	/*BOOL*/   {divide_e_xx, divide_e_xx, divide_e_xx, divide_e_xx, divide_e_xx, divide_e_xx, divide_e_xx, divide_e_xx},
 };
 
diff --git a/doc/mlr.1 b/doc/mlr.1
index b234a362c..2249777e7 100644
--- a/doc/mlr.1
+++ b/doc/mlr.1
@@ -2,12 +2,12 @@
 .\"     Title: mlr
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: ./mkman.rb
-.\"      Date: 2016-02-25
+.\"      Date: 2016-02-26
 .\"    Manual: \ \&
 .\"    Source: \ \&
 .\"  Language: English
 .\"
-.TH "MILLER" "1" "2016-02-25" "\ \&" "\ \&"
+.TH "MILLER" "1" "2016-02-26" "\ \&" "\ \&"
 .\" -----------------------------------------------------------------
 .\" * Portability definitions
 .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~