166_uppsrc.diff

The diff file to apply for uppsrc directory - Sender Ghost, 11/11/2011 07:44 PM

+    	}
+    }
     inline void WriteLines(String& r, int count)
+    {
     	for (int i = 0; i < count; ++i)
     		r << '\n';
+    }
     void ScanLayFile(const char *fn)
+    {
     	LTIMING("Lay file");
-...
     	CParser p(s);
     	String r;
     	try {
     		int line = p.GetLine();
     		if(p.Char('#') && p.Id("ifdef")) {
     			if(!p.Id("LAYOUTFILE"))
     				p.Id("LAYOUT");
     			WriteLines(r, p.GetLine() - line);
+    		}
     		while(!p.IsEof()) {
     			line = p.GetLine();
     			p.PassId("LAYOUT");
     			p.PassChar('(');
     			r << "template <class T> struct With" << p.ReadId() << " : public T {\n"
     			  << "\tstatic Size GetLayoutSize();\n";
     			r << "template <class T> struct With" << p.ReadId() << " : public T {"
     			  << "\tstatic Size GetLayoutSize();";
     			LaySkipRest(p);
     			WriteLines(r, p.GetLine() - line);
     			for(;;) {
     				line = p.GetLine();
     				if(p.Id("ITEM")) {
     					p.PassChar('(');
     					if(p.IsId()) {
-...
     						if(strncmp(type, "dv___", 5)) {
     							r << '\t' << type;
     							p.PassChar(',');
     							r << ' ' << p.ReadId() << ";\n";
     							r << ' ' << p.ReadId() << ";";
+    						}
+    					}
+    				}
-...
     				else
     					break;
     				LaySkipRest(p);
     				WriteLines(r, p.GetLine() - line);
+    			}
     			line = p.GetLine();
     			p.PassId("END_LAYOUT");
     			if(p.Char('#'))
     				p.Id("endif");
     			r << "};\n\n";
     			r << "};";
     			WriteLines(r, p.GetLine() - line);
+    		}
+    	}
     	catch(CParser::Error) {}