Author: mordante
Date: Wed Feb 27 21:28:51 2008
New Revision: 24128
URL: http://svn.gna.org/viewcvs/wesnoth?rev=24128&view=rev
Log:
Disable the recursive macro call detection for now, it causes problems with
valid WML and thus breaks addons. (Fixing it properly before 1.4 is not
possible thus disabled.) Fixes bug #11160 for now.
Modified:
trunk/src/serialization/preprocessor.cpp
Modified: trunk/src/serialization/preprocessor.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/serialization/preprocessor.cpp?rev=24128&r1=24127&r2=24128&view=diff
==============================================================================
--- trunk/src/serialization/preprocessor.cpp (original)
+++ trunk/src/serialization/preprocessor.cpp Wed Feb 27 21:28:51 2008
@@ -722,7 +722,11 @@
// otherwise we assume it's a file name to load.
preproc_map::const_iterator macro =
target_.defines_->find(symbol);
if(macro != target_.defines_->end()) {
-
+
+//! @todo it seems some addons use other names instead of include so disable
the
+//! code for now. Once 1.4 has been released we can try to fix it again or
+//! make it mandatory to use INCLUDE for this purpose.
+#if 0
// INCLUDE is special and is allowed to be used
recusively.
if(symbol != "INCLUDE") {
for(std::vector<std::string>::iterator
@@ -737,7 +741,7 @@
}
}
}
-
+#endif
preproc_define const &val = macro->second;
size_t nb_arg = strings_.size() -
token.stack_pos - 1;
if (nb_arg != val.arguments.size()) {
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
