1 files changed, 19 insertions, 19 deletions

diff --git a/quadnames.c b/quadnames.c
index 209c339..d711ebb 100644
--- a/quadnames.c
+++ b/quadnames.c
@@ -175,7 +175,7 @@ getio(void)
 void
 setio(Datum *new)
 {
-	if(new->tag != ArrayTag || new->array->rank != 0 || new->array->type != AtypeInt || (new->array->intdata[0] != 0 && new->array->intdata[0] != 1))
+	if(new->tag != ArrayTag || GetRank(new->array) != 0 || GetType(new->array) != AtypeInt || (new->array->intdata[0] != 0 && new->array->intdata[0] != 1))
 		throwerror(nil, EDomain);
 	else
 		globalIOset(new->array->intdata[0]);
@@ -193,7 +193,7 @@ getpp(void)
 void
 setpp(Datum *new)
 {
-	if(new->tag != ArrayTag || new->array->rank != 0 || new->array->type != AtypeInt || new->array->intdata[0] < 0)
+	if(new->tag != ArrayTag || GetRank(new->array) != 0 || GetType(new->array) != AtypeInt || new->array->intdata[0] < 0)
 		throwerror(nil, EDomain);
 	else
 		printprecision = new->array->intdata[0];
@@ -211,7 +211,7 @@ getdiv(void)
 void
 setdiv(Datum *new)
 {
-	if(new->tag != ArrayTag || new->array->rank != 0 || new->array->type != AtypeInt || (new->array->intdata[0] != 0 && new->array->intdata[0] != 1))
+	if(new->tag != ArrayTag || GetRank(new->array) != 0 || GetType(new->array) != AtypeInt || (new->array->intdata[0] != 0 && new->array->intdata[0] != 1))
 		throwerror(nil, EDomain);
 	else
 		globalDIVset(new->array->intdata[0]);
@@ -249,7 +249,7 @@ getself(void)
 Array *
 runfile(Array *a)
 {
-	if(a->type != AtypeRune || a->rank > 1){
+	if(GetType(a) != AtypeRune || GetRank(a) > 1){
 		return mkscalarint(0);
 	}
 
@@ -274,9 +274,9 @@ runfile(Array *a)
 Array *
 quadthrow1(Array *code)
 {
-	if(code->type != AtypeInt)
+	if(GetType(code) != AtypeInt)
 		throwerror(nil, EType);
-	if(code->size != 1)
+	if(GetSize(code) != 1)
 		throwerror(nil, ELength);
 	throwerror(nil, code->intdata[0]);
 	return nil;
@@ -285,11 +285,11 @@ quadthrow1(Array *code)
 Array *
 quadthrow2(Array *msg, Array *code)
 {
-	if(code->type != AtypeInt || msg->type != AtypeRune)
+	if(GetType(code) != AtypeInt || GetType(msg) != AtypeRune)
 		throwerror(nil, EType);
-	if(code->size != 1)
+	if(GetSize(code) != 1)
 		throwerror(nil, ELength);
-	if(msg->rank > 1)
+	if(GetRank(msg) > 1)
 		throwerror(nil, ERank);
 	throwerror(pparray(msg), code->intdata[0]);
 	return nil;
@@ -299,7 +299,7 @@ quadthrow2(Array *msg, Array *code)
 Array *
 quadinfo(Array *a)
 {
-	if(a->type != AtypeRune)
+	if(GetType(a) != AtypeRune)
 		throwerror(nil, EType);
 	Rune *code = pparray(a);
 	Datum *res = evalline(code, nil, 0);
@@ -307,7 +307,7 @@ quadinfo(Array *a)
 	switch(res->tag){
 	case ArrayTag:{
 		char *typestring = "?";
-		switch(res->array->type){
+		switch(GetType(res->array)){
 		case AtypeInt: typestring = "int"; break;
 		case AtypeFloat: typestring = "float"; break;
 		case AtypeRune: typestring = "rune"; break;
@@ -340,13 +340,13 @@ Array *
 quaducs(Array *a)
 {
 	Array *res = nil;
-	if(a->type == AtypeInt){
+	if(GetType(a) == AtypeInt){
 		res = duparrayshape(a, AtypeRune);
-		for(int i = 0; i < res->size; i++)
+		for(int i = 0; i < GetSize(res); i++)
 			res->runedata[i] = a->intdata[i];
-	}else if(a->type == AtypeRune){
+	}else if(GetType(a) == AtypeRune){
 		res = duparrayshape(a, AtypeInt);
-		for(int i = 0; i < res->size; i++)
+		for(int i = 0; i < GetSize(res); i++)
 			res->intdata[i] = a->runedata[i];
 	}else
 		throwerror(nil, EType);
@@ -358,14 +358,14 @@ Array *
 quaddl(Array *a)
 {
 	/* TODO: return amount of seconds slept */
-	if(a->size != 1)
+	if(GetSize(a) != 1)
 		throwerror(nil, ELength);
-	if(a->type != AtypeInt && a->type != AtypeFloat)
+	if(GetType(a) != AtypeInt && GetType(a) != AtypeFloat)
 		throwerror(nil, EType);
 
-	if(a->type == AtypeInt && a->intdata[0] >= 0)
+	if(GetType(a) == AtypeInt && a->intdata[0] >= 0)
 		sleep(a->intdata[0] * 1000);
-	else if(a->type == AtypeFloat && a->floatdata[0] >= 0)
+	else if(GetType(a) == AtypeFloat && a->floatdata[0] >= 0)
 		sleep(a->floatdata[0] * 1000);
 	else
 		throwerror(nil, EDomain);