X-Git-Url: http://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/8cb6370effd9f2dacc6dc9b662a43ea19ee637ac..2310330e7d4d724bf6641339836be8523f95c916:/src/parse.c

diff --git a/src/parse.c b/src/parse.c
index 51a215a..101d2e6 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -293,9 +293,9 @@ static const short yyrline[] = { 0,
    357,   360,   363,   366,   369,   374,   377,   380,   385,   386,
    389,   401,   413,   416,   428,   433,   438,   441,   446,   447,
    451,   461,   471,   481,   487,   492,   497,   518,   519,   523,
-   524,   527,   528,   544,   559,   562,   563,   566,   567,   570,
-   573,   583,   584,   587,   600,   604,   608,   612,   616,   620,
-   626,   627,   631
+   524,   527,   528,   539,   549,   552,   553,   556,   557,   560,
+   563,   573,   574,   577,   590,   594,   598,   602,   606,   610,
+   616,   617,   621
 };
 #endif
 
@@ -1531,12 +1531,7 @@ case 73:
 {
 			vararg = FALSE;
 			has_self = TRUE;
-			if(strcmp(yyvsp[0].id,"this")==0) {
-				push_self(yyvsp[0].id);
-				print_error(TRUE,_("Use of 'this' is "
-						   "depreciated, use 'self' "
-						   "instead"),line_no);
-			} else if(strcmp(yyvsp[0].id,"self")==0)
+			if(strcmp(yyvsp[0].id,"self")==0)
 				push_self(yyvsp[0].id);
 			else {
 				g_free(yyvsp[0].id);
@@ -1546,15 +1541,10 @@ case 73:
        					;
     break;}
 case 74:
-#line 544 "parse.y"
+#line 539 "parse.y"
 {
 			has_self = TRUE;
-			if(strcmp(yyvsp[-2].id,"this")==0) {
-				push_self(yyvsp[-2].id);
-				print_error(TRUE,_("Use of 'this' is "
-						   "depreciated, use 'self' "
-						   "instead"),line_no);
-			} else if(strcmp(yyvsp[-2].id,"self")==0)
+			if(strcmp(yyvsp[-2].id,"self")==0)
 				push_self(yyvsp[-2].id);
 			else {
 				g_free(yyvsp[-2].id);
@@ -1564,33 +1554,33 @@ case 74:
 					;
     break;}
 case 75:
-#line 559 "parse.y"
+#line 549 "parse.y"
 { has_self = FALSE; ;
     break;}
 case 76:
-#line 562 "parse.y"
+#line 552 "parse.y"
 { vararg = TRUE; ;
     break;}
 case 77:
-#line 563 "parse.y"
+#line 553 "parse.y"
 { vararg = FALSE; ;
     break;}
 case 78:
-#line 566 "parse.y"
+#line 556 "parse.y"
 { ; ;
     break;}
 case 79:
-#line 567 "parse.y"
+#line 557 "parse.y"
 { ; ;
     break;}
 case 80:
-#line 570 "parse.y"
+#line 560 "parse.y"
 {
 			push_funcarg(yyvsp[0].id);
 								;
     break;}
 case 81:
-#line 573 "parse.y"
+#line 563 "parse.y"
 {
 			if(strcmp(yyvsp[-2].id,"check")!=0) {
 				yyerror(_("parse error"));
@@ -1601,15 +1591,15 @@ case 81:
 								;
     break;}
 case 82:
-#line 583 "parse.y"
+#line 573 "parse.y"
 { ; ;
     break;}
 case 83:
-#line 584 "parse.y"
+#line 574 "parse.y"
 { ; ;
     break;}
 case 84:
-#line 587 "parse.y"
+#line 577 "parse.y"
 {
 			if(strcmp(yyvsp[0].id,"type")==0) {
 				Node *node = new_check(TYPE_CHECK,NULL);
@@ -1625,60 +1615,60 @@ case 84:
 					;
     break;}
 case 85:
-#line 600 "parse.y"
+#line 590 "parse.y"
 {
 			Node *node = new_check(GT_CHECK,yyvsp[0].id);
 			checks = g_list_append(checks,node);
 					;
     break;}
 case 86:
-#line 604 "parse.y"
+#line 594 "parse.y"
 {
 			Node *node = new_check(LT_CHECK,yyvsp[0].id);
 			checks = g_list_append(checks,node);
 					;
     break;}
 case 87:
-#line 608 "parse.y"
+#line 598 "parse.y"
 {
 			Node *node = new_check(GE_CHECK,yyvsp[0].id);
 			checks = g_list_append(checks,node);
 					;
     break;}
 case 88:
-#line 612 "parse.y"
+#line 602 "parse.y"
 {
 			Node *node = new_check(LE_CHECK,yyvsp[0].id);
 			checks = g_list_append(checks,node);
 					;
     break;}
 case 89:
-#line 616 "parse.y"
+#line 606 "parse.y"
 {
 			Node *node = new_check(EQ_CHECK,yyvsp[0].id);
 			checks = g_list_append(checks,node);
 					;
     break;}
 case 90:
-#line 620 "parse.y"
+#line 610 "parse.y"
 {
 			Node *node = new_check(NE_CHECK,yyvsp[0].id);
 			checks = g_list_append(checks,node);
 					;
     break;}
 case 91:
-#line 626 "parse.y"
+#line 616 "parse.y"
 { yyval.id = yyvsp[0].id; ;
     break;}
 case 92:
-#line 627 "parse.y"
+#line 617 "parse.y"
 {
 			yyval.id = g_strconcat("-",yyvsp[0].id,NULL);
 			g_free(yyvsp[0].id);
 					;
     break;}
 case 93:
-#line 631 "parse.y"
+#line 621 "parse.y"
 { yyval.id = yyvsp[0].id; ;
     break;}
 }
@@ -1903,5 +1893,5 @@ yyerrhandle:
     }
   return 1;
 }
-#line 634 "parse.y"
+#line 624 "parse.y"