Mercurial > hg > c2html / changeset

changeset

add number highlighting

Sun, 02 Mar 2025 16:06:24 +0100

author
Mike Becker <universe@uap-core.de>
date
Sun, 02 Mar 2025 16:06:24 +0100
changeset 91
2c8514b3891b
parent 90
98adda6171d1
child 92
fe4dfb4d074d

add number highlighting

fixes #393

src/highlighter.c file | annotate | diff | comparison | revisions
test/gs/bigtest.html file | annotate | diff | comparison | revisions
test/gs/ctest.html file | annotate | diff | comparison | revisions
test/gs/javatest.html file | annotate | diff | comparison | revisions
test/gs/plain.html file | annotate | diff | comparison | revisions
test/header.html file | annotate | diff | comparison | revisions
test/javatest.java file | annotate | diff | comparison | revisions
test/jheader.html file | annotate | diff | comparison | revisions 
--- a/src/highlighter.c	Sun Mar 02 12:47:31 2025 +0100
+++ b/src/highlighter.c	Sun Mar 02 16:06:24 2025 +0100
@@ -75,6 +75,107 @@
     return 1;
 }
 
+static size_t check_number(const char *str) {
+    /* this function is not precise, but a good over-approximation */
+    size_t i = 0;
+    if (str[0] == '+' || str[0] == '-') {
+        i++;
+    }
+    bool hex = str[i] == '0' && (str[i + 1] == 'x' || str[i + 1] == 'X');
+    bool bin = str[i] == '0' && (str[i + 1] == 'b' || str[i + 1] == 'B');
+    if (hex || bin) {
+        i += 2;
+    }
+    bool flt = false;
+    bool exp = false;
+    bool dot = false;
+    bool digit_seen = false;
+    if (str[i] == '.') {
+        dot = true;
+        flt = true;
+        i++;
+    }
+    char exp_char_low = hex ? 'p' : 'e';
+    char exp_char_up = hex ? 'P' : 'E';
+    while (str[i] != '\0' && str[i] != '\n') {
+        /* ignore grouping char */
+        if (str[i] == '\'') {
+            i++;
+            continue;
+        }
+        /* binary is always integer, nothing else allowed */
+        if (bin) {
+            if (str[i] != '0' && str[i] != '1') {
+                break;
+            } else {
+                i++;
+                digit_seen = true;
+            }
+        } else {
+            /* detect decimal and exponent separators */
+            if ((!dot && str[i] == '.') ||
+                (!exp && digit_seen &&
+                    (str[i] == exp_char_low || str[i] == exp_char_up)
+                )
+            ) {
+                if (str[i] == '.') {
+                    dot = true;
+                } else {
+                    exp = true;
+                    /* a sign may directly follow */
+                    if (str[i+1] == '+' || str[i+1] == '-') {
+                        i++;
+                    }
+                }
+                flt = true;
+                i++;
+                continue;
+            }
+            /* check for allowed digits */
+            if ((str[i] >= '0' && str[i] <= '9') || (hex && (
+                (str[i] >= 'a' && str[i] <= 'f')
+                || (str[i] >= 'A' && str[i] <= 'F')
+            ))) {
+                digit_seen = true;
+                i++;
+            } else {
+                break;
+            }
+        }
+    }
+    /* have we seen at least one digit? */
+    if (!digit_seen) return 0;
+
+    /* check if we are already done (over-approximation) */
+    if (!isalpha(str[i])) return i;
+
+    /* check suffixes (must check with decreasing length) */
+    const char *const flt_suffixes[] = {
+        "f128", "bf16", "F128", "BF16",
+        "f16", "f32", "f64", "F16", "F32", "F64",
+        "df", "DF", "dd", "DD", "dl", "DL",
+        "d", "D", "f", "l", "F", "L",
+    };
+    const unsigned flt_suffixes_len = 22;
+    const char *const int_suffixes[] = {
+        "ull", "ULL",
+        "ul", "UL", "ll", "LL", "wb", "WB",
+        "u", "U", "l", "L",
+    };
+    const unsigned int_suffixes_len = 12;
+    const char * const *allowed_suffixes = flt ? flt_suffixes : int_suffixes;
+    const unsigned allowed_suffixes_len = flt ? flt_suffixes_len : int_suffixes_len;
+    for (unsigned j = 0 ; j < allowed_suffixes_len ; j++) {
+        cxstring suffix = cx_str(allowed_suffixes[j]);
+        const char *testee = str+i;
+        if (memcmp(testee, suffix.ptr, suffix.length) == 0) {
+            return i+suffix.length;
+        }
+    }
+    /* no suffix matched */
+    return 0;
+}
+
 /* Plaintext Highlighter */
 
 void c2html_plain_highlighter(char const *src, CxBuffer *dest,
@@ -246,6 +347,22 @@
             } else {
                 if (isstring) {
                     put_htmlescaped(dest, c);
+                } else if (wbuf->size == 0 &&
+                    (isdigit(c) ||  c == '+' || c == '-' || c == '.')
+                ) {
+                    /* might be a number */
+                    size_t numlen = check_number(src+sp);
+                    if (numlen > 0) {
+                        start_span("number");
+                        put_htmlescapedstr(dest, cx_strn(src+sp, numlen));
+                        stop_span;
+                        sp += numlen - 1;
+                        c = src[sp];
+                        continue;
+                    } else {
+                        /* start a new buffered word */
+                        cxBufferPut(wbuf, c);
+                    }
                 } else if (isalnum(c) ||  c == '_' || c == '#') {
                     /* buffer the current word */
                     cxBufferPut(wbuf, c);
@@ -271,8 +388,14 @@
                         if (closespan) {
                             stop_span;
                         }
+
+                        /* reset word buffer */
+                        wbuf->pos = wbuf->size = 0;
+
+                        /* re-test current char */
+                        c = src[--sp];
+                        continue;
                     }
-                    wbuf->pos = wbuf->size = 0; /* reset word buffer */
                     
                     /* write current character */
                     put_htmlescaped(dest, c);
@@ -367,6 +490,23 @@
             } else {
                 if (isstring) {
                     put_htmlescaped(dest, c);
+                } else if (wbuf->size == 0 &&
+                    (isdigit(c) ||  c == '+' || c == '-' || c == '.')
+                ) {
+                    /* might be a number */
+                    size_t numlen = check_number(src+sp);
+                    if (numlen > 0) {
+                        cxBufferPutString(dest,
+                                "<span class=\"c2html-number\">");
+                        put_htmlescapedstr(dest, cx_strn(src+sp, numlen));
+                        cxBufferPutString(dest, "</span>");
+                        sp += numlen - 1;
+                        c = src[sp];
+                        continue;
+                    } else {
+                        /* start a new buffered word */
+                        cxBufferPut(wbuf, c);
+                    }
                 } else if (isalnum(c) || c == '_' || c == '@') {
                     /* buffer the current word */
                     cxBufferPut(wbuf, c);
@@ -395,8 +535,14 @@
                         if (closespan) {
                             cxBufferPutString(dest, "</span>");
                         }
+
+                        /* reset word buffer */
+                        wbuf->pos = wbuf->size = 0;
+
+                        /* re-test current char */
+                        c = src[--sp];
+                        continue;
                     }
-                    wbuf->pos = wbuf->size = 0; /* reset buffer */
                     
                     /* write current character */
                     put_htmlescaped(dest, c);
--- a/test/gs/bigtest.html	Sun Mar 02 12:47:31 2025 +0100
+++ b/test/gs/bigtest.html	Sun Mar 02 16:06:24 2025 +0100
@@ -33,6 +33,9 @@
       span.c2html-string {
         color: darkorange;
       }
+      span.c2html-number {
+          color: dodgerblue;
+      }
       span.c2html-comment {
         color: grey;
       }
@@ -98,15 +101,15 @@
 <a class="c2html-lineno" name="l45" href="#l45"> 45 </a>}
 <a class="c2html-lineno" name="l46" href="#l46"> 46 </a>
 <a class="c2html-lineno" name="l47" href="#l47"> 47 </a><span class="c2html-keyword">void</span> gamestate_init(GameState *gamestate) {
-<a class="c2html-lineno" name="l48" href="#l48"> 48 </a>    memset(gamestate, <span class="c2html-macroconst">0</span>, <span class="c2html-keyword">sizeof</span>(GameState));
+<a class="c2html-lineno" name="l48" href="#l48"> 48 </a>    memset(gamestate, <span class="c2html-number">0</span>, <span class="c2html-keyword">sizeof</span>(GameState));
 <a class="c2html-lineno" name="l49" href="#l49"> 49 </a>    
 <a class="c2html-lineno" name="l50" href="#l50"> 50 </a>    Board initboard = {
 <a class="c2html-lineno" name="l51" href="#l51"> 51 </a>        {<span class="c2html-macroconst">WROOK</span>, <span class="c2html-macroconst">WKNIGHT</span>, <span class="c2html-macroconst">WBISHOP</span>, <span class="c2html-macroconst">WQUEEN</span>, <span class="c2html-macroconst">WKING</span>, <span class="c2html-macroconst">WBISHOP</span>, <span class="c2html-macroconst">WKNIGHT</span>, <span class="c2html-macroconst">WROOK</span>},
 <a class="c2html-lineno" name="l52" href="#l52"> 52 </a>        {<span class="c2html-macroconst">WPAWN</span>, <span class="c2html-macroconst">WPAWN</span>,   <span class="c2html-macroconst">WPAWN</span>,   <span class="c2html-macroconst">WPAWN</span>,  <span class="c2html-macroconst">WPAWN</span>, <span class="c2html-macroconst">WPAWN</span>,   <span class="c2html-macroconst">WPAWN</span>,   <span class="c2html-macroconst">WPAWN</span>},
-<a class="c2html-lineno" name="l53" href="#l53"> 53 </a>        {<span class="c2html-macroconst">0</span>,     <span class="c2html-macroconst">0</span>,       <span class="c2html-macroconst">0</span>,       <span class="c2html-macroconst">0</span>,      <span class="c2html-macroconst">0</span>,     <span class="c2html-macroconst">0</span>,       <span class="c2html-macroconst">0</span>,       <span class="c2html-macroconst">0</span>},
-<a class="c2html-lineno" name="l54" href="#l54"> 54 </a>        {<span class="c2html-macroconst">0</span>,     <span class="c2html-macroconst">0</span>,       <span class="c2html-macroconst">0</span>,       <span class="c2html-macroconst">0</span>,      <span class="c2html-macroconst">0</span>,     <span class="c2html-macroconst">0</span>,       <span class="c2html-macroconst">0</span>,       <span class="c2html-macroconst">0</span>},
-<a class="c2html-lineno" name="l55" href="#l55"> 55 </a>        {<span class="c2html-macroconst">0</span>,     <span class="c2html-macroconst">0</span>,       <span class="c2html-macroconst">0</span>,       <span class="c2html-macroconst">0</span>,      <span class="c2html-macroconst">0</span>,     <span class="c2html-macroconst">0</span>,       <span class="c2html-macroconst">0</span>,       <span class="c2html-macroconst">0</span>},
-<a class="c2html-lineno" name="l56" href="#l56"> 56 </a>        {<span class="c2html-macroconst">0</span>,     <span class="c2html-macroconst">0</span>,       <span class="c2html-macroconst">0</span>,       <span class="c2html-macroconst">0</span>,      <span class="c2html-macroconst">0</span>,     <span class="c2html-macroconst">0</span>,       <span class="c2html-macroconst">0</span>,       <span class="c2html-macroconst">0</span>},
+<a class="c2html-lineno" name="l53" href="#l53"> 53 </a>        {<span class="c2html-number">0</span>,     <span class="c2html-number">0</span>,       <span class="c2html-number">0</span>,       <span class="c2html-number">0</span>,      <span class="c2html-number">0</span>,     <span class="c2html-number">0</span>,       <span class="c2html-number">0</span>,       <span class="c2html-number">0</span>},
+<a class="c2html-lineno" name="l54" href="#l54"> 54 </a>        {<span class="c2html-number">0</span>,     <span class="c2html-number">0</span>,       <span class="c2html-number">0</span>,       <span class="c2html-number">0</span>,      <span class="c2html-number">0</span>,     <span class="c2html-number">0</span>,       <span class="c2html-number">0</span>,       <span class="c2html-number">0</span>},
+<a class="c2html-lineno" name="l55" href="#l55"> 55 </a>        {<span class="c2html-number">0</span>,     <span class="c2html-number">0</span>,       <span class="c2html-number">0</span>,       <span class="c2html-number">0</span>,      <span class="c2html-number">0</span>,     <span class="c2html-number">0</span>,       <span class="c2html-number">0</span>,       <span class="c2html-number">0</span>},
+<a class="c2html-lineno" name="l56" href="#l56"> 56 </a>        {<span class="c2html-number">0</span>,     <span class="c2html-number">0</span>,       <span class="c2html-number">0</span>,       <span class="c2html-number">0</span>,      <span class="c2html-number">0</span>,     <span class="c2html-number">0</span>,       <span class="c2html-number">0</span>,       <span class="c2html-number">0</span>},
 <a class="c2html-lineno" name="l57" href="#l57"> 57 </a>        {<span class="c2html-macroconst">BPAWN</span>, <span class="c2html-macroconst">BPAWN</span>,   <span class="c2html-macroconst">BPAWN</span>,   <span class="c2html-macroconst">BPAWN</span>,  <span class="c2html-macroconst">BPAWN</span>, <span class="c2html-macroconst">BPAWN</span>,   <span class="c2html-macroconst">BPAWN</span>,   <span class="c2html-macroconst">BPAWN</span>},
 <a class="c2html-lineno" name="l58" href="#l58"> 58 </a>        {<span class="c2html-macroconst">BROOK</span>, <span class="c2html-macroconst">BKNIGHT</span>, <span class="c2html-macroconst">BBISHOP</span>, <span class="c2html-macroconst">BQUEEN</span>, <span class="c2html-macroconst">BKING</span>, <span class="c2html-macroconst">BBISHOP</span>, <span class="c2html-macroconst">BKNIGHT</span>, <span class="c2html-macroconst">BROOK</span>}
 <a class="c2html-lineno" name="l59" href="#l59"> 59 </a>    };
@@ -128,21 +131,21 @@
 <a class="c2html-lineno" name="l75" href="#l75"> 75 </a>    <span class="c2html-keyword">char</span> *string = move-&gt;string;
 <a class="c2html-lineno" name="l76" href="#l76"> 76 </a>    
 <a class="c2html-lineno" name="l77" href="#l77"> 77 </a>    <span class="c2html-comment">/* at least 8 characters should be available, wipe them out */</span>
-<a class="c2html-lineno" name="l78" href="#l78"> 78 </a>    memset(string, <span class="c2html-macroconst">0</span>, <span class="c2html-macroconst">8</span>);
+<a class="c2html-lineno" name="l78" href="#l78"> 78 </a>    memset(string, <span class="c2html-number">0</span>, <span class="c2html-number">8</span>);
 <a class="c2html-lineno" name="l79" href="#l79"> 79 </a>    
 <a class="c2html-lineno" name="l80" href="#l80"> 80 </a>    <span class="c2html-comment">/* special formats for castling */</span>
 <a class="c2html-lineno" name="l81" href="#l81"> 81 </a>    <span class="c2html-keyword">if</span> ((move-&gt;piece&amp;<span class="c2html-macroconst">PIECE_MASK</span>) == <span class="c2html-macroconst">KING</span> &amp;&amp;
-<a class="c2html-lineno" name="l82" href="#l82"> 82 </a>            abs(move-&gt;tofile-move-&gt;fromfile) == <span class="c2html-macroconst">2</span>) {
+<a class="c2html-lineno" name="l82" href="#l82"> 82 </a>            abs(move-&gt;tofile-move-&gt;fromfile) == <span class="c2html-number">2</span>) {
 <a class="c2html-lineno" name="l83" href="#l83"> 83 </a>        <span class="c2html-keyword">if</span> (move-&gt;tofile==fileidx(<span class="c2html-string">'c'</span>)) {
-<a class="c2html-lineno" name="l84" href="#l84"> 84 </a>            memcpy(string, <span class="c2html-string">"O-O-O"</span>, <span class="c2html-macroconst">5</span>);
+<a class="c2html-lineno" name="l84" href="#l84"> 84 </a>            memcpy(string, <span class="c2html-string">"O-O-O"</span>, <span class="c2html-number">5</span>);
 <a class="c2html-lineno" name="l85" href="#l85"> 85 </a>        } <span class="c2html-keyword">else</span> {
-<a class="c2html-lineno" name="l86" href="#l86"> 86 </a>            memcpy(string, <span class="c2html-string">"O-O"</span>, <span class="c2html-macroconst">3</span>);
+<a class="c2html-lineno" name="l86" href="#l86"> 86 </a>            memcpy(string, <span class="c2html-string">"O-O"</span>, <span class="c2html-number">3</span>);
 <a class="c2html-lineno" name="l87" href="#l87"> 87 </a>        }
 <a class="c2html-lineno" name="l88" href="#l88"> 88 </a>    }
 <a class="c2html-lineno" name="l89" href="#l89"> 89 </a>
 <a class="c2html-lineno" name="l90" href="#l90"> 90 </a>    <span class="c2html-comment">/* start by notating the piece character */</span>
-<a class="c2html-lineno" name="l91" href="#l91"> 91 </a>    string[<span class="c2html-macroconst">0</span>] = getpiecechr(move-&gt;piece);
-<a class="c2html-lineno" name="l92" href="#l92"> 92 </a>    <span class="c2html-keyword">int</span> idx = string[<span class="c2html-macroconst">0</span>] ? <span class="c2html-macroconst">1</span> : <span class="c2html-macroconst">0</span>;
+<a class="c2html-lineno" name="l91" href="#l91"> 91 </a>    string[<span class="c2html-number">0</span>] = getpiecechr(move-&gt;piece);
+<a class="c2html-lineno" name="l92" href="#l92"> 92 </a>    <span class="c2html-keyword">int</span> idx = string[<span class="c2html-number">0</span>] ? <span class="c2html-number">1</span> : <span class="c2html-number">0</span>;
 <a class="c2html-lineno" name="l93" href="#l93"> 93 </a>    
 <a class="c2html-lineno" name="l94" href="#l94"> 94 </a>    <span class="c2html-comment">/* find out how many source information we do need */</span>
 <a class="c2html-lineno" name="l95" href="#l95"> 95 </a>    <span class="c2html-type">uint8_t</span> piece = move-&gt;piece &amp; <span class="c2html-macroconst">PIECE_MASK</span>;
@@ -151,13 +154,13 @@
 <a class="c2html-lineno" name="l98" href="#l98"> 98 </a>            string[idx++] = filechr(move-&gt;fromfile);
 <a class="c2html-lineno" name="l99" href="#l99"> 99 </a>        }
 <a class="c2html-lineno" name="l100" href="#l100">100 </a>    } <span class="c2html-keyword">else</span> <span class="c2html-keyword">if</span> (piece != <span class="c2html-macroconst">KING</span>) {
-<a class="c2html-lineno" name="l101" href="#l101">101 </a>        Move threats[<span class="c2html-macroconst">16</span>];
+<a class="c2html-lineno" name="l101" href="#l101">101 </a>        Move threats[<span class="c2html-number">16</span>];
 <a class="c2html-lineno" name="l102" href="#l102">102 </a>        <span class="c2html-type">uint8_t</span> threatcount;
 <a class="c2html-lineno" name="l103" href="#l103">103 </a>        get_real_threats(gamestate, move-&gt;torow, move-&gt;tofile,
 <a class="c2html-lineno" name="l104" href="#l104">104 </a>            move-&gt;piece&amp;<span class="c2html-macroconst">COLOR_MASK</span>, threats, &amp;threatcount);
-<a class="c2html-lineno" name="l105" href="#l105">105 </a>        <span class="c2html-keyword">if</span> (threatcount &gt; <span class="c2html-macroconst">1</span>) {
-<a class="c2html-lineno" name="l106" href="#l106">106 </a>            <span class="c2html-keyword">int</span> ambrows = <span class="c2html-macroconst">0</span>, ambfiles = <span class="c2html-macroconst">0</span>;
-<a class="c2html-lineno" name="l107" href="#l107">107 </a>            <span class="c2html-keyword">for</span> (<span class="c2html-type">uint8_t</span> i = <span class="c2html-macroconst">0</span> ; i &lt; threatcount ; i++) {
+<a class="c2html-lineno" name="l105" href="#l105">105 </a>        <span class="c2html-keyword">if</span> (threatcount &gt; <span class="c2html-number">1</span>) {
+<a class="c2html-lineno" name="l106" href="#l106">106 </a>            <span class="c2html-keyword">int</span> ambrows = <span class="c2html-number">0</span>, ambfiles = <span class="c2html-number">0</span>;
+<a class="c2html-lineno" name="l107" href="#l107">107 </a>            <span class="c2html-keyword">for</span> (<span class="c2html-type">uint8_t</span> i = <span class="c2html-number">0</span> ; i &lt; threatcount ; i++) {
 <a class="c2html-lineno" name="l108" href="#l108">108 </a>                <span class="c2html-keyword">if</span> (threats[i].fromrow == move-&gt;fromrow) {
 <a class="c2html-lineno" name="l109" href="#l109">109 </a>                    ambrows++;
 <a class="c2html-lineno" name="l110" href="#l110">110 </a>                }
@@ -166,11 +169,11 @@
 <a class="c2html-lineno" name="l113" href="#l113">113 </a>                }
 <a class="c2html-lineno" name="l114" href="#l114">114 </a>            }
 <a class="c2html-lineno" name="l115" href="#l115">115 </a>            <span class="c2html-comment">/* ambiguous row, name file */</span>
-<a class="c2html-lineno" name="l116" href="#l116">116 </a>            <span class="c2html-keyword">if</span> (ambrows &gt; <span class="c2html-macroconst">1</span>) {
+<a class="c2html-lineno" name="l116" href="#l116">116 </a>            <span class="c2html-keyword">if</span> (ambrows &gt; <span class="c2html-number">1</span>) {
 <a class="c2html-lineno" name="l117" href="#l117">117 </a>                string[idx++] = filechr(move-&gt;fromfile);
 <a class="c2html-lineno" name="l118" href="#l118">118 </a>            }
 <a class="c2html-lineno" name="l119" href="#l119">119 </a>            <span class="c2html-comment">/* ambiguous file, name row */</span>
-<a class="c2html-lineno" name="l120" href="#l120">120 </a>            <span class="c2html-keyword">if</span> (ambfiles &gt; <span class="c2html-macroconst">1</span>) {
+<a class="c2html-lineno" name="l120" href="#l120">120 </a>            <span class="c2html-keyword">if</span> (ambfiles &gt; <span class="c2html-number">1</span>) {
 <a class="c2html-lineno" name="l121" href="#l121">121 </a>                string[idx++] = filechr(move-&gt;fromrow);
 <a class="c2html-lineno" name="l122" href="#l122">122 </a>            }
 <a class="c2html-lineno" name="l123" href="#l123">123 </a>        }
@@ -213,7 +216,7 @@
 <a class="c2html-lineno" name="l160" href="#l160">160 </a>        <span class="c2html-type">uint64_t</span> sec = curtimestamp.tv_sec - lasttstamp-&gt;tv_sec;
 <a class="c2html-lineno" name="l161" href="#l161">161 </a>        <span class="c2html-type">suseconds_t</span> micros;
 <a class="c2html-lineno" name="l162" href="#l162">162 </a>        <span class="c2html-keyword">if</span> (curtimestamp.tv_usec &lt; lasttstamp-&gt;tv_usec) {
-<a class="c2html-lineno" name="l163" href="#l163">163 </a>            micros = 1e6L-(lasttstamp-&gt;tv_usec - curtimestamp.tv_usec);
+<a class="c2html-lineno" name="l163" href="#l163">163 </a>            micros = <span class="c2html-number">1e6L</span>-(lasttstamp-&gt;tv_usec - curtimestamp.tv_usec);
 <a class="c2html-lineno" name="l164" href="#l164">164 </a>            sec--;
 <a class="c2html-lineno" name="l165" href="#l165">165 </a>        } <span class="c2html-keyword">else</span> {
 <a class="c2html-lineno" name="l166" href="#l166">166 </a>            micros = curtimestamp.tv_usec - lasttstamp-&gt;tv_usec;
@@ -225,8 +228,8 @@
 <a class="c2html-lineno" name="l172" href="#l172">172 </a>        gamestate-&gt;lastmove-&gt;next = elem;
 <a class="c2html-lineno" name="l173" href="#l173">173 </a>        gamestate-&gt;lastmove = elem;
 <a class="c2html-lineno" name="l174" href="#l174">174 </a>    } <span class="c2html-keyword">else</span> {
-<a class="c2html-lineno" name="l175" href="#l175">175 </a>        elem-&gt;move.movetime.tv_usec = <span class="c2html-macroconst">0</span>;
-<a class="c2html-lineno" name="l176" href="#l176">176 </a>        elem-&gt;move.movetime.tv_sec = <span class="c2html-macroconst">0</span>;
+<a class="c2html-lineno" name="l175" href="#l175">175 </a>        elem-&gt;move.movetime.tv_usec = <span class="c2html-number">0</span>;
+<a class="c2html-lineno" name="l176" href="#l176">176 </a>        elem-&gt;move.movetime.tv_sec = <span class="c2html-number">0</span>;
 <a class="c2html-lineno" name="l177" href="#l177">177 </a>        gamestate-&gt;movelist = gamestate-&gt;lastmove = elem;
 <a class="c2html-lineno" name="l178" href="#l178">178 </a>    }
 <a class="c2html-lineno" name="l179" href="#l179">179 </a>}
@@ -249,7 +252,7 @@
 <a class="c2html-lineno" name="l196" href="#l196">196 </a>        <span class="c2html-keyword">case</span> <span class="c2html-string">'B'</span>: <span class="c2html-keyword">return</span> <span class="c2html-macroconst">BISHOP</span>;
 <a class="c2html-lineno" name="l197" href="#l197">197 </a>        <span class="c2html-keyword">case</span> <span class="c2html-string">'Q'</span>: <span class="c2html-keyword">return</span> <span class="c2html-macroconst">QUEEN</span>;
 <a class="c2html-lineno" name="l198" href="#l198">198 </a>        <span class="c2html-keyword">case</span> <span class="c2html-string">'K'</span>: <span class="c2html-keyword">return</span> <span class="c2html-macroconst">KING</span>;
-<a class="c2html-lineno" name="l199" href="#l199">199 </a>        <span class="c2html-keyword">default</span>: <span class="c2html-keyword">return</span> <span class="c2html-macroconst">0</span>;
+<a class="c2html-lineno" name="l199" href="#l199">199 </a>        <span class="c2html-keyword">default</span>: <span class="c2html-keyword">return</span> <span class="c2html-number">0</span>;
 <a class="c2html-lineno" name="l200" href="#l200">200 </a>    }
 <a class="c2html-lineno" name="l201" href="#l201">201 </a>}
 <a class="c2html-lineno" name="l202" href="#l202">202 </a>
@@ -259,25 +262,25 @@
 <a class="c2html-lineno" name="l206" href="#l206">206 </a>    
 <a class="c2html-lineno" name="l207" href="#l207">207 </a>    <span class="c2html-comment">/* en passant capture */</span>
 <a class="c2html-lineno" name="l208" href="#l208">208 </a>    <span class="c2html-keyword">if</span> (move-&gt;capture &amp;&amp; piece == <span class="c2html-macroconst">PAWN</span> &amp;&amp;
-<a class="c2html-lineno" name="l209" href="#l209">209 </a>        mdst(gamestate-&gt;board, move) == <span class="c2html-macroconst">0</span>) {
-<a class="c2html-lineno" name="l210" href="#l210">210 </a>        gamestate-&gt;board[move-&gt;fromrow][move-&gt;tofile] = <span class="c2html-macroconst">0</span>;
+<a class="c2html-lineno" name="l209" href="#l209">209 </a>        mdst(gamestate-&gt;board, move) == <span class="c2html-number">0</span>) {
+<a class="c2html-lineno" name="l210" href="#l210">210 </a>        gamestate-&gt;board[move-&gt;fromrow][move-&gt;tofile] = <span class="c2html-number">0</span>;
 <a class="c2html-lineno" name="l211" href="#l211">211 </a>    }
 <a class="c2html-lineno" name="l212" href="#l212">212 </a>    
 <a class="c2html-lineno" name="l213" href="#l213">213 </a>    <span class="c2html-comment">/* remove old en passant threats */</span>
-<a class="c2html-lineno" name="l214" href="#l214">214 </a>    <span class="c2html-keyword">for</span> (<span class="c2html-type">uint8_t</span> file = <span class="c2html-macroconst">0</span> ; file &lt; <span class="c2html-macroconst">8</span> ; file++) {
-<a class="c2html-lineno" name="l215" href="#l215">215 </a>        gamestate-&gt;board[<span class="c2html-macroconst">3</span>][file] &amp;= ~<span class="c2html-macroconst">ENPASSANT_THREAT</span>;
-<a class="c2html-lineno" name="l216" href="#l216">216 </a>        gamestate-&gt;board[<span class="c2html-macroconst">4</span>][file] &amp;= ~<span class="c2html-macroconst">ENPASSANT_THREAT</span>;
+<a class="c2html-lineno" name="l214" href="#l214">214 </a>    <span class="c2html-keyword">for</span> (<span class="c2html-type">uint8_t</span> file = <span class="c2html-number">0</span> ; file &lt; <span class="c2html-number">8</span> ; file++) {
+<a class="c2html-lineno" name="l215" href="#l215">215 </a>        gamestate-&gt;board[<span class="c2html-number">3</span>][file] &amp;= ~<span class="c2html-macroconst">ENPASSANT_THREAT</span>;
+<a class="c2html-lineno" name="l216" href="#l216">216 </a>        gamestate-&gt;board[<span class="c2html-number">4</span>][file] &amp;= ~<span class="c2html-macroconst">ENPASSANT_THREAT</span>;
 <a class="c2html-lineno" name="l217" href="#l217">217 </a>    }
 <a class="c2html-lineno" name="l218" href="#l218">218 </a>    
 <a class="c2html-lineno" name="l219" href="#l219">219 </a>    <span class="c2html-comment">/* add new en passant threat */</span>
 <a class="c2html-lineno" name="l220" href="#l220">220 </a>    <span class="c2html-keyword">if</span> (piece == <span class="c2html-macroconst">PAWN</span> &amp;&amp; (
-<a class="c2html-lineno" name="l221" href="#l221">221 </a>        (move-&gt;fromrow == <span class="c2html-macroconst">1</span> &amp;&amp; move-&gt;torow == <span class="c2html-macroconst">3</span>) ||
-<a class="c2html-lineno" name="l222" href="#l222">222 </a>        (move-&gt;fromrow == <span class="c2html-macroconst">6</span> &amp;&amp; move-&gt;torow == <span class="c2html-macroconst">4</span>))) {
+<a class="c2html-lineno" name="l221" href="#l221">221 </a>        (move-&gt;fromrow == <span class="c2html-number">1</span> &amp;&amp; move-&gt;torow == <span class="c2html-number">3</span>) ||
+<a class="c2html-lineno" name="l222" href="#l222">222 </a>        (move-&gt;fromrow == <span class="c2html-number">6</span> &amp;&amp; move-&gt;torow == <span class="c2html-number">4</span>))) {
 <a class="c2html-lineno" name="l223" href="#l223">223 </a>        move-&gt;piece |= <span class="c2html-macroconst">ENPASSANT_THREAT</span>;
 <a class="c2html-lineno" name="l224" href="#l224">224 </a>    }
 <a class="c2html-lineno" name="l225" href="#l225">225 </a>    
 <a class="c2html-lineno" name="l226" href="#l226">226 </a>    <span class="c2html-comment">/* move (and maybe capture or promote) */</span>
-<a class="c2html-lineno" name="l227" href="#l227">227 </a>    msrc(gamestate-&gt;board, move) = <span class="c2html-macroconst">0</span>;
+<a class="c2html-lineno" name="l227" href="#l227">227 </a>    msrc(gamestate-&gt;board, move) = <span class="c2html-number">0</span>;
 <a class="c2html-lineno" name="l228" href="#l228">228 </a>    <span class="c2html-keyword">if</span> (move-&gt;promotion) {
 <a class="c2html-lineno" name="l229" href="#l229">229 </a>        mdst(gamestate-&gt;board, move) = move-&gt;promotion;
 <a class="c2html-lineno" name="l230" href="#l230">230 </a>    } <span class="c2html-keyword">else</span> {
@@ -288,16 +291,16 @@
 <a class="c2html-lineno" name="l235" href="#l235">235 </a>    <span class="c2html-keyword">if</span> (piece == <span class="c2html-macroconst">KING</span> &amp;&amp; move-&gt;fromfile == fileidx(<span class="c2html-string">'e'</span>)) {
 <a class="c2html-lineno" name="l236" href="#l236">236 </a>        
 <a class="c2html-lineno" name="l237" href="#l237">237 </a>        <span class="c2html-keyword">if</span> (move-&gt;tofile == fileidx(<span class="c2html-string">'g'</span>)) {
-<a class="c2html-lineno" name="l238" href="#l238">238 </a>            gamestate-&gt;board[move-&gt;torow][fileidx(<span class="c2html-string">'h'</span>)] = <span class="c2html-macroconst">0</span>;
+<a class="c2html-lineno" name="l238" href="#l238">238 </a>            gamestate-&gt;board[move-&gt;torow][fileidx(<span class="c2html-string">'h'</span>)] = <span class="c2html-number">0</span>;
 <a class="c2html-lineno" name="l239" href="#l239">239 </a>            gamestate-&gt;board[move-&gt;torow][fileidx(<span class="c2html-string">'f'</span>)] = color|<span class="c2html-macroconst">ROOK</span>;
 <a class="c2html-lineno" name="l240" href="#l240">240 </a>        } <span class="c2html-keyword">else</span> <span class="c2html-keyword">if</span> (move-&gt;tofile == fileidx(<span class="c2html-string">'c'</span>)) {
-<a class="c2html-lineno" name="l241" href="#l241">241 </a>            gamestate-&gt;board[move-&gt;torow][fileidx(<span class="c2html-string">'a'</span>)] = <span class="c2html-macroconst">0</span>;
+<a class="c2html-lineno" name="l241" href="#l241">241 </a>            gamestate-&gt;board[move-&gt;torow][fileidx(<span class="c2html-string">'a'</span>)] = <span class="c2html-number">0</span>;
 <a class="c2html-lineno" name="l242" href="#l242">242 </a>            gamestate-&gt;board[move-&gt;torow][fileidx(<span class="c2html-string">'d'</span>)] = color|<span class="c2html-macroconst">ROOK</span>;
 <a class="c2html-lineno" name="l243" href="#l243">243 </a>        }
 <a class="c2html-lineno" name="l244" href="#l244">244 </a>    }
 <a class="c2html-lineno" name="l245" href="#l245">245 </a>
 <a class="c2html-lineno" name="l246" href="#l246">246 </a>    <span class="c2html-keyword">if</span> (!simulate) {
-<a class="c2html-lineno" name="l247" href="#l247">247 </a>        <span class="c2html-keyword">if</span> (!move-&gt;string[<span class="c2html-macroconst">0</span>]) {
+<a class="c2html-lineno" name="l247" href="#l247">247 </a>        <span class="c2html-keyword">if</span> (!move-&gt;string[<span class="c2html-number">0</span>]) {
 <a class="c2html-lineno" name="l248" href="#l248">248 </a>            format_move(gamestate, move);
 <a class="c2html-lineno" name="l249" href="#l249">249 </a>        }
 <a class="c2html-lineno" name="l250" href="#l250">250 </a>    }
@@ -306,7 +309,7 @@
 <a class="c2html-lineno" name="l253" href="#l253">253 </a>}
 <a class="c2html-lineno" name="l254" href="#l254">254 </a>
 <a class="c2html-lineno" name="l255" href="#l255">255 </a><span class="c2html-keyword">void</span> apply_move(GameState *gamestate, Move *move) {
-<a class="c2html-lineno" name="l256" href="#l256">256 </a>    apply_move_impl(gamestate, move, <span class="c2html-macroconst">0</span>);
+<a class="c2html-lineno" name="l256" href="#l256">256 </a>    apply_move_impl(gamestate, move, <span class="c2html-number">0</span>);
 <a class="c2html-lineno" name="l257" href="#l257">257 </a>}
 <a class="c2html-lineno" name="l258" href="#l258">258 </a>
 <a class="c2html-lineno" name="l259" href="#l259">259 </a><span class="c2html-keyword">static</span> <span class="c2html-keyword">int</span> validate_move_rules(GameState *gamestate, Move *move) {
@@ -333,8 +336,8 @@
 <a class="c2html-lineno" name="l280" href="#l280">280 </a>    }
 <a class="c2html-lineno" name="l281" href="#l281">281 </a>    
 <a class="c2html-lineno" name="l282" href="#l282">282 </a>    <span class="c2html-comment">/* must capture, if and only if destination is occupied */</span>
-<a class="c2html-lineno" name="l283" href="#l283">283 </a>    <span class="c2html-keyword">if</span> ((mdst(gamestate-&gt;board, move) == <span class="c2html-macroconst">0</span> &amp;&amp; move-&gt;capture) ||
-<a class="c2html-lineno" name="l284" href="#l284">284 </a>            (mdst(gamestate-&gt;board, move) != <span class="c2html-macroconst">0</span> &amp;&amp; !move-&gt;capture)) {
+<a class="c2html-lineno" name="l283" href="#l283">283 </a>    <span class="c2html-keyword">if</span> ((mdst(gamestate-&gt;board, move) == <span class="c2html-number">0</span> &amp;&amp; move-&gt;capture) ||
+<a class="c2html-lineno" name="l284" href="#l284">284 </a>            (mdst(gamestate-&gt;board, move) != <span class="c2html-number">0</span> &amp;&amp; !move-&gt;capture)) {
 <a class="c2html-lineno" name="l285" href="#l285">285 </a>        <span class="c2html-keyword">return</span> <span class="c2html-macroconst">INVALID_MOVE_SYNTAX</span>;
 <a class="c2html-lineno" name="l286" href="#l286">286 </a>    }
 <a class="c2html-lineno" name="l287" href="#l287">287 </a>    
@@ -383,9 +386,9 @@
 <a class="c2html-lineno" name="l330" href="#l330">330 </a>    <span class="c2html-comment">/* find kings for check validation */</span>
 <a class="c2html-lineno" name="l331" href="#l331">331 </a>    <span class="c2html-type">uint8_t</span> piececolor = (move-&gt;piece &amp; <span class="c2html-macroconst">COLOR_MASK</span>);
 <a class="c2html-lineno" name="l332" href="#l332">332 </a>    
-<a class="c2html-lineno" name="l333" href="#l333">333 </a>    <span class="c2html-type">uint8_t</span> mykingfile = <span class="c2html-macroconst">0</span>, mykingrow = <span class="c2html-macroconst">0</span>, opkingfile = <span class="c2html-macroconst">0</span>, opkingrow = <span class="c2html-macroconst">0</span>;
-<a class="c2html-lineno" name="l334" href="#l334">334 </a>    <span class="c2html-keyword">for</span> (<span class="c2html-type">uint8_t</span> row = <span class="c2html-macroconst">0</span> ; row &lt; <span class="c2html-macroconst">8</span> ; row++) {
-<a class="c2html-lineno" name="l335" href="#l335">335 </a>        <span class="c2html-keyword">for</span> (<span class="c2html-type">uint8_t</span> file = <span class="c2html-macroconst">0</span> ; file &lt; <span class="c2html-macroconst">8</span> ; file++) {
+<a class="c2html-lineno" name="l333" href="#l333">333 </a>    <span class="c2html-type">uint8_t</span> mykingfile = <span class="c2html-number">0</span>, mykingrow = <span class="c2html-number">0</span>, opkingfile = <span class="c2html-number">0</span>, opkingrow = <span class="c2html-number">0</span>;
+<a class="c2html-lineno" name="l334" href="#l334">334 </a>    <span class="c2html-keyword">for</span> (<span class="c2html-type">uint8_t</span> row = <span class="c2html-number">0</span> ; row &lt; <span class="c2html-number">8</span> ; row++) {
+<a class="c2html-lineno" name="l335" href="#l335">335 </a>        <span class="c2html-keyword">for</span> (<span class="c2html-type">uint8_t</span> file = <span class="c2html-number">0</span> ; file &lt; <span class="c2html-number">8</span> ; file++) {
 <a class="c2html-lineno" name="l336" href="#l336">336 </a>            <span class="c2html-keyword">if</span> (gamestate-&gt;board[row][file] ==
 <a class="c2html-lineno" name="l337" href="#l337">337 </a>                    (piececolor == <span class="c2html-macroconst">WHITE</span>?<span class="c2html-macroconst">WKING</span>:<span class="c2html-macroconst">BKING</span>)) {
 <a class="c2html-lineno" name="l338" href="#l338">338 </a>                mykingfile = file;
@@ -401,7 +404,7 @@
 <a class="c2html-lineno" name="l348" href="#l348">348 </a>    <span class="c2html-comment">/* simulate move for check validation */</span>
 <a class="c2html-lineno" name="l349" href="#l349">349 </a>    GameState simulation = gamestate_copy_sim(gamestate);
 <a class="c2html-lineno" name="l350" href="#l350">350 </a>    Move simmove = *move;
-<a class="c2html-lineno" name="l351" href="#l351">351 </a>    apply_move_impl(&amp;simulation, &amp;simmove, <span class="c2html-macroconst">1</span>);
+<a class="c2html-lineno" name="l351" href="#l351">351 </a>    apply_move_impl(&amp;simulation, &amp;simmove, <span class="c2html-number">1</span>);
 <a class="c2html-lineno" name="l352" href="#l352">352 </a>    
 <a class="c2html-lineno" name="l353" href="#l353">353 </a>    <span class="c2html-comment">/* don't move into or stay in check position */</span>
 <a class="c2html-lineno" name="l354" href="#l354">354 </a>    <span class="c2html-keyword">if</span> (is_covered(&amp;simulation, mykingrow, mykingfile,
@@ -418,17 +421,17 @@
 <a class="c2html-lineno" name="l365" href="#l365">365 </a>    }
 <a class="c2html-lineno" name="l366" href="#l366">366 </a>    
 <a class="c2html-lineno" name="l367" href="#l367">367 </a>    <span class="c2html-comment">/* correct check and checkmate flags (move is still valid) */</span>
-<a class="c2html-lineno" name="l368" href="#l368">368 </a>    Move threats[<span class="c2html-macroconst">16</span>];
+<a class="c2html-lineno" name="l368" href="#l368">368 </a>    Move threats[<span class="c2html-number">16</span>];
 <a class="c2html-lineno" name="l369" href="#l369">369 </a>    <span class="c2html-type">uint8_t</span> threatcount;
 <a class="c2html-lineno" name="l370" href="#l370">370 </a>    move-&gt;check = get_threats(&amp;simulation, opkingrow, opkingfile,
 <a class="c2html-lineno" name="l371" href="#l371">371 </a>        piececolor, threats, &amp;threatcount);
 <a class="c2html-lineno" name="l372" href="#l372">372 </a>    
 <a class="c2html-lineno" name="l373" href="#l373">373 </a>    <span class="c2html-keyword">if</span> (move-&gt;check) {
 <a class="c2html-lineno" name="l374" href="#l374">374 </a>        <span class="c2html-comment">/* determine possible escape fields */</span>
-<a class="c2html-lineno" name="l375" href="#l375">375 </a>        _Bool canescape = <span class="c2html-macroconst">0</span>;
-<a class="c2html-lineno" name="l376" href="#l376">376 </a>        <span class="c2html-keyword">for</span> (<span class="c2html-keyword">int</span> dr = -<span class="c2html-macroconst">1</span> ; dr &lt;= <span class="c2html-macroconst">1</span> &amp;&amp; !canescape ; dr++) {
-<a class="c2html-lineno" name="l377" href="#l377">377 </a>            <span class="c2html-keyword">for</span> (<span class="c2html-keyword">int</span> df = -<span class="c2html-macroconst">1</span> ; df &lt;= <span class="c2html-macroconst">1</span> &amp;&amp; !canescape ; df++) {
-<a class="c2html-lineno" name="l378" href="#l378">378 </a>                <span class="c2html-keyword">if</span> (!(dr == <span class="c2html-macroconst">0</span> &amp;&amp; df == <span class="c2html-macroconst">0</span>)  &amp;&amp;
+<a class="c2html-lineno" name="l375" href="#l375">375 </a>        _Bool canescape = <span class="c2html-number">0</span>;
+<a class="c2html-lineno" name="l376" href="#l376">376 </a>        <span class="c2html-keyword">for</span> (<span class="c2html-keyword">int</span> dr = <span class="c2html-number">-1</span> ; dr &lt;= <span class="c2html-number">1</span> &amp;&amp; !canescape ; dr++) {
+<a class="c2html-lineno" name="l377" href="#l377">377 </a>            <span class="c2html-keyword">for</span> (<span class="c2html-keyword">int</span> df = <span class="c2html-number">-1</span> ; df &lt;= <span class="c2html-number">1</span> &amp;&amp; !canescape ; df++) {
+<a class="c2html-lineno" name="l378" href="#l378">378 </a>                <span class="c2html-keyword">if</span> (!(dr == <span class="c2html-number">0</span> &amp;&amp; df == <span class="c2html-number">0</span>)  &amp;&amp;
 <a class="c2html-lineno" name="l379" href="#l379">379 </a>                        isidx(opkingrow + dr) &amp;&amp; isidx(opkingfile + df)) {
 <a class="c2html-lineno" name="l380" href="#l380">380 </a>                    
 <a class="c2html-lineno" name="l381" href="#l381">381 </a>                    <span class="c2html-comment">/* escape field neither blocked nor covered */</span>
@@ -441,14 +444,14 @@
 <a class="c2html-lineno" name="l388" href="#l388">388 </a>            }
 <a class="c2html-lineno" name="l389" href="#l389">389 </a>        }
 <a class="c2html-lineno" name="l390" href="#l390">390 </a>        <span class="c2html-comment">/* can't escape, can he capture? */</span>
-<a class="c2html-lineno" name="l391" href="#l391">391 </a>        <span class="c2html-keyword">if</span> (!canescape &amp;&amp; threatcount == <span class="c2html-macroconst">1</span>) {
-<a class="c2html-lineno" name="l392" href="#l392">392 </a>            canescape = is_attacked(&amp;simulation, threats[<span class="c2html-macroconst">0</span>].fromrow,
-<a class="c2html-lineno" name="l393" href="#l393">393 </a>                threats[<span class="c2html-macroconst">0</span>].fromfile, opponent_color(piececolor));
+<a class="c2html-lineno" name="l391" href="#l391">391 </a>        <span class="c2html-keyword">if</span> (!canescape &amp;&amp; threatcount == <span class="c2html-number">1</span>) {
+<a class="c2html-lineno" name="l392" href="#l392">392 </a>            canescape = is_attacked(&amp;simulation, threats[<span class="c2html-number">0</span>].fromrow,
+<a class="c2html-lineno" name="l393" href="#l393">393 </a>                threats[<span class="c2html-number">0</span>].fromfile, opponent_color(piececolor));
 <a class="c2html-lineno" name="l394" href="#l394">394 </a>        }
 <a class="c2html-lineno" name="l395" href="#l395">395 </a>        
 <a class="c2html-lineno" name="l396" href="#l396">396 </a>        <span class="c2html-comment">/* can't capture, can he block? */</span>
-<a class="c2html-lineno" name="l397" href="#l397">397 </a>        <span class="c2html-keyword">if</span> (!canescape &amp;&amp; threatcount == <span class="c2html-macroconst">1</span>) {
-<a class="c2html-lineno" name="l398" href="#l398">398 </a>            Move *threat = &amp;(threats[<span class="c2html-macroconst">0</span>]);
+<a class="c2html-lineno" name="l397" href="#l397">397 </a>        <span class="c2html-keyword">if</span> (!canescape &amp;&amp; threatcount == <span class="c2html-number">1</span>) {
+<a class="c2html-lineno" name="l398" href="#l398">398 </a>            Move *threat = &amp;(threats[<span class="c2html-number">0</span>]);
 <a class="c2html-lineno" name="l399" href="#l399">399 </a>            <span class="c2html-type">uint8_t</span> threatpiece = threat-&gt;piece &amp; <span class="c2html-macroconst">PIECE_MASK</span>;
 <a class="c2html-lineno" name="l400" href="#l400">400 </a>            
 <a class="c2html-lineno" name="l401" href="#l401">401 </a>            <span class="c2html-comment">/* knight, pawns and the king cannot be blocked */</span>
@@ -456,7 +459,7 @@
 <a class="c2html-lineno" name="l403" href="#l403">403 </a>                || threatpiece == <span class="c2html-macroconst">QUEEN</span>) {
 <a class="c2html-lineno" name="l404" href="#l404">404 </a>                <span class="c2html-keyword">if</span> (threat-&gt;fromrow == threat-&gt;torow) {
 <a class="c2html-lineno" name="l405" href="#l405">405 </a>                    <span class="c2html-comment">/* rook aspect (on row) */</span>
-<a class="c2html-lineno" name="l406" href="#l406">406 </a>                    <span class="c2html-keyword">int</span> d = threat-&gt;tofile &gt; threat-&gt;fromfile ? <span class="c2html-macroconst">1</span> : -<span class="c2html-macroconst">1</span>;
+<a class="c2html-lineno" name="l406" href="#l406">406 </a>                    <span class="c2html-keyword">int</span> d = threat-&gt;tofile &gt; threat-&gt;fromfile ? <span class="c2html-number">1</span> : <span class="c2html-number">-1</span>;
 <a class="c2html-lineno" name="l407" href="#l407">407 </a>                    <span class="c2html-type">uint8_t</span> file = threat-&gt;fromfile;
 <a class="c2html-lineno" name="l408" href="#l408">408 </a>                    <span class="c2html-keyword">while</span> (!canescape &amp;&amp; file != threat-&gt;tofile - d) {
 <a class="c2html-lineno" name="l409" href="#l409">409 </a>                        file += d;
@@ -465,7 +468,7 @@
 <a class="c2html-lineno" name="l412" href="#l412">412 </a>                    }
 <a class="c2html-lineno" name="l413" href="#l413">413 </a>                } <span class="c2html-keyword">else</span> <span class="c2html-keyword">if</span> (threat-&gt;fromfile == threat-&gt;tofile) {
 <a class="c2html-lineno" name="l414" href="#l414">414 </a>                    <span class="c2html-comment">/* rook aspect (on file) */</span>
-<a class="c2html-lineno" name="l415" href="#l415">415 </a>                    <span class="c2html-keyword">int</span> d = threat-&gt;torow &gt; threat-&gt;fromrow ? <span class="c2html-macroconst">1</span> : -<span class="c2html-macroconst">1</span>;
+<a class="c2html-lineno" name="l415" href="#l415">415 </a>                    <span class="c2html-keyword">int</span> d = threat-&gt;torow &gt; threat-&gt;fromrow ? <span class="c2html-number">1</span> : <span class="c2html-number">-1</span>;
 <a class="c2html-lineno" name="l416" href="#l416">416 </a>                    <span class="c2html-type">uint8_t</span> row = threat-&gt;fromrow;
 <a class="c2html-lineno" name="l417" href="#l417">417 </a>                    <span class="c2html-keyword">while</span> (!canescape &amp;&amp; row != threat-&gt;torow - d) {
 <a class="c2html-lineno" name="l418" href="#l418">418 </a>                        row += d;
@@ -474,8 +477,8 @@
 <a class="c2html-lineno" name="l421" href="#l421">421 </a>                    }
 <a class="c2html-lineno" name="l422" href="#l422">422 </a>                } <span class="c2html-keyword">else</span> {
 <a class="c2html-lineno" name="l423" href="#l423">423 </a>                    <span class="c2html-comment">/* bishop aspect */</span>
-<a class="c2html-lineno" name="l424" href="#l424">424 </a>                    <span class="c2html-keyword">int</span> dr = threat-&gt;torow &gt; threat-&gt;fromrow ? <span class="c2html-macroconst">1</span> : -<span class="c2html-macroconst">1</span>;
-<a class="c2html-lineno" name="l425" href="#l425">425 </a>                    <span class="c2html-keyword">int</span> df = threat-&gt;tofile &gt; threat-&gt;fromfile ? <span class="c2html-macroconst">1</span> : -<span class="c2html-macroconst">1</span>;
+<a class="c2html-lineno" name="l424" href="#l424">424 </a>                    <span class="c2html-keyword">int</span> dr = threat-&gt;torow &gt; threat-&gt;fromrow ? <span class="c2html-number">1</span> : <span class="c2html-number">-1</span>;
+<a class="c2html-lineno" name="l425" href="#l425">425 </a>                    <span class="c2html-keyword">int</span> df = threat-&gt;tofile &gt; threat-&gt;fromfile ? <span class="c2html-number">1</span> : <span class="c2html-number">-1</span>;
 <a class="c2html-lineno" name="l426" href="#l426">426 </a>
 <a class="c2html-lineno" name="l427" href="#l427">427 </a>                    <span class="c2html-type">uint8_t</span> row = threat-&gt;fromrow;
 <a class="c2html-lineno" name="l428" href="#l428">428 </a>                    <span class="c2html-type">uint8_t</span> file = threat-&gt;fromfile;
@@ -491,7 +494,7 @@
 <a class="c2html-lineno" name="l438" href="#l438">438 </a>        }
 <a class="c2html-lineno" name="l439" href="#l439">439 </a>            
 <a class="c2html-lineno" name="l440" href="#l440">440 </a>        <span class="c2html-keyword">if</span> (!canescape) {
-<a class="c2html-lineno" name="l441" href="#l441">441 </a>            gamestate-&gt;checkmate = <span class="c2html-macroconst">1</span>;
+<a class="c2html-lineno" name="l441" href="#l441">441 </a>            gamestate-&gt;checkmate = <span class="c2html-number">1</span>;
 <a class="c2html-lineno" name="l442" href="#l442">442 </a>        }
 <a class="c2html-lineno" name="l443" href="#l443">443 </a>    }
 <a class="c2html-lineno" name="l444" href="#l444">444 </a>    
@@ -502,13 +505,13 @@
 <a class="c2html-lineno" name="l449" href="#l449">449 </a>
 <a class="c2html-lineno" name="l450" href="#l450">450 </a>_Bool get_threats(GameState *gamestate, <span class="c2html-type">uint8_t</span> row, <span class="c2html-type">uint8_t</span> file,
 <a class="c2html-lineno" name="l451" href="#l451">451 </a>        <span class="c2html-type">uint8_t</span> color, Move *threats, <span class="c2html-type">uint8_t</span> *threatcount) {
-<a class="c2html-lineno" name="l452" href="#l452">452 </a>    Move candidates[<span class="c2html-macroconst">32</span>];
-<a class="c2html-lineno" name="l453" href="#l453">453 </a>    <span class="c2html-keyword">int</span> candidatecount = <span class="c2html-macroconst">0</span>;
-<a class="c2html-lineno" name="l454" href="#l454">454 </a>    <span class="c2html-keyword">for</span> (<span class="c2html-type">uint8_t</span> r = <span class="c2html-macroconst">0</span> ; r &lt; <span class="c2html-macroconst">8</span> ; r++) {
-<a class="c2html-lineno" name="l455" href="#l455">455 </a>        <span class="c2html-keyword">for</span> (<span class="c2html-type">uint8_t</span> f = <span class="c2html-macroconst">0</span> ; f &lt; <span class="c2html-macroconst">8</span> ; f++) {
+<a class="c2html-lineno" name="l452" href="#l452">452 </a>    Move candidates[<span class="c2html-number">32</span>];
+<a class="c2html-lineno" name="l453" href="#l453">453 </a>    <span class="c2html-keyword">int</span> candidatecount = <span class="c2html-number">0</span>;
+<a class="c2html-lineno" name="l454" href="#l454">454 </a>    <span class="c2html-keyword">for</span> (<span class="c2html-type">uint8_t</span> r = <span class="c2html-number">0</span> ; r &lt; <span class="c2html-number">8</span> ; r++) {
+<a class="c2html-lineno" name="l455" href="#l455">455 </a>        <span class="c2html-keyword">for</span> (<span class="c2html-type">uint8_t</span> f = <span class="c2html-number">0</span> ; f &lt; <span class="c2html-number">8</span> ; f++) {
 <a class="c2html-lineno" name="l456" href="#l456">456 </a>            <span class="c2html-keyword">if</span> ((gamestate-&gt;board[r][f] &amp; <span class="c2html-macroconst">COLOR_MASK</span>) == color) {
 <a class="c2html-lineno" name="l457" href="#l457">457 </a>                <span class="c2html-comment">// non-capturing move</span>
-<a class="c2html-lineno" name="l458" href="#l458">458 </a>                memset(&amp;(candidates[candidatecount]), <span class="c2html-macroconst">0</span>, <span class="c2html-keyword">sizeof</span>(Move));
+<a class="c2html-lineno" name="l458" href="#l458">458 </a>                memset(&amp;(candidates[candidatecount]), <span class="c2html-number">0</span>, <span class="c2html-keyword">sizeof</span>(Move));
 <a class="c2html-lineno" name="l459" href="#l459">459 </a>                candidates[candidatecount].piece = gamestate-&gt;board[r][f];
 <a class="c2html-lineno" name="l460" href="#l460">460 </a>                candidates[candidatecount].fromrow = r;
 <a class="c2html-lineno" name="l461" href="#l461">461 </a>                candidates[candidatecount].fromfile = f;
@@ -518,24 +521,24 @@
 <a class="c2html-lineno" name="l465" href="#l465">465 </a>
 <a class="c2html-lineno" name="l466" href="#l466">466 </a>                <span class="c2html-comment">// capturing move</span>
 <a class="c2html-lineno" name="l467" href="#l467">467 </a>                memcpy(&amp;(candidates[candidatecount]),
-<a class="c2html-lineno" name="l468" href="#l468">468 </a>                    &amp;(candidates[candidatecount-<span class="c2html-macroconst">1</span>]), <span class="c2html-keyword">sizeof</span>(Move));
-<a class="c2html-lineno" name="l469" href="#l469">469 </a>                candidates[candidatecount].capture = <span class="c2html-macroconst">1</span>;
+<a class="c2html-lineno" name="l468" href="#l468">468 </a>                    &amp;(candidates[candidatecount<span class="c2html-number">-1</span>]), <span class="c2html-keyword">sizeof</span>(Move));
+<a class="c2html-lineno" name="l469" href="#l469">469 </a>                candidates[candidatecount].capture = <span class="c2html-number">1</span>;
 <a class="c2html-lineno" name="l470" href="#l470">470 </a>                candidatecount++;
 <a class="c2html-lineno" name="l471" href="#l471">471 </a>            }
 <a class="c2html-lineno" name="l472" href="#l472">472 </a>        }
 <a class="c2html-lineno" name="l473" href="#l473">473 </a>    }
 <a class="c2html-lineno" name="l474" href="#l474">474 </a>
 <a class="c2html-lineno" name="l475" href="#l475">475 </a>    <span class="c2html-keyword">if</span> (threatcount) {
-<a class="c2html-lineno" name="l476" href="#l476">476 </a>        *threatcount = <span class="c2html-macroconst">0</span>;
+<a class="c2html-lineno" name="l476" href="#l476">476 </a>        *threatcount = <span class="c2html-number">0</span>;
 <a class="c2html-lineno" name="l477" href="#l477">477 </a>    }
 <a class="c2html-lineno" name="l478" href="#l478">478 </a>    
 <a class="c2html-lineno" name="l479" href="#l479">479 </a>    
-<a class="c2html-lineno" name="l480" href="#l480">480 </a>    _Bool result = <span class="c2html-macroconst">0</span>;
+<a class="c2html-lineno" name="l480" href="#l480">480 </a>    _Bool result = <span class="c2html-number">0</span>;
 <a class="c2html-lineno" name="l481" href="#l481">481 </a>    
-<a class="c2html-lineno" name="l482" href="#l482">482 </a>    <span class="c2html-keyword">for</span> (<span class="c2html-keyword">int</span> i = <span class="c2html-macroconst">0</span> ; i &lt; candidatecount ; i++) {
+<a class="c2html-lineno" name="l482" href="#l482">482 </a>    <span class="c2html-keyword">for</span> (<span class="c2html-keyword">int</span> i = <span class="c2html-number">0</span> ; i &lt; candidatecount ; i++) {
 <a class="c2html-lineno" name="l483" href="#l483">483 </a>        <span class="c2html-keyword">if</span> (validate_move_rules(gamestate, &amp;(candidates[i]))
 <a class="c2html-lineno" name="l484" href="#l484">484 </a>                == <span class="c2html-macroconst">VALID_MOVE_SEMANTICS</span>) {
-<a class="c2html-lineno" name="l485" href="#l485">485 </a>            result = <span class="c2html-macroconst">1</span>;
+<a class="c2html-lineno" name="l485" href="#l485">485 </a>            result = <span class="c2html-number">1</span>;
 <a class="c2html-lineno" name="l486" href="#l486">486 </a>            <span class="c2html-keyword">if</span> (threats &amp;&amp; threatcount) {
 <a class="c2html-lineno" name="l487" href="#l487">487 </a>                threats[(*threatcount)++] = candidates[i];
 <a class="c2html-lineno" name="l488" href="#l488">488 </a>            }
@@ -548,9 +551,9 @@
 <a class="c2html-lineno" name="l495" href="#l495">495 </a>_Bool is_pinned(GameState *gamestate, Move *move) {
 <a class="c2html-lineno" name="l496" href="#l496">496 </a>    <span class="c2html-type">uint8_t</span> color = move-&gt;piece &amp; <span class="c2html-macroconst">COLOR_MASK</span>;
 <a class="c2html-lineno" name="l497" href="#l497">497 </a>
-<a class="c2html-lineno" name="l498" href="#l498">498 </a>    <span class="c2html-type">uint8_t</span> kingfile = <span class="c2html-macroconst">0</span>, kingrow = <span class="c2html-macroconst">0</span>;
-<a class="c2html-lineno" name="l499" href="#l499">499 </a>    <span class="c2html-keyword">for</span> (<span class="c2html-type">uint8_t</span> row = <span class="c2html-macroconst">0</span> ; row &lt; <span class="c2html-macroconst">8</span> ; row++) {
-<a class="c2html-lineno" name="l500" href="#l500">500 </a>        <span class="c2html-keyword">for</span> (<span class="c2html-type">uint8_t</span> file = <span class="c2html-macroconst">0</span> ; file &lt; <span class="c2html-macroconst">8</span> ; file++) {
+<a class="c2html-lineno" name="l498" href="#l498">498 </a>    <span class="c2html-type">uint8_t</span> kingfile = <span class="c2html-number">0</span>, kingrow = <span class="c2html-number">0</span>;
+<a class="c2html-lineno" name="l499" href="#l499">499 </a>    <span class="c2html-keyword">for</span> (<span class="c2html-type">uint8_t</span> row = <span class="c2html-number">0</span> ; row &lt; <span class="c2html-number">8</span> ; row++) {
+<a class="c2html-lineno" name="l500" href="#l500">500 </a>        <span class="c2html-keyword">for</span> (<span class="c2html-type">uint8_t</span> file = <span class="c2html-number">0</span> ; file &lt; <span class="c2html-number">8</span> ; file++) {
 <a class="c2html-lineno" name="l501" href="#l501">501 </a>            <span class="c2html-keyword">if</span> (gamestate-&gt;board[row][file] == (color|<span class="c2html-macroconst">KING</span>)) {
 <a class="c2html-lineno" name="l502" href="#l502">502 </a>                kingfile = file;
 <a class="c2html-lineno" name="l503" href="#l503">503 </a>                kingrow = row;
@@ -572,17 +575,17 @@
 <a class="c2html-lineno" name="l519" href="#l519">519 </a>        <span class="c2html-type">uint8_t</span> color, Move *threats, <span class="c2html-type">uint8_t</span> *threatcount) {
 <a class="c2html-lineno" name="l520" href="#l520">520 </a>    
 <a class="c2html-lineno" name="l521" href="#l521">521 </a>    <span class="c2html-keyword">if</span> (threatcount) {
-<a class="c2html-lineno" name="l522" href="#l522">522 </a>        *threatcount = <span class="c2html-macroconst">0</span>;
+<a class="c2html-lineno" name="l522" href="#l522">522 </a>        *threatcount = <span class="c2html-number">0</span>;
 <a class="c2html-lineno" name="l523" href="#l523">523 </a>    }
 <a class="c2html-lineno" name="l524" href="#l524">524 </a>
-<a class="c2html-lineno" name="l525" href="#l525">525 </a>    Move candidates[<span class="c2html-macroconst">16</span>];
+<a class="c2html-lineno" name="l525" href="#l525">525 </a>    Move candidates[<span class="c2html-number">16</span>];
 <a class="c2html-lineno" name="l526" href="#l526">526 </a>    <span class="c2html-type">uint8_t</span> candidatecount;
 <a class="c2html-lineno" name="l527" href="#l527">527 </a>    <span class="c2html-keyword">if</span> (get_threats(gamestate, row, file, color, candidates, &amp;candidatecount)) {
 <a class="c2html-lineno" name="l528" href="#l528">528 </a>        
-<a class="c2html-lineno" name="l529" href="#l529">529 </a>        _Bool result = <span class="c2html-macroconst">0</span>;
-<a class="c2html-lineno" name="l530" href="#l530">530 </a>        <span class="c2html-type">uint8_t</span> kingfile = <span class="c2html-macroconst">0</span>, kingrow = <span class="c2html-macroconst">0</span>;
-<a class="c2html-lineno" name="l531" href="#l531">531 </a>        <span class="c2html-keyword">for</span> (<span class="c2html-type">uint8_t</span> row = <span class="c2html-macroconst">0</span> ; row &lt; <span class="c2html-macroconst">8</span> ; row++) {
-<a class="c2html-lineno" name="l532" href="#l532">532 </a>            <span class="c2html-keyword">for</span> (<span class="c2html-type">uint8_t</span> file = <span class="c2html-macroconst">0</span> ; file &lt; <span class="c2html-macroconst">8</span> ; file++) {
+<a class="c2html-lineno" name="l529" href="#l529">529 </a>        _Bool result = <span class="c2html-number">0</span>;
+<a class="c2html-lineno" name="l530" href="#l530">530 </a>        <span class="c2html-type">uint8_t</span> kingfile = <span class="c2html-number">0</span>, kingrow = <span class="c2html-number">0</span>;
+<a class="c2html-lineno" name="l531" href="#l531">531 </a>        <span class="c2html-keyword">for</span> (<span class="c2html-type">uint8_t</span> row = <span class="c2html-number">0</span> ; row &lt; <span class="c2html-number">8</span> ; row++) {
+<a class="c2html-lineno" name="l532" href="#l532">532 </a>            <span class="c2html-keyword">for</span> (<span class="c2html-type">uint8_t</span> file = <span class="c2html-number">0</span> ; file &lt; <span class="c2html-number">8</span> ; file++) {
 <a class="c2html-lineno" name="l533" href="#l533">533 </a>                <span class="c2html-keyword">if</span> (gamestate-&gt;board[row][file] == (color|<span class="c2html-macroconst">KING</span>)) {
 <a class="c2html-lineno" name="l534" href="#l534">534 </a>                    kingfile = file;
 <a class="c2html-lineno" name="l535" href="#l535">535 </a>                    kingrow = row;
@@ -590,13 +593,13 @@
 <a class="c2html-lineno" name="l537" href="#l537">537 </a>            }
 <a class="c2html-lineno" name="l538" href="#l538">538 </a>        }
 <a class="c2html-lineno" name="l539" href="#l539">539 </a>
-<a class="c2html-lineno" name="l540" href="#l540">540 </a>        <span class="c2html-keyword">for</span> (<span class="c2html-type">uint8_t</span> i = <span class="c2html-macroconst">0</span> ; i &lt; candidatecount ; i++) {
+<a class="c2html-lineno" name="l540" href="#l540">540 </a>        <span class="c2html-keyword">for</span> (<span class="c2html-type">uint8_t</span> i = <span class="c2html-number">0</span> ; i &lt; candidatecount ; i++) {
 <a class="c2html-lineno" name="l541" href="#l541">541 </a>            GameState simulation = gamestate_copy_sim(gamestate);
 <a class="c2html-lineno" name="l542" href="#l542">542 </a>            Move simmove = candidates[i];
 <a class="c2html-lineno" name="l543" href="#l543">543 </a>            apply_move(&amp;simulation, &amp;simmove);
 <a class="c2html-lineno" name="l544" href="#l544">544 </a>            <span class="c2html-keyword">if</span> (!is_covered(&amp;simulation, kingrow, kingfile,
 <a class="c2html-lineno" name="l545" href="#l545">545 </a>                    opponent_color(color))) {
-<a class="c2html-lineno" name="l546" href="#l546">546 </a>                result = <span class="c2html-macroconst">1</span>;
+<a class="c2html-lineno" name="l546" href="#l546">546 </a>                result = <span class="c2html-number">1</span>;
 <a class="c2html-lineno" name="l547" href="#l547">547 </a>                <span class="c2html-keyword">if</span> (threats &amp;&amp; threatcount) {
 <a class="c2html-lineno" name="l548" href="#l548">548 </a>                    threats[(*threatcount)++] = candidates[i];
 <a class="c2html-lineno" name="l549" href="#l549">549 </a>                }
@@ -605,16 +608,16 @@
 <a class="c2html-lineno" name="l552" href="#l552">552 </a>        
 <a class="c2html-lineno" name="l553" href="#l553">553 </a>        <span class="c2html-keyword">return</span> result;
 <a class="c2html-lineno" name="l554" href="#l554">554 </a>    } <span class="c2html-keyword">else</span> {
-<a class="c2html-lineno" name="l555" href="#l555">555 </a>        <span class="c2html-keyword">return</span> <span class="c2html-macroconst">0</span>;
+<a class="c2html-lineno" name="l555" href="#l555">555 </a>        <span class="c2html-keyword">return</span> <span class="c2html-number">0</span>;
 <a class="c2html-lineno" name="l556" href="#l556">556 </a>    }
 <a class="c2html-lineno" name="l557" href="#l557">557 </a>}
 <a class="c2html-lineno" name="l558" href="#l558">558 </a>
 <a class="c2html-lineno" name="l559" href="#l559">559 </a><span class="c2html-keyword">static</span> <span class="c2html-keyword">int</span> getlocation(GameState *gamestate, Move *move) {   
 <a class="c2html-lineno" name="l560" href="#l560">560 </a>
 <a class="c2html-lineno" name="l561" href="#l561">561 </a>    <span class="c2html-type">uint8_t</span> color = move-&gt;piece &amp; <span class="c2html-macroconst">COLOR_MASK</span>;
-<a class="c2html-lineno" name="l562" href="#l562">562 </a>    _Bool incheck = gamestate-&gt;lastmove?gamestate-&gt;lastmove-&gt;move.check:<span class="c2html-macroconst">0</span>;
+<a class="c2html-lineno" name="l562" href="#l562">562 </a>    _Bool incheck = gamestate-&gt;lastmove?gamestate-&gt;lastmove-&gt;move.check:<span class="c2html-number">0</span>;
 <a class="c2html-lineno" name="l563" href="#l563">563 </a>    
-<a class="c2html-lineno" name="l564" href="#l564">564 </a>    Move threats[<span class="c2html-macroconst">16</span>], *threat = <span class="c2html-macroconst">NULL</span>;
+<a class="c2html-lineno" name="l564" href="#l564">564 </a>    Move threats[<span class="c2html-number">16</span>], *threat = <span class="c2html-macroconst">NULL</span>;
 <a class="c2html-lineno" name="l565" href="#l565">565 </a>    <span class="c2html-type">uint8_t</span> threatcount;
 <a class="c2html-lineno" name="l566" href="#l566">566 </a>    
 <a class="c2html-lineno" name="l567" href="#l567">567 </a>    <span class="c2html-keyword">if</span> (get_threats(gamestate, move-&gt;torow, move-&gt;tofile, color,
@@ -623,7 +626,7 @@
 <a class="c2html-lineno" name="l570" href="#l570">570 </a>        <span class="c2html-keyword">int</span> reason = <span class="c2html-macroconst">INVALID_POSITION</span>;
 <a class="c2html-lineno" name="l571" href="#l571">571 </a>        
 <a class="c2html-lineno" name="l572" href="#l572">572 </a>        <span class="c2html-comment">// find threats for the specified position</span>
-<a class="c2html-lineno" name="l573" href="#l573">573 </a>        <span class="c2html-keyword">for</span> (<span class="c2html-type">uint8_t</span> i = <span class="c2html-macroconst">0</span> ; i &lt; threatcount ; i++) {
+<a class="c2html-lineno" name="l573" href="#l573">573 </a>        <span class="c2html-keyword">for</span> (<span class="c2html-type">uint8_t</span> i = <span class="c2html-number">0</span> ; i &lt; threatcount ; i++) {
 <a class="c2html-lineno" name="l574" href="#l574">574 </a>            <span class="c2html-keyword">if</span> ((threats[i].piece &amp; (<span class="c2html-macroconst">PIECE_MASK</span> | <span class="c2html-macroconst">COLOR_MASK</span>))
 <a class="c2html-lineno" name="l575" href="#l575">575 </a>                    == move-&gt;piece &amp;&amp;
 <a class="c2html-lineno" name="l576" href="#l576">576 </a>                    (move-&gt;fromrow == <span class="c2html-macroconst">POS_UNSPECIFIED</span> ||
@@ -657,120 +660,120 @@
 <a class="c2html-lineno" name="l604" href="#l604">604 </a>}
 <a class="c2html-lineno" name="l605" href="#l605">605 </a>
 <a class="c2html-lineno" name="l606" href="#l606">606 </a><span class="c2html-keyword">int</span> eval_move(GameState *gamestate, <span class="c2html-keyword">char</span> *mstr, Move *move, <span class="c2html-type">uint8_t</span> color) {
-<a class="c2html-lineno" name="l607" href="#l607">607 </a>    memset(move, <span class="c2html-macroconst">0</span>, <span class="c2html-keyword">sizeof</span>(Move));
+<a class="c2html-lineno" name="l607" href="#l607">607 </a>    memset(move, <span class="c2html-number">0</span>, <span class="c2html-keyword">sizeof</span>(Move));
 <a class="c2html-lineno" name="l608" href="#l608">608 </a>    move-&gt;fromfile = <span class="c2html-macroconst">POS_UNSPECIFIED</span>;
 <a class="c2html-lineno" name="l609" href="#l609">609 </a>    move-&gt;fromrow = <span class="c2html-macroconst">POS_UNSPECIFIED</span>;
 <a class="c2html-lineno" name="l610" href="#l610">610 </a>
 <a class="c2html-lineno" name="l611" href="#l611">611 </a>    <span class="c2html-type">size_t</span> len = strlen(mstr);
-<a class="c2html-lineno" name="l612" href="#l612">612 </a>    <span class="c2html-keyword">if</span> (len &lt; <span class="c2html-macroconst">1</span> || len &gt; <span class="c2html-macroconst">6</span>) {
+<a class="c2html-lineno" name="l612" href="#l612">612 </a>    <span class="c2html-keyword">if</span> (len &lt; <span class="c2html-number">1</span> || len &gt; <span class="c2html-number">6</span>) {
 <a class="c2html-lineno" name="l613" href="#l613">613 </a>        <span class="c2html-keyword">return</span> <span class="c2html-macroconst">INVALID_MOVE_SYNTAX</span>;
 <a class="c2html-lineno" name="l614" href="#l614">614 </a>    }
 <a class="c2html-lineno" name="l615" href="#l615">615 </a>    
 <a class="c2html-lineno" name="l616" href="#l616">616 </a>    <span class="c2html-comment">/* evaluate check/checkmate flags */</span>
-<a class="c2html-lineno" name="l617" href="#l617">617 </a>    <span class="c2html-keyword">if</span> (mstr[len-<span class="c2html-macroconst">1</span>] == <span class="c2html-string">'+'</span>) {
+<a class="c2html-lineno" name="l617" href="#l617">617 </a>    <span class="c2html-keyword">if</span> (mstr[len<span class="c2html-number">-1</span>] == <span class="c2html-string">'+'</span>) {
 <a class="c2html-lineno" name="l618" href="#l618">618 </a>        len--; mstr[len] = <span class="c2html-string">'\0'</span>;
-<a class="c2html-lineno" name="l619" href="#l619">619 </a>        move-&gt;check = <span class="c2html-macroconst">1</span>;
-<a class="c2html-lineno" name="l620" href="#l620">620 </a>    } <span class="c2html-keyword">else</span> <span class="c2html-keyword">if</span> (mstr[len-<span class="c2html-macroconst">1</span>] == <span class="c2html-string">'#'</span>) {
+<a class="c2html-lineno" name="l619" href="#l619">619 </a>        move-&gt;check = <span class="c2html-number">1</span>;
+<a class="c2html-lineno" name="l620" href="#l620">620 </a>    } <span class="c2html-keyword">else</span> <span class="c2html-keyword">if</span> (mstr[len<span class="c2html-number">-1</span>] == <span class="c2html-string">'#'</span>) {
 <a class="c2html-lineno" name="l621" href="#l621">621 </a>        len--; mstr[len] = <span class="c2html-string">'\0'</span>;
 <a class="c2html-lineno" name="l622" href="#l622">622 </a>        <span class="c2html-comment">/* ignore - validation should set game state */</span>
 <a class="c2html-lineno" name="l623" href="#l623">623 </a>    }
 <a class="c2html-lineno" name="l624" href="#l624">624 </a>    
 <a class="c2html-lineno" name="l625" href="#l625">625 </a>    <span class="c2html-comment">/* evaluate promotion */</span>
-<a class="c2html-lineno" name="l626" href="#l626">626 </a>    <span class="c2html-keyword">if</span> (len &gt; <span class="c2html-macroconst">3</span> &amp;&amp; mstr[len-<span class="c2html-macroconst">2</span>] == <span class="c2html-string">'='</span>) {
-<a class="c2html-lineno" name="l627" href="#l627">627 </a>        move-&gt;promotion = getpiece(mstr[len-<span class="c2html-macroconst">1</span>]);
+<a class="c2html-lineno" name="l626" href="#l626">626 </a>    <span class="c2html-keyword">if</span> (len &gt; <span class="c2html-number">3</span> &amp;&amp; mstr[len<span class="c2html-number">-2</span>] == <span class="c2html-string">'='</span>) {
+<a class="c2html-lineno" name="l627" href="#l627">627 </a>        move-&gt;promotion = getpiece(mstr[len<span class="c2html-number">-1</span>]);
 <a class="c2html-lineno" name="l628" href="#l628">628 </a>        <span class="c2html-keyword">if</span> (!move-&gt;promotion) {
 <a class="c2html-lineno" name="l629" href="#l629">629 </a>            <span class="c2html-keyword">return</span> <span class="c2html-macroconst">INVALID_MOVE_SYNTAX</span>;
 <a class="c2html-lineno" name="l630" href="#l630">630 </a>        } <span class="c2html-keyword">else</span> {
 <a class="c2html-lineno" name="l631" href="#l631">631 </a>            move-&gt;promotion |= color;
-<a class="c2html-lineno" name="l632" href="#l632">632 </a>            len -= <span class="c2html-macroconst">2</span>;
-<a class="c2html-lineno" name="l633" href="#l633">633 </a>            mstr[len] = <span class="c2html-macroconst">0</span>;
+<a class="c2html-lineno" name="l632" href="#l632">632 </a>            len -= <span class="c2html-number">2</span>;
+<a class="c2html-lineno" name="l633" href="#l633">633 </a>            mstr[len] = <span class="c2html-number">0</span>;
 <a class="c2html-lineno" name="l634" href="#l634">634 </a>        }
 <a class="c2html-lineno" name="l635" href="#l635">635 </a>    }
 <a class="c2html-lineno" name="l636" href="#l636">636 </a>    
-<a class="c2html-lineno" name="l637" href="#l637">637 </a>    <span class="c2html-keyword">if</span> (len == <span class="c2html-macroconst">2</span>) {
+<a class="c2html-lineno" name="l637" href="#l637">637 </a>    <span class="c2html-keyword">if</span> (len == <span class="c2html-number">2</span>) {
 <a class="c2html-lineno" name="l638" href="#l638">638 </a>        <span class="c2html-comment">/* pawn move (e.g. "e4") */</span>
 <a class="c2html-lineno" name="l639" href="#l639">639 </a>        move-&gt;piece = <span class="c2html-macroconst">PAWN</span>;
-<a class="c2html-lineno" name="l640" href="#l640">640 </a>        move-&gt;tofile = fileidx(mstr[<span class="c2html-macroconst">0</span>]);
-<a class="c2html-lineno" name="l641" href="#l641">641 </a>        move-&gt;torow = rowidx(mstr[<span class="c2html-macroconst">1</span>]);
-<a class="c2html-lineno" name="l642" href="#l642">642 </a>    } <span class="c2html-keyword">else</span> <span class="c2html-keyword">if</span> (len == <span class="c2html-macroconst">3</span>) {
-<a class="c2html-lineno" name="l643" href="#l643">643 </a>        <span class="c2html-keyword">if</span> (strcmp(mstr, <span class="c2html-string">"O-O"</span>) == <span class="c2html-macroconst">0</span>) {
+<a class="c2html-lineno" name="l640" href="#l640">640 </a>        move-&gt;tofile = fileidx(mstr[<span class="c2html-number">0</span>]);
+<a class="c2html-lineno" name="l641" href="#l641">641 </a>        move-&gt;torow = rowidx(mstr[<span class="c2html-number">1</span>]);
+<a class="c2html-lineno" name="l642" href="#l642">642 </a>    } <span class="c2html-keyword">else</span> <span class="c2html-keyword">if</span> (len == <span class="c2html-number">3</span>) {
+<a class="c2html-lineno" name="l643" href="#l643">643 </a>        <span class="c2html-keyword">if</span> (strcmp(mstr, <span class="c2html-string">"O-O"</span>) == <span class="c2html-number">0</span>) {
 <a class="c2html-lineno" name="l644" href="#l644">644 </a>            <span class="c2html-comment">/* king side castling */</span>
 <a class="c2html-lineno" name="l645" href="#l645">645 </a>            move-&gt;piece = <span class="c2html-macroconst">KING</span>;
 <a class="c2html-lineno" name="l646" href="#l646">646 </a>            move-&gt;fromfile = fileidx(<span class="c2html-string">'e'</span>);
 <a class="c2html-lineno" name="l647" href="#l647">647 </a>            move-&gt;tofile = fileidx(<span class="c2html-string">'g'</span>);
-<a class="c2html-lineno" name="l648" href="#l648">648 </a>            move-&gt;fromrow = move-&gt;torow = color == <span class="c2html-macroconst">WHITE</span> ? <span class="c2html-macroconst">0</span> : <span class="c2html-macroconst">7</span>;
+<a class="c2html-lineno" name="l648" href="#l648">648 </a>            move-&gt;fromrow = move-&gt;torow = color == <span class="c2html-macroconst">WHITE</span> ? <span class="c2html-number">0</span> : <span class="c2html-number">7</span>;
 <a class="c2html-lineno" name="l649" href="#l649">649 </a>        } <span class="c2html-keyword">else</span> {
 <a class="c2html-lineno" name="l650" href="#l650">650 </a>            <span class="c2html-comment">/* move (e.g. "Nf3") */</span>
-<a class="c2html-lineno" name="l651" href="#l651">651 </a>            move-&gt;piece = getpiece(mstr[<span class="c2html-macroconst">0</span>]);
-<a class="c2html-lineno" name="l652" href="#l652">652 </a>            move-&gt;tofile = fileidx(mstr[<span class="c2html-macroconst">1</span>]);
-<a class="c2html-lineno" name="l653" href="#l653">653 </a>            move-&gt;torow = rowidx(mstr[<span class="c2html-macroconst">2</span>]);
+<a class="c2html-lineno" name="l651" href="#l651">651 </a>            move-&gt;piece = getpiece(mstr[<span class="c2html-number">0</span>]);
+<a class="c2html-lineno" name="l652" href="#l652">652 </a>            move-&gt;tofile = fileidx(mstr[<span class="c2html-number">1</span>]);
+<a class="c2html-lineno" name="l653" href="#l653">653 </a>            move-&gt;torow = rowidx(mstr[<span class="c2html-number">2</span>]);
 <a class="c2html-lineno" name="l654" href="#l654">654 </a>        }
-<a class="c2html-lineno" name="l655" href="#l655">655 </a>    } <span class="c2html-keyword">else</span> <span class="c2html-keyword">if</span> (len == <span class="c2html-macroconst">4</span>) {
-<a class="c2html-lineno" name="l656" href="#l656">656 </a>        move-&gt;piece = getpiece(mstr[<span class="c2html-macroconst">0</span>]);
+<a class="c2html-lineno" name="l655" href="#l655">655 </a>    } <span class="c2html-keyword">else</span> <span class="c2html-keyword">if</span> (len == <span class="c2html-number">4</span>) {
+<a class="c2html-lineno" name="l656" href="#l656">656 </a>        move-&gt;piece = getpiece(mstr[<span class="c2html-number">0</span>]);
 <a class="c2html-lineno" name="l657" href="#l657">657 </a>        <span class="c2html-keyword">if</span> (!move-&gt;piece) {
 <a class="c2html-lineno" name="l658" href="#l658">658 </a>            move-&gt;piece = <span class="c2html-macroconst">PAWN</span>;
-<a class="c2html-lineno" name="l659" href="#l659">659 </a>            move-&gt;fromfile = fileidx(mstr[<span class="c2html-macroconst">0</span>]);
+<a class="c2html-lineno" name="l659" href="#l659">659 </a>            move-&gt;fromfile = fileidx(mstr[<span class="c2html-number">0</span>]);
 <a class="c2html-lineno" name="l660" href="#l660">660 </a>        }
-<a class="c2html-lineno" name="l661" href="#l661">661 </a>        <span class="c2html-keyword">if</span> (mstr[<span class="c2html-macroconst">1</span>] == <span class="c2html-string">'x'</span>) {
+<a class="c2html-lineno" name="l661" href="#l661">661 </a>        <span class="c2html-keyword">if</span> (mstr[<span class="c2html-number">1</span>] == <span class="c2html-string">'x'</span>) {
 <a class="c2html-lineno" name="l662" href="#l662">662 </a>            <span class="c2html-comment">/* capture (e.g. "Nxf3", "dxe5") */</span>
-<a class="c2html-lineno" name="l663" href="#l663">663 </a>            move-&gt;capture = <span class="c2html-macroconst">1</span>;
+<a class="c2html-lineno" name="l663" href="#l663">663 </a>            move-&gt;capture = <span class="c2html-number">1</span>;
 <a class="c2html-lineno" name="l664" href="#l664">664 </a>        } <span class="c2html-keyword">else</span> {
 <a class="c2html-lineno" name="l665" href="#l665">665 </a>            <span class="c2html-comment">/* move (e.g. "Ndf3", "N2c3", "e2e4") */</span>
-<a class="c2html-lineno" name="l666" href="#l666">666 </a>            <span class="c2html-keyword">if</span> (isfile(mstr[<span class="c2html-macroconst">1</span>])) {
-<a class="c2html-lineno" name="l667" href="#l667">667 </a>                move-&gt;fromfile = fileidx(mstr[<span class="c2html-macroconst">1</span>]);
+<a class="c2html-lineno" name="l666" href="#l666">666 </a>            <span class="c2html-keyword">if</span> (isfile(mstr[<span class="c2html-number">1</span>])) {
+<a class="c2html-lineno" name="l667" href="#l667">667 </a>                move-&gt;fromfile = fileidx(mstr[<span class="c2html-number">1</span>]);
 <a class="c2html-lineno" name="l668" href="#l668">668 </a>                <span class="c2html-keyword">if</span> (move-&gt;piece == <span class="c2html-macroconst">PAWN</span>) {
-<a class="c2html-lineno" name="l669" href="#l669">669 </a>                    move-&gt;piece = <span class="c2html-macroconst">0</span>;
+<a class="c2html-lineno" name="l669" href="#l669">669 </a>                    move-&gt;piece = <span class="c2html-number">0</span>;
 <a class="c2html-lineno" name="l670" href="#l670">670 </a>                }
 <a class="c2html-lineno" name="l671" href="#l671">671 </a>            } <span class="c2html-keyword">else</span> {
-<a class="c2html-lineno" name="l672" href="#l672">672 </a>                move-&gt;fromrow = rowidx(mstr[<span class="c2html-macroconst">1</span>]);
+<a class="c2html-lineno" name="l672" href="#l672">672 </a>                move-&gt;fromrow = rowidx(mstr[<span class="c2html-number">1</span>]);
 <a class="c2html-lineno" name="l673" href="#l673">673 </a>            }
 <a class="c2html-lineno" name="l674" href="#l674">674 </a>        }
-<a class="c2html-lineno" name="l675" href="#l675">675 </a>        move-&gt;tofile = fileidx(mstr[<span class="c2html-macroconst">2</span>]);
-<a class="c2html-lineno" name="l676" href="#l676">676 </a>        move-&gt;torow = rowidx(mstr[<span class="c2html-macroconst">3</span>]);
-<a class="c2html-lineno" name="l677" href="#l677">677 </a>    } <span class="c2html-keyword">else</span> <span class="c2html-keyword">if</span> (len == <span class="c2html-macroconst">5</span>) {
-<a class="c2html-lineno" name="l678" href="#l678">678 </a>        <span class="c2html-keyword">if</span> (strcmp(mstr, <span class="c2html-string">"O-O-O"</span>) == <span class="c2html-macroconst">0</span>) {
+<a class="c2html-lineno" name="l675" href="#l675">675 </a>        move-&gt;tofile = fileidx(mstr[<span class="c2html-number">2</span>]);
+<a class="c2html-lineno" name="l676" href="#l676">676 </a>        move-&gt;torow = rowidx(mstr[<span class="c2html-number">3</span>]);
+<a class="c2html-lineno" name="l677" href="#l677">677 </a>    } <span class="c2html-keyword">else</span> <span class="c2html-keyword">if</span> (len == <span class="c2html-number">5</span>) {
+<a class="c2html-lineno" name="l678" href="#l678">678 </a>        <span class="c2html-keyword">if</span> (strcmp(mstr, <span class="c2html-string">"O-O-O"</span>) == <span class="c2html-number">0</span>) {
 <a class="c2html-lineno" name="l679" href="#l679">679 </a>            <span class="c2html-comment">/* queen side castling "O-O-O" */</span>
 <a class="c2html-lineno" name="l680" href="#l680">680 </a>            move-&gt;piece = <span class="c2html-macroconst">KING</span>;
 <a class="c2html-lineno" name="l681" href="#l681">681 </a>            move-&gt;fromfile = fileidx(<span class="c2html-string">'e'</span>);
 <a class="c2html-lineno" name="l682" href="#l682">682 </a>            move-&gt;tofile = fileidx(<span class="c2html-string">'c'</span>);
-<a class="c2html-lineno" name="l683" href="#l683">683 </a>            move-&gt;fromrow = move-&gt;torow = color == <span class="c2html-macroconst">WHITE</span> ? <span class="c2html-macroconst">0</span> : <span class="c2html-macroconst">7</span>;
+<a class="c2html-lineno" name="l683" href="#l683">683 </a>            move-&gt;fromrow = move-&gt;torow = color == <span class="c2html-macroconst">WHITE</span> ? <span class="c2html-number">0</span> : <span class="c2html-number">7</span>;
 <a class="c2html-lineno" name="l684" href="#l684">684 </a>        } <span class="c2html-keyword">else</span> {
-<a class="c2html-lineno" name="l685" href="#l685">685 </a>            move-&gt;piece = getpiece(mstr[<span class="c2html-macroconst">0</span>]);
-<a class="c2html-lineno" name="l686" href="#l686">686 </a>            <span class="c2html-keyword">if</span> (mstr[<span class="c2html-macroconst">2</span>] == <span class="c2html-string">'x'</span>) {
-<a class="c2html-lineno" name="l687" href="#l687">687 </a>                move-&gt;capture = <span class="c2html-macroconst">1</span>;
+<a class="c2html-lineno" name="l685" href="#l685">685 </a>            move-&gt;piece = getpiece(mstr[<span class="c2html-number">0</span>]);
+<a class="c2html-lineno" name="l686" href="#l686">686 </a>            <span class="c2html-keyword">if</span> (mstr[<span class="c2html-number">2</span>] == <span class="c2html-string">'x'</span>) {
+<a class="c2html-lineno" name="l687" href="#l687">687 </a>                move-&gt;capture = <span class="c2html-number">1</span>;
 <a class="c2html-lineno" name="l688" href="#l688">688 </a>                <span class="c2html-keyword">if</span> (move-&gt;piece) {
 <a class="c2html-lineno" name="l689" href="#l689">689 </a>                    <span class="c2html-comment">/* capture (e.g. "Ndxf3") */</span>
-<a class="c2html-lineno" name="l690" href="#l690">690 </a>                    move-&gt;fromfile = fileidx(mstr[<span class="c2html-macroconst">1</span>]);
+<a class="c2html-lineno" name="l690" href="#l690">690 </a>                    move-&gt;fromfile = fileidx(mstr[<span class="c2html-number">1</span>]);
 <a class="c2html-lineno" name="l691" href="#l691">691 </a>                } <span class="c2html-keyword">else</span> {
 <a class="c2html-lineno" name="l692" href="#l692">692 </a>                    <span class="c2html-comment">/* long notation capture (e.g. "e5xf6") */</span>
 <a class="c2html-lineno" name="l693" href="#l693">693 </a>                    move-&gt;piece = <span class="c2html-macroconst">PAWN</span>;
-<a class="c2html-lineno" name="l694" href="#l694">694 </a>                    move-&gt;fromfile = fileidx(mstr[<span class="c2html-macroconst">0</span>]);
-<a class="c2html-lineno" name="l695" href="#l695">695 </a>                    move-&gt;fromrow = rowidx(mstr[<span class="c2html-macroconst">1</span>]);
+<a class="c2html-lineno" name="l694" href="#l694">694 </a>                    move-&gt;fromfile = fileidx(mstr[<span class="c2html-number">0</span>]);
+<a class="c2html-lineno" name="l695" href="#l695">695 </a>                    move-&gt;fromrow = rowidx(mstr[<span class="c2html-number">1</span>]);
 <a class="c2html-lineno" name="l696" href="#l696">696 </a>                }
 <a class="c2html-lineno" name="l697" href="#l697">697 </a>            } <span class="c2html-keyword">else</span> {
 <a class="c2html-lineno" name="l698" href="#l698">698 </a>                <span class="c2html-comment">/* long notation move (e.g. "Nc5a4") */</span>
-<a class="c2html-lineno" name="l699" href="#l699">699 </a>                move-&gt;fromfile = fileidx(mstr[<span class="c2html-macroconst">1</span>]);
-<a class="c2html-lineno" name="l700" href="#l700">700 </a>                move-&gt;fromrow = rowidx(mstr[<span class="c2html-macroconst">2</span>]);
+<a class="c2html-lineno" name="l699" href="#l699">699 </a>                move-&gt;fromfile = fileidx(mstr[<span class="c2html-number">1</span>]);
+<a class="c2html-lineno" name="l700" href="#l700">700 </a>                move-&gt;fromrow = rowidx(mstr[<span class="c2html-number">2</span>]);
 <a class="c2html-lineno" name="l701" href="#l701">701 </a>            }
-<a class="c2html-lineno" name="l702" href="#l702">702 </a>            move-&gt;tofile = fileidx(mstr[<span class="c2html-macroconst">3</span>]);
-<a class="c2html-lineno" name="l703" href="#l703">703 </a>            move-&gt;torow = rowidx(mstr[<span class="c2html-macroconst">4</span>]);
+<a class="c2html-lineno" name="l702" href="#l702">702 </a>            move-&gt;tofile = fileidx(mstr[<span class="c2html-number">3</span>]);
+<a class="c2html-lineno" name="l703" href="#l703">703 </a>            move-&gt;torow = rowidx(mstr[<span class="c2html-number">4</span>]);
 <a class="c2html-lineno" name="l704" href="#l704">704 </a>        }
-<a class="c2html-lineno" name="l705" href="#l705">705 </a>    } <span class="c2html-keyword">else</span> <span class="c2html-keyword">if</span> (len == <span class="c2html-macroconst">6</span>) {
+<a class="c2html-lineno" name="l705" href="#l705">705 </a>    } <span class="c2html-keyword">else</span> <span class="c2html-keyword">if</span> (len == <span class="c2html-number">6</span>) {
 <a class="c2html-lineno" name="l706" href="#l706">706 </a>        <span class="c2html-comment">/* long notation capture (e.g. "Nc5xf3") */</span>
-<a class="c2html-lineno" name="l707" href="#l707">707 </a>        <span class="c2html-keyword">if</span> (mstr[<span class="c2html-macroconst">3</span>] == <span class="c2html-string">'x'</span>) {
-<a class="c2html-lineno" name="l708" href="#l708">708 </a>            move-&gt;capture = <span class="c2html-macroconst">1</span>;
-<a class="c2html-lineno" name="l709" href="#l709">709 </a>            move-&gt;piece = getpiece(mstr[<span class="c2html-macroconst">0</span>]);
-<a class="c2html-lineno" name="l710" href="#l710">710 </a>            move-&gt;fromfile = fileidx(mstr[<span class="c2html-macroconst">1</span>]);
-<a class="c2html-lineno" name="l711" href="#l711">711 </a>            move-&gt;fromrow = rowidx(mstr[<span class="c2html-macroconst">2</span>]);
-<a class="c2html-lineno" name="l712" href="#l712">712 </a>            move-&gt;tofile = fileidx(mstr[<span class="c2html-macroconst">4</span>]);
-<a class="c2html-lineno" name="l713" href="#l713">713 </a>            move-&gt;torow = rowidx(mstr[<span class="c2html-macroconst">5</span>]);
+<a class="c2html-lineno" name="l707" href="#l707">707 </a>        <span class="c2html-keyword">if</span> (mstr[<span class="c2html-number">3</span>] == <span class="c2html-string">'x'</span>) {
+<a class="c2html-lineno" name="l708" href="#l708">708 </a>            move-&gt;capture = <span class="c2html-number">1</span>;
+<a class="c2html-lineno" name="l709" href="#l709">709 </a>            move-&gt;piece = getpiece(mstr[<span class="c2html-number">0</span>]);
+<a class="c2html-lineno" name="l710" href="#l710">710 </a>            move-&gt;fromfile = fileidx(mstr[<span class="c2html-number">1</span>]);
+<a class="c2html-lineno" name="l711" href="#l711">711 </a>            move-&gt;fromrow = rowidx(mstr[<span class="c2html-number">2</span>]);
+<a class="c2html-lineno" name="l712" href="#l712">712 </a>            move-&gt;tofile = fileidx(mstr[<span class="c2html-number">4</span>]);
+<a class="c2html-lineno" name="l713" href="#l713">713 </a>            move-&gt;torow = rowidx(mstr[<span class="c2html-number">5</span>]);
 <a class="c2html-lineno" name="l714" href="#l714">714 </a>        }
 <a class="c2html-lineno" name="l715" href="#l715">715 </a>    }
 <a class="c2html-lineno" name="l716" href="#l716">716 </a>
 <a class="c2html-lineno" name="l717" href="#l717">717 </a>    
 <a class="c2html-lineno" name="l718" href="#l718">718 </a>    <span class="c2html-keyword">if</span> (move-&gt;piece) {
 <a class="c2html-lineno" name="l719" href="#l719">719 </a>        <span class="c2html-keyword">if</span> (move-&gt;piece == <span class="c2html-macroconst">PAWN</span>
-<a class="c2html-lineno" name="l720" href="#l720">720 </a>            &amp;&amp; move-&gt;torow == (color==<span class="c2html-macroconst">WHITE</span>?<span class="c2html-macroconst">7</span>:<span class="c2html-macroconst">0</span>)
+<a class="c2html-lineno" name="l720" href="#l720">720 </a>            &amp;&amp; move-&gt;torow == (color==<span class="c2html-macroconst">WHITE</span>?<span class="c2html-number">7</span>:<span class="c2html-number">0</span>)
 <a class="c2html-lineno" name="l721" href="#l721">721 </a>            &amp;&amp; !move-&gt;promotion) {
 <a class="c2html-lineno" name="l722" href="#l722">722 </a>            <span class="c2html-keyword">return</span> <span class="c2html-macroconst">NEED_PROMOTION</span>;
 <a class="c2html-lineno" name="l723" href="#l723">723 </a>        }
@@ -790,29 +793,29 @@
 <a class="c2html-lineno" name="l737" href="#l737">737 </a>_Bool is_protected(GameState *gamestate, <span class="c2html-type">uint8_t</span> row, <span class="c2html-type">uint8_t</span> file,
 <a class="c2html-lineno" name="l738" href="#l738">738 </a>        <span class="c2html-type">uint8_t</span> color) {
 <a class="c2html-lineno" name="l739" href="#l739">739 </a>    
-<a class="c2html-lineno" name="l740" href="#l740">740 </a>    Move threats[<span class="c2html-macroconst">16</span>];
+<a class="c2html-lineno" name="l740" href="#l740">740 </a>    Move threats[<span class="c2html-number">16</span>];
 <a class="c2html-lineno" name="l741" href="#l741">741 </a>    <span class="c2html-type">uint8_t</span> threatcount;
 <a class="c2html-lineno" name="l742" href="#l742">742 </a>    <span class="c2html-keyword">if</span> (get_real_threats(gamestate, row, file, color, threats, &amp;threatcount)) {
-<a class="c2html-lineno" name="l743" href="#l743">743 </a>        <span class="c2html-keyword">for</span> (<span class="c2html-keyword">int</span> i = <span class="c2html-macroconst">0</span> ; i &lt; threatcount ; i++) {
+<a class="c2html-lineno" name="l743" href="#l743">743 </a>        <span class="c2html-keyword">for</span> (<span class="c2html-keyword">int</span> i = <span class="c2html-number">0</span> ; i &lt; threatcount ; i++) {
 <a class="c2html-lineno" name="l744" href="#l744">744 </a>            <span class="c2html-keyword">if</span> (threats[i].piece != (color|<span class="c2html-macroconst">KING</span>)) {
-<a class="c2html-lineno" name="l745" href="#l745">745 </a>                <span class="c2html-keyword">return</span> <span class="c2html-macroconst">1</span>;
+<a class="c2html-lineno" name="l745" href="#l745">745 </a>                <span class="c2html-keyword">return</span> <span class="c2html-number">1</span>;
 <a class="c2html-lineno" name="l746" href="#l746">746 </a>            }
 <a class="c2html-lineno" name="l747" href="#l747">747 </a>        }
-<a class="c2html-lineno" name="l748" href="#l748">748 </a>        <span class="c2html-keyword">return</span> <span class="c2html-macroconst">0</span>;
+<a class="c2html-lineno" name="l748" href="#l748">748 </a>        <span class="c2html-keyword">return</span> <span class="c2html-number">0</span>;
 <a class="c2html-lineno" name="l749" href="#l749">749 </a>    } <span class="c2html-keyword">else</span> {
-<a class="c2html-lineno" name="l750" href="#l750">750 </a>        <span class="c2html-keyword">return</span> <span class="c2html-macroconst">0</span>;
+<a class="c2html-lineno" name="l750" href="#l750">750 </a>        <span class="c2html-keyword">return</span> <span class="c2html-number">0</span>;
 <a class="c2html-lineno" name="l751" href="#l751">751 </a>    }
 <a class="c2html-lineno" name="l752" href="#l752">752 </a>}
 <a class="c2html-lineno" name="l753" href="#l753">753 </a>
 <a class="c2html-lineno" name="l754" href="#l754">754 </a><span class="c2html-type">uint16_t</span> remaining_movetime(GameInfo *gameinfo, GameState *gamestate,
 <a class="c2html-lineno" name="l755" href="#l755">755 </a>        <span class="c2html-type">uint8_t</span> color) {
 <a class="c2html-lineno" name="l756" href="#l756">756 </a>    <span class="c2html-keyword">if</span> (!gameinfo-&gt;timecontrol) {
-<a class="c2html-lineno" name="l757" href="#l757">757 </a>        <span class="c2html-keyword">return</span> <span class="c2html-macroconst">0</span>;
+<a class="c2html-lineno" name="l757" href="#l757">757 </a>        <span class="c2html-keyword">return</span> <span class="c2html-number">0</span>;
 <a class="c2html-lineno" name="l758" href="#l758">758 </a>    }
 <a class="c2html-lineno" name="l759" href="#l759">759 </a>    
 <a class="c2html-lineno" name="l760" href="#l760">760 </a>    <span class="c2html-keyword">if</span> (gamestate-&gt;movelist) {
 <a class="c2html-lineno" name="l761" href="#l761">761 </a>        <span class="c2html-type">uint16_t</span> time = gameinfo-&gt;time;
-<a class="c2html-lineno" name="l762" href="#l762">762 </a>        <span class="c2html-type">suseconds_t</span> micros = <span class="c2html-macroconst">0</span>;
+<a class="c2html-lineno" name="l762" href="#l762">762 </a>        <span class="c2html-type">suseconds_t</span> micros = <span class="c2html-number">0</span>;
 <a class="c2html-lineno" name="l763" href="#l763">763 </a>        
 <a class="c2html-lineno" name="l764" href="#l764">764 </a>        MoveList *movelist = color == <span class="c2html-macroconst">WHITE</span> ?
 <a class="c2html-lineno" name="l765" href="#l765">765 </a>            gamestate-&gt;movelist : gamestate-&gt;movelist-&gt;next;
@@ -822,7 +825,7 @@
 <a class="c2html-lineno" name="l769" href="#l769">769 </a>            
 <a class="c2html-lineno" name="l770" href="#l770">770 </a>            <span class="c2html-keyword">struct</span> movetimeval *movetime = &amp;(movelist-&gt;move.movetime);
 <a class="c2html-lineno" name="l771" href="#l771">771 </a>            <span class="c2html-keyword">if</span> (movetime-&gt;tv_sec &gt;= time) {
-<a class="c2html-lineno" name="l772" href="#l772">772 </a>                <span class="c2html-keyword">return</span> <span class="c2html-macroconst">0</span>;
+<a class="c2html-lineno" name="l772" href="#l772">772 </a>                <span class="c2html-keyword">return</span> <span class="c2html-number">0</span>;
 <a class="c2html-lineno" name="l773" href="#l773">773 </a>            }
 <a class="c2html-lineno" name="l774" href="#l774">774 </a>            
 <a class="c2html-lineno" name="l775" href="#l775">775 </a>            time -= movetime-&gt;tv_sec;
@@ -840,16 +843,16 @@
 <a class="c2html-lineno" name="l787" href="#l787">787 </a>            micros += currenttstamp.tv_usec - lastmovetstamp-&gt;tv_usec;
 <a class="c2html-lineno" name="l788" href="#l788">788 </a>            sec = currenttstamp.tv_sec - lastmovetstamp-&gt;tv_sec;
 <a class="c2html-lineno" name="l789" href="#l789">789 </a>            <span class="c2html-keyword">if</span> (sec &gt;= time) {
-<a class="c2html-lineno" name="l790" href="#l790">790 </a>                <span class="c2html-keyword">return</span> <span class="c2html-macroconst">0</span>;
+<a class="c2html-lineno" name="l790" href="#l790">790 </a>                <span class="c2html-keyword">return</span> <span class="c2html-number">0</span>;
 <a class="c2html-lineno" name="l791" href="#l791">791 </a>            }
 <a class="c2html-lineno" name="l792" href="#l792">792 </a>            
 <a class="c2html-lineno" name="l793" href="#l793">793 </a>            time -= sec;
 <a class="c2html-lineno" name="l794" href="#l794">794 </a>        }
 <a class="c2html-lineno" name="l795" href="#l795">795 </a>        
-<a class="c2html-lineno" name="l796" href="#l796">796 </a>        sec = micros / 1e6L;
+<a class="c2html-lineno" name="l796" href="#l796">796 </a>        sec = micros / <span class="c2html-number">1e6L</span>;
 <a class="c2html-lineno" name="l797" href="#l797">797 </a>        
 <a class="c2html-lineno" name="l798" href="#l798">798 </a>        <span class="c2html-keyword">if</span> (sec &gt;= time) {
-<a class="c2html-lineno" name="l799" href="#l799">799 </a>            <span class="c2html-keyword">return</span> <span class="c2html-macroconst">0</span>;
+<a class="c2html-lineno" name="l799" href="#l799">799 </a>            <span class="c2html-keyword">return</span> <span class="c2html-number">0</span>;
 <a class="c2html-lineno" name="l800" href="#l800">800 </a>        }
 <a class="c2html-lineno" name="l801" href="#l801">801 </a>
 <a class="c2html-lineno" name="l802" href="#l802">802 </a>        time -= sec;
--- a/test/gs/ctest.html	Sun Mar 02 12:47:31 2025 +0100
+++ b/test/gs/ctest.html	Sun Mar 02 16:06:24 2025 +0100
@@ -33,6 +33,9 @@
       span.c2html-string {
         color: darkorange;
       }
+      span.c2html-number {
+          color: dodgerblue;
+      }
       span.c2html-comment {
         color: grey;
       }
@@ -101,7 +104,7 @@
 <a class="c2html-lineno" name="l48" href="#l48"> 48 </a><span class="c2html-directive">#include</span> <a class="c2html-userinclude" href="crypto.h">"crypto.h"</a>
 <a class="c2html-lineno" name="l49" href="#l49"> 49 </a><span class="c2html-directive">#include</span> <a class="c2html-userinclude" href="webdav.h">"webdav.h"</a>
 <a class="c2html-lineno" name="l50" href="#l50"> 50 </a>
-<a class="c2html-lineno" name="l51" href="#l51"> 51 </a><span class="c2html-directive">#define</span> <span class="c2html-macroconst">MACRO1337</span> <span class="c2html-macroconst">1337L</span>
+<a class="c2html-lineno" name="l51" href="#l51"> 51 </a><span class="c2html-directive">#define</span> <span class="c2html-macroconst">MACRO1337</span> <span class="c2html-number">1337L</span>
 <a class="c2html-lineno" name="l52" href="#l52"> 52 </a>
 <a class="c2html-lineno" name="l53" href="#l53"> 53 </a><span class="c2html-keyword">static</span> <span class="c2html-keyword">const</span> <span class="c2html-keyword">char</span>* continuation_test = <span class="c2html-string">"this is a string\
 </span><a class="c2html-lineno" name="l54" href="#l54"> 54 </a><span class="c2html-string">    with a continuation"</span>;
@@ -120,44 +123,44 @@
 <a class="c2html-lineno" name="l67" href="#l67"> 67 </a><span class="c2html-type">time_t</span> util_parse_lastmodified(<span class="c2html-keyword">char</span> *str) {
 <a class="c2html-lineno" name="l68" href="#l68"> 68 </a>    <span class="c2html-comment">// example: Thu, 29 Nov 2012 21:35:35 GMT</span>
 <a class="c2html-lineno" name="l69" href="#l69"> 69 </a>    <span class="c2html-keyword">if</span>(!str) {
-<a class="c2html-lineno" name="l70" href="#l70"> 70 </a>        <span class="c2html-keyword">return</span> <span class="c2html-macroconst">0</span>;
+<a class="c2html-lineno" name="l70" href="#l70"> 70 </a>        <span class="c2html-keyword">return</span> <span class="c2html-number">0</span>;
 <a class="c2html-lineno" name="l71" href="#l71"> 71 </a>    } <span class="c2html-keyword">else</span> {
 <a class="c2html-lineno" name="l72" href="#l72"> 72 </a>        <span class="c2html-keyword">return</span> curl_getdate(str, <span class="c2html-macroconst">NULL</span>);
 <a class="c2html-lineno" name="l73" href="#l73"> 73 </a>    }
 <a class="c2html-lineno" name="l74" href="#l74"> 74 </a>}
 <a class="c2html-lineno" name="l75" href="#l75"> 75 </a>
 <a class="c2html-lineno" name="l76" href="#l76"> 76 </a><span class="c2html-keyword">int</span> util_getboolean(<span class="c2html-keyword">char</span> *v) {
-<a class="c2html-lineno" name="l77" href="#l77"> 77 </a>    <span class="c2html-keyword">if</span>(v[<span class="c2html-macroconst">0</span>] == <span class="c2html-string">'T'</span> || v[<span class="c2html-macroconst">0</span>] == <span class="c2html-string">'t'</span>) {
-<a class="c2html-lineno" name="l78" href="#l78"> 78 </a>        <span class="c2html-keyword">return</span> <span class="c2html-macroconst">1</span>;
+<a class="c2html-lineno" name="l77" href="#l77"> 77 </a>    <span class="c2html-keyword">if</span>(v[<span class="c2html-number">0</span>] == <span class="c2html-string">'T'</span> || v[<span class="c2html-number">0</span>] == <span class="c2html-string">'t'</span>) {
+<a class="c2html-lineno" name="l78" href="#l78"> 78 </a>        <span class="c2html-keyword">return</span> <span class="c2html-number">1</span>;
 <a class="c2html-lineno" name="l79" href="#l79"> 79 </a>    }
-<a class="c2html-lineno" name="l80" href="#l80"> 80 </a>    <span class="c2html-keyword">return</span> <span class="c2html-macroconst">0</span>;
+<a class="c2html-lineno" name="l80" href="#l80"> 80 </a>    <span class="c2html-keyword">return</span> <span class="c2html-number">0</span>;
 <a class="c2html-lineno" name="l81" href="#l81"> 81 </a>}
 <a class="c2html-lineno" name="l82" href="#l82"> 82 </a>
 <a class="c2html-lineno" name="l83" href="#l83"> 83 </a><span class="c2html-keyword">int</span> util_strtoint(<span class="c2html-keyword">char</span> *str, <span class="c2html-type">int64_t</span> *value) {
 <a class="c2html-lineno" name="l84" href="#l84"> 84 </a>    <span class="c2html-keyword">char</span> *end;
-<a class="c2html-lineno" name="l85" href="#l85"> 85 </a>    <span class="c2html-type">int64_t</span> val = strtoll(str, &amp;end, <span class="c2html-macroconst">0</span>);
-<a class="c2html-lineno" name="l86" href="#l86"> 86 </a>    <span class="c2html-keyword">if</span>(strlen(end) == <span class="c2html-macroconst">0</span>) {
+<a class="c2html-lineno" name="l85" href="#l85"> 85 </a>    <span class="c2html-type">int64_t</span> val = strtoll(str, &amp;end, <span class="c2html-number">0</span>);
+<a class="c2html-lineno" name="l86" href="#l86"> 86 </a>    <span class="c2html-keyword">if</span>(strlen(end) == <span class="c2html-number">0</span>) {
 <a class="c2html-lineno" name="l87" href="#l87"> 87 </a>        *value = val;
-<a class="c2html-lineno" name="l88" href="#l88"> 88 </a>        <span class="c2html-keyword">return</span> <span class="c2html-macroconst">1</span>;
+<a class="c2html-lineno" name="l88" href="#l88"> 88 </a>        <span class="c2html-keyword">return</span> <span class="c2html-number">1</span>;
 <a class="c2html-lineno" name="l89" href="#l89"> 89 </a>    } <span class="c2html-keyword">else</span> {
-<a class="c2html-lineno" name="l90" href="#l90"> 90 </a>        <span class="c2html-keyword">return</span> <span class="c2html-macroconst">0</span>;
+<a class="c2html-lineno" name="l90" href="#l90"> 90 </a>        <span class="c2html-keyword">return</span> <span class="c2html-number">0</span>;
 <a class="c2html-lineno" name="l91" href="#l91"> 91 </a>    }
 <a class="c2html-lineno" name="l92" href="#l92"> 92 </a>}
 <a class="c2html-lineno" name="l93" href="#l93"> 93 </a>
 <a class="c2html-lineno" name="l94" href="#l94"> 94 </a><span class="c2html-keyword">char</span>* util_url_path(<span class="c2html-keyword">char</span> *url) { 
 <a class="c2html-lineno" name="l95" href="#l95"> 95 </a>    <span class="c2html-keyword">char</span> *path = <span class="c2html-macroconst">NULL</span>;
 <a class="c2html-lineno" name="l96" href="#l96"> 96 </a>    <span class="c2html-type">size_t</span> len = strlen(url);
-<a class="c2html-lineno" name="l97" href="#l97"> 97 </a>    <span class="c2html-keyword">int</span> slashcount = <span class="c2html-macroconst">0</span>;
+<a class="c2html-lineno" name="l97" href="#l97"> 97 </a>    <span class="c2html-keyword">int</span> slashcount = <span class="c2html-number">0</span>;
 <a class="c2html-lineno" name="l98" href="#l98"> 98 </a>    <span class="c2html-keyword">int</span> slmax;
-<a class="c2html-lineno" name="l99" href="#l99"> 99 </a>    <span class="c2html-keyword">if</span>(len &gt; <span class="c2html-macroconst">7</span> &amp;&amp; !strncasecmp(url, <span class="c2html-string">"http://"</span>, <span class="c2html-macroconst">7</span>)) {
-<a class="c2html-lineno" name="l100" href="#l100">100 </a>        slmax = <span class="c2html-macroconst">3</span>;
-<a class="c2html-lineno" name="l101" href="#l101">101 </a>    } <span class="c2html-keyword">else</span> <span class="c2html-keyword">if</span>(len &gt; <span class="c2html-macroconst">8</span> &amp;&amp; !strncasecmp(url, <span class="c2html-string">"https://"</span>, <span class="c2html-macroconst">8</span>)) {
-<a class="c2html-lineno" name="l102" href="#l102">102 </a>        slmax = <span class="c2html-macroconst">3</span>;
+<a class="c2html-lineno" name="l99" href="#l99"> 99 </a>    <span class="c2html-keyword">if</span>(len &gt; <span class="c2html-number">7</span> &amp;&amp; !strncasecmp(url, <span class="c2html-string">"http://"</span>, <span class="c2html-number">7</span>)) {
+<a class="c2html-lineno" name="l100" href="#l100">100 </a>        slmax = <span class="c2html-number">3</span>;
+<a class="c2html-lineno" name="l101" href="#l101">101 </a>    } <span class="c2html-keyword">else</span> <span class="c2html-keyword">if</span>(len &gt; <span class="c2html-number">8</span> &amp;&amp; !strncasecmp(url, <span class="c2html-string">"https://"</span>, <span class="c2html-number">8</span>)) {
+<a class="c2html-lineno" name="l102" href="#l102">102 </a>        slmax = <span class="c2html-number">3</span>;
 <a class="c2html-lineno" name="l103" href="#l103">103 </a>    } <span class="c2html-keyword">else</span> {
-<a class="c2html-lineno" name="l104" href="#l104">104 </a>        slmax = <span class="c2html-macroconst">1</span>;
+<a class="c2html-lineno" name="l104" href="#l104">104 </a>        slmax = <span class="c2html-number">1</span>;
 <a class="c2html-lineno" name="l105" href="#l105">105 </a>    }
 <a class="c2html-lineno" name="l106" href="#l106">106 </a>    <span class="c2html-keyword">char</span> c;
-<a class="c2html-lineno" name="l107" href="#l107">107 </a>    <span class="c2html-keyword">for</span>(<span class="c2html-keyword">int</span> i=<span class="c2html-macroconst">0</span>;i&lt;len;i++) {
+<a class="c2html-lineno" name="l107" href="#l107">107 </a>    <span class="c2html-keyword">for</span>(<span class="c2html-keyword">int</span> i=<span class="c2html-number">0</span>;i&lt;len;i++) {
 <a class="c2html-lineno" name="l108" href="#l108">108 </a>        c = url[i];
 <a class="c2html-lineno" name="l109" href="#l109">109 </a>        <span class="c2html-keyword">if</span>(c == <span class="c2html-string">'/'</span>) {
 <a class="c2html-lineno" name="l110" href="#l110">110 </a>            slashcount++;
@@ -178,24 +181,24 @@
 <a class="c2html-lineno" name="l125" href="#l125">125 </a>}
 <a class="c2html-lineno" name="l126" href="#l126">126 </a>
 <a class="c2html-lineno" name="l127" href="#l127">127 </a><span class="c2html-keyword">char</span>* util_resource_name(<span class="c2html-keyword">char</span> *url) {
-<a class="c2html-lineno" name="l128" href="#l128">128 </a>    <span class="c2html-keyword">int</span> si = <span class="c2html-macroconst">0</span>;
-<a class="c2html-lineno" name="l129" href="#l129">129 </a>    <span class="c2html-keyword">int</span> osi = <span class="c2html-macroconst">0</span>;
-<a class="c2html-lineno" name="l130" href="#l130">130 </a>    <span class="c2html-keyword">int</span> i = <span class="c2html-macroconst">0</span>;
-<a class="c2html-lineno" name="l131" href="#l131">131 </a>    <span class="c2html-keyword">int</span> p = <span class="c2html-macroconst">0</span>;
+<a class="c2html-lineno" name="l128" href="#l128">128 </a>    <span class="c2html-keyword">int</span> si = <span class="c2html-number">0</span>;
+<a class="c2html-lineno" name="l129" href="#l129">129 </a>    <span class="c2html-keyword">int</span> osi = <span class="c2html-number">0</span>;
+<a class="c2html-lineno" name="l130" href="#l130">130 </a>    <span class="c2html-keyword">int</span> i = <span class="c2html-number">0</span>;
+<a class="c2html-lineno" name="l131" href="#l131">131 </a>    <span class="c2html-keyword">int</span> p = <span class="c2html-number">0</span>;
 <a class="c2html-lineno" name="l132" href="#l132">132 </a>    <span class="c2html-keyword">char</span> c;
-<a class="c2html-lineno" name="l133" href="#l133">133 </a>    <span class="c2html-keyword">while</span>((c = url[i]) != <span class="c2html-macroconst">0</span>) {
+<a class="c2html-lineno" name="l133" href="#l133">133 </a>    <span class="c2html-keyword">while</span>((c = url[i]) != <span class="c2html-number">0</span>) {
 <a class="c2html-lineno" name="l134" href="#l134">134 </a>        <span class="c2html-keyword">if</span>(c == <span class="c2html-string">'/'</span>) {
 <a class="c2html-lineno" name="l135" href="#l135">135 </a>            osi = si;
 <a class="c2html-lineno" name="l136" href="#l136">136 </a>            si = i;
-<a class="c2html-lineno" name="l137" href="#l137">137 </a>            p = <span class="c2html-macroconst">1</span>;
+<a class="c2html-lineno" name="l137" href="#l137">137 </a>            p = <span class="c2html-number">1</span>;
 <a class="c2html-lineno" name="l138" href="#l138">138 </a>        }
 <a class="c2html-lineno" name="l139" href="#l139">139 </a>        i++;
 <a class="c2html-lineno" name="l140" href="#l140">140 </a>    }
 <a class="c2html-lineno" name="l141" href="#l141">141 </a>    
 <a class="c2html-lineno" name="l142" href="#l142">142 </a>    <span class="c2html-keyword">char</span> *name = url + si + p;
-<a class="c2html-lineno" name="l143" href="#l143">143 </a>    <span class="c2html-keyword">if</span>(name[<span class="c2html-macroconst">0</span>] == <span class="c2html-macroconst">0</span>) {
+<a class="c2html-lineno" name="l143" href="#l143">143 </a>    <span class="c2html-keyword">if</span>(name[<span class="c2html-number">0</span>] == <span class="c2html-number">0</span>) {
 <a class="c2html-lineno" name="l144" href="#l144">144 </a>        name = url + osi + p;
-<a class="c2html-lineno" name="l145" href="#l145">145 </a>        <span class="c2html-keyword">if</span>(name[<span class="c2html-macroconst">0</span>] == <span class="c2html-macroconst">0</span>) {
+<a class="c2html-lineno" name="l145" href="#l145">145 </a>        <span class="c2html-keyword">if</span>(name[<span class="c2html-number">0</span>] == <span class="c2html-number">0</span>) {
 <a class="c2html-lineno" name="l146" href="#l146">146 </a>            <span class="c2html-keyword">return</span> url;
 <a class="c2html-lineno" name="l147" href="#l147">147 </a>        }
 <a class="c2html-lineno" name="l148" href="#l148">148 </a>    }
@@ -217,25 +220,25 @@
 <a class="c2html-lineno" name="l164" href="#l164">164 </a>    <span class="c2html-keyword">if</span>(p) {
 <a class="c2html-lineno" name="l165" href="#l165">165 </a>        path = sstr(p);
 <a class="c2html-lineno" name="l166" href="#l166">166 </a>    } <span class="c2html-keyword">else</span> {
-<a class="c2html-lineno" name="l167" href="#l167">167 </a>        path = sstrn(<span class="c2html-string">""</span>, <span class="c2html-macroconst">0</span>);
+<a class="c2html-lineno" name="l167" href="#l167">167 </a>        path = sstrn(<span class="c2html-string">""</span>, <span class="c2html-number">0</span>);
 <a class="c2html-lineno" name="l168" href="#l168">168 </a>    }
 <a class="c2html-lineno" name="l169" href="#l169">169 </a>    
-<a class="c2html-lineno" name="l170" href="#l170">170 </a>    <span class="c2html-keyword">int</span> add_separator = <span class="c2html-macroconst">0</span>;
-<a class="c2html-lineno" name="l171" href="#l171">171 </a>    <span class="c2html-keyword">if</span>(base.ptr[base.length-<span class="c2html-macroconst">1</span>] == <span class="c2html-string">'/'</span>) {
-<a class="c2html-lineno" name="l172" href="#l172">172 </a>        <span class="c2html-keyword">if</span>(path.ptr[<span class="c2html-macroconst">0</span>] == <span class="c2html-string">'/'</span>) {
+<a class="c2html-lineno" name="l170" href="#l170">170 </a>    <span class="c2html-keyword">int</span> add_separator = <span class="c2html-number">0</span>;
+<a class="c2html-lineno" name="l171" href="#l171">171 </a>    <span class="c2html-keyword">if</span>(base.ptr[base.length<span class="c2html-number">-1</span>] == <span class="c2html-string">'/'</span>) {
+<a class="c2html-lineno" name="l172" href="#l172">172 </a>        <span class="c2html-keyword">if</span>(path.ptr[<span class="c2html-number">0</span>] == <span class="c2html-string">'/'</span>) {
 <a class="c2html-lineno" name="l173" href="#l173">173 </a>            base.length--;
 <a class="c2html-lineno" name="l174" href="#l174">174 </a>        }
 <a class="c2html-lineno" name="l175" href="#l175">175 </a>    } <span class="c2html-keyword">else</span> {
-<a class="c2html-lineno" name="l176" href="#l176">176 </a>        <span class="c2html-keyword">if</span>(path.length == <span class="c2html-macroconst">0</span> || path.ptr[<span class="c2html-macroconst">0</span>] != <span class="c2html-string">'/'</span>) {
-<a class="c2html-lineno" name="l177" href="#l177">177 </a>            add_separator = <span class="c2html-macroconst">1</span>;
+<a class="c2html-lineno" name="l176" href="#l176">176 </a>        <span class="c2html-keyword">if</span>(path.length == <span class="c2html-number">0</span> || path.ptr[<span class="c2html-number">0</span>] != <span class="c2html-string">'/'</span>) {
+<a class="c2html-lineno" name="l177" href="#l177">177 </a>            add_separator = <span class="c2html-number">1</span>;
 <a class="c2html-lineno" name="l178" href="#l178">178 </a>        }
 <a class="c2html-lineno" name="l179" href="#l179">179 </a>    }
 <a class="c2html-lineno" name="l180" href="#l180">180 </a>    
 <a class="c2html-lineno" name="l181" href="#l181">181 </a>    <span class="c2html-type">sstr_t</span> url;
 <a class="c2html-lineno" name="l182" href="#l182">182 </a>    <span class="c2html-keyword">if</span>(add_separator) {
-<a class="c2html-lineno" name="l183" href="#l183">183 </a>        url = sstrcat(<span class="c2html-macroconst">3</span>, base, sstr(<span class="c2html-string">"/"</span>), path);
+<a class="c2html-lineno" name="l183" href="#l183">183 </a>        url = sstrcat(<span class="c2html-number">3</span>, base, sstr(<span class="c2html-string">"/"</span>), path);
 <a class="c2html-lineno" name="l184" href="#l184">184 </a>    } <span class="c2html-keyword">else</span> {
-<a class="c2html-lineno" name="l185" href="#l185">185 </a>        url = sstrcat(<span class="c2html-macroconst">2</span>, base, path);
+<a class="c2html-lineno" name="l185" href="#l185">185 </a>        url = sstrcat(<span class="c2html-number">2</span>, base, path);
 <a class="c2html-lineno" name="l186" href="#l186">186 </a>    }
 <a class="c2html-lineno" name="l187" href="#l187">187 </a>    
 <a class="c2html-lineno" name="l188" href="#l188">188 </a>    <span class="c2html-keyword">return</span> url.ptr;
@@ -248,40 +251,40 @@
 <a class="c2html-lineno" name="l195" href="#l195">195 </a>    <span class="c2html-keyword">char</span> *base_path = util_url_path(sn-&gt;base_url);
 <a class="c2html-lineno" name="l196" href="#l196">196 </a>    base.length -= strlen(base_path);
 <a class="c2html-lineno" name="l197" href="#l197">197 </a>    
-<a class="c2html-lineno" name="l198" href="#l198">198 </a>    <span class="c2html-type">sstr_t</span> url = sstrcat(<span class="c2html-macroconst">2</span>, base, href_str);
+<a class="c2html-lineno" name="l198" href="#l198">198 </a>    <span class="c2html-type">sstr_t</span> url = sstrcat(<span class="c2html-number">2</span>, base, href_str);
 <a class="c2html-lineno" name="l199" href="#l199">199 </a>    
 <a class="c2html-lineno" name="l200" href="#l200">200 </a>    curl_easy_setopt(sn-&gt;handle, <span class="c2html-macroconst">CURLOPT_URL</span>, url.ptr);
 <a class="c2html-lineno" name="l201" href="#l201">201 </a>    free(url.ptr);
 <a class="c2html-lineno" name="l202" href="#l202">202 </a>}
 <a class="c2html-lineno" name="l203" href="#l203">203 </a>
 <a class="c2html-lineno" name="l204" href="#l204">204 </a><span class="c2html-keyword">char</span>* util_path_to_url(DavSession *sn, <span class="c2html-keyword">char</span> *path) {
-<a class="c2html-lineno" name="l205" href="#l205">205 </a>    <span class="c2html-keyword">char</span> *space = malloc(<span class="c2html-macroconst">256</span>);
-<a class="c2html-lineno" name="l206" href="#l206">206 </a>    UcxBuffer *url = ucx_buffer_new(space, <span class="c2html-macroconst">256</span>, <span class="c2html-macroconst">CX_BUFFER_AUTO_EXTEND</span>);
+<a class="c2html-lineno" name="l205" href="#l205">205 </a>    <span class="c2html-keyword">char</span> *space = malloc(<span class="c2html-number">256</span>);
+<a class="c2html-lineno" name="l206" href="#l206">206 </a>    UcxBuffer *url = ucx_buffer_new(space, <span class="c2html-number">256</span>, <span class="c2html-macroconst">CX_BUFFER_AUTO_EXTEND</span>);
 <a class="c2html-lineno" name="l207" href="#l207">207 </a>    
 <a class="c2html-lineno" name="l208" href="#l208">208 </a>    <span class="c2html-comment">// add base url</span>
-<a class="c2html-lineno" name="l209" href="#l209">209 </a>    ucx_buffer_write(sn-&gt;base_url, <span class="c2html-macroconst">1</span>, strlen(sn-&gt;base_url), url);
+<a class="c2html-lineno" name="l209" href="#l209">209 </a>    ucx_buffer_write(sn-&gt;base_url, <span class="c2html-number">1</span>, strlen(sn-&gt;base_url), url);
 <a class="c2html-lineno" name="l210" href="#l210">210 </a>    <span class="c2html-comment">// remove trailing slash</span>
-<a class="c2html-lineno" name="l211" href="#l211">211 </a>    ucx_buffer_seek(url, -<span class="c2html-macroconst">1</span>, <span class="c2html-macroconst">SEEK_CUR</span>);
+<a class="c2html-lineno" name="l211" href="#l211">211 </a>    ucx_buffer_seek(url, <span class="c2html-number">-1</span>, <span class="c2html-macroconst">SEEK_CUR</span>);
 <a class="c2html-lineno" name="l212" href="#l212">212 </a>    
 <a class="c2html-lineno" name="l213" href="#l213">213 </a>    <span class="c2html-type">sstr_t</span> p = sstr(path);
-<a class="c2html-lineno" name="l214" href="#l214">214 </a>    <span class="c2html-type">ssize_t</span> ntk = <span class="c2html-macroconst">0</span>;
+<a class="c2html-lineno" name="l214" href="#l214">214 </a>    <span class="c2html-type">ssize_t</span> ntk = <span class="c2html-number">0</span>;
 <a class="c2html-lineno" name="l215" href="#l215">215 </a>    <span class="c2html-type">sstr_t</span> *tks = sstrsplit(p, <span class="c2html-macroconst">S</span>(<span class="c2html-string">"/"</span>), &amp;ntk);
 <a class="c2html-lineno" name="l216" href="#l216">216 </a>    
-<a class="c2html-lineno" name="l217" href="#l217">217 </a>    <span class="c2html-keyword">for</span>(<span class="c2html-keyword">int</span> i=<span class="c2html-macroconst">0</span>;i&lt;ntk;i++) {
+<a class="c2html-lineno" name="l217" href="#l217">217 </a>    <span class="c2html-keyword">for</span>(<span class="c2html-keyword">int</span> i=<span class="c2html-number">0</span>;i&lt;ntk;i++) {
 <a class="c2html-lineno" name="l218" href="#l218">218 </a>        <span class="c2html-type">sstr_t</span> node = tks[i];
-<a class="c2html-lineno" name="l219" href="#l219">219 </a>        <span class="c2html-keyword">if</span>(node.length &gt; <span class="c2html-macroconst">0</span>) {
+<a class="c2html-lineno" name="l219" href="#l219">219 </a>        <span class="c2html-keyword">if</span>(node.length &gt; <span class="c2html-number">0</span>) {
 <a class="c2html-lineno" name="l220" href="#l220">220 </a>            <span class="c2html-keyword">char</span> *esc = curl_easy_escape(sn-&gt;handle, node.ptr, node.length);
 <a class="c2html-lineno" name="l221" href="#l221">221 </a>            ucx_buffer_putc(url, <span class="c2html-string">'/'</span>);
-<a class="c2html-lineno" name="l222" href="#l222">222 </a>            ucx_buffer_write(esc, <span class="c2html-macroconst">1</span>, strlen(esc), url);
+<a class="c2html-lineno" name="l222" href="#l222">222 </a>            ucx_buffer_write(esc, <span class="c2html-number">1</span>, strlen(esc), url);
 <a class="c2html-lineno" name="l223" href="#l223">223 </a>            curl_free(esc);
 <a class="c2html-lineno" name="l224" href="#l224">224 </a>        }
 <a class="c2html-lineno" name="l225" href="#l225">225 </a>        free(node.ptr);
 <a class="c2html-lineno" name="l226" href="#l226">226 </a>    }
 <a class="c2html-lineno" name="l227" href="#l227">227 </a>    free(tks);
-<a class="c2html-lineno" name="l228" href="#l228">228 </a>    <span class="c2html-keyword">if</span>(path[p.length-<span class="c2html-macroconst">1</span>] == <span class="c2html-string">'/'</span>) {
+<a class="c2html-lineno" name="l228" href="#l228">228 </a>    <span class="c2html-keyword">if</span>(path[p.length<span class="c2html-number">-1</span>] == <span class="c2html-string">'/'</span>) {
 <a class="c2html-lineno" name="l229" href="#l229">229 </a>        ucx_buffer_putc(url, <span class="c2html-string">'/'</span>);
 <a class="c2html-lineno" name="l230" href="#l230">230 </a>    }
-<a class="c2html-lineno" name="l231" href="#l231">231 </a>    ucx_buffer_putc(url, <span class="c2html-macroconst">0</span>);
+<a class="c2html-lineno" name="l231" href="#l231">231 </a>    ucx_buffer_putc(url, <span class="c2html-number">0</span>);
 <a class="c2html-lineno" name="l232" href="#l232">232 </a>    
 <a class="c2html-lineno" name="l233" href="#l233">233 </a>    space = url-&gt;space;
 <a class="c2html-lineno" name="l234" href="#l234">234 </a>    ucx_buffer_free(url);
@@ -294,7 +297,7 @@
 <a class="c2html-lineno" name="l241" href="#l241">241 </a>    <span class="c2html-type">size_t</span> namelen = strlen(name);
 <a class="c2html-lineno" name="l242" href="#l242">242 </a>    <span class="c2html-type">size_t</span> pathlen = strlen(path);
 <a class="c2html-lineno" name="l243" href="#l243">243 </a>    <span class="c2html-type">size_t</span> parentlen = pathlen - namelen;
-<a class="c2html-lineno" name="l244" href="#l244">244 </a>    <span class="c2html-keyword">char</span> *parent = malloc(parentlen + <span class="c2html-macroconst">1</span>);
+<a class="c2html-lineno" name="l244" href="#l244">244 </a>    <span class="c2html-keyword">char</span> *parent = malloc(parentlen + <span class="c2html-number">1</span>);
 <a class="c2html-lineno" name="l245" href="#l245">245 </a>    memcpy(parent, path, parentlen);
 <a class="c2html-lineno" name="l246" href="#l246">246 </a>    parent[parentlen] = <span class="c2html-string">'\0'</span>;
 <a class="c2html-lineno" name="l247" href="#l247">247 </a>    <span class="c2html-keyword">return</span> parent;
@@ -314,13 +317,13 @@
 <a class="c2html-lineno" name="l261" href="#l261">261 </a>
 <a class="c2html-lineno" name="l262" href="#l262">262 </a>
 <a class="c2html-lineno" name="l263" href="#l263">263 </a><span class="c2html-keyword">char</span>* util_base64decode(<span class="c2html-keyword">char</span> *in) {
-<a class="c2html-lineno" name="l264" href="#l264">264 </a>    <span class="c2html-keyword">int</span> len = <span class="c2html-macroconst">0</span>;
+<a class="c2html-lineno" name="l264" href="#l264">264 </a>    <span class="c2html-keyword">int</span> len = <span class="c2html-number">0</span>;
 <a class="c2html-lineno" name="l265" href="#l265">265 </a>    <span class="c2html-keyword">return</span> util_base64decode_len(in, &amp;len);
 <a class="c2html-lineno" name="l266" href="#l266">266 </a>}
 <a class="c2html-lineno" name="l267" href="#l267">267 </a>
 <a class="c2html-lineno" name="l268" href="#l268">268 </a><span class="c2html-keyword">char</span>* util_base64decode_len(<span class="c2html-keyword">char</span>* in, <span class="c2html-keyword">int</span> *outlen) {
 <a class="c2html-lineno" name="l269" href="#l269">269 </a>    <span class="c2html-type">size_t</span> len = strlen(in);
-<a class="c2html-lineno" name="l270" href="#l270">270 </a>    <span class="c2html-keyword">char</span> *out = calloc(<span class="c2html-macroconst">1</span>, len);
+<a class="c2html-lineno" name="l270" href="#l270">270 </a>    <span class="c2html-keyword">char</span> *out = calloc(<span class="c2html-number">1</span>, len);
 <a class="c2html-lineno" name="l271" href="#l271">271 </a>    
 <a class="c2html-lineno" name="l272" href="#l272">272 </a>    <span class="c2html-macroconst">BIO</span>* b = BIO_new_mem_buf(in, len);
 <a class="c2html-lineno" name="l273" href="#l273">273 </a>    <span class="c2html-macroconst">BIO</span> *d = BIO_new(BIO_f_base64());
@@ -347,8 +350,8 @@
 <a class="c2html-lineno" name="l294" href="#l294">294 </a>    
 <a class="c2html-lineno" name="l295" href="#l295">295 </a>    BIO_get_mem_ptr(e, &amp;mem);
 <a class="c2html-lineno" name="l296" href="#l296">296 </a>    <span class="c2html-keyword">char</span> *out = malloc(mem-&gt;length);
-<a class="c2html-lineno" name="l297" href="#l297">297 </a>    memcpy(out, mem-&gt;data, mem-&gt;length -<span class="c2html-macroconst">1</span>);
-<a class="c2html-lineno" name="l298" href="#l298">298 </a>    out[mem-&gt;length - <span class="c2html-macroconst">1</span>] = <span class="c2html-string">'\0'</span>;
+<a class="c2html-lineno" name="l297" href="#l297">297 </a>    memcpy(out, mem-&gt;data, mem-&gt;length <span class="c2html-number">-1</span>);
+<a class="c2html-lineno" name="l298" href="#l298">298 </a>    out[mem-&gt;length - <span class="c2html-number">1</span>] = <span class="c2html-string">'\0'</span>;
 <a class="c2html-lineno" name="l299" href="#l299">299 </a>
 <a class="c2html-lineno" name="l300" href="#l300">300 </a>    BIO_free_all(e);
 <a class="c2html-lineno" name="l301" href="#l301">301 </a>
@@ -384,8 +387,8 @@
 <a class="c2html-lineno" name="l331" href="#l331">331 </a><span class="c2html-comment">}</span>
 <a class="c2html-lineno" name="l332" href="#l332">332 </a><span class="c2html-comment">*/</span>
 <a class="c2html-lineno" name="l333" href="#l333">333 </a><span class="c2html-keyword">char</span>* util_random_str() {
-<a class="c2html-lineno" name="l334" href="#l334">334 </a>    <span class="c2html-keyword">unsigned</span> <span class="c2html-keyword">char</span> *str = malloc(<span class="c2html-macroconst">25</span>);
-<a class="c2html-lineno" name="l335" href="#l335">335 </a>    str[<span class="c2html-macroconst">24</span>] = <span class="c2html-string">'\0'</span>;
+<a class="c2html-lineno" name="l334" href="#l334">334 </a>    <span class="c2html-keyword">unsigned</span> <span class="c2html-keyword">char</span> *str = malloc(<span class="c2html-number">25</span>);
+<a class="c2html-lineno" name="l335" href="#l335">335 </a>    str[<span class="c2html-number">24</span>] = <span class="c2html-string">'\0'</span>;
 <a class="c2html-lineno" name="l336" href="#l336">336 </a>    
 <a class="c2html-lineno" name="l337" href="#l337">337 </a>    <span class="c2html-type">sstr_t</span> t = <span class="c2html-macroconst">S</span>(
 <a class="c2html-lineno" name="l338" href="#l338">338 </a>            <span class="c2html-string">"01234567890"</span>
@@ -393,8 +396,8 @@
 <a class="c2html-lineno" name="l340" href="#l340">340 </a>            <span class="c2html-string">"ABCDEFGHIJKLMNOPQRSTUVWXYZ"</span>);
 <a class="c2html-lineno" name="l341" href="#l341">341 </a>    <span class="c2html-keyword">const</span> <span class="c2html-keyword">unsigned</span> <span class="c2html-keyword">char</span> *table = (<span class="c2html-keyword">const</span> <span class="c2html-keyword">unsigned</span> <span class="c2html-keyword">char</span>*)t.ptr;
 <a class="c2html-lineno" name="l342" href="#l342">342 </a>    
-<a class="c2html-lineno" name="l343" href="#l343">343 </a>    RAND_pseudo_bytes(str, <span class="c2html-macroconst">24</span>);
-<a class="c2html-lineno" name="l344" href="#l344">344 </a>    <span class="c2html-keyword">for</span>(<span class="c2html-keyword">int</span> i=<span class="c2html-macroconst">0</span>;i&lt;<span class="c2html-macroconst">24</span>;i++) {
+<a class="c2html-lineno" name="l343" href="#l343">343 </a>    RAND_pseudo_bytes(str, <span class="c2html-number">24</span>);
+<a class="c2html-lineno" name="l344" href="#l344">344 </a>    <span class="c2html-keyword">for</span>(<span class="c2html-keyword">int</span> i=<span class="c2html-number">0</span>;i&lt;<span class="c2html-number">24</span>;i++) {
 <a class="c2html-lineno" name="l345" href="#l345">345 </a>        <span class="c2html-keyword">int</span> c = str[i] % t.length;
 <a class="c2html-lineno" name="l346" href="#l346">346 </a>        str[i] = table[c];
 <a class="c2html-lineno" name="l347" href="#l347">347 </a>    }
@@ -409,30 +412,30 @@
 <a class="c2html-lineno" name="l356" href="#l356">356 </a><span class="c2html-comment"> */</span>
 <a class="c2html-lineno" name="l357" href="#l357">357 </a><span class="c2html-type">sstr_t</span> util_getsubstr_until_token(<span class="c2html-type">sstr_t</span> str, <span class="c2html-type">sstr_t</span> token, <span class="c2html-type">sstr_t</span> *sub) {  
 <a class="c2html-lineno" name="l358" href="#l358">358 </a>    <span class="c2html-keyword">int</span> i;
-<a class="c2html-lineno" name="l359" href="#l359">359 </a>    <span class="c2html-keyword">int</span> token_start = -<span class="c2html-macroconst">1</span>;
-<a class="c2html-lineno" name="l360" href="#l360">360 </a>    <span class="c2html-keyword">int</span> token_end = -<span class="c2html-macroconst">1</span>;
-<a class="c2html-lineno" name="l361" href="#l361">361 </a>    <span class="c2html-keyword">for</span>(i=<span class="c2html-macroconst">0</span>;i&lt;=str.length;i++) {
+<a class="c2html-lineno" name="l359" href="#l359">359 </a>    <span class="c2html-keyword">int</span> token_start = <span class="c2html-number">-1</span>;
+<a class="c2html-lineno" name="l360" href="#l360">360 </a>    <span class="c2html-keyword">int</span> token_end = <span class="c2html-number">-1</span>;
+<a class="c2html-lineno" name="l361" href="#l361">361 </a>    <span class="c2html-keyword">for</span>(i=<span class="c2html-number">0</span>;i&lt;=str.length;i++) {
 <a class="c2html-lineno" name="l362" href="#l362">362 </a>        <span class="c2html-keyword">int</span> c;
 <a class="c2html-lineno" name="l363" href="#l363">363 </a>        <span class="c2html-keyword">if</span>(i == str.length) {
 <a class="c2html-lineno" name="l364" href="#l364">364 </a>            c = <span class="c2html-string">' '</span>;
 <a class="c2html-lineno" name="l365" href="#l365">365 </a>        } <span class="c2html-keyword">else</span> {
 <a class="c2html-lineno" name="l366" href="#l366">366 </a>            c = str.ptr[i];
 <a class="c2html-lineno" name="l367" href="#l367">367 </a>        }
-<a class="c2html-lineno" name="l368" href="#l368">368 </a>        <span class="c2html-keyword">if</span>(c &lt; <span class="c2html-macroconst">33</span>) {
-<a class="c2html-lineno" name="l369" href="#l369">369 </a>            <span class="c2html-keyword">if</span>(token_start != -<span class="c2html-macroconst">1</span>) {
+<a class="c2html-lineno" name="l368" href="#l368">368 </a>        <span class="c2html-keyword">if</span>(c &lt; <span class="c2html-number">33</span>) {
+<a class="c2html-lineno" name="l369" href="#l369">369 </a>            <span class="c2html-keyword">if</span>(token_start != <span class="c2html-number">-1</span>) {
 <a class="c2html-lineno" name="l370" href="#l370">370 </a>                token_end = i;
 <a class="c2html-lineno" name="l371" href="#l371">371 </a>                <span class="c2html-type">size_t</span> len = token_end - token_start;
 <a class="c2html-lineno" name="l372" href="#l372">372 </a>                <span class="c2html-type">sstr_t</span> tk = sstrsubsl(str, token_start, len);
 <a class="c2html-lineno" name="l373" href="#l373">373 </a>                <span class="c2html-comment">//printf("token: {%.*s}\n", token.length, token.ptr);</span>
 <a class="c2html-lineno" name="l374" href="#l374">374 </a>                <span class="c2html-keyword">if</span>(!sstrcmp(tk, token)) {
-<a class="c2html-lineno" name="l375" href="#l375">375 </a>                    *sub = sstrtrim(sstrsubsl(str, <span class="c2html-macroconst">0</span>, token_start));
+<a class="c2html-lineno" name="l375" href="#l375">375 </a>                    *sub = sstrtrim(sstrsubsl(str, <span class="c2html-number">0</span>, token_start));
 <a class="c2html-lineno" name="l376" href="#l376">376 </a>                    <span class="c2html-keyword">break</span>;
 <a class="c2html-lineno" name="l377" href="#l377">377 </a>                }
-<a class="c2html-lineno" name="l378" href="#l378">378 </a>                token_start = -<span class="c2html-macroconst">1</span>;
-<a class="c2html-lineno" name="l379" href="#l379">379 </a>                token_end = -<span class="c2html-macroconst">1</span>;
+<a class="c2html-lineno" name="l378" href="#l378">378 </a>                token_start = <span class="c2html-number">-1</span>;
+<a class="c2html-lineno" name="l379" href="#l379">379 </a>                token_end = <span class="c2html-number">-1</span>;
 <a class="c2html-lineno" name="l380" href="#l380">380 </a>            }
 <a class="c2html-lineno" name="l381" href="#l381">381 </a>        } <span class="c2html-keyword">else</span> {
-<a class="c2html-lineno" name="l382" href="#l382">382 </a>            <span class="c2html-keyword">if</span>(token_start == -<span class="c2html-macroconst">1</span>) {
+<a class="c2html-lineno" name="l382" href="#l382">382 </a>            <span class="c2html-keyword">if</span>(token_start == <span class="c2html-number">-1</span>) {
 <a class="c2html-lineno" name="l383" href="#l383">383 </a>                token_start = i;
 <a class="c2html-lineno" name="l384" href="#l384">384 </a>            }
 <a class="c2html-lineno" name="l385" href="#l385">385 </a>        }
@@ -442,7 +445,7 @@
 <a class="c2html-lineno" name="l389" href="#l389">389 </a>        <span class="c2html-keyword">return</span> sstrtrim(sstrsubs(str, i));
 <a class="c2html-lineno" name="l390" href="#l390">390 </a>    } <span class="c2html-keyword">else</span> {
 <a class="c2html-lineno" name="l391" href="#l391">391 </a>        str.ptr = <span class="c2html-macroconst">NULL</span>;
-<a class="c2html-lineno" name="l392" href="#l392">392 </a>        str.length = <span class="c2html-macroconst">0</span>;
+<a class="c2html-lineno" name="l392" href="#l392">392 </a>        str.length = <span class="c2html-number">0</span>;
 <a class="c2html-lineno" name="l393" href="#l393">393 </a>        <span class="c2html-keyword">return</span> str;
 <a class="c2html-lineno" name="l394" href="#l394">394 </a>    }
 <a class="c2html-lineno" name="l395" href="#l395">395 </a>}</div>
--- a/test/gs/javatest.html	Sun Mar 02 12:47:31 2025 +0100
+++ b/test/gs/javatest.html	Sun Mar 02 16:06:24 2025 +0100
@@ -33,6 +33,9 @@
       span.c2html-string {
         color: darkorange;
       }
+      span.c2html-number {
+          color: dodgerblue;
+      }
       span.c2html-comment {
         color: grey;
       }
@@ -44,181 +47,246 @@
 
 <div class="c2html-code">
 <a class="c2html-lineno" name="l1" href="#l1">  1 </a><span class="c2html-comment">/*</span>
-<a class="c2html-lineno" name="l2" href="#l2">  2 </a><span class="c2html-comment"> * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.</span>
-<a class="c2html-lineno" name="l3" href="#l3">  3 </a><span class="c2html-comment"> *</span>
-<a class="c2html-lineno" name="l4" href="#l4">  4 </a><span class="c2html-comment"> * Copyright 2014 Mike Becker. All rights reserved.</span>
-<a class="c2html-lineno" name="l5" href="#l5">  5 </a><span class="c2html-comment"> *</span>
-<a class="c2html-lineno" name="l6" href="#l6">  6 </a><span class="c2html-comment"> * Redistribution and use in source and binary forms, with or without</span>
-<a class="c2html-lineno" name="l7" href="#l7">  7 </a><span class="c2html-comment"> * modification, are permitted provided that the following conditions are met:</span>
-<a class="c2html-lineno" name="l8" href="#l8">  8 </a><span class="c2html-comment"> *</span>
-<a class="c2html-lineno" name="l9" href="#l9">  9 </a><span class="c2html-comment"> *   1. Redistributions of source code must retain the above copyright</span>
-<a class="c2html-lineno" name="l10" href="#l10"> 10 </a><span class="c2html-comment"> *      notice, this list of conditions and the following disclaimer.</span>
-<a class="c2html-lineno" name="l11" href="#l11"> 11 </a><span class="c2html-comment"> *</span>
-<a class="c2html-lineno" name="l12" href="#l12"> 12 </a><span class="c2html-comment"> *   2. Redistributions in binary form must reproduce the above copyright</span>
-<a class="c2html-lineno" name="l13" href="#l13"> 13 </a><span class="c2html-comment"> *      notice, this list of conditions and the following disclaimer in the</span>
-<a class="c2html-lineno" name="l14" href="#l14"> 14 </a><span class="c2html-comment"> *      documentation and/or other materials provided with the distribution.</span>
-<a class="c2html-lineno" name="l15" href="#l15"> 15 </a><span class="c2html-comment"> *</span>
-<a class="c2html-lineno" name="l16" href="#l16"> 16 </a><span class="c2html-comment"> * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"</span>
-<a class="c2html-lineno" name="l17" href="#l17"> 17 </a><span class="c2html-comment"> * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE</span>
-<a class="c2html-lineno" name="l18" href="#l18"> 18 </a><span class="c2html-comment"> * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE</span>
-<a class="c2html-lineno" name="l19" href="#l19"> 19 </a><span class="c2html-comment"> * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE</span>
-<a class="c2html-lineno" name="l20" href="#l20"> 20 </a><span class="c2html-comment"> * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</span>
-<a class="c2html-lineno" name="l21" href="#l21"> 21 </a><span class="c2html-comment"> * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</span>
-<a class="c2html-lineno" name="l22" href="#l22"> 22 </a><span class="c2html-comment"> * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS</span>
-<a class="c2html-lineno" name="l23" href="#l23"> 23 </a><span class="c2html-comment"> * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN</span>
-<a class="c2html-lineno" name="l24" href="#l24"> 24 </a><span class="c2html-comment"> * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)</span>
-<a class="c2html-lineno" name="l25" href="#l25"> 25 </a><span class="c2html-comment"> * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE</span>
-<a class="c2html-lineno" name="l26" href="#l26"> 26 </a><span class="c2html-comment"> * POSSIBILITY OF SUCH DAMAGE.</span>
-<a class="c2html-lineno" name="l27" href="#l27"> 27 </a><span class="c2html-comment"> *</span>
-<a class="c2html-lineno" name="l28" href="#l28"> 28 </a><span class="c2html-comment"> */</span>
-<a class="c2html-lineno" name="l29" href="#l29"> 29 </a>
-<a class="c2html-lineno" name="l30" href="#l30"> 30 </a><span class="c2html-keyword">package</span> de.uapcore.sigred.doc.base;
+<a class="c2html-lineno" name="l2" href="#l2">  2 </a><span class="c2html-comment"> * Copyright 2013 Mike Becker. All rights reserved.</span>
+<a class="c2html-lineno" name="l3" href="#l3">  3 </a><span class="c2html-comment"> * </span>
+<a class="c2html-lineno" name="l4" href="#l4">  4 </a><span class="c2html-comment"> * Redistribution and use in source and binary forms, with or without</span>
+<a class="c2html-lineno" name="l5" href="#l5">  5 </a><span class="c2html-comment"> * modification, are permitted provided that the following conditions are met:</span>
+<a class="c2html-lineno" name="l6" href="#l6">  6 </a><span class="c2html-comment"> * </span>
+<a class="c2html-lineno" name="l7" href="#l7">  7 </a><span class="c2html-comment"> * 1. Redistributions of source code must retain the above copyright</span>
+<a class="c2html-lineno" name="l8" href="#l8">  8 </a><span class="c2html-comment"> *    notice, this list of conditions and the following disclaimer.</span>
+<a class="c2html-lineno" name="l9" href="#l9">  9 </a><span class="c2html-comment"> * </span>
+<a class="c2html-lineno" name="l10" href="#l10"> 10 </a><span class="c2html-comment"> * 2. Redistributions in binary form must reproduce the above copyright</span>
+<a class="c2html-lineno" name="l11" href="#l11"> 11 </a><span class="c2html-comment"> *    notice, this list of conditions and the following disclaimer in the</span>
+<a class="c2html-lineno" name="l12" href="#l12"> 12 </a><span class="c2html-comment"> *    documentation and/or other materials provided with the distribution.</span>
+<a class="c2html-lineno" name="l13" href="#l13"> 13 </a><span class="c2html-comment"> * </span>
+<a class="c2html-lineno" name="l14" href="#l14"> 14 </a><span class="c2html-comment"> * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"</span>
+<a class="c2html-lineno" name="l15" href="#l15"> 15 </a><span class="c2html-comment"> * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE</span>
+<a class="c2html-lineno" name="l16" href="#l16"> 16 </a><span class="c2html-comment"> * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE</span>
+<a class="c2html-lineno" name="l17" href="#l17"> 17 </a><span class="c2html-comment"> * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE</span>
+<a class="c2html-lineno" name="l18" href="#l18"> 18 </a><span class="c2html-comment"> * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</span>
+<a class="c2html-lineno" name="l19" href="#l19"> 19 </a><span class="c2html-comment"> * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</span>
+<a class="c2html-lineno" name="l20" href="#l20"> 20 </a><span class="c2html-comment"> * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS</span>
+<a class="c2html-lineno" name="l21" href="#l21"> 21 </a><span class="c2html-comment"> * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN</span>
+<a class="c2html-lineno" name="l22" href="#l22"> 22 </a><span class="c2html-comment"> * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)</span>
+<a class="c2html-lineno" name="l23" href="#l23"> 23 </a><span class="c2html-comment"> * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE</span>
+<a class="c2html-lineno" name="l24" href="#l24"> 24 </a><span class="c2html-comment"> * POSSIBILITY OF SUCH DAMAGE.</span>
+<a class="c2html-lineno" name="l25" href="#l25"> 25 </a><span class="c2html-comment"> */</span>
+<a class="c2html-lineno" name="l26" href="#l26"> 26 </a>
+<a class="c2html-lineno" name="l27" href="#l27"> 27 </a><span class="c2html-keyword">package</span> de.uapcore.sudoku;
+<a class="c2html-lineno" name="l28" href="#l28"> 28 </a>
+<a class="c2html-lineno" name="l29" href="#l29"> 29 </a><span class="c2html-keyword">import</span> java.util.ArrayList;
+<a class="c2html-lineno" name="l30" href="#l30"> 30 </a><span class="c2html-keyword">import</span> java.util.List;
 <a class="c2html-lineno" name="l31" href="#l31"> 31 </a>
-<a class="c2html-lineno" name="l32" href="#l32"> 32 </a><span class="c2html-keyword">import</span> de.uapcore.sigred.doc.<span class="c2html-type">Resources</span>;
-<a class="c2html-lineno" name="l33" href="#l33"> 33 </a><span class="c2html-keyword">import</span> de.uapcore.sigrapi.impl.<span class="c2html-type">Digraph</span>;
-<a class="c2html-lineno" name="l34" href="#l34"> 34 </a><span class="c2html-keyword">import</span> de.uapcore.sigrapi.impl.<span class="c2html-type">Graph</span>;
-<a class="c2html-lineno" name="l35" href="#l35"> 35 </a><span class="c2html-keyword">import</span> de.uapcore.sigrapi.<span class="c2html-type">IGraph</span>;
-<a class="c2html-lineno" name="l36" href="#l36"> 36 </a><span class="c2html-keyword">import</span> java.io.<span class="c2html-type">IOException</span>;
-<a class="c2html-lineno" name="l37" href="#l37"> 37 </a><span class="c2html-keyword">import</span> java.io.<span class="c2html-type">InputStream</span>;
-<a class="c2html-lineno" name="l38" href="#l38"> 38 </a><span class="c2html-keyword">import</span> java.io.<span class="c2html-type">OutputStream</span>;
-<a class="c2html-lineno" name="l39" href="#l39"> 39 </a><span class="c2html-keyword">import</span> java.util.concurrent.atomic.<span class="c2html-type">AtomicBoolean</span>;
-<a class="c2html-lineno" name="l40" href="#l40"> 40 </a><span class="c2html-keyword">import</span> java.util.concurrent.atomic.<span class="c2html-type">AtomicReference</span>;
-<a class="c2html-lineno" name="l41" href="#l41"> 41 </a><span class="c2html-keyword">import</span> org.apache.xerces.impl.<span class="c2html-type">Constants</span>;
-<a class="c2html-lineno" name="l42" href="#l42"> 42 </a><span class="c2html-keyword">import</span> org.dom4j.<span class="c2html-type">Document</span>;
-<a class="c2html-lineno" name="l43" href="#l43"> 43 </a><span class="c2html-keyword">import</span> org.dom4j.<span class="c2html-type">DocumentException</span>;
-<a class="c2html-lineno" name="l44" href="#l44"> 44 </a><span class="c2html-keyword">import</span> org.dom4j.<span class="c2html-type">DocumentHelper</span>;
-<a class="c2html-lineno" name="l45" href="#l45"> 45 </a><span class="c2html-keyword">import</span> org.dom4j.<span class="c2html-type">Element</span>;
-<a class="c2html-lineno" name="l46" href="#l46"> 46 </a><span class="c2html-keyword">import</span> org.dom4j.<span class="c2html-type">Namespace</span>;
-<a class="c2html-lineno" name="l47" href="#l47"> 47 </a><span class="c2html-keyword">import</span> org.dom4j.<span class="c2html-type">QName</span>;
-<a class="c2html-lineno" name="l48" href="#l48"> 48 </a><span class="c2html-keyword">import</span> org.dom4j.io.<span class="c2html-type">OutputFormat</span>;
-<a class="c2html-lineno" name="l49" href="#l49"> 49 </a><span class="c2html-keyword">import</span> org.dom4j.io.<span class="c2html-type">SAXReader</span>;
-<a class="c2html-lineno" name="l50" href="#l50"> 50 </a><span class="c2html-keyword">import</span> org.dom4j.io.<span class="c2html-type">XMLWriter</span>;
-<a class="c2html-lineno" name="l51" href="#l51"> 51 </a><span class="c2html-keyword">import</span> org.xml.sax.<span class="c2html-type">ErrorHandler</span>;
-<a class="c2html-lineno" name="l52" href="#l52"> 52 </a><span class="c2html-keyword">import</span> org.xml.sax.<span class="c2html-type">SAXException</span>;
-<a class="c2html-lineno" name="l53" href="#l53"> 53 </a><span class="c2html-keyword">import</span> org.xml.sax.<span class="c2html-type">SAXParseException</span>;
-<a class="c2html-lineno" name="l54" href="#l54"> 54 </a>
-<a class="c2html-lineno" name="l55" href="#l55"> 55 </a><span class="c2html-keyword">public</span> <span class="c2html-keyword">abstract</span> <span class="c2html-keyword">class</span> <span class="c2html-type">AbstractGraphDocument</span>&lt;<span class="c2html-type">T</span> <span class="c2html-keyword">extends</span> <span class="c2html-type">IGraph</span>&gt;
-<a class="c2html-lineno" name="l56" href="#l56"> 56 </a>        <span class="c2html-keyword">extends</span> <span class="c2html-type">FileBackedDocument</span> {
-<a class="c2html-lineno" name="l57" href="#l57"> 57 </a>    
-<a class="c2html-lineno" name="l58" href="#l58"> 58 </a>    <span class="c2html-keyword">protected</span> <span class="c2html-keyword">static</span> <span class="c2html-keyword">final</span> <span class="c2html-type">Namespace</span> <span class="c2html-type">NAMESPACE</span> = <span class="c2html-type">Namespace</span>.get(<span class="c2html-string">"sigred"</span>,
-<a class="c2html-lineno" name="l59" href="#l59"> 59 </a>        <span class="c2html-string">"http://develop.uap-core.de/sigred/"</span>);
-<a class="c2html-lineno" name="l60" href="#l60"> 60 </a>    
-<a class="c2html-lineno" name="l61" href="#l61"> 61 </a>    <span class="c2html-keyword">private</span> <span class="c2html-keyword">static</span> <span class="c2html-keyword">final</span>
-<a class="c2html-lineno" name="l62" href="#l62"> 62 </a>        <span class="c2html-type">QName</span> <span class="c2html-type">TAG_GRAPHDOC</span> = <span class="c2html-type">QName</span>.get(<span class="c2html-string">"graph-document"</span>, <span class="c2html-type">NAMESPACE</span>);
-<a class="c2html-lineno" name="l63" href="#l63"> 63 </a>    <span class="c2html-keyword">private</span> <span class="c2html-keyword">static</span> <span class="c2html-keyword">final</span>
-<a class="c2html-lineno" name="l64" href="#l64"> 64 </a>        <span class="c2html-type">QName</span> <span class="c2html-type">TAG_GRAPH</span> = <span class="c2html-type">QName</span>.get(<span class="c2html-string">"graph"</span>, <span class="c2html-type">NAMESPACE</span>);
-<a class="c2html-lineno" name="l65" href="#l65"> 65 </a>    <span class="c2html-keyword">private</span> <span class="c2html-keyword">static</span> <span class="c2html-keyword">final</span>
-<a class="c2html-lineno" name="l66" href="#l66"> 66 </a>        <span class="c2html-type">QName</span> <span class="c2html-type">TAG_DIGRAPH</span> = <span class="c2html-type">QName</span>.get(<span class="c2html-string">"digraph"</span>, <span class="c2html-type">NAMESPACE</span>);
-<a class="c2html-lineno" name="l67" href="#l67"> 67 </a>    <span class="c2html-keyword">private</span> <span class="c2html-keyword">static</span> <span class="c2html-keyword">final</span>
-<a class="c2html-lineno" name="l68" href="#l68"> 68 </a>        <span class="c2html-type">QName</span> <span class="c2html-type">TAG_METADATA</span> = <span class="c2html-type">QName</span>.get(<span class="c2html-string">"metadata"</span>, <span class="c2html-type">NAMESPACE</span>);
-<a class="c2html-lineno" name="l69" href="#l69"> 69 </a>    
-<a class="c2html-lineno" name="l70" href="#l70"> 70 </a>    <span class="c2html-keyword">protected</span> <span class="c2html-keyword">final</span> <span class="c2html-type">T</span> graph;
+<a class="c2html-lineno" name="l32" href="#l32"> 32 </a><span class="c2html-comment">/**</span>
+<a class="c2html-lineno" name="l33" href="#l33"> 33 </a><span class="c2html-comment"> * Implements the backtracking algorithm for solving the Sudoku.</span>
+<a class="c2html-lineno" name="l34" href="#l34"> 34 </a><span class="c2html-comment"> */</span>
+<a class="c2html-lineno" name="l35" href="#l35"> 35 </a><span class="c2html-keyword">public</span> <span class="c2html-keyword">final</span> <span class="c2html-keyword">class</span> <span class="c2html-type">Solver</span> {
+<a class="c2html-lineno" name="l36" href="#l36"> 36 </a>
+<a class="c2html-lineno" name="l37" href="#l37"> 37 </a>    <span class="c2html-keyword">public</span> <span class="c2html-keyword">static</span> <span class="c2html-keyword">final</span> <span class="c2html-keyword">int</span> <span class="c2html-type">VERSION</span> = <span class="c2html-number">0x1000</span>;
+<a class="c2html-lineno" name="l38" href="#l38"> 38 </a>
+<a class="c2html-lineno" name="l39" href="#l39"> 39 </a>    <span class="c2html-keyword">private</span> <span class="c2html-type">Integer</span> fillInCandidate(<span class="c2html-type">Field</span> f, <span class="c2html-type">List</span>&lt;<span class="c2html-type">Integer</span>&gt;[][] candidates, <span class="c2html-keyword">int</span> x, <span class="c2html-keyword">int</span> y) {
+<a class="c2html-lineno" name="l40" href="#l40"> 40 </a>        <span class="c2html-type">Integer</span> c = candidates[x][y].remove(<span class="c2html-number">0</span>);
+<a class="c2html-lineno" name="l41" href="#l41"> 41 </a>        f.setCellValue(x, y, c);
+<a class="c2html-lineno" name="l42" href="#l42"> 42 </a>        f.setCellModified(x, y, true);
+<a class="c2html-lineno" name="l43" href="#l43"> 43 </a>        <span class="c2html-keyword">for</span> (<span class="c2html-keyword">int</span> i = <span class="c2html-number">0</span> ; i &lt; <span class="c2html-number">9</span> ; i++) {
+<a class="c2html-lineno" name="l44" href="#l44"> 44 </a>            candidates[x][i].remove(c);
+<a class="c2html-lineno" name="l45" href="#l45"> 45 </a>            candidates[i][y].remove(c);
+<a class="c2html-lineno" name="l46" href="#l46"> 46 </a>        }
+<a class="c2html-lineno" name="l47" href="#l47"> 47 </a>        <span class="c2html-keyword">for</span> (<span class="c2html-keyword">int</span> i = <span class="c2html-number">0</span> ; i &lt; <span class="c2html-number">3</span> ; i++) {
+<a class="c2html-lineno" name="l48" href="#l48"> 48 </a>            <span class="c2html-keyword">for</span> (<span class="c2html-keyword">int</span> j = <span class="c2html-number">0</span> ; j &lt; <span class="c2html-number">3</span> ; j++) {
+<a class="c2html-lineno" name="l49" href="#l49"> 49 </a>                candidates[x-x%<span class="c2html-number">3</span>+i][y-y%<span class="c2html-number">3</span>+j].remove(c);
+<a class="c2html-lineno" name="l50" href="#l50"> 50 </a>            }
+<a class="c2html-lineno" name="l51" href="#l51"> 51 </a>        }
+<a class="c2html-lineno" name="l52" href="#l52"> 52 </a>        <span class="c2html-keyword">return</span> c;
+<a class="c2html-lineno" name="l53" href="#l53"> 53 </a>    }
+<a class="c2html-lineno" name="l54" href="#l54"> 54 </a>    
+<a class="c2html-lineno" name="l55" href="#l55"> 55 </a>    <span class="c2html-keyword">private</span> <span class="c2html-keyword">void</span> makeBackup(<span class="c2html-type">List</span>&lt;<span class="c2html-type">Integer</span>&gt;[][] candidates, <span class="c2html-type">List</span>&lt;<span class="c2html-type">Integer</span>&gt;[][] candidatesBackup) {
+<a class="c2html-lineno" name="l56" href="#l56"> 56 </a>        <span class="c2html-keyword">for</span> (<span class="c2html-keyword">int</span> x = <span class="c2html-number">0</span> ; x &lt; <span class="c2html-number">9</span> ; x++) {
+<a class="c2html-lineno" name="l57" href="#l57"> 57 </a>            <span class="c2html-keyword">for</span> (<span class="c2html-keyword">int</span> y = <span class="c2html-number">0</span> ; y &lt; <span class="c2html-number">9</span> ; y++) {
+<a class="c2html-lineno" name="l58" href="#l58"> 58 </a>                candidatesBackup[x][y] = <span class="c2html-keyword">new</span> <span class="c2html-type">ArrayList</span>&lt;&gt;(<span class="c2html-number">9</span>);
+<a class="c2html-lineno" name="l59" href="#l59"> 59 </a>                candidatesBackup[x][y].addAll(candidates[x][y]);
+<a class="c2html-lineno" name="l60" href="#l60"> 60 </a>            }
+<a class="c2html-lineno" name="l61" href="#l61"> 61 </a>        }
+<a class="c2html-lineno" name="l62" href="#l62"> 62 </a>    }
+<a class="c2html-lineno" name="l63" href="#l63"> 63 </a>    
+<a class="c2html-lineno" name="l64" href="#l64"> 64 </a>    <span class="c2html-keyword">private</span> <span class="c2html-keyword">void</span> makeBackup(<span class="c2html-type">Field</span> f, <span class="c2html-keyword">int</span>[][] fieldBackup) {
+<a class="c2html-lineno" name="l65" href="#l65"> 65 </a>        <span class="c2html-keyword">for</span> (<span class="c2html-keyword">int</span> x = <span class="c2html-number">0</span> ; x &lt; <span class="c2html-number">9</span> ; x++) {
+<a class="c2html-lineno" name="l66" href="#l66"> 66 </a>            <span class="c2html-keyword">for</span> (<span class="c2html-keyword">int</span> y = <span class="c2html-number">0</span> ; y &lt; <span class="c2html-number">9</span> ; y++) {
+<a class="c2html-lineno" name="l67" href="#l67"> 67 </a>                fieldBackup[x][y] = f.getCellValue(x, y);
+<a class="c2html-lineno" name="l68" href="#l68"> 68 </a>            }
+<a class="c2html-lineno" name="l69" href="#l69"> 69 </a>        }
+<a class="c2html-lineno" name="l70" href="#l70"> 70 </a>    }
 <a class="c2html-lineno" name="l71" href="#l71"> 71 </a>    
-<a class="c2html-lineno" name="l72" href="#l72"> 72 </a>    <span class="c2html-keyword">private</span> <span class="c2html-keyword">final</span> <span class="c2html-type">GraphDocumentMetadata</span> metadata;
-<a class="c2html-lineno" name="l73" href="#l73"> 73 </a>    
-<a class="c2html-lineno" name="l74" href="#l74"> 74 </a>    <span class="c2html-keyword">public</span> <span class="c2html-type">AbstractGraphDocument</span>(<span class="c2html-type">Class</span>&lt;<span class="c2html-type">T</span>&gt; graphType) {
-<a class="c2html-lineno" name="l75" href="#l75"> 75 </a>        <span class="c2html-type">T</span> g;
-<a class="c2html-lineno" name="l76" href="#l76"> 76 </a>        <span class="c2html-keyword">try</span> {
-<a class="c2html-lineno" name="l77" href="#l77"> 77 </a>            g = graphType.newInstance();
-<a class="c2html-lineno" name="l78" href="#l78"> 78 </a>        } <span class="c2html-keyword">catch</span> (<span class="c2html-type">ReflectiveOperationException</span> e) {
-<a class="c2html-lineno" name="l79" href="#l79"> 79 </a>            <span class="c2html-keyword">assert</span> false;
-<a class="c2html-lineno" name="l80" href="#l80"> 80 </a>            g = null; <span class="c2html-comment">// for the compiler</span>
-<a class="c2html-lineno" name="l81" href="#l81"> 81 </a>        }
-<a class="c2html-lineno" name="l82" href="#l82"> 82 </a>        graph = g;
-<a class="c2html-lineno" name="l83" href="#l83"> 83 </a>        metadata = <span class="c2html-keyword">new</span> <span class="c2html-type">GraphDocumentMetadata</span>();
-<a class="c2html-lineno" name="l84" href="#l84"> 84 </a>    }
-<a class="c2html-lineno" name="l85" href="#l85"> 85 </a>
-<a class="c2html-lineno" name="l86" href="#l86"> 86 </a>    <span class="c2html-keyword">public</span> <span class="c2html-type">T</span> getGraph() {
-<a class="c2html-lineno" name="l87" href="#l87"> 87 </a>        <span class="c2html-keyword">return</span> graph;
-<a class="c2html-lineno" name="l88" href="#l88"> 88 </a>    }
-<a class="c2html-lineno" name="l89" href="#l89"> 89 </a>    
-<a class="c2html-lineno" name="l90" href="#l90"> 90 </a>    <span class="c2html-keyword">public</span> <span class="c2html-type">GraphDocumentMetadata</span> getMetadata() {
-<a class="c2html-lineno" name="l91" href="#l91"> 91 </a>        <span class="c2html-keyword">return</span> metadata;
-<a class="c2html-lineno" name="l92" href="#l92"> 92 </a>    }
-<a class="c2html-lineno" name="l93" href="#l93"> 93 </a>
-<a class="c2html-lineno" name="l94" href="#l94"> 94 </a>    <span class="c2html-keyword">protected</span> <span class="c2html-keyword">abstract</span> <span class="c2html-keyword">void</span> writeGraph(<span class="c2html-type">Element</span> rootNode) <span class="c2html-keyword">throws</span> <span class="c2html-type">IOException</span>;
-<a class="c2html-lineno" name="l95" href="#l95"> 95 </a>    <span class="c2html-keyword">protected</span> <span class="c2html-keyword">abstract</span> <span class="c2html-keyword">void</span> readGraph(<span class="c2html-type">Element</span> rootNode) <span class="c2html-keyword">throws</span> <span class="c2html-type">IOException</span>;
-<a class="c2html-lineno" name="l96" href="#l96"> 96 </a>
-<a class="c2html-lineno" name="l97" href="#l97"> 97 </a>    <span class="c2html-directive">@Override</span>
-<a class="c2html-lineno" name="l98" href="#l98"> 98 </a>    <span class="c2html-keyword">public</span> <span class="c2html-keyword">void</span> writeTo(<span class="c2html-type">OutputStream</span> out) <span class="c2html-keyword">throws</span> <span class="c2html-type">IOException</span> {
-<a class="c2html-lineno" name="l99" href="#l99"> 99 </a>        <span class="c2html-type">Document</span> doc = <span class="c2html-type">DocumentHelper</span>.createDocument();
-<a class="c2html-lineno" name="l100" href="#l100">100 </a>
-<a class="c2html-lineno" name="l101" href="#l101">101 </a>        <span class="c2html-type">Element</span> rootNode = doc.addElement(<span class="c2html-type">TAG_GRAPHDOC</span>);
-<a class="c2html-lineno" name="l102" href="#l102">102 </a>
-<a class="c2html-lineno" name="l103" href="#l103">103 </a>        <span class="c2html-type">Element</span> metadataNode = rootNode.addElement(<span class="c2html-type">TAG_METADATA</span>);
-<a class="c2html-lineno" name="l104" href="#l104">104 </a>
-<a class="c2html-lineno" name="l105" href="#l105">105 </a>        metadata.write(metadataNode);
-<a class="c2html-lineno" name="l106" href="#l106">106 </a>
-<a class="c2html-lineno" name="l107" href="#l107">107 </a>        <span class="c2html-keyword">if</span> (graph <span class="c2html-keyword">instanceof</span> <span class="c2html-type">Graph</span>) {
-<a class="c2html-lineno" name="l108" href="#l108">108 </a>            writeGraph(rootNode.addElement(<span class="c2html-type">TAG_GRAPH</span>));
-<a class="c2html-lineno" name="l109" href="#l109">109 </a>        } <span class="c2html-keyword">else</span> <span class="c2html-keyword">if</span> (graph <span class="c2html-keyword">instanceof</span> <span class="c2html-type">Digraph</span>) {
-<a class="c2html-lineno" name="l110" href="#l110">110 </a>            writeGraph(rootNode.addElement(<span class="c2html-type">TAG_DIGRAPH</span>));
-<a class="c2html-lineno" name="l111" href="#l111">111 </a>        } <span class="c2html-keyword">else</span> {
-<a class="c2html-lineno" name="l112" href="#l112">112 </a>            <span class="c2html-keyword">throw</span> <span class="c2html-keyword">new</span> <span class="c2html-type">IOException</span>(<span class="c2html-string">"unsupported graph type"</span>);
-<a class="c2html-lineno" name="l113" href="#l113">113 </a>        }
-<a class="c2html-lineno" name="l114" href="#l114">114 </a>
-<a class="c2html-lineno" name="l115" href="#l115">115 </a>        <span class="c2html-type">XMLWriter</span> writer = <span class="c2html-keyword">new</span> <span class="c2html-type">XMLWriter</span>(out, <span class="c2html-type">OutputFormat</span>.createPrettyPrint());
-<a class="c2html-lineno" name="l116" href="#l116">116 </a>        writer.write(doc);
-<a class="c2html-lineno" name="l117" href="#l117">117 </a>        writer.flush();
-<a class="c2html-lineno" name="l118" href="#l118">118 </a>    }
-<a class="c2html-lineno" name="l119" href="#l119">119 </a>
-<a class="c2html-lineno" name="l120" href="#l120">120 </a>    <span class="c2html-directive">@Override</span>
-<a class="c2html-lineno" name="l121" href="#l121">121 </a>    <span class="c2html-keyword">public</span> <span class="c2html-keyword">void</span> readFrom(<span class="c2html-type">InputStream</span> in) <span class="c2html-keyword">throws</span> <span class="c2html-type">IOException</span> {
-<a class="c2html-lineno" name="l122" href="#l122">122 </a>        <span class="c2html-keyword">try</span> {
-<a class="c2html-lineno" name="l123" href="#l123">123 </a>            <span class="c2html-type">SAXReader</span> reader = <span class="c2html-keyword">new</span> <span class="c2html-type">SAXReader</span>(true);
-<a class="c2html-lineno" name="l124" href="#l124">124 </a>            reader.setStripWhitespaceText(true);
-<a class="c2html-lineno" name="l125" href="#l125">125 </a>            
-<a class="c2html-lineno" name="l126" href="#l126">126 </a>            reader.setFeature(<span class="c2html-type">Constants</span>.<span class="c2html-type">XERCES_FEATURE_PREFIX</span>+
-<a class="c2html-lineno" name="l127" href="#l127">127 </a>                <span class="c2html-type">Constants</span>.<span class="c2html-type">SCHEMA_VALIDATION_FEATURE</span>, true);
-<a class="c2html-lineno" name="l128" href="#l128">128 </a>            reader.setProperty(<span class="c2html-type">Constants</span>.<span class="c2html-type">XERCES_PROPERTY_PREFIX</span> +
-<a class="c2html-lineno" name="l129" href="#l129">129 </a>                <span class="c2html-type">Constants</span>.<span class="c2html-type">SCHEMA_LOCATION</span>, <span class="c2html-type">String</span>.format(<span class="c2html-string">"%s %s"</span>,
-<a class="c2html-lineno" name="l130" href="#l130">130 </a>                    <span class="c2html-type">NAMESPACE</span>.getURI(), <span class="c2html-type">Resources</span>.<span class="c2html-keyword">class</span>.getResource(
-<a class="c2html-lineno" name="l131" href="#l131">131 </a>                        <span class="c2html-string">"graph-document.xsd"</span>).toExternalForm()));
-<a class="c2html-lineno" name="l132" href="#l132">132 </a>            
-<a class="c2html-lineno" name="l133" href="#l133">133 </a>            <span class="c2html-keyword">final</span> <span class="c2html-type">AtomicBoolean</span> passed = <span class="c2html-keyword">new</span> <span class="c2html-type">AtomicBoolean</span>(true);
-<a class="c2html-lineno" name="l134" href="#l134">134 </a>            <span class="c2html-keyword">final</span> <span class="c2html-type">AtomicReference</span>&lt;<span class="c2html-type">SAXParseException</span>&gt; xmlerror = <span class="c2html-keyword">new</span> <span class="c2html-type">AtomicReference</span>&lt;&gt;();
-<a class="c2html-lineno" name="l135" href="#l135">135 </a>            <span class="c2html-comment">// TODO: we should do more detailed error handling here</span>
-<a class="c2html-lineno" name="l136" href="#l136">136 </a>            reader.setErrorHandler(<span class="c2html-keyword">new</span> <span class="c2html-type">ErrorHandler</span>() {
-<a class="c2html-lineno" name="l137" href="#l137">137 </a>                <span class="c2html-directive">@Override</span>
-<a class="c2html-lineno" name="l138" href="#l138">138 </a>                <span class="c2html-keyword">public</span> <span class="c2html-keyword">void</span> warning(<span class="c2html-type">SAXParseException</span> exception) <span class="c2html-keyword">throws</span> <span class="c2html-type">SAXException</span> {
-<a class="c2html-lineno" name="l139" href="#l139">139 </a>                }
-<a class="c2html-lineno" name="l140" href="#l140">140 </a>
-<a class="c2html-lineno" name="l141" href="#l141">141 </a>                <span class="c2html-directive">@Override</span>
-<a class="c2html-lineno" name="l142" href="#l142">142 </a>                <span class="c2html-keyword">public</span> <span class="c2html-keyword">void</span> error(<span class="c2html-type">SAXParseException</span> exception) <span class="c2html-keyword">throws</span> <span class="c2html-type">SAXException</span> {
-<a class="c2html-lineno" name="l143" href="#l143">143 </a>                    xmlerror.set(exception);
-<a class="c2html-lineno" name="l144" href="#l144">144 </a>                    passed.set(false);
-<a class="c2html-lineno" name="l145" href="#l145">145 </a>                }
-<a class="c2html-lineno" name="l146" href="#l146">146 </a>
-<a class="c2html-lineno" name="l147" href="#l147">147 </a>                <span class="c2html-directive">@Override</span>
-<a class="c2html-lineno" name="l148" href="#l148">148 </a>                <span class="c2html-keyword">public</span> <span class="c2html-keyword">void</span> fatalError(<span class="c2html-type">SAXParseException</span> exception) <span class="c2html-keyword">throws</span> <span class="c2html-type">SAXException</span> {
-<a class="c2html-lineno" name="l149" href="#l149">149 </a>                    xmlerror.set(exception);
-<a class="c2html-lineno" name="l150" href="#l150">150 </a>                    passed.set(false);
-<a class="c2html-lineno" name="l151" href="#l151">151 </a>                }
-<a class="c2html-lineno" name="l152" href="#l152">152 </a>                
-<a class="c2html-lineno" name="l153" href="#l153">153 </a>            });
-<a class="c2html-lineno" name="l154" href="#l154">154 </a>            <span class="c2html-type">Document</span> doc = reader.read(in);
-<a class="c2html-lineno" name="l155" href="#l155">155 </a>            <span class="c2html-keyword">if</span> (!passed.get()) {
-<a class="c2html-lineno" name="l156" href="#l156">156 </a>                <span class="c2html-comment">// TODO: provide details (maybe via separate error object?)</span>
-<a class="c2html-lineno" name="l157" href="#l157">157 </a>                <span class="c2html-keyword">throw</span> xmlerror.get();
-<a class="c2html-lineno" name="l158" href="#l158">158 </a>            }
-<a class="c2html-lineno" name="l159" href="#l159">159 </a>            
-<a class="c2html-lineno" name="l160" href="#l160">160 </a>            doc.normalize();
-<a class="c2html-lineno" name="l161" href="#l161">161 </a>            
-<a class="c2html-lineno" name="l162" href="#l162">162 </a>            <span class="c2html-type">Element</span> root = doc.getRootElement();
-<a class="c2html-lineno" name="l163" href="#l163">163 </a>            metadata.read(root.element(<span class="c2html-type">TAG_METADATA</span>));
-<a class="c2html-lineno" name="l164" href="#l164">164 </a>            
-<a class="c2html-lineno" name="l165" href="#l165">165 </a>            <span class="c2html-keyword">if</span> (graph <span class="c2html-keyword">instanceof</span> <span class="c2html-type">Graph</span>) {
-<a class="c2html-lineno" name="l166" href="#l166">166 </a>                readGraph(root.element(<span class="c2html-type">TAG_GRAPH</span>));
-<a class="c2html-lineno" name="l167" href="#l167">167 </a>            } <span class="c2html-keyword">else</span> <span class="c2html-keyword">if</span> (graph <span class="c2html-keyword">instanceof</span> <span class="c2html-type">Digraph</span>) {
-<a class="c2html-lineno" name="l168" href="#l168">168 </a>                readGraph(root.element(<span class="c2html-type">TAG_DIGRAPH</span>));
-<a class="c2html-lineno" name="l169" href="#l169">169 </a>            } <span class="c2html-keyword">else</span> {
-<a class="c2html-lineno" name="l170" href="#l170">170 </a>                <span class="c2html-keyword">throw</span> <span class="c2html-keyword">new</span> <span class="c2html-type">IOException</span>(<span class="c2html-string">"unsupported graph type"</span>);
-<a class="c2html-lineno" name="l171" href="#l171">171 </a>            }
-<a class="c2html-lineno" name="l172" href="#l172">172 </a>        } <span class="c2html-keyword">catch</span> (<span class="c2html-type">DocumentException</span> | <span class="c2html-type">SAXException</span> ex) {
-<a class="c2html-lineno" name="l173" href="#l173">173 </a>            <span class="c2html-keyword">throw</span> <span class="c2html-keyword">new</span> <span class="c2html-type">IOException</span>(ex);
-<a class="c2html-lineno" name="l174" href="#l174">174 </a>        }
-<a class="c2html-lineno" name="l175" href="#l175">175 </a>    }
-<a class="c2html-lineno" name="l176" href="#l176">176 </a>}
+<a class="c2html-lineno" name="l72" href="#l72"> 72 </a>    <span class="c2html-keyword">private</span> <span class="c2html-keyword">void</span> restoreBackup(<span class="c2html-type">Field</span> f, <span class="c2html-keyword">int</span>[][] fieldBackup) {
+<a class="c2html-lineno" name="l73" href="#l73"> 73 </a>        <span class="c2html-keyword">for</span> (<span class="c2html-keyword">int</span> x = <span class="c2html-number">0</span> ; x &lt; <span class="c2html-number">9</span> ; x++) {
+<a class="c2html-lineno" name="l74" href="#l74"> 74 </a>            <span class="c2html-keyword">for</span> (<span class="c2html-keyword">int</span> y = <span class="c2html-number">0</span> ; y &lt; <span class="c2html-number">9</span> ; y++) {
+<a class="c2html-lineno" name="l75" href="#l75"> 75 </a>                f.setCellValue(x, y, fieldBackup[x][y]);
+<a class="c2html-lineno" name="l76" href="#l76"> 76 </a>            }
+<a class="c2html-lineno" name="l77" href="#l77"> 77 </a>        }
+<a class="c2html-lineno" name="l78" href="#l78"> 78 </a>    }
+<a class="c2html-lineno" name="l79" href="#l79"> 79 </a>    
+<a class="c2html-lineno" name="l80" href="#l80"> 80 </a>    <span class="c2html-keyword">private</span> <span class="c2html-keyword">void</span> restoreBackup(<span class="c2html-type">List</span>&lt;<span class="c2html-type">Integer</span>&gt;[][] candidates, <span class="c2html-type">List</span>&lt;<span class="c2html-type">Integer</span>&gt;[][] candidatesBackup) {
+<a class="c2html-lineno" name="l81" href="#l81"> 81 </a>        <span class="c2html-keyword">for</span> (<span class="c2html-keyword">int</span> x = <span class="c2html-number">0</span> ; x &lt; <span class="c2html-number">9</span> ; x++) {
+<a class="c2html-lineno" name="l82" href="#l82"> 82 </a>            <span class="c2html-keyword">for</span> (<span class="c2html-keyword">int</span> y = <span class="c2html-number">0</span> ; y &lt; <span class="c2html-number">9</span> ; y++) {
+<a class="c2html-lineno" name="l83" href="#l83"> 83 </a>                candidates[x][y].clear();
+<a class="c2html-lineno" name="l84" href="#l84"> 84 </a>                candidates[x][y].addAll(candidatesBackup[x][y]);
+<a class="c2html-lineno" name="l85" href="#l85"> 85 </a>            }
+<a class="c2html-lineno" name="l86" href="#l86"> 86 </a>        }
+<a class="c2html-lineno" name="l87" href="#l87"> 87 </a>    }
+<a class="c2html-lineno" name="l88" href="#l88"> 88 </a>    
+<a class="c2html-lineno" name="l89" href="#l89"> 89 </a>    <span class="c2html-keyword">private</span> <span class="c2html-keyword">boolean</span> solve(<span class="c2html-type">Field</span> f, <span class="c2html-type">List</span>&lt;<span class="c2html-type">Integer</span>&gt;[][] candidates) {
+<a class="c2html-lineno" name="l90" href="#l90"> 90 </a>        
+<a class="c2html-lineno" name="l91" href="#l91"> 91 </a>        <span class="c2html-comment">// Make backup</span>
+<a class="c2html-lineno" name="l92" href="#l92"> 92 </a>        <span class="c2html-type">List</span>&lt;<span class="c2html-type">Integer</span>&gt;[][] candidatesBackup = <span class="c2html-keyword">new</span> <span class="c2html-type">List</span>[<span class="c2html-number">9</span>][<span class="c2html-number">9</span>];
+<a class="c2html-lineno" name="l93" href="#l93"> 93 </a>        <span class="c2html-keyword">int</span>[][] fieldBackup = <span class="c2html-keyword">new</span> <span class="c2html-keyword">int</span>[<span class="c2html-number">9</span>][<span class="c2html-number">9</span>];
+<a class="c2html-lineno" name="l94" href="#l94"> 94 </a>        makeBackup(candidates, candidatesBackup);
+<a class="c2html-lineno" name="l95" href="#l95"> 95 </a>        makeBackup(f, fieldBackup);
+<a class="c2html-lineno" name="l96" href="#l96"> 96 </a>        
+<a class="c2html-lineno" name="l97" href="#l97"> 97 </a>        <span class="c2html-comment">// Fill in distinct solutions</span>
+<a class="c2html-lineno" name="l98" href="#l98"> 98 </a>        <span class="c2html-keyword">boolean</span> fillDistinct;
+<a class="c2html-lineno" name="l99" href="#l99"> 99 </a>        <span class="c2html-keyword">do</span> {
+<a class="c2html-lineno" name="l100" href="#l100">100 </a>            fillDistinct = false;
+<a class="c2html-lineno" name="l101" href="#l101">101 </a>            <span class="c2html-keyword">for</span> (<span class="c2html-keyword">int</span> x = <span class="c2html-number">0</span> ; x &lt; <span class="c2html-number">9</span> ; x++) {
+<a class="c2html-lineno" name="l102" href="#l102">102 </a>                <span class="c2html-keyword">for</span> (<span class="c2html-keyword">int</span> y = <span class="c2html-number">0</span> ; y &lt; <span class="c2html-number">9</span> ; y++) {
+<a class="c2html-lineno" name="l103" href="#l103">103 </a>                    <span class="c2html-keyword">if</span> (f.isCellEmpty(x, y) &amp;&amp; candidates[x][y].size() == <span class="c2html-number">1</span>) {
+<a class="c2html-lineno" name="l104" href="#l104">104 </a>                        fillInCandidate(f, candidates, x, y);
+<a class="c2html-lineno" name="l105" href="#l105">105 </a>                        fillDistinct = true;
+<a class="c2html-lineno" name="l106" href="#l106">106 </a>                    }
+<a class="c2html-lineno" name="l107" href="#l107">107 </a>                }
+<a class="c2html-lineno" name="l108" href="#l108">108 </a>            }
+<a class="c2html-lineno" name="l109" href="#l109">109 </a>        } <span class="c2html-keyword">while</span> (fillDistinct);
+<a class="c2html-lineno" name="l110" href="#l110">110 </a>        
+<a class="c2html-lineno" name="l111" href="#l111">111 </a>        <span class="c2html-comment">// Try out remaining candidates</span>
+<a class="c2html-lineno" name="l112" href="#l112">112 </a>        <span class="c2html-keyword">for</span> (<span class="c2html-keyword">int</span> x = <span class="c2html-number">0</span> ; x &lt; <span class="c2html-number">9</span> ; x++) {
+<a class="c2html-lineno" name="l113" href="#l113">113 </a>            <span class="c2html-keyword">for</span> (<span class="c2html-keyword">int</span> y = <span class="c2html-number">0</span> ; y &lt; <span class="c2html-number">9</span> ; y++) {
+<a class="c2html-lineno" name="l114" href="#l114">114 </a>                <span class="c2html-keyword">if</span> (f.isCellEmpty(x, y)) {
+<a class="c2html-lineno" name="l115" href="#l115">115 </a>                    <span class="c2html-keyword">while</span> (candidates[x][y].size() &gt; <span class="c2html-number">0</span>) {
+<a class="c2html-lineno" name="l116" href="#l116">116 </a>                        <span class="c2html-type">List</span>&lt;<span class="c2html-type">Integer</span>&gt;[][] cb = <span class="c2html-keyword">new</span> <span class="c2html-type">List</span>[<span class="c2html-number">9</span>][<span class="c2html-number">9</span>];
+<a class="c2html-lineno" name="l117" href="#l117">117 </a>                        makeBackup(candidates, cb);
+<a class="c2html-lineno" name="l118" href="#l118">118 </a>                        <span class="c2html-type">Integer</span> c = fillInCandidate(f, candidates, x, y);
+<a class="c2html-lineno" name="l119" href="#l119">119 </a>                        <span class="c2html-keyword">if</span> (solve(f, candidates)) {
+<a class="c2html-lineno" name="l120" href="#l120">120 </a>                            <span class="c2html-keyword">break</span>;
+<a class="c2html-lineno" name="l121" href="#l121">121 </a>                        } <span class="c2html-keyword">else</span> {
+<a class="c2html-lineno" name="l122" href="#l122">122 </a>                            f.clearCellValue(x, y);
+<a class="c2html-lineno" name="l123" href="#l123">123 </a>                            restoreBackup(candidates, cb);
+<a class="c2html-lineno" name="l124" href="#l124">124 </a>                            <span class="c2html-comment">// Remove current candidate anyway</span>
+<a class="c2html-lineno" name="l125" href="#l125">125 </a>                            candidates[x][y].remove(c);
+<a class="c2html-lineno" name="l126" href="#l126">126 </a>                        }
+<a class="c2html-lineno" name="l127" href="#l127">127 </a>                    }
+<a class="c2html-lineno" name="l128" href="#l128">128 </a>                }
+<a class="c2html-lineno" name="l129" href="#l129">129 </a>                <span class="c2html-keyword">if</span> (f.isCellEmpty(x, y)) {
+<a class="c2html-lineno" name="l130" href="#l130">130 </a>                    restoreBackup(f, fieldBackup);
+<a class="c2html-lineno" name="l131" href="#l131">131 </a>                    restoreBackup(candidates, candidatesBackup);
+<a class="c2html-lineno" name="l132" href="#l132">132 </a>                    <span class="c2html-keyword">return</span> false;
+<a class="c2html-lineno" name="l133" href="#l133">133 </a>                }
+<a class="c2html-lineno" name="l134" href="#l134">134 </a>            }
+<a class="c2html-lineno" name="l135" href="#l135">135 </a>        }
+<a class="c2html-lineno" name="l136" href="#l136">136 </a>        
+<a class="c2html-lineno" name="l137" href="#l137">137 </a>        <span class="c2html-keyword">return</span> true;
+<a class="c2html-lineno" name="l138" href="#l138">138 </a>    }
+<a class="c2html-lineno" name="l139" href="#l139">139 </a>
+<a class="c2html-lineno" name="l140" href="#l140">140 </a>    <span class="c2html-comment">/**</span>
+<a class="c2html-lineno" name="l141" href="#l141">141 </a><span class="c2html-comment">     * Attempts to solve the given Sudoku field.</span>
+<a class="c2html-lineno" name="l142" href="#l142">142 </a><span class="c2html-comment">     *</span>
+<a class="c2html-lineno" name="l143" href="#l143">143 </a><span class="c2html-comment">     * The solution, if any, is directly entered into the field.</span>
+<a class="c2html-lineno" name="l144" href="#l144">144 </a><span class="c2html-comment">     * All solved fields will be in modified state.</span>
+<a class="c2html-lineno" name="l145" href="#l145">145 </a><span class="c2html-comment">     * The already given fields are left untouched.</span>
+<a class="c2html-lineno" name="l146" href="#l146">146 </a><span class="c2html-comment">     *</span>
+<a class="c2html-lineno" name="l147" href="#l147">147 </a><span class="c2html-comment">     * @param f the field to solve</span>
+<a class="c2html-lineno" name="l148" href="#l148">148 </a><span class="c2html-comment">     * @return true if a solution could be found, false if the field is unsolvable</span>
+<a class="c2html-lineno" name="l149" href="#l149">149 </a><span class="c2html-comment">     */</span>
+<a class="c2html-lineno" name="l150" href="#l150">150 </a>    <span class="c2html-keyword">public</span> <span class="c2html-keyword">boolean</span> solve(<span class="c2html-type">Field</span> f) {
+<a class="c2html-lineno" name="l151" href="#l151">151 </a>        
+<a class="c2html-lineno" name="l152" href="#l152">152 </a>        <span class="c2html-comment">// Calculate initial candidates</span>
+<a class="c2html-lineno" name="l153" href="#l153">153 </a>        <span class="c2html-type">List</span>&lt;<span class="c2html-type">Integer</span>&gt;[][] candidates = <span class="c2html-keyword">new</span> <span class="c2html-type">List</span>[<span class="c2html-number">9</span>][<span class="c2html-number">9</span>];
+<a class="c2html-lineno" name="l154" href="#l154">154 </a>        <span class="c2html-keyword">for</span> (<span class="c2html-keyword">int</span> x = <span class="c2html-number">0</span> ; x &lt; <span class="c2html-number">9</span> ; x++) {
+<a class="c2html-lineno" name="l155" href="#l155">155 </a>            <span class="c2html-keyword">for</span> (<span class="c2html-keyword">int</span> y = <span class="c2html-number">0</span> ; y &lt; <span class="c2html-number">9</span> ; y++) {
+<a class="c2html-lineno" name="l156" href="#l156">156 </a>                candidates[x][y] = <span class="c2html-keyword">new</span> <span class="c2html-type">ArrayList</span>&lt;&gt;(<span class="c2html-number">9</span>);
+<a class="c2html-lineno" name="l157" href="#l157">157 </a>                <span class="c2html-keyword">if</span> (f.getCellValue(x, y) == <span class="c2html-number">0</span>) {
+<a class="c2html-lineno" name="l158" href="#l158">158 </a>                    <span class="c2html-comment">// All numbers are candidates</span>
+<a class="c2html-lineno" name="l159" href="#l159">159 </a>                    <span class="c2html-keyword">for</span> (<span class="c2html-keyword">int</span> c = <span class="c2html-number">1</span> ; c &lt;= <span class="c2html-number">9</span> ; c++) {
+<a class="c2html-lineno" name="l160" href="#l160">160 </a>                        candidates[x][y].add(c);
+<a class="c2html-lineno" name="l161" href="#l161">161 </a>                    }
+<a class="c2html-lineno" name="l162" href="#l162">162 </a>                    <span class="c2html-comment">// Remove row duplicates</span>
+<a class="c2html-lineno" name="l163" href="#l163">163 </a>                    <span class="c2html-keyword">int</span>[] line = f.getRow(y);
+<a class="c2html-lineno" name="l164" href="#l164">164 </a>                    <span class="c2html-keyword">for</span> (<span class="c2html-type">Integer</span> c : line) {
+<a class="c2html-lineno" name="l165" href="#l165">165 </a>                        candidates[x][y].remove(c);
+<a class="c2html-lineno" name="l166" href="#l166">166 </a>                    }
+<a class="c2html-lineno" name="l167" href="#l167">167 </a>                    <span class="c2html-comment">// Remove column duplicates</span>
+<a class="c2html-lineno" name="l168" href="#l168">168 </a>                    line = f.getColumn(x);
+<a class="c2html-lineno" name="l169" href="#l169">169 </a>                    <span class="c2html-keyword">for</span> (<span class="c2html-type">Integer</span> c : line) {
+<a class="c2html-lineno" name="l170" href="#l170">170 </a>                        candidates[x][y].remove(c);
+<a class="c2html-lineno" name="l171" href="#l171">171 </a>                    }
+<a class="c2html-lineno" name="l172" href="#l172">172 </a>                    <span class="c2html-comment">// Remove square duplicates</span>
+<a class="c2html-lineno" name="l173" href="#l173">173 </a>                    <span class="c2html-keyword">int</span>[][] square = f.getSquare(x/<span class="c2html-number">3</span>, y/<span class="c2html-number">3</span>);
+<a class="c2html-lineno" name="l174" href="#l174">174 </a>                    <span class="c2html-keyword">for</span> (<span class="c2html-keyword">int</span>[] sq : square) {
+<a class="c2html-lineno" name="l175" href="#l175">175 </a>                        <span class="c2html-keyword">for</span> (<span class="c2html-type">Integer</span> c : sq) {
+<a class="c2html-lineno" name="l176" href="#l176">176 </a>                            candidates[x][y].remove(c);
+<a class="c2html-lineno" name="l177" href="#l177">177 </a>                        }
+<a class="c2html-lineno" name="l178" href="#l178">178 </a>                    }
+<a class="c2html-lineno" name="l179" href="#l179">179 </a>                }
+<a class="c2html-lineno" name="l180" href="#l180">180 </a>            }
+<a class="c2html-lineno" name="l181" href="#l181">181 </a>        }
+<a class="c2html-lineno" name="l182" href="#l182">182 </a>        
+<a class="c2html-lineno" name="l183" href="#l183">183 </a>        <span class="c2html-comment">// Backtrack</span>
+<a class="c2html-lineno" name="l184" href="#l184">184 </a>        <span class="c2html-keyword">return</span> solve(f, candidates);
+<a class="c2html-lineno" name="l185" href="#l185">185 </a>    }
+<a class="c2html-lineno" name="l186" href="#l186">186 </a>
+<a class="c2html-lineno" name="l187" href="#l187">187 </a>    <span class="c2html-comment">/**</span>
+<a class="c2html-lineno" name="l188" href="#l188">188 </a><span class="c2html-comment">     * Performs a fast check whether any field violates the Sudoku rules.</span>
+<a class="c2html-lineno" name="l189" href="#l189">189 </a><span class="c2html-comment">     *</span>
+<a class="c2html-lineno" name="l190" href="#l190">190 </a><span class="c2html-comment">     * @param f the field to check</span>
+<a class="c2html-lineno" name="l191" href="#l191">191 </a><span class="c2html-comment">     * @return true, if the check succeeds, false otherwise</span>
+<a class="c2html-lineno" name="l192" href="#l192">192 </a><span class="c2html-comment">     */</span>
+<a class="c2html-lineno" name="l193" href="#l193">193 </a>    <span class="c2html-keyword">public</span> <span class="c2html-keyword">boolean</span> check(<span class="c2html-type">Field</span> f) {
+<a class="c2html-lineno" name="l194" href="#l194">194 </a>        <span class="c2html-keyword">int</span>[] line;
+<a class="c2html-lineno" name="l195" href="#l195">195 </a>        <span class="c2html-keyword">for</span> (<span class="c2html-keyword">int</span> i = <span class="c2html-number">0</span> ; i &lt; <span class="c2html-number">9</span> ; i++) {
+<a class="c2html-lineno" name="l196" href="#l196">196 </a>            line = f.getRow(i);
+<a class="c2html-lineno" name="l197" href="#l197">197 </a>            <span class="c2html-keyword">if</span> (!valid(line)) {
+<a class="c2html-lineno" name="l198" href="#l198">198 </a>                <span class="c2html-keyword">return</span> false;
+<a class="c2html-lineno" name="l199" href="#l199">199 </a>            }
+<a class="c2html-lineno" name="l200" href="#l200">200 </a>            line = f.getColumn(i);
+<a class="c2html-lineno" name="l201" href="#l201">201 </a>            <span class="c2html-keyword">if</span> (!valid(line)) {
+<a class="c2html-lineno" name="l202" href="#l202">202 </a>                <span class="c2html-keyword">return</span> false;
+<a class="c2html-lineno" name="l203" href="#l203">203 </a>            }
+<a class="c2html-lineno" name="l204" href="#l204">204 </a>        }
+<a class="c2html-lineno" name="l205" href="#l205">205 </a>        
+<a class="c2html-lineno" name="l206" href="#l206">206 </a>        <span class="c2html-keyword">int</span>[][] square;
+<a class="c2html-lineno" name="l207" href="#l207">207 </a>        <span class="c2html-keyword">for</span> (<span class="c2html-keyword">int</span> x = <span class="c2html-number">0</span> ; x &lt; <span class="c2html-number">3</span> ; x++) {
+<a class="c2html-lineno" name="l208" href="#l208">208 </a>            <span class="c2html-keyword">for</span> (<span class="c2html-keyword">int</span> y = <span class="c2html-number">0</span> ; y &lt; <span class="c2html-number">3</span> ; y++) {
+<a class="c2html-lineno" name="l209" href="#l209">209 </a>                square = f.getSquare(x, y);
+<a class="c2html-lineno" name="l210" href="#l210">210 </a>                <span class="c2html-keyword">if</span> (!valid(square)) {
+<a class="c2html-lineno" name="l211" href="#l211">211 </a>                    <span class="c2html-keyword">return</span> false;
+<a class="c2html-lineno" name="l212" href="#l212">212 </a>                }
+<a class="c2html-lineno" name="l213" href="#l213">213 </a>            }
+<a class="c2html-lineno" name="l214" href="#l214">214 </a>        }
+<a class="c2html-lineno" name="l215" href="#l215">215 </a>        
+<a class="c2html-lineno" name="l216" href="#l216">216 </a>        <span class="c2html-keyword">return</span> true;
+<a class="c2html-lineno" name="l217" href="#l217">217 </a>    }
+<a class="c2html-lineno" name="l218" href="#l218">218 </a>    
+<a class="c2html-lineno" name="l219" href="#l219">219 </a>    <span class="c2html-keyword">private</span> <span class="c2html-keyword">boolean</span> valid(<span class="c2html-keyword">int</span>[] line) {
+<a class="c2html-lineno" name="l220" href="#l220">220 </a>        <span class="c2html-keyword">int</span>[] numbers;
+<a class="c2html-lineno" name="l221" href="#l221">221 </a>        numbers = <span class="c2html-keyword">new</span> <span class="c2html-keyword">int</span>[<span class="c2html-number">9</span>];
+<a class="c2html-lineno" name="l222" href="#l222">222 </a>        <span class="c2html-keyword">for</span> (<span class="c2html-keyword">int</span> i = <span class="c2html-number">0</span> ; i &lt; <span class="c2html-number">9</span> ; i++) {
+<a class="c2html-lineno" name="l223" href="#l223">223 </a>            <span class="c2html-keyword">int</span> l = line[i]<span class="c2html-number">-1</span>;
+<a class="c2html-lineno" name="l224" href="#l224">224 </a>            <span class="c2html-keyword">if</span> (l &gt;= <span class="c2html-number">0</span>) {
+<a class="c2html-lineno" name="l225" href="#l225">225 </a>                <span class="c2html-keyword">if</span> ((++numbers[l]) &gt; <span class="c2html-number">1</span>) {
+<a class="c2html-lineno" name="l226" href="#l226">226 </a>                    <span class="c2html-keyword">return</span> false;
+<a class="c2html-lineno" name="l227" href="#l227">227 </a>                }
+<a class="c2html-lineno" name="l228" href="#l228">228 </a>            }
+<a class="c2html-lineno" name="l229" href="#l229">229 </a>        }
+<a class="c2html-lineno" name="l230" href="#l230">230 </a>        
+<a class="c2html-lineno" name="l231" href="#l231">231 </a>        <span class="c2html-keyword">return</span> true;
+<a class="c2html-lineno" name="l232" href="#l232">232 </a>    }
+<a class="c2html-lineno" name="l233" href="#l233">233 </a>    
+<a class="c2html-lineno" name="l234" href="#l234">234 </a>    <span class="c2html-keyword">private</span> <span class="c2html-keyword">boolean</span> valid(<span class="c2html-keyword">int</span>[][] square) {
+<a class="c2html-lineno" name="l235" href="#l235">235 </a>        <span class="c2html-keyword">int</span>[] line = <span class="c2html-keyword">new</span> <span class="c2html-keyword">int</span>[<span class="c2html-number">9</span>];
+<a class="c2html-lineno" name="l236" href="#l236">236 </a>        <span class="c2html-keyword">for</span> (<span class="c2html-keyword">int</span> x = <span class="c2html-number">0</span> ; x &lt; <span class="c2html-number">3</span> ; x++) {
+<a class="c2html-lineno" name="l237" href="#l237">237 </a>            <span class="c2html-type">System</span>.arraycopy(square[x], <span class="c2html-number">0</span>, line, <span class="c2html-number">3</span>*x, <span class="c2html-number">3</span>);
+<a class="c2html-lineno" name="l238" href="#l238">238 </a>        }
+<a class="c2html-lineno" name="l239" href="#l239">239 </a>        <span class="c2html-keyword">return</span> valid(line);
+<a class="c2html-lineno" name="l240" href="#l240">240 </a>    }
+<a class="c2html-lineno" name="l241" href="#l241">241 </a>}
 </div>
   </body>
 </html>
--- a/test/gs/plain.html	Sun Mar 02 12:47:31 2025 +0100
+++ b/test/gs/plain.html	Sun Mar 02 16:06:24 2025 +0100
@@ -33,6 +33,9 @@
       span.c2html-string {
         color: darkorange;
       }
+      span.c2html-number {
+          color: dodgerblue;
+      }
       span.c2html-comment {
         color: grey;
       }
--- a/test/header.html	Sun Mar 02 12:47:31 2025 +0100
+++ b/test/header.html	Sun Mar 02 16:06:24 2025 +0100
@@ -33,6 +33,9 @@
       span.c2html-string {
         color: darkorange;
       }
+      span.c2html-number {
+          color: dodgerblue;
+      }
       span.c2html-comment {
         color: grey;
       }
--- a/test/javatest.java	Sun Mar 02 12:47:31 2025 +0100
+++ b/test/javatest.java	Sun Mar 02 16:06:24 2025 +0100
@@ -1,18 +1,16 @@
 /*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2014 Mike Becker. All rights reserved.
- *
+ * Copyright 2013 Mike Becker. All rights reserved.
+ * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- *
- *   1. Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *
- *   2. Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *
+ * 
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -24,153 +22,220 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
  */
 
-package de.uapcore.sigred.doc.base;
+package de.uapcore.sudoku;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Implements the backtracking algorithm for solving the Sudoku.
+ */
+public final class Solver {
+
+    public static final int VERSION = 0x1000;
 
-import de.uapcore.sigred.doc.Resources;
-import de.uapcore.sigrapi.impl.Digraph;
-import de.uapcore.sigrapi.impl.Graph;
-import de.uapcore.sigrapi.IGraph;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
-import org.apache.xerces.impl.Constants;
-import org.dom4j.Document;
-import org.dom4j.DocumentException;
-import org.dom4j.DocumentHelper;
-import org.dom4j.Element;
-import org.dom4j.Namespace;
-import org.dom4j.QName;
-import org.dom4j.io.OutputFormat;
-import org.dom4j.io.SAXReader;
-import org.dom4j.io.XMLWriter;
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-
-public abstract class AbstractGraphDocument<T extends IGraph>
-        extends FileBackedDocument {
+    private Integer fillInCandidate(Field f, List<Integer>[][] candidates, int x, int y) {
+        Integer c = candidates[x][y].remove(0);
+        f.setCellValue(x, y, c);
+        f.setCellModified(x, y, true);
+        for (int i = 0 ; i < 9 ; i++) {
+            candidates[x][i].remove(c);
+            candidates[i][y].remove(c);
+        }
+        for (int i = 0 ; i < 3 ; i++) {
+            for (int j = 0 ; j < 3 ; j++) {
+                candidates[x-x%3+i][y-y%3+j].remove(c);
+            }
+        }
+        return c;
+    }
     
-    protected static final Namespace NAMESPACE = Namespace.get("sigred",
-        "http://develop.uap-core.de/sigred/");
-    
-    private static final
-        QName TAG_GRAPHDOC = QName.get("graph-document", NAMESPACE);
-    private static final
-        QName TAG_GRAPH = QName.get("graph", NAMESPACE);
-    private static final
-        QName TAG_DIGRAPH = QName.get("digraph", NAMESPACE);
-    private static final
-        QName TAG_METADATA = QName.get("metadata", NAMESPACE);
-    
-    protected final T graph;
+    private void makeBackup(List<Integer>[][] candidates, List<Integer>[][] candidatesBackup) {
+        for (int x = 0 ; x < 9 ; x++) {
+            for (int y = 0 ; y < 9 ; y++) {
+                candidatesBackup[x][y] = new ArrayList<>(9);
+                candidatesBackup[x][y].addAll(candidates[x][y]);
+            }
+        }
+    }
     
-    private final GraphDocumentMetadata metadata;
+    private void makeBackup(Field f, int[][] fieldBackup) {
+        for (int x = 0 ; x < 9 ; x++) {
+            for (int y = 0 ; y < 9 ; y++) {
+                fieldBackup[x][y] = f.getCellValue(x, y);
+            }
+        }
+    }
     
-    public AbstractGraphDocument(Class<T> graphType) {
-        T g;
-        try {
-            g = graphType.newInstance();
-        } catch (ReflectiveOperationException e) {
-            assert false;
-            g = null; // for the compiler
+    private void restoreBackup(Field f, int[][] fieldBackup) {
+        for (int x = 0 ; x < 9 ; x++) {
+            for (int y = 0 ; y < 9 ; y++) {
+                f.setCellValue(x, y, fieldBackup[x][y]);
+            }
         }
-        graph = g;
-        metadata = new GraphDocumentMetadata();
-    }
-
-    public T getGraph() {
-        return graph;
     }
     
-    public GraphDocumentMetadata getMetadata() {
-        return metadata;
+    private void restoreBackup(List<Integer>[][] candidates, List<Integer>[][] candidatesBackup) {
+        for (int x = 0 ; x < 9 ; x++) {
+            for (int y = 0 ; y < 9 ; y++) {
+                candidates[x][y].clear();
+                candidates[x][y].addAll(candidatesBackup[x][y]);
+            }
+        }
+    }
+    
+    private boolean solve(Field f, List<Integer>[][] candidates) {
+        
+        // Make backup
+        List<Integer>[][] candidatesBackup = new List[9][9];
+        int[][] fieldBackup = new int[9][9];
+        makeBackup(candidates, candidatesBackup);
+        makeBackup(f, fieldBackup);
+        
+        // Fill in distinct solutions
+        boolean fillDistinct;
+        do {
+            fillDistinct = false;
+            for (int x = 0 ; x < 9 ; x++) {
+                for (int y = 0 ; y < 9 ; y++) {
+                    if (f.isCellEmpty(x, y) && candidates[x][y].size() == 1) {
+                        fillInCandidate(f, candidates, x, y);
+                        fillDistinct = true;
+                    }
+                }
+            }
+        } while (fillDistinct);
+        
+        // Try out remaining candidates
+        for (int x = 0 ; x < 9 ; x++) {
+            for (int y = 0 ; y < 9 ; y++) {
+                if (f.isCellEmpty(x, y)) {
+                    while (candidates[x][y].size() > 0) {
+                        List<Integer>[][] cb = new List[9][9];
+                        makeBackup(candidates, cb);
+                        Integer c = fillInCandidate(f, candidates, x, y);
+                        if (solve(f, candidates)) {
+                            break;
+                        } else {
+                            f.clearCellValue(x, y);
+                            restoreBackup(candidates, cb);
+                            // Remove current candidate anyway
+                            candidates[x][y].remove(c);
+                        }
+                    }
+                }
+                if (f.isCellEmpty(x, y)) {
+                    restoreBackup(f, fieldBackup);
+                    restoreBackup(candidates, candidatesBackup);
+                    return false;
+                }
+            }
+        }
+        
+        return true;
     }
 
-    protected abstract void writeGraph(Element rootNode) throws IOException;
-    protected abstract void readGraph(Element rootNode) throws IOException;
-
-    @Override
-    public void writeTo(OutputStream out) throws IOException {
-        Document doc = DocumentHelper.createDocument();
-
-        Element rootNode = doc.addElement(TAG_GRAPHDOC);
-
-        Element metadataNode = rootNode.addElement(TAG_METADATA);
-
-        metadata.write(metadataNode);
-
-        if (graph instanceof Graph) {
-            writeGraph(rootNode.addElement(TAG_GRAPH));
-        } else if (graph instanceof Digraph) {
-            writeGraph(rootNode.addElement(TAG_DIGRAPH));
-        } else {
-            throw new IOException("unsupported graph type");
+    /**
+     * Attempts to solve the given Sudoku field.
+     *
+     * The solution, if any, is directly entered into the field.
+     * All solved fields will be in modified state.
+     * The already given fields are left untouched.
+     *
+     * @param f the field to solve
+     * @return true if a solution could be found, false if the field is unsolvable
+     */
+    public boolean solve(Field f) {
+        
+        // Calculate initial candidates
+        List<Integer>[][] candidates = new List[9][9];
+        for (int x = 0 ; x < 9 ; x++) {
+            for (int y = 0 ; y < 9 ; y++) {
+                candidates[x][y] = new ArrayList<>(9);
+                if (f.getCellValue(x, y) == 0) {
+                    // All numbers are candidates
+                    for (int c = 1 ; c <= 9 ; c++) {
+                        candidates[x][y].add(c);
+                    }
+                    // Remove row duplicates
+                    int[] line = f.getRow(y);
+                    for (Integer c : line) {
+                        candidates[x][y].remove(c);
+                    }
+                    // Remove column duplicates
+                    line = f.getColumn(x);
+                    for (Integer c : line) {
+                        candidates[x][y].remove(c);
+                    }
+                    // Remove square duplicates
+                    int[][] square = f.getSquare(x/3, y/3);
+                    for (int[] sq : square) {
+                        for (Integer c : sq) {
+                            candidates[x][y].remove(c);
+                        }
+                    }
+                }
+            }
         }
-
-        XMLWriter writer = new XMLWriter(out, OutputFormat.createPrettyPrint());
-        writer.write(doc);
-        writer.flush();
+        
+        // Backtrack
+        return solve(f, candidates);
     }
 
-    @Override
-    public void readFrom(InputStream in) throws IOException {
-        try {
-            SAXReader reader = new SAXReader(true);
-            reader.setStripWhitespaceText(true);
-            
-            reader.setFeature(Constants.XERCES_FEATURE_PREFIX+
-                Constants.SCHEMA_VALIDATION_FEATURE, true);
-            reader.setProperty(Constants.XERCES_PROPERTY_PREFIX +
-                Constants.SCHEMA_LOCATION, String.format("%s %s",
-                    NAMESPACE.getURI(), Resources.class.getResource(
-                        "graph-document.xsd").toExternalForm()));
-            
-            final AtomicBoolean passed = new AtomicBoolean(true);
-            final AtomicReference<SAXParseException> xmlerror = new AtomicReference<>();
-            // TODO: we should do more detailed error handling here
-            reader.setErrorHandler(new ErrorHandler() {
-                @Override
-                public void warning(SAXParseException exception) throws SAXException {
-                }
-
-                @Override
-                public void error(SAXParseException exception) throws SAXException {
-                    xmlerror.set(exception);
-                    passed.set(false);
+    /**
+     * Performs a fast check whether any field violates the Sudoku rules.
+     *
+     * @param f the field to check
+     * @return true, if the check succeeds, false otherwise
+     */
+    public boolean check(Field f) {
+        int[] line;
+        for (int i = 0 ; i < 9 ; i++) {
+            line = f.getRow(i);
+            if (!valid(line)) {
+                return false;
+            }
+            line = f.getColumn(i);
+            if (!valid(line)) {
+                return false;
+            }
+        }
+        
+        int[][] square;
+        for (int x = 0 ; x < 3 ; x++) {
+            for (int y = 0 ; y < 3 ; y++) {
+                square = f.getSquare(x, y);
+                if (!valid(square)) {
+                    return false;
                 }
-
-                @Override
-                public void fatalError(SAXParseException exception) throws SAXException {
-                    xmlerror.set(exception);
-                    passed.set(false);
-                }
-                
-            });
-            Document doc = reader.read(in);
-            if (!passed.get()) {
-                // TODO: provide details (maybe via separate error object?)
-                throw xmlerror.get();
             }
-            
-            doc.normalize();
-            
-            Element root = doc.getRootElement();
-            metadata.read(root.element(TAG_METADATA));
-            
-            if (graph instanceof Graph) {
-                readGraph(root.element(TAG_GRAPH));
-            } else if (graph instanceof Digraph) {
-                readGraph(root.element(TAG_DIGRAPH));
-            } else {
-                throw new IOException("unsupported graph type");
+        }
+        
+        return true;
+    }
+    
+    private boolean valid(int[] line) {
+        int[] numbers;
+        numbers = new int[9];
+        for (int i = 0 ; i < 9 ; i++) {
+            int l = line[i]-1;
+            if (l >= 0) {
+                if ((++numbers[l]) > 1) {
+                    return false;
+                }
             }
-        } catch (DocumentException | SAXException ex) {
-            throw new IOException(ex);
         }
+        
+        return true;
+    }
+    
+    private boolean valid(int[][] square) {
+        int[] line = new int[9];
+        for (int x = 0 ; x < 3 ; x++) {
+            System.arraycopy(square[x], 0, line, 3*x, 3);
+        }
+        return valid(line);
     }
 }
--- a/test/jheader.html	Sun Mar 02 12:47:31 2025 +0100
+++ b/test/jheader.html	Sun Mar 02 16:06:24 2025 +0100
@@ -33,6 +33,9 @@
       span.c2html-string {
         color: darkorange;
       }
+      span.c2html-number {
+          color: dodgerblue;
+      }
       span.c2html-comment {
         color: grey;
       }

Mercurial Repository: c2html

mercurial