Changeset 454 for abnfparser

Timestamp:

Feb 28, 2009, 8:19:40 AM (11 years ago)

Author:

julian.reschke@…

Message:

fix line wrap in ABNF prose problem; update XSLT for collected ABNF to move diagnostics into separate figure

File:

• abnfparser/bap/main.c (modified) (1 diff)

abnfparser/bap/main.c

@@ -58 +58 @@
     printf( format, ## args );                                  \
   } else {                                                      \
+    int prevcount = charcount;  \
     charcount += sprintf((charbuf+charcount), format, ## args); \
     if (charcount > olenlimit) {                                \
-      charcut = charbuf+olenlimit;                              \
-      while (*charcut != ' ' && charcut >= charbuf) {           \
-        charcut--;                                              \
-        charcount++;                                            \
-      }                                                         \
+      char x[1000];  \
+      sprintf(x, format, ## args ); \
+      if (*x == '<') { /* prose rule? */  \
+        charcut = charbuf + prevcount - 1; /* wrap all of it */ \
+        charcount = olenlimit + strlen(x) + 1;  \
+      } \
+      else { \
+        charcut = charbuf+olenlimit;                            \
+        while (*charcut != ' ' && charcut >= charbuf) {         \
+                charcut--;                                              \
+                charcount++;                                            \
+        }                                                               \
+      } \
       if (charcut != charbuf) {                                 \
-        *charcut++ = 0;                                         \
-        printf("%s\n", charbuf);                                \
-        if (*charbuf == ';') {                                  \
-          memmove(charbuf+2, charcut, charcount - olenlimit);   \
-          *(charbuf+1) = ' ';                                   \
-          charcount -= (olenlimit-1);                           \
-        } else {                                                \
-          memmove(charbuf+1, charcut, charcount - olenlimit);   \
-          *charbuf = ' ';                                       \
-          charcount -= olenlimit;                               \
-        }                                                       \
+        *charcut++ = 0;                                         \
+        printf("%s\n", charbuf);                                \
+        if (*charbuf == ';') {                                  \
+          memmove(charbuf+2, charcut, charcount - olenlimit);   \
+          *(charbuf+1) = ' ';                                   \
+          charcount -= (olenlimit-1);                           \
+        } else {                                                \
+          memmove(charbuf+1, charcut, charcount - olenlimit);   \
+          *charbuf = ' ';                                       \
+          charcount -= olenlimit;                               \
+        }                                                       \
       }                                                         \
     }                                                           \
+    /* flush the line when EOL present */ \
     charcut = strchr(charbuf, '\n');                            \
     if (charcut) {                                              \