...

diff --git a/dev/phpdbg_lexer.l b/dev/phpdbg_lexer.l
index ff90f1255dc7cff7379b14bf4ab59d46148a9967..9be1f533b006281e489b809d2878dec479333829 100644 (file)
--- a/dev/phpdbg_lexer.l
+++ b/dev/phpdbg_lexer.l
@@ -33,7 +33,7 @@ C_EVAL                "eval"
 C_SHELL                "shell"
 
 DIGITS         [0-9]+
-ID                     [a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*
+ID                     [a-zA-Z_\x7f-\xff\-][a-zA-Z0-9_\x7f-\xff\-]*
 NSID           [\\\\]?{ID}
 METHOD         {NSID}+::{ID}
 FILE           [^ :]+:[0-9]+

diff --git a/phpdbg_lexer.c b/phpdbg_lexer.c
index f4a7f324bb769b28831cff2e579d4ea46dbcb3e8..0804af5619d250a0ec8347e43deed39e10e8455f 100644 (file)
--- a/phpdbg_lexer.c
+++ b/phpdbg_lexer.c
@@ -361,11 +361,11 @@ struct yy_trans_info
 static yyconst flex_int16_t yy_accept[83] =
     {   0,
         0,    0,    0,    0,   15,   13,   12,   12,   12,   13,
-        5,    5,   13,   10,   13,   10,   10,   10,   10,   10,
+       10,    5,    5,   13,   13,   10,   10,   10,   10,   10,
        10,   10,   10,   11,   11,   12,    0,    0,   12,   12,
-        0,    0,    9,    0,    0,    5,    0,   10,    0,   10,
+        0,    0,    9,    0,    0,   10,   10,    0,    0,    5,
         0,    0,   10,   10,   10,   10,    2,   10,    1,   10,
-       10,   10,   11,   11,    7,    9,    0,    7,    8,    0,
+       10,   10,   11,   11,    7,    9,    0,    7,    0,    8,
         0,    0,   10,   10,   10,   10,   10,   10,    6,   10,
        10,    3,   10,   10,    6,   10,   10,    4,   10,   10,
        10,    0
@@ -377,62 +377,62 @@ static yyconst flex_int32_t yy_ec[256] =
         1,    1,    2,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    4,    1,    5,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    6,    7,    7,
-        7,    7,    7,    7,    7,    7,    7,    8,    1,    1,
-        1,    1,    1,    1,    9,    9,    9,    9,    9,    9,
-       10,   10,   10,   10,   10,   10,   10,   10,   10,   10,
-       10,   10,   10,   10,   10,   10,   10,   10,   10,   10,
-        1,   11,    1,    1,   10,    1,   12,   13,    9,   14,
-
-       15,   16,   10,   17,   18,   10,   10,   19,   10,   20,
-       21,   10,   10,   22,   23,   24,   25,   26,   10,   27,
-       28,   10,    1,    1,    1,    1,   10,   10,   10,   10,
-       10,   10,   10,   10,   10,   10,   10,   10,   10,   10,
-       10,   10,   10,   10,   10,   10,   10,   10,   10,   10,
-       10,   10,   10,   10,   10,   10,   10,   10,   10,   10,
-       10,   10,   10,   10,   10,   10,   10,   10,   10,   10,
-       10,   10,   10,   10,   10,   10,   10,   10,   10,   10,
-       10,   10,   10,   10,   10,   10,   10,   10,   10,   10,
-       10,   10,   10,   10,   10,   10,   10,   10,   10,   10,
-
-       10,   10,   10,   10,   10,   10,   10,   10,   10,   10,
-       10,   10,   10,   10,   10,   10,   10,   10,   10,   10,
-       10,   10,   10,   10,   10,   10,   10,   10,   10,   10,
-       10,   10,   10,   10,   10,   10,   10,   10,   10,   10,
-       10,   10,   10,   10,   10,   10,   10,   10,   10,   10,
-       10,   10,   10,   10,   10
+        1,    1,    1,    1,    6,    1,    1,    7,    8,    8,
+        8,    8,    8,    8,    8,    8,    8,    9,    1,    1,
+        1,    1,    1,    1,   10,   10,   10,   10,   10,   10,
+        6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
+        6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
+        1,   11,    1,    1,    6,    1,   12,   13,   10,   14,
+
+       15,   16,    6,   17,   18,    6,    6,   19,    6,   20,
+       21,    6,    6,   22,   23,   24,   25,   26,    6,   27,
+       28,    6,    1,    1,    1,    1,    6,    6,    6,    6,
+        6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
+        6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
+        6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
+        6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
+        6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
+        6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
+        6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
+
+        6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
+        6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
+        6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
+        6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
+        6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
+        6,    6,    6,    6,    6
     } ;
 
 static yyconst flex_int32_t yy_meta[29] =
     {   0,
-        1,    1,    2,    3,    1,    4,    4,    1,    5,    5,
-        1,    5,    5,    5,    5,    5,    5,    5,    5,    5,
-        5,    5,    5,    5,    5,    5,    5,    5
+        1,    1,    2,    3,    1,    4,    5,    5,    1,    4,
+        1,    4,    4,    4,    4,    4,    4,    4,    4,    4,
+        4,    4,    4,    4,    4,    4,    4,    4
     } ;
 
 static yyconst flex_int16_t yy_base[93] =
     {   0,
-        0,    0,   27,   30,  264,  245,   33,   36,   43,   44,
-       50,   53,  269,   77,   88,   99,   44,   51,   32,   55,
-       25,   50,   36,    0,   63,  109,  241,   80,  112,  119,
-      120,   87,  236,  127,  132,  135,  138,  216,  149,  207,
-      157,  168,   58,   85,  149,   90,  206,  111,  121,  162,
-      101,  160,    0,  182,  142,  269,  134,  182,    0,    0,
-      193,    0,  154,  179,  163,  184,  172,  188,    0,  192,
-      190,  112,  196,  194,    0,  197,  202,  100,  203,  205,
-      208,  269,  226,  231,  236,  241,  246,  251,  256,  261,
-       69,  263
+        0,    0,   27,   30,  247,  228,   33,   36,   44,   45,
+       56,   44,   61,  272,   71,   82,   68,   48,   23,   79,
+       84,   59,   88,    0,  105,  108,  219,   97,  111,  114,
+      117,   87,  208,  122,  128,  179,  144,  116,  137,  127,
+      142,  158,  150,  129,  152,  153,  135,  158,  125,  160,
+       37,  159,    0,  177,  176,  272,  116,  180,    0,    0,
+      191,    0,  177,  188,  185,  187,  189,  194,    0,  198,
+      195,   78,  200,  201,    0,  203,  208,   57,  209,  172,
+      211,  272,  229,  234,  239,  244,  249,  254,  259,  264,
+       39,  266
 
     } ;
 
 static yyconst flex_int16_t yy_def[93] =
     {   0,
        82,    1,   83,   83,   82,   84,   84,   84,   82,   85,
-       84,   84,   82,   86,   87,   86,   16,   16,   16,   16,
+       86,   84,   84,   82,   87,   86,   16,   16,   16,   16,
        16,   16,   16,   88,   88,   82,   84,   82,   84,   82,
-       85,   89,   84,   89,   85,   84,   84,   16,   82,   16,
-       87,   90,   16,   16,   16,   16,   16,   16,   16,   16,
-       16,   16,   88,   88,   82,   82,   89,   89,   37,   91,
+       85,   89,   84,   89,   85,   16,   16,   82,   87,   84,
+       84,   90,   16,   16,   16,   16,   16,   16,   16,   16,
+       16,   16,   88,   88,   82,   82,   89,   89,   91,   41,
        90,   61,   16,   16,   16,   16,   16,   16,   92,   16,
        16,   16,   16,   16,   92,   16,   16,   16,   16,   16,
        16,    0,   82,   82,   82,   82,   82,   82,   82,   82,
@@ -440,77 +440,77 @@ static yyconst flex_int16_t yy_def[93] =
 
     } ;
 
-static yyconst flex_int16_t yy_nxt[298] =
+static yyconst flex_int16_t yy_nxt[301] =
     {   0,
-        6,    7,    8,    9,   10,   11,   12,   13,   14,   14,
-       15,   14,   14,   16,   17,   18,   14,   14,   14,   19,
-       20,   14,   21,   22,   14,   14,   14,   23,   25,   26,
+        6,    7,    8,    9,   10,   11,   12,   13,   14,   11,
+       15,   11,   11,   16,   17,   18,   11,   11,   11,   19,
+       20,   11,   21,   22,   11,   11,   11,   23,   25,   26,
        25,   25,   26,   25,   29,   29,   30,   29,   29,   30,
-       28,   50,   40,   28,   30,   30,   30,   32,   33,   40,
-       52,   34,   47,   40,   35,   36,   36,   28,   36,   36,
-       28,   40,   46,   44,   54,   30,   54,   40,   40,   45,
-       48,   51,   40,   69,   49,   40,   37,   27,   27,   27,
-       63,   27,   38,   38,   39,   55,   55,   41,   27,   27,
-       27,   56,   27,   27,   27,   28,   64,   57,   27,   27,
-
-       27,   27,   40,   27,   38,   38,   39,   40,   66,   41,
-       30,   30,   30,   29,   29,   30,   43,   40,   40,   28,
-       30,   30,   30,   32,   33,   68,   47,   34,   40,   40,
-       35,   56,   58,   58,   27,   32,   82,   57,   40,   34,
-       36,   36,   28,   59,   59,   28,   59,   55,   55,   59,
-       59,   59,   59,   59,   55,   55,   60,   27,   27,   27,
-       65,   27,   27,   27,   28,   70,   40,   27,   27,   27,
-       27,   40,   27,   61,   61,   39,   67,   40,   41,   40,
-       40,   72,   49,   54,   30,   54,   56,   58,   58,   40,
-       74,   71,   57,   27,   27,   27,   40,   27,   61,   61,
-
-       39,   40,   49,   41,   76,   40,   73,   40,   77,   40,
-       47,   40,   78,   40,   40,   79,   80,   81,   49,   40,
-       40,   47,   40,   40,   40,   40,   24,   24,   24,   24,
-       24,   27,   27,   40,   27,   27,   31,   31,   31,   31,
-       31,   40,   40,   28,   40,   40,   42,   42,   28,   42,
-       42,   53,   28,   53,   53,   53,   32,   32,   32,   32,
-       32,   62,   62,   82,   62,   62,   75,   75,    5,   82,
+       36,   28,   69,   47,   28,   30,   30,   30,   32,   33,
+       40,   40,   28,   34,   36,   35,   27,   27,   27,   46,
+       27,   68,   37,   37,   38,   36,   39,   40,   40,   28,
+       41,   27,   27,   27,   36,   27,   36,   27,   27,   28,
+       51,   27,   27,   27,   27,   36,   27,   44,   37,   37,
+       38,   56,   39,   45,   48,   36,   36,   57,   49,   43,
+
+       50,   36,   52,   55,   55,   36,   54,   30,   54,   30,
+       30,   30,   29,   29,   30,   30,   30,   30,   82,   28,
+       32,   33,   55,   55,   59,   34,   56,   35,   58,   58,
+       27,   32,   57,   40,   40,   28,   34,   27,   27,   27,
+       64,   27,   36,   27,   27,   28,   36,   27,   60,   60,
+       28,   60,   36,   60,   60,   60,   60,   60,   27,   27,
+       27,   36,   27,   65,   62,   62,   38,   36,   39,   36,
+       36,   66,   63,   47,   67,   36,   36,   36,   54,   30,
+       54,   49,   55,   55,   56,   49,   58,   58,   70,   36,
+       57,   27,   27,   27,   36,   27,   36,   62,   62,   38,
+
+       71,   39,   36,   72,   36,   36,   36,   74,   49,   73,
+       76,   36,   36,   77,   47,   36,   28,   36,   36,   78,
+       36,   79,   80,   81,   47,   36,   36,   28,   36,   24,
+       24,   24,   24,   24,   27,   27,   28,   27,   27,   31,
+       31,   31,   31,   31,   36,   36,   82,   36,   36,   42,
+       42,   82,   42,   42,   53,   82,   53,   53,   53,   32,
+       32,   32,   32,   32,   61,   61,   82,   61,   61,   75,
+       75,    5,   82,   82,   82,   82,   82,   82,   82,   82,
        82,   82,   82,   82,   82,   82,   82,   82,   82,   82,
-       82,   82,   82,   82,   82,   82,   82,   82,   82,   82,
-       82,   82,   82,   82,   82,   82,   82
+       82,   82,   82,   82,   82,   82,   82,   82,   82,   82
 
     } ;
 
-static yyconst flex_int16_t yy_chk[298] =
+static yyconst flex_int16_t yy_chk[301] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    3,    3,
         3,    4,    4,    4,    7,    7,    7,    8,    8,    8,
-        7,   21,   21,    8,    9,    9,    9,   10,   10,   19,
-       23,   10,   19,   23,   10,   11,   11,   11,   12,   12,
-       12,   17,   18,   17,   25,   25,   25,   22,   18,   17,
-       20,   22,   20,   91,   20,   43,   11,   14,   14,   14,
-       43,   14,   14,   14,   14,   28,   28,   14,   15,   15,
-       15,   32,   15,   15,   15,   15,   44,   32,   15,   16,
-
-       16,   16,   44,   16,   16,   16,   16,   46,   46,   16,
-       26,   26,   26,   29,   29,   29,   16,   78,   51,   29,
-       30,   30,   30,   31,   31,   51,   48,   31,   48,   72,
-       31,   34,   34,   34,   35,   35,   57,   34,   49,   35,
-       36,   36,   36,   37,   37,   37,   37,   55,   55,   37,
-       37,   37,   37,   37,   39,   39,   39,   41,   41,   41,
-       45,   41,   41,   41,   41,   63,   45,   41,   42,   42,
-       42,   63,   42,   42,   42,   42,   50,   52,   42,   50,
-       65,   65,   52,   54,   54,   54,   58,   58,   58,   67,
-       67,   64,   58,   61,   61,   61,   64,   61,   61,   61,
-
-       61,   66,   68,   61,   70,   68,   66,   71,   71,   70,
-       73,   74,   74,   73,   76,   76,   77,   79,   80,   77,
-       79,   81,   80,   47,   40,   81,   83,   83,   83,   83,
-       83,   84,   84,   38,   84,   84,   85,   85,   85,   85,
-       85,   86,   86,   33,   86,   86,   87,   87,   27,   87,
-       87,   88,    6,   88,   88,   88,   89,   89,   89,   89,
-       89,   90,   90,    5,   90,   90,   92,   92,   82,   82,
-       82,   82,   82,   82,   82,   82,   82,   82,   82,   82,
+       19,    7,   91,   19,    8,    9,    9,    9,   10,   10,
+       12,   12,   12,   10,   51,   10,   11,   11,   11,   18,
+       11,   51,   11,   11,   11,   18,   11,   13,   13,   13,
+       12,   15,   15,   15,   78,   15,   22,   15,   15,   15,
+       22,   15,   16,   16,   16,   17,   16,   17,   16,   16,
+       16,   32,   16,   17,   20,   72,   20,   32,   20,   16,
+
+       21,   21,   23,   28,   28,   23,   25,   25,   25,   26,
+       26,   26,   29,   29,   29,   30,   30,   30,   57,   29,
+       31,   31,   38,   38,   38,   31,   34,   31,   34,   34,
+       35,   35,   34,   40,   40,   40,   35,   39,   39,   39,
+       44,   39,   49,   39,   39,   39,   44,   39,   41,   41,
+       41,   41,   47,   41,   41,   41,   41,   41,   42,   42,
+       42,   37,   42,   45,   42,   42,   42,   43,   42,   45,
+       46,   46,   43,   48,   50,   48,   52,   50,   54,   54,
+       54,   52,   55,   55,   58,   80,   58,   58,   63,   80,
+       58,   61,   61,   61,   63,   61,   36,   61,   61,   61,
+
+       64,   61,   65,   65,   66,   64,   67,   67,   68,   66,
+       70,   68,   71,   71,   73,   70,   33,   73,   74,   74,
+       76,   76,   77,   79,   81,   77,   79,   27,   81,   83,
+       83,   83,   83,   83,   84,   84,    6,   84,   84,   85,
+       85,   85,   85,   85,   86,   86,    5,   86,   86,   87,
+       87,    0,   87,   87,   88,    0,   88,   88,   88,   89,
+       89,   89,   89,   89,   90,   90,    0,   90,   90,   92,
+       92,   82,   82,   82,   82,   82,   82,   82,   82,   82,
        82,   82,   82,   82,   82,   82,   82,   82,   82,   82,
-       82,   82,   82,   82,   82,   82,   82
+       82,   82,   82,   82,   82,   82,   82,   82,   82,   82
 
     } ;
 
