Changeset 10272 for code/trunk/src

Timestamp:

Feb 15, 2015, 9:37:54 PM (10 years ago)

Author:

landauf

Message:

reverted a part of the changes from r10264. only single lua-tags between quotes should be filtered, not pairs of tags.
"<?lua" → filtered
"<?lua code() ?>" → not filtered

File:

• code/trunk/src/libraries/core/Loader.cc (modified) (1 diff)

code/trunk/src/libraries/core/Loader.cc

@@ -340 +340 @@
         {
             std::map<size_t, bool>::iterator it = luaTags.begin();
-            while(it != luaTags.end())
-            {
-                if (isBetweenQuotes(text, it->first))
+            std::map<size_t, bool>::iterator it2 = it;
+            bool bBetweenQuotes = false;
+            size_t pos = 0;
+            while ((pos = getNextQuote(text, pos)) != std::string::npos)
+            {
+                while ((it != luaTags.end()) && (it->first < pos))
                 {
-                    luaTags.erase(it++);
+                    if (bBetweenQuotes)
+                    {
+                        it2++;
+                        if (it->second && !(it2->second) && it2->first < pos)
+                            it = ++it2;
+                        else
+                            luaTags.erase(it++);
+                    }
+                    else
+                        ++it;
                 }
-                else
-                {
-                    ++it;
-                }
+                bBetweenQuotes = !bBetweenQuotes;
+                pos++;
             }
         }