Remove .file, .line, setfile and setline directives from the IMCC par…

…ser. These mechanisms are to be replaced by the newer and more flexible .annotate directive.
parrot · May 13, 2012 · d27a655 · d27a655
1 parent 1952060
commit d27a655
Show file tree

Hide file tree

Showing 5 changed files with 3,077 additions and 3,607 deletions.
diff --git a/compilers/imcc/imcc.l b/compilers/imcc/imcc.l
@@ -223,10 +223,6 @@ SP              [ ]
         yy_push_state(cmt4, yyscanner);
     }
 
-<*>setfile{SP}+["] { yy_push_state(cmt2, yyscanner); }
-
-<*>setline{SP}+ { yy_push_state(cmt1, yyscanner);  }
-
 <cmt1>{DIGITS} {
         yylineno = imcc->line = atoi(yytext);
         yy_pop_state(yyscanner);
@@ -284,8 +280,6 @@ SP              [ ]
 
 <pod>{EOL}      { /* ignore */ }
 
-<*>".line"               return TK_LINE;
-<*>".file"               return TK_FILE;
 <INITIAL,emit>".annotate" return ANNOTATE;
 <INITIAL,emit>".lex"     return LEXICAL;
 ".set_arg"               return ARG;

diff --git a/compilers/imcc/imcc.y b/compilers/imcc/imcc.y
@@ -1042,7 +1042,7 @@ do_loadlib(ARGMOD(imc_info_t *imcc), ARGIN(const char *lib))
 %nonassoc '\n'
 %nonassoc <t> PARAM
 
-%token <t> SOL HLL TK_LINE TK_FILE
+%token <t> SOL HLL
 %token <t> GOTO ARG IF UNLESS PNULL SET_RETURN SET_YIELD
 %token <t> ADV_FLAT ADV_SLURPY ADV_OPTIONAL ADV_OPT_FLAG ADV_NAMED ADV_ARROW
 %token <t> ADV_INVOCANT ADV_CALL_SIG
@@ -1145,7 +1145,6 @@ compilation_unit:
          }
    | MACRO '\n'                { $$ = 0; }
    | pragma                    { $$ = 0; }
-   | location_directive        { $$ = 0; }
    | '\n'                      { $$ = 0; }
    ;
 
@@ -1159,20 +1158,6 @@ pragma:
          }
    ;
 
-location_directive:
-     TK_LINE INTC COMMA STRINGC '\n'
-         {
-           imcc->line = atoi($2);
-           /* set_filename() frees the STRINGC */
-           set_filename(imcc, $4);
-         }
-   | TK_FILE STRINGC '\n'
-         {
-           /* set_filename() frees the STRINGC */
-           set_filename(imcc, $2);
-         }
-   ;
-
 annotate_directive:
     ANNOTATE STRINGC COMMA const
         {
@@ -1850,7 +1835,6 @@ statement:
    | MACRO '\n'                { $$ = 0; }
    | FILECOMMENT               { $$ = 0; }
    | LINECOMMENT               { $$ = 0; }
-   | location_directive        { $$ = 0; }
    | annotate_directive        { $$ = $1; }
    ;