Changeset 3426 for trunk/tools/wrc/parser.l

Timestamp:

Apr 19, 2000, 4:46:07 PM (25 years ago)

Author:

sandervl

Message:

update with latest wine code

File:

• trunk/tools/wrc/parser.l (modified) (17 diffs)

trunk/tools/wrc/parser.l

@@ -76 +76 @@
 %x pp_false
 /* Set when stripping c-junk */
+%x pp_stripe
 %x pp_strips
 %x pp_stripp
@@ -135 +136 @@
 static int want_nl = 0;         /* Set when newline needs to go to parser */
 static int want_ident = 0;      /* Set is #ifdef, #ifndef or defined is seen */
-static int stripslevel = 0;     /* Count {} during pp_strips mode */
+static int stripslevel = 0;     /* Count {} during pp_strips/pp_stripe mode */
 static int stripplevel = 0;     /* Count () during pp_strips mode */
 static char *substtext = NULL;  /* Holds the substition text while getting a define */
@@ -455 +456 @@
 
         /* Conditional handling */
-<INITIAL,pp_strips,pp_stripp,pp_false>^{ws}*#{ws}*if{ws}*       {
+<INITIAL,pp_strips,pp_stripe,pp_stripp,pp_false>^{ws}*#{ws}*if{ws}*     {
                         if(YY_START == pp_false)
                         {
@@ -470 +471 @@
                         }
                 }
-<INITIAL,pp_strips,pp_stripp,pp_false>^{ws}*#{ws}*ifdef{ws}*    {
+<INITIAL,pp_strips,pp_stripe,pp_stripp,pp_false>^{ws}*#{ws}*ifdef{ws}*  {
                         if(YY_START == pp_false)
                         {
@@ -486 +487 @@
                         }
                 }
-<INITIAL,pp_strips,pp_stripp,pp_false>^{ws}*#{ws}*ifndef{ws}*   {
+<INITIAL,pp_strips,pp_stripe,pp_stripp,pp_false>^{ws}*#{ws}*ifndef{ws}* {
                         if(YY_START == pp_false)
                         {
@@ -502 +503 @@
                         }
                 }
-<INITIAL,pp_strips,pp_stripp,pp_false>^{ws}*#{ws}*elif{ws}*     {
+<INITIAL,pp_strips,pp_stripe,pp_stripp,pp_false>^{ws}*#{ws}*elif{ws}*   {
                         if(!isnevertrue_if())
                         {
@@ -514 +515 @@
                                 printf("(%d)#elif ignored\n", line_number);
                 }
-<INITIAL,pp_strips,pp_stripp,pp_false>^{ws}*#{ws}*else{ws}*     {
+<INITIAL,pp_strips,pp_stripe,pp_stripp,pp_false>^{ws}*#{ws}*else{ws}*   {
                         if(!isnevertrue_if())
                         {
@@ -524 +525 @@
                                 printf("(%d)#else ignored\n", line_number);
                 }
-<INITIAL,pp_strips,pp_stripp,pp_false>^{ws}*#{ws}*endif{ws}*    {
+<INITIAL,pp_strips,pp_stripe,pp_stripp,pp_false>^{ws}*#{ws}*endif{ws}*  {
                         if(!isnevertrue_if())
                         {
@@ -539 +540 @@
 
         /* The error directive */
-^{ws}*#{ws}*error{ws}*  push_to(pp_error);
-<pp_error>[^\n]*        yyerror("Error directive: %s", yytext);
+<INITIAL,pp_strips,pp_stripe,pp_stripp>^{ws}*#{ws}*error{ws}*   push_to(pp_error);
+<pp_error>[^\n]*        yyerror("Error directive: %s", yytext);
+<pp_false>^{ws}*#{ws}*error[^\n]* {
+                        if(yydebug)
+                                printf("(%d)#error ignored\n", line_number);
+                }
 
         /* preprocessor junk */
