[src/trunk]: src/tools/m4/bootstrap Adjust #line directive paths so that make...

[uebayasi <uebayasi%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f71b804a38e1
branches:  trunk
changeset: 749272:f71b804a38e1
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Tue Nov 24 15:09:10 2009 +0000

description:
Adjust #line directive paths so that make depend works correctly.

diffstat:

 tools/m4/bootstrap/parser.c    |  52 +++++++++++++++++++++---------------------
 tools/m4/bootstrap/tokenizer.c |  34 +++++++++++++-------------
 2 files changed, 43 insertions(+), 43 deletions(-)

diffs (269 lines):

diff -r 6e1d0e6069e6 -r f71b804a38e1 tools/m4/bootstrap/parser.c
--- a/tools/m4/bootstrap/parser.c       Tue Nov 24 14:07:30 2009 +0000
+++ b/tools/m4/bootstrap/parser.c       Tue Nov 24 15:09:10 2009 +0000
@@ -20,7 +20,7 @@
 #define yyerrok (yyerrflag=0)
 #define YYRECOVERING (yyerrflag!=0)
 #define YYPREFIX "yy"
-#line 2 "/usr/src/tools/m4/../../usr.bin/m4/parser.y"
+#line 2 "../../../usr.bin/m4/parser.y"
 /* NetBSD: parser.y,v 1.2 2009/10/26 21:11:28 christos Exp  */
 /* $OpenBSD: parser.y,v 1.6 2008/08/21 21:00:14 espie Exp $ */
 /*
@@ -312,7 +312,7 @@
 YYSTYPE *yyvs;
 int yystacksize;
 int yyparse(void);
-#line 85 "/usr/src/tools/m4/../../usr.bin/m4/parser.y"
+#line 85 "../../../usr.bin/m4/parser.y"
 
 #line 315 "parser.c"
 /* allocate initial stack or double stack size, up to YYMAXDEPTH */
@@ -483,23 +483,23 @@
     switch (yyn)
     {
 case 1:
-#line 45 "/usr/src/tools/m4/../../usr.bin/m4/parser.y"
+#line 45 "../../../usr.bin/m4/parser.y"
 { end_result = yyvsp[0]; }
 break;
 case 2:
-#line 47 "/usr/src/tools/m4/../../usr.bin/m4/parser.y"
+#line 47 "../../../usr.bin/m4/parser.y"
 { yyval = yyvsp[-2] + yyvsp[0]; }
 break;
 case 3:
-#line 48 "/usr/src/tools/m4/../../usr.bin/m4/parser.y"
+#line 48 "../../../usr.bin/m4/parser.y"
 { yyval = yyvsp[-2] - yyvsp[0]; }
 break;
 case 4:
-#line 49 "/usr/src/tools/m4/../../usr.bin/m4/parser.y"
+#line 49 "../../../usr.bin/m4/parser.y"
 { yyval = yyvsp[-2] * yyvsp[0]; }
 break;
 case 5:
-#line 50 "/usr/src/tools/m4/../../usr.bin/m4/parser.y"
+#line 50 "../../../usr.bin/m4/parser.y"
 {
                if (yyvsp[0] == 0) {
                        yyerror("division by zero");
@@ -509,7 +509,7 @@
        }
 break;
 case 6:
-#line 57 "/usr/src/tools/m4/../../usr.bin/m4/parser.y"
+#line 57 "../../../usr.bin/m4/parser.y"
 { 
                if (yyvsp[0] == 0) {
                        yyerror("modulo zero");
@@ -519,75 +519,75 @@
        }
 break;
 case 7:
-#line 64 "/usr/src/tools/m4/../../usr.bin/m4/parser.y"
+#line 64 "../../../usr.bin/m4/parser.y"
 { yyval = yyvsp[-2] << yyvsp[0]; }
 break;
 case 8:
-#line 65 "/usr/src/tools/m4/../../usr.bin/m4/parser.y"
+#line 65 "../../../usr.bin/m4/parser.y"
 { yyval = yyvsp[-2] >> yyvsp[0]; }
 break;
 case 9:
-#line 66 "/usr/src/tools/m4/../../usr.bin/m4/parser.y"
+#line 66 "../../../usr.bin/m4/parser.y"
 { yyval = yyvsp[-2] < yyvsp[0]; }
 break;
 case 10:
-#line 67 "/usr/src/tools/m4/../../usr.bin/m4/parser.y"
+#line 67 "../../../usr.bin/m4/parser.y"
 { yyval = yyvsp[-2] > yyvsp[0]; }
 break;
 case 11:
-#line 68 "/usr/src/tools/m4/../../usr.bin/m4/parser.y"
+#line 68 "../../../usr.bin/m4/parser.y"
 { yyval = yyvsp[-2] <= yyvsp[0]; }
 break;
 case 12:
-#line 69 "/usr/src/tools/m4/../../usr.bin/m4/parser.y"
+#line 69 "../../../usr.bin/m4/parser.y"
 { yyval = yyvsp[-2] >= yyvsp[0]; }
 break;
 case 13:
-#line 70 "/usr/src/tools/m4/../../usr.bin/m4/parser.y"
+#line 70 "../../../usr.bin/m4/parser.y"
 { yyval = yyvsp[-2] == yyvsp[0]; }
 break;
 case 14:
-#line 71 "/usr/src/tools/m4/../../usr.bin/m4/parser.y"
+#line 71 "../../../usr.bin/m4/parser.y"
 { yyval = yyvsp[-2] != yyvsp[0]; }
 break;
 case 15:
-#line 72 "/usr/src/tools/m4/../../usr.bin/m4/parser.y"
+#line 72 "../../../usr.bin/m4/parser.y"
 { yyval = yyvsp[-2] & yyvsp[0]; }
 break;
 case 16:
-#line 73 "/usr/src/tools/m4/../../usr.bin/m4/parser.y"
+#line 73 "../../../usr.bin/m4/parser.y"
 { yyval = yyvsp[-2] ^ yyvsp[0]; }
 break;
 case 17:
-#line 74 "/usr/src/tools/m4/../../usr.bin/m4/parser.y"
+#line 74 "../../../usr.bin/m4/parser.y"
 { yyval = yyvsp[-2] | yyvsp[0]; }
 break;
 case 18:
-#line 75 "/usr/src/tools/m4/../../usr.bin/m4/parser.y"
+#line 75 "../../../usr.bin/m4/parser.y"
 { yyval = yyvsp[-2] && yyvsp[0]; }
 break;
 case 19:
-#line 76 "/usr/src/tools/m4/../../usr.bin/m4/parser.y"
+#line 76 "../../../usr.bin/m4/parser.y"
 { yyval = yyvsp[-2] || yyvsp[0]; }
 break;
 case 20:
-#line 77 "/usr/src/tools/m4/../../usr.bin/m4/parser.y"
+#line 77 "../../../usr.bin/m4/parser.y"
 { yyval = yyvsp[-1]; }
 break;
 case 21:
-#line 78 "/usr/src/tools/m4/../../usr.bin/m4/parser.y"
+#line 78 "../../../usr.bin/m4/parser.y"
 { yyval = -yyvsp[0]; }
 break;
 case 22:
-#line 79 "/usr/src/tools/m4/../../usr.bin/m4/parser.y"
+#line 79 "../../../usr.bin/m4/parser.y"
 { yyval = yyvsp[0]; }
 break;
 case 23:
-#line 80 "/usr/src/tools/m4/../../usr.bin/m4/parser.y"
+#line 80 "../../../usr.bin/m4/parser.y"
 { yyval = !yyvsp[0]; }
 break;
 case 24:
-#line 81 "/usr/src/tools/m4/../../usr.bin/m4/parser.y"
+#line 81 "../../../usr.bin/m4/parser.y"
 { yyval = ~yyvsp[0]; }
 break;
 #line 591 "parser.c"
diff -r 6e1d0e6069e6 -r f71b804a38e1 tools/m4/bootstrap/tokenizer.c
--- a/tools/m4/bootstrap/tokenizer.c    Tue Nov 24 14:07:30 2009 +0000
+++ b/tools/m4/bootstrap/tokenizer.c    Tue Nov 24 15:09:10 2009 +0000
@@ -472,8 +472,8 @@
 #define YY_MORE_ADJ 0
 #define YY_RESTORE_YY_MORE_OFFSET
 char *yytext;
-#line 1 "/usr/src/tools/m4/../../usr.bin/m4/tokenizer.l"
-#line 2 "/usr/src/tools/m4/../../usr.bin/m4/tokenizer.l"
+#line 1 "../../../usr.bin/m4/tokenizer.l"
+#line 2 "../../../usr.bin/m4/tokenizer.l"
 /* NetBSD: tokenizer.l,v 1.2 2009/10/26 21:11:28 christos Exp  */
 /* $OpenBSD: tokenizer.l,v 1.6 2008/08/21 21:00:14 espie Exp $ */
 /*
@@ -694,7 +694,7 @@
        register char *yy_cp, *yy_bp;
        register int yy_act;
     
-#line 45 "/usr/src/tools/m4/../../usr.bin/m4/tokenizer.l"
+#line 45 "../../../usr.bin/m4/tokenizer.l"
 
 #line 697 "tokenizer.c"
 
@@ -782,17 +782,17 @@
 case 1:
 /* rule 1 can match eol */
 YY_RULE_SETUP
-#line 46 "/usr/src/tools/m4/../../usr.bin/m4/tokenizer.l"
+#line 46 "../../../usr.bin/m4/tokenizer.l"
 {/* just skip it */}
        YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 47 "/usr/src/tools/m4/../../usr.bin/m4/tokenizer.l"
+#line 47 "../../../usr.bin/m4/tokenizer.l"
 { yylval = number(); return(NUMBER); }
        YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 48 "/usr/src/tools/m4/../../usr.bin/m4/tokenizer.l"
+#line 48 "../../../usr.bin/m4/tokenizer.l"
 { if (mimic_gnu) {
                                yylval = parse_radix(); return(NUMBER);
                          } else {
@@ -802,52 +802,52 @@
        YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 54 "/usr/src/tools/m4/../../usr.bin/m4/tokenizer.l"
+#line 54 "../../../usr.bin/m4/tokenizer.l"
 { return(LE); }
        YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 55 "/usr/src/tools/m4/../../usr.bin/m4/tokenizer.l"
+#line 55 "../../../usr.bin/m4/tokenizer.l"
 { return(GE); }
        YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 56 "/usr/src/tools/m4/../../usr.bin/m4/tokenizer.l"
+#line 56 "../../../usr.bin/m4/tokenizer.l"
 { return(LSHIFT); }
        YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 57 "/usr/src/tools/m4/../../usr.bin/m4/tokenizer.l"
+#line 57 "../../../usr.bin/m4/tokenizer.l"
 { return(RSHIFT); }
        YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 58 "/usr/src/tools/m4/../../usr.bin/m4/tokenizer.l"
+#line 58 "../../../usr.bin/m4/tokenizer.l"
 { return(EQ); }
        YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 59 "/usr/src/tools/m4/../../usr.bin/m4/tokenizer.l"
+#line 59 "../../../usr.bin/m4/tokenizer.l"
 { return(NE); }
        YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 60 "/usr/src/tools/m4/../../usr.bin/m4/tokenizer.l"
+#line 60 "../../../usr.bin/m4/tokenizer.l"
 { return(LAND); }
        YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 61 "/usr/src/tools/m4/../../usr.bin/m4/tokenizer.l"
+#line 61 "../../../usr.bin/m4/tokenizer.l"
 { return(LOR); }
        YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 62 "/usr/src/tools/m4/../../usr.bin/m4/tokenizer.l"
+#line 62 "../../../usr.bin/m4/tokenizer.l"
 { return yytext[0]; }
        YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 63 "/usr/src/tools/m4/../../usr.bin/m4/tokenizer.l"
+#line 63 "../../../usr.bin/m4/tokenizer.l"
 ECHO;
        YY_BREAK
 #line 851 "tokenizer.c"
@@ -1852,7 +1852,7 @@
 
 #define YYTABLES_NAME "yytables"
 
-#line 63 "/usr/src/tools/m4/../../usr.bin/m4/tokenizer.l"
+#line 63 "../../../usr.bin/m4/tokenizer.l"