Changeset 410 for abnfparser

Timestamp:

15/11/08 21:28:06 (13 years ago)

Author:

ylafon@…

Message:

more change (the complex case)

File:

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

abnfparser/bap/main.c

@@ -409 +409 @@
                   break;
                 case T_GROUP:
-                        if (tflag)
-                                printf("{GROUP}");
-      if (o->u.e.islist) {
-        if (o->u.e.repetition.lo == 0) {
-          printf("( [ *LWS ");
-          printobj_r(o->u.e.e.group, o->type, tflag);
-          printf(" ] *( *LWS \",\" *LWS ");
-          printobj_r(o->u.e.e.group, o->type, tflag);
-          printf(" ) )");
-        }
-        else if (o->u.e.repetition.lo == 1) {
-          printf("( *LWS ");
-          printobj_r(o->u.e.e.group, o->type, tflag);
-          printf(" *( *LWS \",\" *LWS ");
-          printobj_r(o->u.e.e.group, o->type, tflag);
-          printf(" ) )");
-        }
-        else {
-          printf("TODO: something is wrong");
-        } 
-      }
-      else {
-                        if (o->u.e.repetition.lo == 0 &&
-                            o->u.e.repetition.hi == 1) {
-                                if (!NOBRACKET(o->u.e.e.group))
-                                        printf("[ ");
-                        } else {
-                                printrep(&o->u.e.repetition);
-                                if (!NOPAREN(o->u.e.e.group))
-                                        printf("( ");
-                        }
-                        printobj_r(o->u.e.e.group, o->type, tflag);
-                        if (o->u.e.repetition.lo == 0 &&
-                            o->u.e.repetition.hi == 1) {
-                                if (!NOBRACKET(o->u.e.e.group))
-                                        printf(" ]");
-                        } else {
-                                if (!NOPAREN(o->u.e.e.group))
-                                        printf(" )");
-                        }
-      }
-                        break;
+                  if (tflag)
+                    printf("{GROUP}");
+                  if (o->u.e.islist) {
+                    if (o->u.e.repetition.lo == 0) {
+                      printf("[ ( \",\" / ");
+                      printobj_r(o->u.e.e.group, o->type, tflag);
+                      printf(" ) *( OWS \",\" [ OWS ");
+                      printobj_r(o->u.e.e.group, o->type, tflag);
+                      printf(" ] ) ]");
+                    }
+                    else if (o->u.e.repetition.lo == 1) {
+                      printf("*( \",\" OWS ) ");
+                      printobj_r(o->u.e.e.group, o->type, tflag);
+                      printf(" *( OWS \",\" [ OWS ");
+                      printobj_r(o->u.e.e.group, o->type, tflag);
+                      printf(" ] )");
+                    }
+                    else {
+                      printf("TODO: something is wrong");
+                    } 
+                  } else {
+                    if (o->u.e.repetition.lo == 0 &&
+                        o->u.e.repetition.hi == 1) {
+                      if (!NOBRACKET(o->u.e.e.group))
+                        printf("[ ");
+                    } else {
+                      printrep(&o->u.e.repetition);
+                      if (!NOPAREN(o->u.e.e.group))
+                        printf("( ");
+                    }
+                    printobj_r(o->u.e.e.group, o->type, tflag);
+                    if (o->u.e.repetition.lo == 0 &&
+                        o->u.e.repetition.hi == 1) {
+                      if (!NOBRACKET(o->u.e.e.group))
+                        printf(" ]");
+                    } else {
+                      if (!NOPAREN(o->u.e.e.group))
+                        printf(" )");
+                    }
+                  }
+                  break;
                 case T_TERMSTR:
                         if (tflag)