git.asbjorn.biz
/
swftools.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
31dd301
)
export current_filename_short
author
kramm
<kramm>
Fri, 19 Dec 2008 07:58:12 +0000
(07:58 +0000)
committer
kramm
<kramm>
Fri, 19 Dec 2008 07:58:12 +0000
(07:58 +0000)
lib/as3/files.c
patch
|
blob
|
history
lib/as3/files.h
patch
|
blob
|
history
diff --git
a/lib/as3/files.c
b/lib/as3/files.c
index
4d8392b
..
10e5de6
100644
(file)
--- a/
lib/as3/files.c
+++ b/
lib/as3/files.c
@@
-55,6
+55,7
@@
typedef struct _include_dir {
int current_line=1;
int current_column=0;
char* current_filename=0;
int current_line=1;
int current_column=0;
char* current_filename=0;
+char* current_filename_short=0;
include_dir_t* current_include_dirs=0;
#define MAX_INCLUDE_DEPTH 16
include_dir_t* current_include_dirs=0;
#define MAX_INCLUDE_DEPTH 16
@@
-63,6
+64,7
@@
void*include_stack[MAX_INCLUDE_DEPTH];
int line_stack[MAX_INCLUDE_DEPTH];
int column_stack[MAX_INCLUDE_DEPTH];
char* filename_stack[MAX_INCLUDE_DEPTH];
int line_stack[MAX_INCLUDE_DEPTH];
int column_stack[MAX_INCLUDE_DEPTH];
char* filename_stack[MAX_INCLUDE_DEPTH];
+char* shortfilename_stack[MAX_INCLUDE_DEPTH];
include_dir_t* includedir_stack[MAX_INCLUDE_DEPTH];
int include_stack_ptr = 0;
include_dir_t* includedir_stack[MAX_INCLUDE_DEPTH];
int include_stack_ptr = 0;
@@
-160,6
+162,7
@@
char*enter_file(char*filename, void*state)
include_stack[include_stack_ptr] = state;
line_stack[include_stack_ptr] = current_line;
column_stack[include_stack_ptr] = current_column;
include_stack[include_stack_ptr] = state;
line_stack[include_stack_ptr] = current_line;
column_stack[include_stack_ptr] = current_column;
+ shortfilename_stack[include_stack_ptr] = current_filename_short = strdup(filename);
filename_stack[include_stack_ptr] = current_filename;
includedir_stack[include_stack_ptr] = current_include_dirs;
add_include_dir(get_path(fullfilename));
filename_stack[include_stack_ptr] = current_filename;
includedir_stack[include_stack_ptr] = current_include_dirs;
add_include_dir(get_path(fullfilename));
@@
-181,8
+184,8
@@
void* leave_file()
} else {
current_column = column_stack[include_stack_ptr];
current_line = line_stack[include_stack_ptr];
} else {
current_column = column_stack[include_stack_ptr];
current_line = line_stack[include_stack_ptr];
- free(current_filename);current_filename=0;
- current_filename = filename_stack[include_stack_ptr];
+ free(current_filename);current_filename = filename_stack[include_stack_ptr];
+ free(current_filename_short);current_filename_short = shortfilename_stack[include_stack_ptr];
current_include_dirs = includedir_stack[include_stack_ptr];
return include_stack[include_stack_ptr];
}
current_include_dirs = includedir_stack[include_stack_ptr];
return include_stack[include_stack_ptr];
}
diff --git
a/lib/as3/files.h
b/lib/as3/files.h
index
7243718
..
c140065
100644
(file)
--- a/
lib/as3/files.h
+++ b/
lib/as3/files.h
@@
-25,6
+25,7
@@
extern int current_line;
extern int current_column;
extern char* current_filename;
extern int current_line;
extern int current_column;
extern char* current_filename;
+extern char* current_filename_short;
void add_include_dir(char*dir);
void add_include_dir(char*dir);