diff options
| author | Marius Kintel <marius@kintel.net> | 2012-01-04 22:07:32 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2012-01-04 22:07:32 (GMT) |
| commit | fdce8d15fc4a927d1a6a257783dde5054d9f3e7b (patch) | |
| tree | 6a779b50ef65474af9c539ad7d42268f7e760ae8 /src/lexer.l | |
| parent | cbabbaed700536b3a1f513fd5a07d25382cb137f (diff) | |
| parent | ba8aa515d14cf270c9d0fdf50b4c7c55b3c416a8 (diff) | |
Merge branch 'master' into boost_filesystem
Conflicts:
boost.pri
src/lexer.l
tests/CMakeLists.txt
Diffstat (limited to 'src/lexer.l')
| -rw-r--r-- | src/lexer.l | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/src/lexer.l b/src/lexer.l index fd9ca3e..1b776d3 100644 --- a/src/lexer.l +++ b/src/lexer.l @@ -118,27 +118,6 @@ use[ \t\r\n>]*"<" { BEGIN(use); } } } -"<"[^ \t\r\n>]+">" { - char *filename = strdup(yytext+1); - filename[strlen(filename)-1] = 0; - path incpath = path(parser_source_path) / filename; - if (!exists(incpath)) { - incpath = librarydir / filename; - } - - PRINTF("DEPRECATED: Support for implicit include will be removed in future releases. Use `include <filename>' instead."); - handle_dep(absolute(incpath).generic_string()); - yyin = fopen(absolute(incpath).c_str(), "r"); - if (!yyin) { - PRINTF("WARNING: Can't open input file `%s'.", filename); - } else { - openfiles.push_back(yyin); - yypush_buffer_state(yy_create_buffer( yyin, YY_BUF_SIZE )); - BEGIN(INITIAL); - } - free(filename); -} - <<EOF>> { if(!path_stack.empty()) path_stack.pop_back(); if (yyin && yyin != stdin) { |