Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[cascardo/linux.git] / scripts / genksyms / lex.lex.c_shipped

diff --git a/scripts/genksyms/lex.lex.c_shipped b/scripts/genksyms/lex.lex.c_shipped
index 0bf4157..f82740a 100644 (file)
--- a/scripts/genksyms/lex.lex.c_shipped
+++ b/scripts/genksyms/lex.lex.c_shipped
@@ -1938,8 +1938,9 @@ int
 yylex(void)
 {
   static enum {
-    ST_NOTSTARTED, ST_NORMAL, ST_ATTRIBUTE, ST_ASM, ST_BRACKET, ST_BRACE,
-    ST_EXPRESSION, ST_TABLE_1, ST_TABLE_2, ST_TABLE_3, ST_TABLE_4,
+    ST_NOTSTARTED, ST_NORMAL, ST_ATTRIBUTE, ST_ASM, ST_TYPEOF, ST_TYPEOF_1,
+    ST_BRACKET, ST_BRACE, ST_EXPRESSION,
+    ST_TABLE_1, ST_TABLE_2, ST_TABLE_3, ST_TABLE_4,
     ST_TABLE_5, ST_TABLE_6
   } lexstate = ST_NOTSTARTED;
 
@@ -2007,6 +2008,10 @@ repeat:
                    lexstate = ST_ASM;
                    count = 0;
                    goto repeat;
+                 case TYPEOF_KEYW:
+                   lexstate = ST_TYPEOF;
+                   count = 0;
+                   goto repeat;
 
                  case STRUCT_KEYW:
                  case UNION_KEYW:
@@ -2093,6 +2098,48 @@ repeat:
        }
       break;
 
+    case ST_TYPEOF:
+      switch (token)
+       {
+       case '(':
+         if ( ++count == 1 )
+           lexstate = ST_TYPEOF_1;
+         else
+           APP;
+         goto repeat;
+       case ')':
+         APP;
+         if (--count == 0)
+           {
+             lexstate = ST_NORMAL;
+             token = TYPEOF_PHRASE;
+             break;
+           }
+         goto repeat;
+       default:
+         APP;
+         goto repeat;
+       }
+      break;
+
+    case ST_TYPEOF_1:
+      if (token == IDENT)
+       {
+         if (is_reserved_word(yytext, yyleng)
+             || find_symbol(yytext, SYM_TYPEDEF, 1))
+           {
+             yyless(0);
+             unput('(');
+             lexstate = ST_NORMAL;
+             token = TYPEOF_KEYW;
+             break;
+           }
+         _APP("(", 1);
+       }
+       APP;
+       lexstate = ST_TYPEOF;
+       goto repeat;
+
     case ST_BRACKET:
       APP;
       switch (token)