chiark
/
gitweb
/
~ian
/
moebius2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
parallel thing compiles now
[moebius2.git]
/
mgraph.h
diff --git
a/mgraph.h
b/mgraph.h
index 06c53e214ec1f5cac09a151f827b8caaf7344b77..7f2ab4397ad747ea54e95901d0f093eb71f42d1a 100644
(file)
--- a/
mgraph.h
+++ b/
mgraph.h
@@
-89,8
+89,11
@@
#define V6 6
#define V3 3
#define V6 6
#define V3 3
-#define FOR_VERTEX(v) \
- for ((v)=0; (v)<N; (v)++)
+#define INNER(v,zero,n, precomp) \
+ for ((v)=(zero); precomp, (v)<(n); (v)++)
+
+#define FOR_VERTEX(v,loop) \
+ loop ((v), 0, N, NOTHING)
#define FOR_VPEDGE(e) \
for ((e)=0; (e)<V6; (e)++)
#define FOR_VPEDGE(e) \
for ((e)=0; (e)<V6; (e)++)
@@
-117,13
+120,13
@@
int edge_reverse(int v1, int e);
#define FOR_VEDGE(v1,e,v2) \
FOR_VEDGE_X(v1,e,v2,NOTHING,NOTHING)
#define FOR_VEDGE(v1,e,v2) \
FOR_VEDGE_X(v1,e,v2,NOTHING,NOTHING)
-#define FOR_EDGE(v1,e,v2
)
\
- FOR_VERTEX((v1)
)
\
+#define FOR_EDGE(v1,e,v2
, loop)
\
+ FOR_VERTEX((v1)
, loop)
\
FOR_VEDGE((v1),(e),(v2))
FOR_VEDGE((v1),(e),(v2))
-#define FOR_RIM_VERTEX(vy,vx,v
)
\
- for ((vy)=0; (vy)<Y; (vy)+=Y-1)
\
-
for ((vx)=0; (v)= (vy)<<YSHIFT | (vx), (vx)<X; (vx)++
)
+#define FOR_RIM_VERTEX(vy,vx,v
, loop)
\
+ for ((vy)=0; (vy)<Y; (vy)+=Y-1) \
+
loop ((vx), 0, X, (v)= (vy)<<YSHIFT | (vx)
)
int vertices_span_join_p(int v0, int v1);
int vertices_span_join_p(int v0, int v1);