@@ -521,8 +521,8 @@ static yyconst flex_int16_t yy_chk[298] =
 #define yymore() yymore_used_but_not_detected
 #define YY_MORE_ADJ 0
 #define YY_RESTORE_YY_MORE_OFFSET
-#line 1 "sapi/phpdbg/phpdbg_lexer.l"
-#line 2 "sapi/phpdbg/phpdbg_lexer.l"
+#line 1 "sapi/phpdbg/dev/phpdbg_lexer.l"
+#line 2 "sapi/phpdbg/dev/phpdbg_lexer.l"
  
 /*
  * phpdbg_lexer.l
@@ -775,7 +775,7 @@ YY_DECL
        register int yy_act;
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
 
-#line 44 "sapi/phpdbg/phpdbg_lexer.l"
+#line 44 "sapi/phpdbg/dev/phpdbg_lexer.l"
 
 #line 781 "sapi/phpdbg/phpdbg_lexer.c"
 
@@ -860,7 +860,7 @@ do_action:  /* This label is used only to access EOF actions. */
 
 case 1:
 YY_RULE_SETUP
-#line 47 "sapi/phpdbg/phpdbg_lexer.l"
+#line 47 "sapi/phpdbg/dev/phpdbg_lexer.l"
 {
                phpdbg_init_param(yylval, NUMERIC_PARAM);
                yylval->num = 1;                
@@ -869,7 +869,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 52 "sapi/phpdbg/phpdbg_lexer.l"
+#line 52 "sapi/phpdbg/dev/phpdbg_lexer.l"
 {
                phpdbg_init_param(yylval, NUMERIC_PARAM);
                yylval->num = 0;
@@ -878,7 +878,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 57 "sapi/phpdbg/phpdbg_lexer.l"
+#line 57 "sapi/phpdbg/dev/phpdbg_lexer.l"
 {
                BEGIN(RAW);
                phpdbg_init_param(yylval, STR_PARAM);
@@ -889,7 +889,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 64 "sapi/phpdbg/phpdbg_lexer.l"
+#line 64 "sapi/phpdbg/dev/phpdbg_lexer.l"
 { 
                BEGIN(RAW);
                phpdbg_init_param(yylval, STR_PARAM);
@@ -900,7 +900,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 71 "sapi/phpdbg/phpdbg_lexer.l"
+#line 71 "sapi/phpdbg/dev/phpdbg_lexer.l"
 {
                phpdbg_init_param(yylval, NUMERIC_PARAM);
                yylval->num = atoi(yytext);
@@ -909,7 +909,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 76 "sapi/phpdbg/phpdbg_lexer.l"
+#line 76 "sapi/phpdbg/dev/phpdbg_lexer.l"
 {
                phpdbg_init_param(yylval, METHOD_PARAM);
                yylval->method.class = "class";
@@ -920,7 +920,7 @@ YY_RULE_SETUP
 case 7:
 /* rule 7 can match eol */
 YY_RULE_SETUP
-#line 82 "sapi/phpdbg/phpdbg_lexer.l"
+#line 82 "sapi/phpdbg/dev/phpdbg_lexer.l"
 {
                phpdbg_init_param(yylval, FILE_PARAM);
                yylval->file.name = strndup(yytext, yyleng);
@@ -930,7 +930,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 88 "sapi/phpdbg/phpdbg_lexer.l"
+#line 88 "sapi/phpdbg/dev/phpdbg_lexer.l"
 {
                phpdbg_init_param(yylval, ADDR_PARAM);
                yylval->addr = strtoul(yytext, NULL, 10);
@@ -940,7 +940,7 @@ YY_RULE_SETUP
 case 9:
 /* rule 9 can match eol */
 YY_RULE_SETUP
-#line 93 "sapi/phpdbg/phpdbg_lexer.l"
+#line 93 "sapi/phpdbg/dev/phpdbg_lexer.l"
 {
                phpdbg_init_param(yylval, STR_PARAM);
                yylval->str = strndup(yytext, yyleng);
@@ -950,7 +950,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 99 "sapi/phpdbg/phpdbg_lexer.l"
+#line 99 "sapi/phpdbg/dev/phpdbg_lexer.l"
 {
                phpdbg_init_param(yylval, STR_PARAM);
                yylval->str = strndup(yytext, yyleng);
@@ -961,7 +961,7 @@ YY_RULE_SETUP
 
 case 11:
 YY_RULE_SETUP
-#line 106 "sapi/phpdbg/phpdbg_lexer.l"
+#line 106 "sapi/phpdbg/dev/phpdbg_lexer.l"
 {
        phpdbg_init_param(yylval, STR_PARAM);
        yylval->str = strndup(yytext, yyleng);
@@ -973,12 +973,12 @@ YY_RULE_SETUP
 case 12:
 /* rule 12 can match eol */
 YY_RULE_SETUP
-#line 113 "sapi/phpdbg/phpdbg_lexer.l"
+#line 113 "sapi/phpdbg/dev/phpdbg_lexer.l"
 { /* ignore whitespace */ }
        YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 114 "sapi/phpdbg/phpdbg_lexer.l"
+#line 114 "sapi/phpdbg/dev/phpdbg_lexer.l"
 {
        phpdbg_init_param(yylval, EMPTY_PARAM);
        return T_UNEXPECTED; 
@@ -986,7 +986,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 118 "sapi/phpdbg/phpdbg_lexer.l"
+#line 118 "sapi/phpdbg/dev/phpdbg_lexer.l"
 YY_FATAL_ERROR( "flex scanner jammed" );
        YY_BREAK
 #line 993 "sapi/phpdbg/phpdbg_lexer.c"
@@ -2154,7 +2154,7 @@ void yyfree (void * ptr , yyscan_t yyscanner)
 
 #define YYTABLES_NAME "yytables"
 
-#line 118 "sapi/phpdbg/phpdbg_lexer.l"
+#line 118 "sapi/phpdbg/dev/phpdbg_lexer.l"
 
 
 

diff --git a/phpdbg_lexer.h b/phpdbg_lexer.h
index b016d96689bb6d07c3124c7728e512e16ead9328..c6d9f1b8bc0fd8bb83aaed956a2c696e8ef3c885 100644 (file)
--- a/phpdbg_lexer.h
+++ b/phpdbg_lexer.h
@@ -338,7 +338,7 @@ extern int yylex \
 #undef YY_DECL
 #endif
 
-#line 118 "sapi/phpdbg/phpdbg_lexer.l"
+#line 118 "sapi/phpdbg/dev/phpdbg_lexer.l"
 
 
 #line 345 "sapi/phpdbg/phpdbg_lexer.h"

diff --git a/phpdbg_parser.c b/phpdbg_parser.c
index b6a7fe20c165f560e57ec8ac9f57a4ebcca0ef3d..be6049a8295cb424cb7d7b4681f968c45f755d00 100644 (file)
--- a/phpdbg_parser.c
+++ b/phpdbg_parser.c
@@ -66,7 +66,7 @@
 /* Copy the first part of user declarations.  */
 
 /* Line 268 of yacc.c  */
-#line 2 "sapi/phpdbg/phpdbg_parser.y"
+#line 2 "sapi/phpdbg/dev/phpdbg_parser.y"
 
  
 /*
@@ -230,7 +230,7 @@ int phpdbg_stack_execute(phpdbg_param_t *stack, char **why) {
 /* "%code requires" blocks.  */
 
 /* Line 288 of yacc.c  */
-#line 141 "sapi/phpdbg/phpdbg_parser.y"
+#line 141 "sapi/phpdbg/dev/phpdbg_parser.y"
 
 #ifndef YY_TYPEDEF_YY_SCANNER_T
 #define YY_TYPEDEF_YY_SCANNER_T
@@ -1529,98 +1529,98 @@ yyreduce:
         case 3:
 
 /* Line 1806 of yacc.c  */
-#line 177 "sapi/phpdbg/phpdbg_parser.y"
+#line 177 "sapi/phpdbg/dev/phpdbg_parser.y"
     { phpdbg_stack_push(stack, &(yyvsp[(1) - (1)])); }
     break;
 
   case 4:
 
 /* Line 1806 of yacc.c  */
-#line 178 "sapi/phpdbg/phpdbg_parser.y"
+#line 178 "sapi/phpdbg/dev/phpdbg_parser.y"
     { phpdbg_stack_push(stack, &(yyvsp[(2) - (2)])); }
     break;
 
   case 7:
 
 /* Line 1806 of yacc.c  */
-#line 187 "sapi/phpdbg/phpdbg_parser.y"
+#line 187 "sapi/phpdbg/dev/phpdbg_parser.y"
     { phpdbg_stack_push(stack, &(yyvsp[(1) - (1)])); }
     break;
 
   case 8:
 
 /* Line 1806 of yacc.c  */
-#line 188 "sapi/phpdbg/phpdbg_parser.y"
+#line 188 "sapi/phpdbg/dev/phpdbg_parser.y"
     { phpdbg_stack_push(stack, &(yyvsp[(2) - (2)])); }
     break;
 
   case 9:
 
 /* Line 1806 of yacc.c  */
-#line 192 "sapi/phpdbg/phpdbg_parser.y"
+#line 192 "sapi/phpdbg/dev/phpdbg_parser.y"
     { phpdbg_stack_push(stack, &(yyvsp[(1) - (2)])); phpdbg_stack_push(stack, &(yyvsp[(2) - (2)])); }
     break;
 
   case 10:
 
 /* Line 1806 of yacc.c  */
-#line 193 "sapi/phpdbg/phpdbg_parser.y"
+#line 193 "sapi/phpdbg/dev/phpdbg_parser.y"
     { phpdbg_stack_push(stack, &(yyvsp[(1) - (2)])); phpdbg_stack_push(stack, &(yyvsp[(2) - (2)])); }
     break;
 
   case 13:
 
 /* Line 1806 of yacc.c  */
-#line 202 "sapi/phpdbg/phpdbg_parser.y"
+#line 202 "sapi/phpdbg/dev/phpdbg_parser.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 14:
 
 /* Line 1806 of yacc.c  */
-#line 203 "sapi/phpdbg/phpdbg_parser.y"
+#line 203 "sapi/phpdbg/dev/phpdbg_parser.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 15:
 
 /* Line 1806 of yacc.c  */
-#line 204 "sapi/phpdbg/phpdbg_parser.y"
+#line 204 "sapi/phpdbg/dev/phpdbg_parser.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 16:
 
 /* Line 1806 of yacc.c  */
-#line 205 "sapi/phpdbg/phpdbg_parser.y"
+#line 205 "sapi/phpdbg/dev/phpdbg_parser.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 17:
 
 /* Line 1806 of yacc.c  */
-#line 206 "sapi/phpdbg/phpdbg_parser.y"
+#line 206 "sapi/phpdbg/dev/phpdbg_parser.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 18:
 
 /* Line 1806 of yacc.c  */
-#line 207 "sapi/phpdbg/phpdbg_parser.y"
+#line 207 "sapi/phpdbg/dev/phpdbg_parser.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 19:
 
 /* Line 1806 of yacc.c  */
-#line 208 "sapi/phpdbg/phpdbg_parser.y"
+#line 208 "sapi/phpdbg/dev/phpdbg_parser.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 20:
 
 /* Line 1806 of yacc.c  */
-#line 209 "sapi/phpdbg/phpdbg_parser.y"
+#line 209 "sapi/phpdbg/dev/phpdbg_parser.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
@@ -1858,6 +1858,6 @@ yyreturn:
 
 
 /* Line 2067 of yacc.c  */
-#line 215 "sapi/phpdbg/phpdbg_parser.y"
+#line 215 "sapi/phpdbg/dev/phpdbg_parser.y"
 
 

diff --git a/phpdbg_parser.h b/phpdbg_parser.h
index 0fc9ed8cc048fa6b31c33545ea660255e450478a..3b4d8bbbe4a659db59e131816d545ae99e29fa9f 100644 (file)
--- a/phpdbg_parser.h
+++ b/phpdbg_parser.h
@@ -33,7 +33,7 @@
 /* "%code requires" blocks.  */
 
 /* Line 2068 of yacc.c  */
-#line 141 "sapi/phpdbg/phpdbg_parser.y"
+#line 141 "sapi/phpdbg/dev/phpdbg_parser.y"
 
 #ifndef YY_TYPEDEF_YY_SCANNER_T
 #define YY_TYPEDEF_YY_SCANNER_T