Changeset 2749 for abnfparser

Timestamp:

03/01/16 13:28:50 (6 years ago)

Author:

julian.reschke@…

Message:

bap: experimental support for RFC 7405

Location:

abnfparser/bap

Files:

• main.c (modified) (5 diffs)
• parser.y (modified) (2 diffs)
• scanner.l (modified) (2 diffs)

abnfparser/bap/main.c

@@ -110 +110 @@
 int tflag = 0;          /* print type info */
 int permissive = 1;     /* Be permissive (e.g. accept '|') */
+int rfc7405 = 0;        /* Support RFC 7405 (%s/%i) */
 int qflag = 0;          /* quiet */
 int canon = 1;          /* canonify */
@@ -121 +122 @@
 {
   fprintf(stderr, "Bill's ABNF Parser version %s\n", versionstring);
-  fprintf(stderr, "usage: bap [-cknqtx][-i rules][-l num][-S name][file]\n");
+  fprintf(stderr, " (with extensions from <https://svn.tools.ietf.org/svn/wg/httpbis/abnfparser/bap/>)\n", versionstring);
+  fprintf(stderr, "usage: bap [-cknqtx][-i rules][-l num][-S name][-X ext][file]\n");
   fprintf(stderr, " parse ABNF grammar from file or stdin\n");
   fprintf(stderr, " Input options:\n");
@@ -127 +129 @@
   fprintf(stderr, "  -i file  read predefined rules from \"file\"\n");
   fprintf(stderr, "  -S name  name rule as production start\n");
+  fprintf(stderr, "  -X ext   comma-separated list of allowed extensions\n");
+  fprintf(stderr, "           (only value currently supported is rfc7405)\n");
   fprintf(stderr, " Output options:\n");
   fprintf(stderr, "  -k       add comments for printable characters specified as %%x\n");
@@ -152 +156 @@
   hcreate(MAXRULE);
 
-  while ((ch = getopt(argc, argv, "cdi:kntqS:xl:")) != -1) {
+  while ((ch = getopt(argc, argv, "cdi:kntqS:xl:X:")) != -1) {
     switch (ch) {
     case 'c':
@@ -198 +202 @@
       break;
       
+    case 'X': {
+        char *x = strtok(optarg, ",");
+        while (x != NULL) {
+          if (0 == strcmp(x, "rfc7405")) {
+            rfc7405 = 1;
+          }
+          else {
+            fprintf(stderr, "unknown extension: %s\n", x);
+            exit(2);
+          }
+          x = strtok(NULL, ",");
+        }
+      }
+      break;
+
     case 'x':
       asxml = 1;

abnfparser/bap/parser.y

@@ -71 +71 @@
 }
 
-%token <string> CHARVAL PROSEVAL BINVAL DECVAL HEXVAL RULENAME
+%token <string> CHARVAL CHARVALCS PROSEVAL BINVAL DECVAL HEXVAL RULENAME
 %token <range> BINVALRANGE DECVALRANGE HEXVALRANGE REPEAT LIST
 %token CWSP EQSLASH CRLF
@@ -322 +322 @@
                                 $$->u.e.e.termstr.flags = 0;
                                 }
+        | CHARVALCS             {
+                                char *p = $1;
+                                if (*$1)
+                                        p += strlen($1) - 1;
+                                if (*p == '\n' || *p == '\r') {
+                                        mywarn(MYERROR, "unterminated quoted-string");
+                                        YYERROR;
+                                }
+                                $$ = newobj(T_TERMSTR);
+                                $$->u.e.e.termstr.str = $1;
+                                $$->u.e.e.termstr.flags = F_CASESENSITIVE;
+                                }
         | numval                {
                                 $$ = newobj(T_TERMSTR);

abnfparser/bap/scanner.l

@@ -43 +43 @@
 int yyerrors = 0;
 extern int permissive;
+extern int rfc7405;
 int indent = -1;
 
@@ -93 +94 @@
                                 mywarn(MYWARNING, "zero-length char-val");
                         return CHARVAL;
+                        }
+\%i\"{charval}["\r\n]   {
+      if (!rfc7405) {
+                                mywarn(MYERROR, "need to enable support for RFC 7405 using -Xrfc7405");
+        badchar = yytext[0];
+        BEGIN(SKIP);
+      }
+                        char *p;
+                        yycolumn += strlen(yytext);
+                        yylval.string = strdup(yytext + 3);
+                        p = &yylval.string[strlen(yylval.string) - 1];
+                        if (*p != '"') {
+                                mywarn(MYERROR, "unterminated char-val");
+                                unput(*p);      /* put the cr or lf back */
+                        }
+                        *p = '\0';
+                        if (*yylval.string == '\0')
+                                mywarn(MYWARNING, "zero-length char-val");
+                        return CHARVAL;
+                        }
+\%s\"{charval}["\r\n]   {
+      if (!rfc7405) {
+                                mywarn(MYERROR, "need to enable support for RFC 7405 using -Xrfc7405");
+        badchar = yytext[0];
+        BEGIN(SKIP);
+      }
+                        char *p;
+                        yycolumn += strlen(yytext);
+                        yylval.string = strdup(yytext + 3);
+                        p = &yylval.string[strlen(yylval.string) - 1];
+                        if (*p != '"') {
+                                mywarn(MYERROR, "unterminated char-val");
+                                unput(*p);      /* put the cr or lf back */
+                        }
+                        *p = '\0';
+                        if (*yylval.string == '\0')
+                                mywarn(MYWARNING, "zero-length char-val");
+                        return CHARVALCS;
                         }
 \<{proseval}[>\r\n]     {