diff options
| author | Marius Kintel <marius@kintel.net> | 2011-09-03 22:03:16 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-09-03 22:03:16 (GMT) |
| commit | 821c7df1fe34006ebeb0150cc0a166563d583f25 (patch) | |
| tree | 3b1891b404583cea57ee4f7f4e17c625f671bfff /src/lexer.l | |
| parent | a5b03ddcf9026dbc60881572419f096ba9ecadab (diff) | |
Extracted handle_dep() to separate source file
Diffstat (limited to 'src/lexer.l')
| -rw-r--r-- | src/lexer.l | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/lexer.l b/src/lexer.l index 5e62b19..4c0ddea 100644 --- a/src/lexer.l +++ b/src/lexer.l @@ -26,7 +26,8 @@ %{ -#include "openscad.h" +#include "handle_dep.h" +#include "openscad.h" // librarydir #include "printutils.h" #include "parser_yacc.h" #include <QStack> @@ -102,7 +103,7 @@ use[ \t\r\n>]*"<"[^ \t\r\n>]+">" { if (!finfo.exists()) { finfo = QFileInfo(QDir(librarydir), filename); } - handle_dep(finfo.absoluteFilePath()); + handle_dep(finfo.absoluteFilePath().toStdString()); parserlval.text = strdup(finfo.absoluteFilePath().toLocal8Bit()); return TOK_USE; } @@ -116,7 +117,7 @@ use[ \t\r\n>]*"<"[^ \t\r\n>]+">" { } PRINTF("DEPRECATED: Support for implicit include will be removed in future releases. Use `include <filename>' instead."); - handle_dep(finfo.absoluteFilePath()); + handle_dep(finfo.absoluteFilePath().toStdString()); yyin = fopen(finfo.absoluteFilePath().toLocal8Bit(), "r"); if (!yyin) { PRINTF("WARNING: Can't open input file `%s'.", filename); @@ -206,7 +207,7 @@ void includefile() finfo = QFileInfo(QDir(librarydir), filename); } - handle_dep(finfo.absoluteFilePath()); + handle_dep(finfo.absoluteFilePath().toStdString()); yyin = fopen(finfo.absoluteFilePath().toLocal8Bit(), "r"); if (!yyin) { PRINTA("WARNING: Can't open input file `%1'.", filename); |