iris

commit eaa2a603032f55ad4d61b3e31df8de7534f6ddbb
parent 65ae92823f2db07e31caf8df8fadf6c3154401e2
Author: sin <sin@2f30.org>
Date:   Thu, 15 May 2014 15:45:39 +0100

Rename p to pair because we'll soon have proc

Diffstat:
M
parser.c
 | 
14
+++++++-------

1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/parser.c b/parser.c
@@ -55,7 +55,7 @@ struct object {
 		struct {
 			struct object *car;
 			struct object *cdr;
-		} p;
+		} pair;
 	} d;
 };
 
@@ -188,8 +188,8 @@ cons(struct object *car, struct object *cdr)
 
 	o = newobject();
 	o->type = OPair;
-	o->d.p.car = car;
-	o->d.p.cdr = cdr;
+	o->d.pair.car = car;
+	o->d.pair.cdr = cdr;
 	return o;
 }
 
@@ -257,13 +257,13 @@ sexpression(FILE *in)
 static struct object *
 car(struct object *o)
 {
-	return o->d.p.car;
+	return o->d.pair.car;
 }
 
 static struct object *
 cdr(struct object *o)
 {
-	return o->d.p.cdr;
+	return o->d.pair.cdr;
 }
 
 #define caar(obj)   car(car(obj))
@@ -432,8 +432,8 @@ printpair(struct object *o)
 {
 	struct object *car, *cdr;
 
-	car = o->d.p.car;
-	cdr = o->d.p.cdr;
+	car = o->d.pair.car;
+	cdr = o->d.pair.cdr;
 	print(car);
 	switch (cdr->type) {
 	case OPair: