git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
implemented conditional compilation
[swftools.git]
/
lib
/
as3
/
tokenizer.lex
diff --git
a/lib/as3/tokenizer.lex
b/lib/as3/tokenizer.lex
index
7752bd5
..
31e5841
100644
(file)
--- a/
lib/as3/tokenizer.lex
+++ b/
lib/as3/tokenizer.lex
@@
-45,7
+45,7
@@
void as3_error(const char*format, ...)
va_start(arglist, format);
vsprintf(buf, format, arglist);
va_end(arglist);
va_start(arglist, format);
vsprintf(buf, format, arglist);
va_end(arglist);
- fprintf(stderr, "%s:%d:%d: error: %s\n", current_filename_short, current_line, current_column, buf);
+ fprintf(stderr, "%s:%d:%d: error: %s\n", current_filename, current_line, current_column, buf);
fflush(stderr);
exit(1);
}
fflush(stderr);
exit(1);
}
@@
-59,7
+59,7
@@
void as3_warning(const char*format, ...)
va_start(arglist, format);
vsprintf(buf, format, arglist);
va_end(arglist);
va_start(arglist, format);
vsprintf(buf, format, arglist);
va_end(arglist);
- fprintf(stderr, "%s:%d:%d: warning: %s\n", current_filename_short, current_line, current_column, buf);
+ fprintf(stderr, "%s:%d:%d: warning: %s\n", current_filename, current_line, current_column, buf);
fflush(stderr);
}
void as3_softwarning(const char*format, ...)
fflush(stderr);
}
void as3_softwarning(const char*format, ...)
@@
-72,7
+72,7
@@
void as3_softwarning(const char*format, ...)
va_start(arglist, format);
vsprintf(buf, format, arglist);
va_end(arglist);
va_start(arglist, format);
vsprintf(buf, format, arglist);
va_end(arglist);
- fprintf(stderr, "%s:%d:%d: warning: %s\n", current_filename_short, current_line, current_column, buf);
+ fprintf(stderr, "%s:%d:%d: warning: %s\n", current_filename, current_line, current_column, buf);
fflush(stderr);
}
static void dbg(const char*format, ...)
fflush(stderr);
}
static void dbg(const char*format, ...)
@@
-516,18
+516,18
@@
static inline void c() {
current_column+=yyleng;
}
current_column+=yyleng;
}
-static trie_t*namespaces = 0;
-void tokenizer_register_namespace(const char*id)
+trie_t*active_namespaces = 0;
+/*void tokenizer_register_namespace(const char*id)
{
{
- trie_put(&namespaces, id);
+ trie_put(namespaces, id, 0);
}
void tokenizer_unregister_namespace(const char*id)
{
trie_remove(namespaces, id);
}
void tokenizer_unregister_namespace(const char*id)
{
trie_remove(namespaces, id);
-}
+}*/
static inline tokenizer_is_namespace(const char*id)
{
static inline tokenizer_is_namespace(const char*id)
{
- return trie_lookup(namespaces, id);
+ return trie_contains(active_namespaces, id);
}
static inline int handleIdentifier()
}
static inline int handleIdentifier()