Skip to content

Commit

Permalink
simplify macro, pointer print formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
@m-clare
m-clare committed May 1, 2024
1 parent 7b45a88 commit 1c7b475
Showing 1 changed file with 19 additions and 23 deletions.
42 changes: 19 additions & 23 deletions c/triangle.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -360,11 +360,7 @@
#endif /* TRILIBRARY */

/* Define the size large enough to store and operate on a pointer. */
#ifdef _WIN32
#define INT_PTR unsigned long long
#else
#define INT_PTR unsigned long
#endif

/* A few forward declarations. */

Expand Down Expand Up @@ -3649,66 +3645,66 @@ void printtriangle(struct mesh *m, struct behavior *b, struct otri *t)
struct osub printsh;
vertex printvertex;

printf("triangle x%lx with orientation %d:\n", (INT_PTR) t->tri,
printf("triangle x%llx with orientation %d:\n", (INT_PTR) t->tri,
t->orient);
decode(t->tri[0], printtri);
if (printtri.tri == m->dummytri) {
printf(" [0] = Outer space\n");
} else {
printf(" [0] = x%lx %d\n", (INT_PTR) printtri.tri,
printf(" [0] = x%llx %d\n", (INT_PTR) printtri.tri,
printtri.orient);
}
decode(t->tri[1], printtri);
if (printtri.tri == m->dummytri) {
printf(" [1] = Outer space\n");
} else {
printf(" [1] = x%lx %d\n", (INT_PTR) printtri.tri,
printf(" [1] = x%llx %d\n", (INT_PTR) printtri.tri,
printtri.orient);
}
decode(t->tri[2], printtri);
if (printtri.tri == m->dummytri) {
printf(" [2] = Outer space\n");
} else {
printf(" [2] = x%lx %d\n", (INT_PTR) printtri.tri,
printf(" [2] = x%llx %d\n", (INT_PTR) printtri.tri,
printtri.orient);
}

org(*t, printvertex);
if (printvertex == (vertex) NULL)
printf(" Origin[%d] = NULL\n", (t->orient + 1) % 3 + 3);
else
printf(" Origin[%d] = x%lx (%.12g, %.12g)\n",
printf(" Origin[%d] = x%llx (%.12g, %.12g)\n",
(t->orient + 1) % 3 + 3, (INT_PTR) printvertex,
printvertex[0], printvertex[1]);
dest(*t, printvertex);
if (printvertex == (vertex) NULL)
printf(" Dest [%d] = NULL\n", (t->orient + 2) % 3 + 3);
else
printf(" Dest [%d] = x%lx (%.12g, %.12g)\n",
printf(" Dest [%d] = x%llx (%.12g, %.12g)\n",
(t->orient + 2) % 3 + 3, (INT_PTR) printvertex,
printvertex[0], printvertex[1]);
apex(*t, printvertex);
if (printvertex == (vertex) NULL)
printf(" Apex [%d] = NULL\n", t->orient + 3);
else
printf(" Apex [%d] = x%lx (%.12g, %.12g)\n",
printf(" Apex [%d] = x%llx (%.12g, %.12g)\n",
t->orient + 3, (INT_PTR) printvertex,
printvertex[0], printvertex[1]);

if (b->usesegments) {
sdecode(t->tri[6], printsh);
if (printsh.ss != m->dummysub) {
printf(" [6] = x%lx %d\n", (INT_PTR) printsh.ss,
printf(" [6] = x%llx %d\n", (INT_PTR) printsh.ss,
printsh.ssorient);
}
sdecode(t->tri[7], printsh);
if (printsh.ss != m->dummysub) {
printf(" [7] = x%lx %d\n", (INT_PTR) printsh.ss,
printf(" [7] = x%llx %d\n", (INT_PTR) printsh.ss,
printsh.ssorient);
}
sdecode(t->tri[8], printsh);
if (printsh.ss != m->dummysub) {
printf(" [8] = x%lx %d\n", (INT_PTR) printsh.ss,
printf(" [8] = x%llx %d\n", (INT_PTR) printsh.ss,
printsh.ssorient);
}
}
Expand All @@ -3735,65 +3731,65 @@ void printsubseg(struct mesh *m, struct behavior *b, struct osub *s)
struct otri printtri;
vertex printvertex;

printf("subsegment x%lx with orientation %d and mark %d:\n",
printf("subsegment x%llx with orientation %d and mark %d:\n",
(INT_PTR) s->ss, s->ssorient, mark(*s));
sdecode(s->ss[0], printsh);
if (printsh.ss == m->dummysub) {
printf(" [0] = No subsegment\n");
} else {
printf(" [0] = x%lx %d\n", (INT_PTR) printsh.ss,
printf(" [0] = x%llx %d\n", (INT_PTR) printsh.ss,
printsh.ssorient);
}
sdecode(s->ss[1], printsh);
if (printsh.ss == m->dummysub) {
printf(" [1] = No subsegment\n");
} else {
printf(" [1] = x%lx %d\n", (INT_PTR) printsh.ss,
printf(" [1] = x%llx %d\n", (INT_PTR) printsh.ss,
printsh.ssorient);
}

sorg(*s, printvertex);
if (printvertex == (vertex) NULL)
printf(" Origin[%d] = NULL\n", 2 + s->ssorient);
else
printf(" Origin[%d] = x%lx (%.12g, %.12g)\n",
printf(" Origin[%d] = x%llx (%.12g, %.12g)\n",
2 + s->ssorient, (INT_PTR) printvertex,
printvertex[0], printvertex[1]);
sdest(*s, printvertex);
if (printvertex == (vertex) NULL)
printf(" Dest [%d] = NULL\n", 3 - s->ssorient);
else
printf(" Dest [%d] = x%lx (%.12g, %.12g)\n",
printf(" Dest [%d] = x%llx (%.12g, %.12g)\n",
3 - s->ssorient, (INT_PTR) printvertex,
printvertex[0], printvertex[1]);

decode(s->ss[6], printtri);
if (printtri.tri == m->dummytri) {
printf(" [6] = Outer space\n");
} else {
printf(" [6] = x%lx %d\n", (INT_PTR) printtri.tri,
printf(" [6] = x%llx %d\n", (INT_PTR) printtri.tri,
printtri.orient);
}
decode(s->ss[7], printtri);
if (printtri.tri == m->dummytri) {
printf(" [7] = Outer space\n");
} else {
printf(" [7] = x%lx %d\n", (INT_PTR) printtri.tri,
printf(" [7] = x%llx %d\n", (INT_PTR) printtri.tri,
printtri.orient);
}

segorg(*s, printvertex);
if (printvertex == (vertex) NULL)
printf(" Segment origin[%d] = NULL\n", 4 + s->ssorient);
else
printf(" Segment origin[%d] = x%lx (%.12g, %.12g)\n",
printf(" Segment origin[%d] = x%llx (%.12g, %.12g)\n",
4 + s->ssorient, (INT_PTR) printvertex,
printvertex[0], printvertex[1]);
segdest(*s, printvertex);
if (printvertex == (vertex) NULL)
printf(" Segment dest [%d] = NULL\n", 5 - s->ssorient);
else
printf(" Segment dest [%d] = x%lx (%.12g, %.12g)\n",
printf(" Segment dest [%d] = x%llx (%.12g, %.12g)\n",
5 - s->ssorient, (INT_PTR) printvertex,
printvertex[0], printvertex[1]);
}
Expand Down

0 comments on commit 1c7b475

Please sign in to comment.