summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Kintel <marius@kintel.net>2012-01-04 18:03:33 (GMT)
committerMarius Kintel <marius@kintel.net>2012-01-04 18:03:33 (GMT)
commitba8aa515d14cf270c9d0fdf50b4c7c55b3c416a8 (patch)
tree5691a56b93e3b91d0f2d13df764efce2e2e3eb87
parent7337f86c96451f92235abe528119ab4116786ee7 (diff)
Disabled the old include syntax; i.e. without the include keyword
-rw-r--r--RELEASE_NOTES7
-rw-r--r--src/lexer.l21
2 files changed, 7 insertions, 21 deletions
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index a954c45..295f6f4 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -1,3 +1,10 @@
+OpenSCAD 2012.XX
+================
+
+Deprecations:
+o The old include syntax "<filename.scad>" without the include keyword is no
+ longer supported and will cause a syntax error.
+
OpenSCAD 2011.12
================
diff --git a/src/lexer.l b/src/lexer.l
index c799028..07819b2 100644
--- a/src/lexer.l
+++ b/src/lexer.l
@@ -114,27 +114,6 @@ use[ \t\r\n>]*"<"[^\t\r\n>]+">" {
return TOK_USE;
}
-"<"[^ \t\r\n>]+">" {
- char *filename = strdup(yytext+1);
- filename[strlen(filename)-1] = 0;
- QFileInfo finfo(QDir(parser_source_path), filename);
- if (!finfo.exists()) {
- finfo = QFileInfo(QDir(librarydir), filename);
- }
-
- PRINTF("DEPRECATED: Support for implicit include will be removed in future releases. Use `include <filename>' instead.");
- handle_dep(finfo.absoluteFilePath().toStdString());
- yyin = fopen(finfo.absoluteFilePath().toLocal8Bit(), "r");
- if (!yyin) {
- PRINTF("WARNING: Can't open input file `%s'.", filename);
- } else {
- openfiles.append(yyin);
- yypush_buffer_state(yy_create_buffer( yyin, YY_BUF_SIZE ));
- BEGIN(INITIAL);
- }
- free(filename);
-}
-
<<EOF>> {
if(!path_stack.empty())
path_stack.pop();
contact: Jan Huwald // Impressum