1 files changed, 40 insertions, 39 deletions
diff --git a/eval.c b/eval.c
index afca940..4d0d497 100644
--- a/eval.c
+++ b/eval.c
@@ -20,42 +20,38 @@ Datum nameis(Datum, Datum);
 Datum assign(Datum, Datum);
 Datum *lookup(Datum);
 
-int bindingstrengths[15][15] = {
-/*	A  F  H  MO DO AF (  )  {  }  [  ]  ←  IS N */
-	4, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* A */
-	2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* F */
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* H */
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* MO */
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* DO */
-	2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* AF */
-	5, 5, 5, 5, 5, 5, 0, 6, 5, 5, 5, 5, 5, 5, 5, /* ( */
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* ) */
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* { */
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* } */
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* [ */
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* ] */
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* ← */
-	1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* IS */
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, /* N */
+int bindingstrengths[13][13] = {
+/*	A  F  H  MO DO AF (  )  [  ]  ←  IS N */
+	4, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* A */
+	2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* F */
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* H */
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* MO */
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* DO */
+	2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* AF */
+	5, 5, 5, 5, 5, 5, 0, 6, 5, 5, 5, 5, 5, /* ( */
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* ) */
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* [ */
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* ] */
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* ← */
+	1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* IS */
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, /* N */
 };
 
-evalfn evalfns[15][15] = {
-/*	A  F  H  MO DO AF (  )  {  }  [  ] ← IS N */
-	strand, dyadfun, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* A */
-	monadfun, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* F */
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* H */
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* MO */
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* DO */
-	monadfun, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* AF */
-	lpar, lpar, lpar, lpar, lpar, 0, lpar, rpar, lpar, lpar, lpar, lpar, lpar, lpar, lpar, /* ( */
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* ) */
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* { */
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* } */
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* [ */
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* ] */
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* ← */
-	assign, assign, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* IS */
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, nameis, 0, 0, /* N */	
+evalfn evalfns[13][13] = {
+/*	A  F  H  MO DO AF (  )  [  ] ← IS N */
+	strand, dyadfun, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* A */
+	monadfun, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* F */
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* H */
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* MO */
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* DO */
+	monadfun, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* AF */
+	lpar, lpar, lpar, lpar, lpar, 0, lpar, rpar,  lpar, lpar, lpar, lpar, lpar, /* ( */
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* ) */
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* [ */
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* ] */
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* ← */
+	assign, assign, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* IS */
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, nameis, 0, 0, /* N */	
 };
 
 Datum *
@@ -155,11 +151,16 @@ monadfun(Datum left, Datum right)
 	Datum result;
 	result.tag = ArrayTag;
 
-	/* TODO handle undefined functions here */
-	if(left.func.left)
-		result.array = dyadfunctiondefs[left.func.code](left.func.left, right.array);
-	else
-		result.array = monadfunctiondefs[left.func.code](right.array);
+	if(left.func.type == FunctypeDfn){
+		print("Can't evaluate dfns yet: %S %S\n", ppdatum(left), ppdatum(right));
+		exits(nil);
+	}else{
+		/* TODO handle undefined functions here */
+		if(left.func.left)
+			result.array = dyadfunctiondefs[left.func.code](left.func.left, right.array);
+		else
+			result.array = monadfunctiondefs[left.func.code](right.array);
+	}
 	return result;
 }