-^{ws}*#{ws}*pragma[^\n]*        ;       /* Ignore #pragma */
-^{ws}*#{ws}*line[^\n]*          ;       /* Ignore #line */
+<INITIAL,pp_strips,pp_stripe,pp_stripp,pp_false>^{ws}*#{ws}*pragma[^\n]*        ;       /* Ignore #pragma */
+<INITIAL,pp_strips,pp_stripe,pp_stripp,pp_false>^{ws}*#{ws}*ident[^\n]*         ;       /* Ignore #ident */
+<INITIAL,pp_strips,pp_stripe,pp_stripp,pp_false>^{ws}*#{ws}*line[^\n]*          ;       /* Ignore #line */
  /* We'll get an error on malformed #xxx statements
   * by not recognising '#' at all. This helps tracking
@@ -556 +562 @@
 <pp_strips>\/[^*\n]             ; /* To catch comments */
 <pp_strips>[^\{\};\n#/]*        ; /* Ignore rest */
+
+<pp_stripe>\{           stripslevel++;
+<pp_stripe>\}   {
+                        stripslevel--;
+                        if(!stripslevel) pop_start();
+                }
+<pp_stripe>;            if(!stripslevel) pop_start();
+<pp_stripe>\/[^*\n]             ; /* To catch comments */
+<pp_stripe>[^\{\};\n#/]*        ; /* Ignore rest */
 
 <pp_stripp>\(           stripplevel++;
@@ -758 +773 @@
 <yystr>\\\"\"           addcchar('\"');         /* "bla\""bla"  -> "bla\"bla" */
 <yystr>\"{ws}+\"        ;                       /* "bla" "bla"  -> "blabla" */
-<yystr>.                yywarning("Matched %c");
+<yystr>.                yywarning("Matched %c", *yytext);
 
 
@@ -782 +797 @@
 <yyrcd>.                yyerror("Malformed data-line");
 
-<INITIAL,pp_ignore,pp_def_s,pp_strips,pp_stripp>"/*"    push_to(comment);       /* Eat comment */
+<INITIAL,pp_ignore,pp_def_s,pp_strips,pp_stripe,pp_stripp>"/*"  push_to(comment);       /* Eat comment */
 <comment>[^*\n]*        ;
 <comment>"*"+[^*/\n]*   ;
@@ -791 +806 @@
 <INITIAL,pp_ignore,pp_def_s>"//"[^\n]*          ; /* Eat comment */
 
-<INITIAL,yywf,pp_false,pp_strips,pp_stripp>\n   {
+<INITIAL,yywf,pp_false,pp_strips,pp_stripe,pp_stripp>\n {
                                 if(YY_START == yywf)
                                         pop_start();
@@ -809 +824 @@
                                 if(!pop_buffer())
                                 {
-                                        if(YY_START == pp_strips || YY_START == pp_stripp || YY_START == pp_stripp_final)
+                                        if(YY_START == pp_strips || YY_START == pp_stripe || YY_START == pp_stripp || YY_START == pp_stripp_final)
                                                 yyerror("Unexpected end of file during c-junk scanning (started at %d)", cjunk_tagline);
                                         else
@@ -824 +839 @@
                                         char_number = 1;
                                 }
-                                yywarning("Unmatched text '%c' (0x%02x) YY_START=%d",
-                                        isprint(*yytext) ? *yytext : '.', *yytext, YY_START);
+                                yywarning("Unmatched text '%c' (0x%02x) YY_START=%d stripslevel=%d",
+                                        isprint(*yytext) ? *yytext : '.', *yytext, YY_START,stripslevel);
                         }
 
@@ -959 +974 @@
 
 /* Called from the parser to kill c-junk */
+void strip_extern(void)
+{
+        cjunk_tagline = line_number;
+        push_to(pp_stripe);
+}
+
 void strip_til_semicolon(void)
 {
@@ -972 +993 @@
 }
 
-