27 Oct
2005
27 Oct
'05
6:06 p.m.
Fix build problems introduced by r18788
Modified: trunk/reactos/tools/wpp/lex.yy.c
Modified: trunk/reactos/tools/wpp/ppl.l
Modified: trunk/reactos/tools/wrc/parser.tab.c
Modified: trunk/reactos/tools/wrc/parser.tab.h
Modified: trunk/reactos/tools/wrc/parser.y
_____
Modified: trunk/reactos/tools/wpp/lex.yy.c
--- trunk/reactos/tools/wpp/lex.yy.c 2005-10-27 17:40:32 UTC (rev
18788)
+++ trunk/reactos/tools/wpp/lex.yy.c 2005-10-27 18:06:50 UTC (rev
18789)
@@ -16877,7 +16877,7 @@
/* Undo the effect of the quotation */
fname[n-1] = '\0';
- if((ppin = pp_open_include(fname+1, type ? pp_status.input :
NULL, &newpath)) == NULL)
+ if((ppin = pp_open_include(fname+1, type ? pp_status.input :
NULL, &newpath, type)) == NULL)
pperror("Unable to open include file %s", fname+1);
fname[n-1] = *fname; /* Redo the quotes */
_____
Modified: trunk/reactos/tools/wpp/ppl.l
--- trunk/reactos/tools/wpp/ppl.l 2005-10-27 17:40:32 UTC (rev
18788)
+++ trunk/reactos/tools/wpp/ppl.l 2005-10-27 18:06:50 UTC (rev
18789)
@@ -1448,7 +1448,7 @@
/* Undo the effect of the quotation */
fname[n-1] = '\0';
- if((ppin = pp_open_include(fname+1, type ? pp_status.input :
NULL, &newpath)) == NULL)
+ if((ppin = pp_open_include(fname+1, type ? pp_status.input :
NULL, &newpath, type)) == NULL)
pperror("Unable to open include file %s", fname+1);
fname[n-1] = *fname; /* Redo the quotes */
_____
Modified: trunk/reactos/tools/wrc/parser.tab.c
--- trunk/reactos/tools/wrc/parser.tab.c 2005-10-27 17:40:32 UTC
(rev 18788)
+++ trunk/reactos/tools/wrc/parser.tab.c 2005-10-27 18:06:50 UTC
(rev 18789)
@@ -226,7 +226,7 @@
/* Copy the first part of user declarations. */
-#line 1 "./parser.y"
+#line 1 "parser.y"
/*
* Copyright 1994 Martin von Loewis
@@ -482,7 +482,7 @@
#endif
#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 241 "./parser.y"
+#line 241 "parser.y"
typedef union YYSTYPE {
string_t *str;
int num;
@@ -1982,7 +1982,7 @@
switch (yyn)
{
case 2:
-#line 364 "./parser.y"
+#line 364 "parser.y"
{
resource_t *rsc;
/* First add stringtables to the resource-list */
@@ -2012,16 +2012,16 @@
yyvsp[0].res = rsc;
/* Final statement before were done */
resource_top = get_resource_head(yyvsp[0].res);
- }
+ ;}
break;
case 3:
-#line 398 "./parser.y"
- { yyval.res = NULL; want_id = 1; }
+#line 398 "parser.y"
+ { yyval.res = NULL; want_id = 1; ;}
break;
case 4:
-#line 399 "./parser.y"
+#line 399 "parser.y"
{
if(yyvsp[0].res)
{
@@ -2066,11 +2066,11 @@
if(!dont_want_id) /* See comments in language
parsing below */
want_id = 1;
dont_want_id = 0;
- }
+ ;}
break;
case 6:
-#line 475 "./parser.y"
+#line 475 "parser.y"
{
yyval.res = yyvsp[0].res;
if(yyval.res)
@@ -2082,11 +2082,11 @@
yyval.res->name->name.i_name = yyvsp[-2].num;
chat("Got %s (%d)", get_typename(yyvsp[0].res),
yyval.res->name->name.i_name);
}
- }
+ ;}
break;
case 7:
-#line 487 "./parser.y"
+#line 487 "parser.y"
{
yyval.res = yyvsp[0].res;
if(yyval.res)
@@ -2096,11 +2096,11 @@
yyval.res->name->name.s_name = yyvsp[-2].str;
chat("Got %s (%s)", get_typename(yyvsp[0].res),
yyval.res->name->name.s_name->str.cstr);
}
- }
+ ;}
break;
case 8:
-#line 497 "./parser.y"
+#line 497 "parser.y"
{
/* Don't do anything, stringtables are converted to
* resource_t structures when we are finished parsing
and
@@ -2108,16 +2108,16 @@
*/
yyval.res = NULL;
chat("Got STRINGTABLE");
- }
+ ;}
break;
case 9:
-#line 505 "./parser.y"
- {want_nl = 1; }
+#line 505 "parser.y"
+ {want_nl = 1; ;}
break;
case 10:
-#line 505 "./parser.y"
+#line 505 "parser.y"
{
/* We *NEED* the newline to delimit the expression.
* Otherwise, we would not be able to set the next
@@ -2155,60 +2155,60 @@
currentlanguage = new_language(yyvsp[-2].num,
yyvsp[0].num);
yyval.res = NULL;
chat("Got LANGUAGE %d,%d (0x%04x)", yyvsp[-2].num,
yyvsp[0].num, (yyvsp[0].num<<10) + yyvsp[-2].num);
- }
+ ;}
break;
case 11:
-#line 549 "./parser.y"
- { yychar = rsrcid_to_token(yychar); }
+#line 549 "parser.y"
+ { yychar = rsrcid_to_token(yychar); ;}
break;
case 12:
-#line 555 "./parser.y"
+#line 555 "parser.y"
{
if(yyvsp[0].num > 65535 || yyvsp[0].num < -32768)
yyerror("Resource's ID out of range (%d)",
yyvsp[0].num);
yyval.nid = new_name_id();
yyval.nid->type = name_ord;
yyval.nid->name.i_name = yyvsp[0].num;
- }
+ ;}
break;
case 13:
-#line 562 "./parser.y"
+#line 562 "parser.y"
{
yyval.nid = new_name_id();
yyval.nid->type = name_str;
yyval.nid->name.s_name = yyvsp[0].str;
- }
+ ;}
break;
case 14:
-#line 572 "./parser.y"
- { yyval.nid = yyvsp[0].nid; }
+#line 572 "parser.y"
+ { yyval.nid = yyvsp[0].nid; ;}
break;
case 15:
-#line 573 "./parser.y"
+#line 573 "parser.y"
{
yyval.nid = new_name_id();
yyval.nid->type = name_str;
yyval.nid->name.s_name = yyvsp[0].str;
- }
+ ;}
break;
case 16:
-#line 582 "./parser.y"
- { yyval.res = new_resource(res_acc, yyvsp[0].acc,
yyvsp[0].acc->memopt, yyvsp[0].acc->lvc.language); }
+#line 582 "parser.y"
+ { yyval.res = new_resource(res_acc, yyvsp[0].acc,
yyvsp[0].acc->memopt, yyvsp[0].acc->lvc.language); ;}
break;
case 17:
-#line 583 "./parser.y"
- { yyval.res = new_resource(res_bmp, yyvsp[0].bmp,
yyvsp[0].bmp->memopt, yyvsp[0].bmp->data->lvc.language); }
+#line 583 "parser.y"
+ { yyval.res = new_resource(res_bmp, yyvsp[0].bmp,
yyvsp[0].bmp->memopt, yyvsp[0].bmp->data->lvc.language); ;}
break;
case 18:
-#line 584 "./parser.y"
+#line 584 "parser.y"
{
resource_t *rsc;
if(yyvsp[0].ani->type == res_anicur)
@@ -2232,41 +2232,41 @@
else
internal_error(__FILE__, __LINE__, "Invalid
top-level type %d in cursor resource", yyvsp[0].ani->type);
free(yyvsp[0].ani);
- }
+ ;}
break;
case 19:
-#line 608 "./parser.y"
- { yyval.res = new_resource(res_dlg, yyvsp[0].dlg,
yyvsp[0].dlg->memopt, yyvsp[0].dlg->lvc.language); }
+#line 608 "parser.y"
+ { yyval.res = new_resource(res_dlg, yyvsp[0].dlg,
yyvsp[0].dlg->memopt, yyvsp[0].dlg->lvc.language); ;}
break;
case 20:
-#line 609 "./parser.y"
+#line 609 "parser.y"
{
if(win32)
yyval.res = new_resource(res_dlgex,
yyvsp[0].dlgex, yyvsp[0].dlgex->memopt, yyvsp[0].dlgex->lvc.language);
else
yyval.res = NULL;
- }
+ ;}
break;
case 21:
-#line 615 "./parser.y"
- { yyval.res = new_resource(res_dlginit, yyvsp[0].dginit,
yyvsp[0].dginit->memopt, yyvsp[0].dginit->data->lvc.language); }
+#line 615 "parser.y"
+ { yyval.res = new_resource(res_dlginit, yyvsp[0].dginit,
yyvsp[0].dginit->memopt, yyvsp[0].dginit->data->lvc.language); ;}
break;
case 22:
-#line 616 "./parser.y"
- { yyval.res = new_resource(res_fnt, yyvsp[0].fnt,
yyvsp[0].fnt->memopt, yyvsp[0].fnt->data->lvc.language); }
+#line 616 "parser.y"
+ { yyval.res = new_resource(res_fnt, yyvsp[0].fnt,
yyvsp[0].fnt->memopt, yyvsp[0].fnt->data->lvc.language); ;}
break;
case 23:
-#line 617 "./parser.y"
- { yyval.res = new_resource(res_fntdir, yyvsp[0].fnd,
yyvsp[0].fnd->memopt, yyvsp[0].fnd->data->lvc.language); }
+#line 617 "parser.y"
+ { yyval.res = new_resource(res_fntdir, yyvsp[0].fnd,
yyvsp[0].fnd->memopt, yyvsp[0].fnd->data->lvc.language); ;}
break;
case 24:
-#line 618 "./parser.y"
+#line 618 "parser.y"
{
resource_t *rsc;
if(yyvsp[0].ani->type == res_aniico)
@@ -2290,76 +2290,76 @@
else
internal_error(__FILE__, __LINE__, "Invalid
top-level type %d in icon resource", yyvsp[0].ani->type);
free(yyvsp[0].ani);
- }
+ ;}
break;
case 25:
-#line 642 "./parser.y"
- { yyval.res = new_resource(res_men, yyvsp[0].men,
yyvsp[0].men->memopt, yyvsp[0].men->lvc.language); }
+#line 642 "parser.y"
+ { yyval.res = new_resource(res_men, yyvsp[0].men,
yyvsp[0].men->memopt, yyvsp[0].men->lvc.language); ;}
break;
case 26:
-#line 643 "./parser.y"
+#line 643 "parser.y"
{
if(win32)
yyval.res = new_resource(res_menex,
yyvsp[0].menex, yyvsp[0].menex->memopt, yyvsp[0].menex->lvc.language);
else
yyval.res = NULL;
- }
+ ;}
break;
case 27:
-#line 649 "./parser.y"
- { yyval.res = new_resource(res_msg, yyvsp[0].msg, WRC_MO_MOVEABLE |
WRC_MO_DISCARDABLE, yyvsp[0].msg->data->lvc.language); }
+#line 649 "parser.y"
+ { yyval.res = new_resource(res_msg, yyvsp[0].msg, WRC_MO_MOVEABLE |
WRC_MO_DISCARDABLE, yyvsp[0].msg->data->lvc.language); ;}
break;
case 28:
-#line 650 "./parser.y"
- { yyval.res = new_resource(res_html, yyvsp[0].html,
yyvsp[0].html->memopt, yyvsp[0].html->data->lvc.language); }
+#line 650 "parser.y"
+ { yyval.res = new_resource(res_html, yyvsp[0].html,
yyvsp[0].html->memopt, yyvsp[0].html->data->lvc.language); ;}
break;
case 29:
-#line 651 "./parser.y"
- { yyval.res = new_resource(res_rdt, yyvsp[0].rdt,
yyvsp[0].rdt->memopt, yyvsp[0].rdt->data->lvc.language); }
+#line 651 "parser.y"
+ { yyval.res = new_resource(res_rdt, yyvsp[0].rdt,
yyvsp[0].rdt->memopt, yyvsp[0].rdt->data->lvc.language); ;}
break;
case 30:
-#line 652 "./parser.y"
- { yyval.res = new_resource(res_toolbar, yyvsp[0].tlbar,
yyvsp[0].tlbar->memopt, yyvsp[0].tlbar->lvc.language); }
+#line 652 "parser.y"
+ { yyval.res = new_resource(res_toolbar, yyvsp[0].tlbar,
yyvsp[0].tlbar->memopt, yyvsp[0].tlbar->lvc.language); ;}
break;
case 31:
-#line 653 "./parser.y"
- { yyval.res = new_resource(res_usr, yyvsp[0].usr,
yyvsp[0].usr->memopt, yyvsp[0].usr->data->lvc.language); }
+#line 653 "parser.y"
+ { yyval.res = new_resource(res_usr, yyvsp[0].usr,
yyvsp[0].usr->memopt, yyvsp[0].usr->data->lvc.language); ;}
break;
case 32:
-#line 654 "./parser.y"
- { yyval.res = new_resource(res_ver, yyvsp[0].veri, WRC_MO_MOVEABLE
| WRC_MO_DISCARDABLE, yyvsp[0].veri->lvc.language); }
+#line 654 "parser.y"
+ { yyval.res = new_resource(res_ver, yyvsp[0].veri, WRC_MO_MOVEABLE
| WRC_MO_DISCARDABLE, yyvsp[0].veri->lvc.language); ;}
break;
case 33:
-#line 658 "./parser.y"
- { yyval.str = make_filename(yyvsp[0].str); }
+#line 658 "parser.y"
+ { yyval.str = make_filename(yyvsp[0].str); ;}
break;
case 34:
-#line 659 "./parser.y"
- { yyval.str = make_filename(yyvsp[0].str); }
+#line 659 "parser.y"
+ { yyval.str = make_filename(yyvsp[0].str); ;}
break;
case 35:
-#line 660 "./parser.y"
- { yyval.str = make_filename(yyvsp[0].str); }
+#line 660 "parser.y"
+ { yyval.str = make_filename(yyvsp[0].str); ;}
break;
case 36:
-#line 664 "./parser.y"
- { yyval.bmp = new_bitmap(yyvsp[0].raw, yyvsp[-1].iptr); }
+#line 664 "parser.y"
+ { yyval.bmp = new_bitmap(yyvsp[0].raw, yyvsp[-1].iptr); ;}
break;
case 37:
-#line 668 "./parser.y"
+#line 668 "parser.y"
{
yyval.ani = new_ani_any();
if(yyvsp[0].raw->size > 4 && !memcmp(yyvsp[0].raw->data,
riff, sizeof(riff)))
@@ -2372,11 +2372,11 @@
yyval.ani->type = res_curg;
yyval.ani->u.curg =
new_cursor_group(yyvsp[0].raw, yyvsp[-1].iptr);
}
- }
+ ;}
break;
case 38:
-#line 684 "./parser.y"
+#line 684 "parser.y"
{
yyval.ani = new_ani_any();
if(yyvsp[0].raw->size > 4 && !memcmp(yyvsp[0].raw->data,
riff, sizeof(riff)))
@@ -2389,45 +2389,45 @@
yyval.ani->type = res_icog;
yyval.ani->u.icog = new_icon_group(yyvsp[0].raw,
yyvsp[-1].iptr);
}
- }
+ ;}
break;
case 39:
-#line 706 "./parser.y"
- { yyval.fnt = new_font(yyvsp[0].raw, yyvsp[-1].iptr); }
+#line 706 "parser.y"
+ { yyval.fnt = new_font(yyvsp[0].raw, yyvsp[-1].iptr); ;}
break;
case 40:
-#line 716 "./parser.y"
- { yyval.fnd = new_fontdir(yyvsp[0].raw, yyvsp[-1].iptr); }
+#line 716 "parser.y"
+ { yyval.fnd = new_fontdir(yyvsp[0].raw, yyvsp[-1].iptr); ;}
break;
case 41:
-#line 724 "./parser.y"
+#line 724 "parser.y"
{
if(!win32)
yywarning("MESSAGETABLE not supported in 16-bit
mode");
yyval.msg = new_messagetable(yyvsp[0].raw,
yyvsp[-1].iptr);
- }
+ ;}
break;
case 42:
-#line 732 "./parser.y"
- { yyval.html = new_html(yyvsp[0].raw, yyvsp[-1].iptr); }
+#line 732 "parser.y"
+ { yyval.html = new_html(yyvsp[0].raw, yyvsp[-1].iptr); ;}
break;
case 43:
-#line 736 "./parser.y"
- { yyval.rdt = new_rcdata(yyvsp[0].raw, yyvsp[-1].iptr); }
+#line 736 "parser.y"
+ { yyval.rdt = new_rcdata(yyvsp[0].raw, yyvsp[-1].iptr); ;}
break;
case 44:
-#line 740 "./parser.y"
- { yyval.dginit = new_dlginit(yyvsp[0].raw, yyvsp[-1].iptr); }
+#line 740 "parser.y"
+ { yyval.dginit = new_dlginit(yyvsp[0].raw, yyvsp[-1].iptr); ;}
break;
case 45:
-#line 744 "./parser.y"
+#line 744 "parser.y"
{
#ifdef WORDS_BIGENDIAN
if(pedantic && byteorder != WRC_BO_LITTLE)
@@ -2436,29 +2436,29 @@
#endif
yywarning("Byteordering is not
little-endian and type cannot be interpreted");
yyval.usr = new_user(yyvsp[-2].nid,
yyvsp[0].raw, yyvsp[-1].iptr);
- }
+ ;}
break;
case 46:
-#line 755 "./parser.y"
+#line 755 "parser.y"
{
yyval.nid = new_name_id();
yyval.nid->type = name_ord;
yyval.nid->name.i_name = yyvsp[0].num;
- }
+ ;}
break;
case 47:
-#line 760 "./parser.y"
+#line 760 "parser.y"
{
yyval.nid = new_name_id();
yyval.nid->type = name_str;
yyval.nid->name.s_name = yyvsp[0].str;
- }
+ ;}
break;
case 48:
-#line 769 "./parser.y"
+#line 769 "parser.y"
{
yyval.acc = new_accelerator();
if(yyvsp[-4].iptr)
@@ -2480,76 +2480,76 @@
}
if(!yyval.acc->lvc.language)
yyval.acc->lvc.language =
dup_language(currentlanguage);
- }
+ ;}
break;
case 49:
-#line 793 "./parser.y"
- { yyval.event=NULL; }
+#line 793 "parser.y"
+ { yyval.event=NULL; ;}
break;
case 50:
-#line 794 "./parser.y"
- { yyval.event=add_string_event(yyvsp[-3].str, yyvsp[-1].num,
yyvsp[0].num, yyvsp[-4].event); }
+#line 794 "parser.y"
+ { yyval.event=add_string_event(yyvsp[-3].str, yyvsp[-1].num,
yyvsp[0].num, yyvsp[-4].event); ;}
break;
case 51:
-#line 795 "./parser.y"
- { yyval.event=add_event(yyvsp[-3].num, yyvsp[-1].num, yyvsp[0].num,
yyvsp[-4].event); }
+#line 795 "parser.y"
+ { yyval.event=add_event(yyvsp[-3].num, yyvsp[-1].num, yyvsp[0].num,
yyvsp[-4].event); ;}
break;
case 52:
-#line 804 "./parser.y"
- { yyval.num = 0; }
+#line 804 "parser.y"
+ { yyval.num = 0; ;}
break;
case 53:
-#line 805 "./parser.y"
- { yyval.num = yyvsp[0].num; }
+#line 805 "parser.y"
+ { yyval.num = yyvsp[0].num; ;}
break;
case 54:
-#line 808 "./parser.y"
- { yyval.num = yyvsp[0].num; }
+#line 808 "parser.y"
+ { yyval.num = yyvsp[0].num; ;}
break;
case 55:
-#line 809 "./parser.y"
- { yyval.num = yyvsp[-2].num | yyvsp[0].num; }
+#line 809 "parser.y"
+ { yyval.num = yyvsp[-2].num | yyvsp[0].num; ;}
break;
case 56:
-#line 812 "./parser.y"
- { yyval.num = WRC_AF_NOINVERT; }
+#line 812 "parser.y"
+ { yyval.num = WRC_AF_NOINVERT; ;}
break;
case 57:
-#line 813 "./parser.y"
- { yyval.num = WRC_AF_SHIFT; }
+#line 813 "parser.y"
+ { yyval.num = WRC_AF_SHIFT; ;}
break;
case 58:
-#line 814 "./parser.y"
- { yyval.num = WRC_AF_CONTROL; }
+#line 814 "parser.y"
+ { yyval.num = WRC_AF_CONTROL; ;}
break;
case 59:
-#line 815 "./parser.y"
- { yyval.num = WRC_AF_ALT; }
+#line 815 "parser.y"
+ { yyval.num = WRC_AF_ALT; ;}
break;
case 60:
-#line 816 "./parser.y"
- { yyval.num = WRC_AF_ASCII; }
+#line 816 "parser.y"
+ { yyval.num = WRC_AF_ASCII; ;}
break;
case 61:
-#line 817 "./parser.y"
- { yyval.num = WRC_AF_VIRTKEY; }
+#line 817 "parser.y"
+ { yyval.num = WRC_AF_VIRTKEY; ;}
break;
case 62:
-#line 823 "./parser.y"
+#line 823 "parser.y"
{
if(yyvsp[-11].iptr)
{
@@ -2580,162 +2580,162 @@
if(!yyval.dlg->lvc.language)
yyval.dlg->lvc.language =
dup_language(currentlanguage);
- }
+ ;}
break;
case 63:
-#line 857 "./parser.y"
- { yyval.dlg=new_dialog(); }
+#line 857 "parser.y"
+ { yyval.dlg=new_dialog(); ;}
break;
case 64:
-#line 858 "./parser.y"
- { yyval.dlg=dialog_style(yyvsp[0].style,yyvsp[-2].dlg); }
+#line 858 "parser.y"
+ { yyval.dlg=dialog_style(yyvsp[0].style,yyvsp[-2].dlg); ;}
break;
case 65:
-#line 859 "./parser.y"
- { yyval.dlg=dialog_exstyle(yyvsp[0].style,yyvsp[-2].dlg); }
+#line 859 "parser.y"
+ { yyval.dlg=dialog_exstyle(yyvsp[0].style,yyvsp[-2].dlg); ;}
break;
case 66:
-#line 860 "./parser.y"
- { yyval.dlg=dialog_caption(yyvsp[0].str,yyvsp[-2].dlg); }
+#line 860 "parser.y"
+ { yyval.dlg=dialog_caption(yyvsp[0].str,yyvsp[-2].dlg); ;}
break;
case 67:
-#line 861 "./parser.y"
- { yyval.dlg=dialog_font(yyvsp[0].fntid,yyvsp[-1].dlg); }
+#line 861 "parser.y"
+ { yyval.dlg=dialog_font(yyvsp[0].fntid,yyvsp[-1].dlg); ;}
break;
case 68:
-#line 862 "./parser.y"
- { yyval.dlg=dialog_class(yyvsp[0].nid,yyvsp[-2].dlg); }
+#line 862 "parser.y"
+ { yyval.dlg=dialog_class(yyvsp[0].nid,yyvsp[-2].dlg); ;}
break;
case 69:
-#line 863 "./parser.y"
- { yyval.dlg=dialog_menu(yyvsp[0].nid,yyvsp[-2].dlg); }
+#line 863 "parser.y"
+ { yyval.dlg=dialog_menu(yyvsp[0].nid,yyvsp[-2].dlg); ;}
break;
case 70:
-#line 864 "./parser.y"
- { yyval.dlg=dialog_language(yyvsp[0].lan,yyvsp[-1].dlg); }
+#line 864 "parser.y"
+ { yyval.dlg=dialog_language(yyvsp[0].lan,yyvsp[-1].dlg); ;}
break;
case 71:
-#line 865 "./parser.y"
- { yyval.dlg=dialog_characteristics(yyvsp[0].chars,yyvsp[-1].dlg); }
+#line 865 "parser.y"
+ { yyval.dlg=dialog_characteristics(yyvsp[0].chars,yyvsp[-1].dlg);
;}
break;
case 72:
-#line 866 "./parser.y"
- { yyval.dlg=dialog_version(yyvsp[0].ver,yyvsp[-1].dlg); }
+#line 866 "parser.y"
+ { yyval.dlg=dialog_version(yyvsp[0].ver,yyvsp[-1].dlg); ;}
break;
case 73:
-#line 869 "./parser.y"
- { yyval.ctl = NULL; }
+#line 869 "parser.y"
+ { yyval.ctl = NULL; ;}
break;
case 74:
-#line 870 "./parser.y"
- { yyval.ctl=ins_ctrl(-1, 0, yyvsp[0].ctl, yyvsp[-2].ctl); }
+#line 870 "parser.y"
+ { yyval.ctl=ins_ctrl(-1, 0, yyvsp[0].ctl, yyvsp[-2].ctl); ;}
break;
case 75:
-#line 871 "./parser.y"
- { yyval.ctl=ins_ctrl(CT_EDIT, 0, yyvsp[0].ctl, yyvsp[-2].ctl); }
+#line 871 "parser.y"
+ { yyval.ctl=ins_ctrl(CT_EDIT, 0, yyvsp[0].ctl, yyvsp[-2].ctl); ;}
break;
case 76:
-#line 872 "./parser.y"
- { yyval.ctl=ins_ctrl(CT_LISTBOX, 0, yyvsp[0].ctl, yyvsp[-2].ctl); }
+#line 872 "parser.y"
+ { yyval.ctl=ins_ctrl(CT_LISTBOX, 0, yyvsp[0].ctl, yyvsp[-2].ctl);
;}
break;
case 77:
-#line 873 "./parser.y"
- { yyval.ctl=ins_ctrl(CT_COMBOBOX, 0, yyvsp[0].ctl, yyvsp[-2].ctl);
}
+#line 873 "parser.y"
+ { yyval.ctl=ins_ctrl(CT_COMBOBOX, 0, yyvsp[0].ctl, yyvsp[-2].ctl);
;}
break;
case 78:
-#line 874 "./parser.y"
- { yyval.ctl=ins_ctrl(CT_SCROLLBAR, 0, yyvsp[0].ctl, yyvsp[-2].ctl);
}
+#line 874 "parser.y"
+ { yyval.ctl=ins_ctrl(CT_SCROLLBAR, 0, yyvsp[0].ctl, yyvsp[-2].ctl);
;}
break;
case 79:
-#line 875 "./parser.y"
- { yyval.ctl=ins_ctrl(CT_BUTTON, BS_CHECKBOX, yyvsp[0].ctl,
yyvsp[-2].ctl); }
+#line 875 "parser.y"
+ { yyval.ctl=ins_ctrl(CT_BUTTON, BS_CHECKBOX, yyvsp[0].ctl,
yyvsp[-2].ctl); ;}
break;
case 80:
-#line 876 "./parser.y"
- { yyval.ctl=ins_ctrl(CT_BUTTON, BS_DEFPUSHBUTTON, yyvsp[0].ctl,
yyvsp[-2].ctl); }
+#line 876 "parser.y"
+ { yyval.ctl=ins_ctrl(CT_BUTTON, BS_DEFPUSHBUTTON, yyvsp[0].ctl,
yyvsp[-2].ctl); ;}
break;
case 81:
-#line 877 "./parser.y"
- { yyval.ctl=ins_ctrl(CT_BUTTON, BS_GROUPBOX, yyvsp[0].ctl,
yyvsp[-2].ctl);}
+#line 877 "parser.y"
+ { yyval.ctl=ins_ctrl(CT_BUTTON, BS_GROUPBOX, yyvsp[0].ctl,
yyvsp[-2].ctl);;}
break;
case 82:
-#line 878 "./parser.y"
- { yyval.ctl=ins_ctrl(CT_BUTTON, BS_PUSHBUTTON, yyvsp[0].ctl,
yyvsp[-2].ctl); }
+#line 878 "parser.y"
+ { yyval.ctl=ins_ctrl(CT_BUTTON, BS_PUSHBUTTON, yyvsp[0].ctl,
yyvsp[-2].ctl); ;}
break;
case 83:
-#line 880 "./parser.y"
- { yyval.ctl=ins_ctrl(CT_BUTTON, BS_RADIOBUTTON, yyvsp[0].ctl,
yyvsp[-2].ctl); }
+#line 880 "parser.y"
+ { yyval.ctl=ins_ctrl(CT_BUTTON, BS_RADIOBUTTON, yyvsp[0].ctl,
yyvsp[-2].ctl); ;}
break;
case 84:
-#line 881 "./parser.y"
- { yyval.ctl=ins_ctrl(CT_BUTTON, BS_AUTO3STATE, yyvsp[0].ctl,
yyvsp[-2].ctl); }
+#line 881 "parser.y"
+ { yyval.ctl=ins_ctrl(CT_BUTTON, BS_AUTO3STATE, yyvsp[0].ctl,
yyvsp[-2].ctl); ;}
break;
case 85:
-#line 882 "./parser.y"
- { yyval.ctl=ins_ctrl(CT_BUTTON, BS_3STATE, yyvsp[0].ctl,
yyvsp[-2].ctl); }
+#line 882 "parser.y"
+ { yyval.ctl=ins_ctrl(CT_BUTTON, BS_3STATE, yyvsp[0].ctl,
yyvsp[-2].ctl); ;}
break;
case 86:
-#line 883 "./parser.y"
- { yyval.ctl=ins_ctrl(CT_BUTTON, BS_AUTOCHECKBOX, yyvsp[0].ctl,
yyvsp[-2].ctl); }
+#line 883 "parser.y"
+ { yyval.ctl=ins_ctrl(CT_BUTTON, BS_AUTOCHECKBOX, yyvsp[0].ctl,
yyvsp[-2].ctl); ;}
break;
case 87:
-#line 884 "./parser.y"
- { yyval.ctl=ins_ctrl(CT_BUTTON, BS_AUTORADIOBUTTON, yyvsp[0].ctl,
yyvsp[-2].ctl); }
+#line 884 "parser.y"
+ { yyval.ctl=ins_ctrl(CT_BUTTON, BS_AUTORADIOBUTTON, yyvsp[0].ctl,
yyvsp[-2].ctl); ;}
break;
case 88:
-#line 885 "./parser.y"
- { yyval.ctl=ins_ctrl(CT_STATIC, SS_LEFT, yyvsp[0].ctl,
yyvsp[-2].ctl); }
+#line 885 "parser.y"
+ { yyval.ctl=ins_ctrl(CT_STATIC, SS_LEFT, yyvsp[0].ctl,
yyvsp[-2].ctl); ;}
break;
case 89:
-#line 886 "./parser.y"
- { yyval.ctl=ins_ctrl(CT_STATIC, SS_CENTER, yyvsp[0].ctl,
yyvsp[-2].ctl); }
+#line 886 "parser.y"
+ { yyval.ctl=ins_ctrl(CT_STATIC, SS_CENTER, yyvsp[0].ctl,
yyvsp[-2].ctl); ;}
break;
case 90:
-#line 887 "./parser.y"
- { yyval.ctl=ins_ctrl(CT_STATIC, SS_RIGHT, yyvsp[0].ctl,
yyvsp[-2].ctl); }
+#line 887 "parser.y"
+ { yyval.ctl=ins_ctrl(CT_STATIC, SS_RIGHT, yyvsp[0].ctl,
yyvsp[-2].ctl); ;}
break;
case 91:
-#line 889 "./parser.y"
+#line 889 "parser.y"
{
yyvsp[0].ctl->title = yyvsp[-7].nid;
yyvsp[0].ctl->id = yyvsp[-5].num;
yyvsp[0].ctl->x = yyvsp[-3].num;
yyvsp[0].ctl->y = yyvsp[-1].num;
yyval.ctl = ins_ctrl(CT_STATIC, SS_ICON, yyvsp[0].ctl,
yyvsp[-9].ctl);
- }
+ ;}
break;
case 92:
-#line 899 "./parser.y"
+#line 899 "parser.y"
{
yyval.ctl=new_control();
yyval.ctl->title = new_name_id();
@@ -2757,11 +2757,11 @@
}
free(yyvsp[0].styles);
}
- }
+ ;}
break;
case 93:
-#line 924 "./parser.y"
+#line 924 "parser.y"
{
yyval.ctl = new_control();
yyval.ctl->id = yyvsp[-9].num;
@@ -2780,36 +2780,36 @@
}
free(yyvsp[0].styles);
}
- }
+ ;}
break;
case 94:
-#line 946 "./parser.y"
- { yyval.ctl = new_control(); }
+#line 946 "parser.y"
+ { yyval.ctl = new_control(); ;}
break;
case 95:
-#line 948 "./parser.y"
+#line 948 "parser.y"
{
yyval.ctl = new_control();
yyval.ctl->width = yyvsp[-2].num;
yyval.ctl->height = yyvsp[0].num;
- }
+ ;}
break;
case 96:
-#line 953 "./parser.y"
+#line 953 "parser.y"
{
yyval.ctl = new_control();
yyval.ctl->width = yyvsp[-4].num;
yyval.ctl->height = yyvsp[-2].num;
yyval.ctl->style = yyvsp[0].style;
yyval.ctl->gotstyle = TRUE;
- }
+ ;}
break;
case 97:
-#line 960 "./parser.y"
+#line 960 "parser.y"
{
yyval.ctl = new_control();
yyval.ctl->width = yyvsp[-6].num;
@@ -2818,11 +2818,11 @@
yyval.ctl->gotstyle = TRUE;
yyval.ctl->exstyle = yyvsp[0].style;
yyval.ctl->gotexstyle = TRUE;
- }
+ ;}
break;
case 98:
-#line 971 "./parser.y"
+#line 971 "parser.y"
{
yyval.ctl=new_control();
yyval.ctl->title = yyvsp[-16].nid;
@@ -2836,11 +2836,11 @@
yyval.ctl->height = yyvsp[-2].num;
yyval.ctl->exstyle = yyvsp[0].style;
yyval.ctl->gotexstyle = TRUE;
- }
+ ;}
break;
case 99:
-#line 985 "./parser.y"
+#line 985 "parser.y"
{
yyval.ctl=new_control();
yyval.ctl->title = yyvsp[-14].nid;
@@ -2852,69 +2852,69 @@
yyval.ctl->y = yyvsp[-4].num;
yyval.ctl->width = yyvsp[-2].num;
yyval.ctl->height = yyvsp[0].num;
- }
+ ;}
break;
case 100:
-#line 1000 "./parser.y"
- { yyval.fntid = new_font_id(yyvsp[-2].num, yyvsp[0].str, 0, 0); }
+#line 1000 "parser.y"
+ { yyval.fntid = new_font_id(yyvsp[-2].num, yyvsp[0].str, 0, 0); ;}
break;
case 101:
-#line 1005 "./parser.y"
- { yyval.styles = NULL; }
+#line 1005 "parser.y"
+ { yyval.styles = NULL; ;}
break;
case 102:
-#line 1006 "./parser.y"
- { yyval.styles = new_style_pair(yyvsp[0].style, 0); }
+#line 1006 "parser.y"
+ { yyval.styles = new_style_pair(yyvsp[0].style, 0); ;}
break;
case 103:
-#line 1007 "./parser.y"
- { yyval.styles = new_style_pair(yyvsp[-2].style, yyvsp[0].style); }
+#line 1007 "parser.y"
+ { yyval.styles = new_style_pair(yyvsp[-2].style, yyvsp[0].style);
;}
break;
case 104:
-#line 1011 "./parser.y"
- { yyval.style = new_style(yyvsp[-2].style->or_mask |
yyvsp[0].style->or_mask, yyvsp[-2].style->and_mask |
yyvsp[0].style->and_mask); free(yyvsp[-2].style); free(yyvsp[0].style);}
+#line 1011 "parser.y"
+ { yyval.style = new_style(yyvsp[-2].style->or_mask |
yyvsp[0].style->or_mask, yyvsp[-2].style->and_mask |
yyvsp[0].style->and_mask); free(yyvsp[-2].style);
free(yyvsp[0].style);;}
break;
case 105:
-#line 1012 "./parser.y"
- { yyval.style = yyvsp[-1].style; }
+#line 1012 "parser.y"
+ { yyval.style = yyvsp[-1].style; ;}
break;
case 106:
-#line 1013 "./parser.y"
- { yyval.style = new_style(yyvsp[0].num, 0); }
+#line 1013 "parser.y"
+ { yyval.style = new_style(yyvsp[0].num, 0); ;}
break;
case 107:
-#line 1014 "./parser.y"
- { yyval.style = new_style(0, yyvsp[0].num); }
+#line 1014 "parser.y"
+ { yyval.style = new_style(0, yyvsp[0].num); ;}
break;
case 108:
-#line 1018 "./parser.y"
+#line 1018 "parser.y"
{
yyval.nid = new_name_id();
yyval.nid->type = name_ord;
yyval.nid->name.i_name = yyvsp[0].num;
- }
+ ;}
break;
case 109:
-#line 1023 "./parser.y"
+#line 1023 "parser.y"
{
yyval.nid = new_name_id();
yyval.nid->type = name_str;
yyval.nid->name.s_name = yyvsp[0].str;
- }
+ ;}
break;
case 110:
-#line 1032 "./parser.y"
+#line 1032 "parser.y"
{
if(!win32)
yywarning("DIALOGEX not supported in 16-bit
mode");
@@ -2954,167 +2954,167 @@
if(!yyval.dlgex->lvc.language)
yyval.dlgex->lvc.language =
dup_language(currentlanguage);
- }
+ ;}
break;
[truncated at 1000 lines; 1359 more skipped]