summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTavian Barnes <tavianator@gmail.com>2009-10-28 21:09:25 -0400
committerTavian Barnes <tavianator@gmail.com>2009-10-28 21:26:17 -0400
commit710a45813e4c9bbc916d876ed111c4b5969cb4e4 (patch)
tree854ad67eb4c74d897d14f201f9a26fe1983f76e7
parentd79aa8e37baf159dab062999c0d0e84044fd3a4c (diff)
downloaddimension-710a45813e4c9bbc916d876ed111c4b5969cb4e4.tar.xz
Search in the same path as the current file for #includes.
-rw-r--r--dimension/main.c1
-rw-r--r--dimension/tokenize.c35
2 files changed, 28 insertions, 8 deletions
diff --git a/dimension/main.c b/dimension/main.c
index e15180f..76c5ff6 100644
--- a/dimension/main.c
+++ b/dimension/main.c
@@ -100,6 +100,7 @@ main(int argc, char **argv) {
/* Tokenize the input file */
tokens = dmnsn_tokenize(input, input_file);
if (!tokens) {
+ fclose(input_file);
dmnsn_error(DMNSN_SEVERITY_HIGH, "Error tokenizing input file.");
}
diff --git a/dimension/tokenize.c b/dimension/tokenize.c
index 83ae0aa..4e3244a 100644
--- a/dimension/tokenize.c
+++ b/dimension/tokenize.c
@@ -24,6 +24,7 @@
#include <ctype.h>
#include <sys/mman.h>
#include <unistd.h>
+#include <libgen.h>
static void
dmnsn_diagnostic(const char *filename, unsigned int line, unsigned int col,
@@ -394,29 +395,48 @@ dmnsn_tokenize(const char *filename, FILE *file)
"Expected string after #include");
goto bailout;
}
-
- FILE *included = fopen(token.value, "r");
- if (!included) {
+
+ /* Search in same directory as current file */
+ char *filename_copy = strdup(filename);
+ char *localdir = dirname(filename_copy);
+ char *local_include = malloc(strlen(localdir)
+ + strlen(token.value)
+ + 2);
+ strcpy(local_include, localdir);
+ strcat(local_include, "/");
+ strcat(local_include, token.value);
+ free(filename_copy);
+ free(token.value);
+
+ /* Try to open the included file */
+ FILE *include = fopen(local_include, "r");
+ if (!include) {
dmnsn_diagnostic(filename, line, col,
"Couldn't open included file \"%s\"",
- token.value);
+ local_include);
+ free(local_include);
goto bailout;
}
- dmnsn_array *included_tokens = dmnsn_tokenize(token.value, included);
+ /* Parse it recursively */
+ dmnsn_array *included_tokens = dmnsn_tokenize(local_include, include);
if (!included_tokens) {
dmnsn_diagnostic(filename, line, col,
"Error tokenizing included file \"%s\"",
- token.value);
+ local_include);
+ free(local_include);
goto bailout;
}
+ fclose(include);
+ free(local_include);
+
+ /* Append the tokens from the included file */
unsigned int i;
for (i = 0; i < dmnsn_array_size(included_tokens); ++i) {
dmnsn_array_push(tokens, dmnsn_array_at(included_tokens, i));
}
- free(token.value);
dmnsn_delete_array(included_tokens);
continue;
}
@@ -446,7 +466,6 @@ dmnsn_tokenize(const char *filename, FILE *file)
break;
}
- token.filename = malloc(strlen(filename) + 1);
token.filename = strdup(filename);
dmnsn_array_push(tokens, &token);
}