--- parser3/src/main/compile.tab.C 2003/04/03 06:40:38 1.81.2.13.2.23 +++ parser3/src/main/compile.tab.C 2003/04/03 12:26:11 1.81.2.13.2.26 @@ -43,7 +43,7 @@ Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - $Id: compile.tab.C,v 1.81.2.13.2.23 2003/04/03 06:40:38 paf Exp $ + $Id: compile.tab.C,v 1.81.2.13.2.26 2003/04/03 12:26:11 paf Exp $ */ /** @@ -83,9 +83,9 @@ // forwards -static int real_yyerror(Parse_control *pc, char *s); -static void yyprint(FILE *file, int type, YYSTYPE value); -static int yylex(YYSTYPE *lvalp, void *pc); +static int real_yyerror(Parse_control* pc, char* s); +static void yyprint(FILE* file, int type, YYSTYPE value); +static int yylex(YYSTYPE* lvalp, void* pc); // local convinient inplace typecast & var @@ -1041,11 +1041,11 @@ yyreduce: case 1: #line 123 "compile.y" { - Method& method=*new Method(/*main_method_name, */Method::CT_ANY, + Method& method=*new Method(Method::CT_ANY, 0, 0, /*min, max numbered_params_count*/ 0/*param_names*/, 0/*local_names*/, yyvsp[0]/*parser_code*/, 0/*native_code*/); - PC.cclass->add_method(main_method_name, method); + PC.cclass->add_method(PC.alias_method(main_method_name), method); ; break;} case 8: @@ -1153,7 +1153,7 @@ case 16: 0, 0/*min,max numbered_params_count*/, params_names, locals_names, yyvsp[0], 0); - PC.cclass->add_method(name, method); + PC.cclass->add_method(PC.alias_method(name), method); ; break;} case 19: @@ -1917,7 +1917,7 @@ yyerrhandle: 4:[^({]=pop */ -inline ungetc(Parse_control& pc, uint last_line_end_col) { +inline void ungetc(Parse_control& pc, uint last_line_end_col) { pc.source--; if(pc.pos.col==0) { --pc.pos.line; pc.pos.col=last_line_end_col;