.uppdev

git-svn-id: svn://ultimatepp.org/upp/trunk@8292 f0d560ea-af0d-0410-9eb7-867de7ffcac7

uppdev/cpp2/cpp.cpp

@@ -1,88 +1,5 @@
 #include "cpp.h"
 
-#include <string.h>
-
-inline bool IsSpc(byte c)
-{
-	return c > 0 && c <= 32;
-}
-
-String CppMacro::ToString() const
-{
-	return String().Cat() << "(" << AsString(param) << ") " << body;
-}
-
-String CppMacro::Expand(const Vector<String>& p) const
-{
-	String r;
-	const char *s = body;
-	while(*s) {
-		if(IsAlpha(*s) || *s == '_') {
-			const char *b = s;
-			s++;
-			while(IsAlNum(*s) || *s == '_')
-				s++;
-			String id(b, s);
-			static String VA_ARGS("__VA_ARGS__"); // Speed optimization
-			if(id == VA_ARGS) {
-				bool next = false;
-				for(int i = param.GetCount(); i < p.GetCount(); i++) {
-					if(next)
-						r.Cat(", ");
-					r.Cat(p[i]);
-					next = true;
-				}
-			}
-			else {
-				int q = param.Find(id);
-				if(q >= 0) {
-					if(q < p.GetCount())
-						r.Cat(p[q]);
-				}
-				else
-					r.Cat(id);
-			}
-			continue;
-		}
-		if(s[0] == '#' && s[1] == '#') {
-			int q = r.GetLength();
-			while(q > 0 && IsSpc(r[q - 1]))
-				q--;
-			r.Trim(q);
-			s += 2;
-			while((byte)*s <= ' ')
-				s++;
-			continue;
-		}
-		if(*s == '#') {
-			const char *ss = s + 1;
-			while(IsSpc(*ss))
-				ss++;
-			if(IsAlpha(*ss) || *ss == '_') {
-				const char *b = ss;
-				ss++;
-				while(IsAlNum(*ss) || *ss == '_')
-					ss++;
-				String id(b, ss);
-				int q = param.Find(id);
-				if(q >= 0) {
-					if(q <= p.GetCount()) {
-						if(q < p.GetCount())
-							r.Cat(AsCString(p[q]));
-						s = ss;
-						continue;
-					}
-				}
-				r.Cat(String(s, ss));
-				s = ss;
-				continue;
-			}
-		}
-		r.Cat(*s++);
-	}
-	return r;
-}
-
 void Cpp::Define(const char *s)
 {
 	CppMacro m;
@@ -145,10 +62,10 @@ String Cpp::Expand(const char *s, Index<String>& notmacro)
 				r.Cat(*s++);
 		}
 		else
-		if(iscib2(*s)) {
+		if(iscib(*s)) {
 			const char *b = s;
 			s++;
-			while(iscid2(*s))
+			while(iscid(*s))
 				s++;
 			String id(b, s);
 			if(notmacro.Find(id) < 0) {
@@ -219,7 +136,8 @@ String Cpp::Expand(const char *s, Index<String>& notmacro)
 	return r;
 }
 
-bool Cpp::Preprocess(const String& sourcefile, Stream& in, const String& currentfile)
+bool Cpp::Preprocess(const String& sourcefile, Stream& in, const String& currentfile,
+                     const Index<String> *get_macros)
 {
 	macro.Clear();
 	Vector<String> ignorelist = Split("__declspec;__cdecl;"
@@ -228,35 +146,39 @@ bool Cpp::Preprocess(const String& sourcefile, Stream& in, const String& current
                                       "$drv_group;$allowed_on_parameter",
                                       ';');
 	for(int i = 0; i < ignorelist.GetCount(); i++)
-		macro.GetAdd(ignorelist[i]).variadic = true;
+		macro.GetAdd(ignorelist[i]).param = ".";
 	done = false;
 	incomment = false;
 	Index<String> visited;
-	Do(NormalizePath(sourcefile), in, NormalizePath(currentfile), visited);
+	Do(NormalizePath(sourcefile), in, NormalizePath(currentfile), visited, get_macros);
 	return done;
 }
 
-void Cpp::Do(const String& sourcefile, Stream& in, const String& currentfile, Index<String>& visited)
+void Cpp::Do(const String& sourcefile, Stream& in, const String& currentfile,
+             Index<String>& visited, const Index<String> *get_macros)
 {
-	DDUMP(currentfile);
+//	DUMP(currentfile);
 	if(visited.Find(currentfile) >= 0 || visited.GetCount() > 20000)
 		return;
 	visited.Add(currentfile);
 	String current_folder = GetFileFolder(currentfile);
 	if(sourcefile != currentfile) {
 		const PPFile& pp = GetPPFile(currentfile);
+	#ifdef _DEBUG
 		pp.Dump();
+	#endif
 		for(int i = 0; i < pp.item.GetCount() && !done; i++) {
 			const PPItem& m = pp.item[i];
 			if(m.type == PP_DEFINE) {
-				if(m.macro.body.GetCount())
+//				RTIMING("macro Add");
-					macro.GetAdd(m.id) = clone(m.macro);
+				if(!get_macros || get_macros->Find(m.id) >= 0)
+					macro.GetAdd(m.id) = m.macro;
 			}
 			else
 			if(m.type == PP_INCLUDE) {
 				String s = GetIncludePath(m.id, current_folder, include_path);
 				if(s.GetCount())
-					Do(sourcefile, in, s, visited);
+					Do(sourcefile, in, s, visited, get_macros);
 			}
 			else
 			if(m.type == PP_NAMESPACE)
@@ -271,6 +193,11 @@ void Cpp::Do(const String& sourcefile, Stream& in, const String& currentfile, In
 		return;
 	}
 	
+	done = true;
+	if(get_macros)
+		return;
+
+	RTIMING("Expand");
 	incomment = false;
 	StringBuffer result;
 	result.Clear();
@@ -299,7 +226,7 @@ void Cpp::Do(const String& sourcefile, Stream& in, const String& currentfile, In
 					String hdr = Expand(p.GetPtr());
 					String header_path = GetIncludePath(hdr, current_folder, include_path);
 					if(header_path.GetCount())
-						Do(Null, NilStream(), header_path, visited);
+						Do(Null, NilStream(), header_path, visited, get_macros);
 				}
 			}
 		}
@@ -309,6 +236,6 @@ void Cpp::Do(const String& sourcefile, Stream& in, const String& currentfile, In
 		while(el--)
 			result.Cat("\n");
 	}
-	done = true;
+	DUMP(macro.GetCount());
 	output = result;
 }

uppdev/cpp2/cpp.h

@@ -10,19 +10,14 @@ using namespace Upp;
 void RemoveComments(String& l, bool& incomment);
 
 struct CppMacro : Moveable<CppMacro>, DeepCopyOption<CppMacro> {
+	String        param;
 	String        body;
-	Index<String> param;
-	bool          variadic;
 	
 	String Define(const char *s);
 
 	String Expand(const Vector<String>& p) const;
 	
 	String ToString() const;
-	
-	CppMacro()    { variadic = false; }
-	rval_default(CppMacro);
-	CppMacro(const CppMacro& s, int) { body = s.body, param = clone(s.param); variadic = s.variadic; }
 };
 
 enum PPItemType {
@@ -77,9 +72,11 @@ struct Cpp {
 	void   ParamAdd(Vector<String>& param, const char *b, const char *e);
 	String Expand(const char *s, Index<String>& notmacro);
 	String Expand(const char *s);
-	void   Do(const String& sourcefile, Stream& in, const String& currentfile, Index<String>& visited);
+	void   Do(const String& sourcefile, Stream& in, const String& currentfile,
+	          Index<String>& visited, const Index<String> *get_macros);
 
-	bool   Preprocess(const String& sourcefile, Stream& in, const String& currentfile);
+	bool   Preprocess(const String& sourcefile, Stream& in, const String& currentfile,
+	                  const Index<String> *get_macros = NULL);
 	
 	typedef Cpp CLASSNAME;
 };

uppdev/cpp2/cpp2.upp

@@ -4,6 +4,7 @@ uses
 
 file
 	cpp.h,
+	macro.cpp,
 	ppfile.cpp,
 	cpp.cpp,
 	main.cpp,

uppdev/cpp2/macro.cpp

@@ -0,0 +1,124 @@
+#include "cpp.h"
+
+inline bool IsSpc(byte c)
+{
+	return c > 0 && c <= 32;
+}
+
+String CppMacro::Define(const char *s)
+{
+	CParser p(s);
+	String id;
+	try {
+		if(!p.IsId())
+			return Null;
+		id = p.ReadId();
+		param.Clear();
+		if(p.Char('(')) {
+			while(p.IsId()) {
+				if(param.GetCount())
+					param << ",";
+				param << p.ReadId();
+				p.Char(',');
+			}
+			if(p.Char3('.', '.', '.'))
+				param << '.';
+			p.Char(')');
+		}
+		body = p.GetPtr();
+	}
+	catch(CParser::Error) {
+		return Null;
+	}
+	return id;
+}
+
+String CppMacro::ToString() const
+{
+	String r;
+	if(param.GetCount()) {
+		String h = param;
+		h.Replace(".", "...");
+		r << "(" << h << ")";
+	}
+	r << ' ' << body;
+	return r;
+}
+
+String CppMacro::Expand(const Vector<String>& p) const
+{
+	String r;
+	const char *s = body;
+	String pp = param;
+	bool variadic = false;
+	if(*pp.Last() == '.') {
+		variadic = true;
+		pp.Trim(pp.GetCount() - 1);
+	}
+	Index<String> param(pick(Split(pp, ',')));
+	while(*s) {
+		if(IsAlpha(*s) || *s == '_') {
+			const char *b = s;
+			s++;
+			while(IsAlNum(*s) || *s == '_')
+				s++;
+			String id(b, s);
+			static String VA_ARGS("__VA_ARGS__"); // Speed optimization
+			if(id == VA_ARGS) {
+				bool next = false;
+				for(int i = param.GetCount(); i < p.GetCount(); i++) {
+					if(next)
+						r.Cat(", ");
+					r.Cat(p[i]);
+					next = true;
+				}
+			}
+			else {
+				int q = param.Find(id);
+				if(q >= 0) {
+					if(q < p.GetCount())
+						r.Cat(p[q]);
+				}
+				else
+					r.Cat(id);
+			}
+			continue;
+		}
+		if(s[0] == '#' && s[1] == '#') {
+			int q = r.GetLength();
+			while(q > 0 && IsSpc(r[q - 1]))
+				q--;
+			r.Trim(q);
+			s += 2;
+			while((byte)*s <= ' ')
+				s++;
+			continue;
+		}
+		if(*s == '#') {
+			const char *ss = s + 1;
+			while(IsSpc(*ss))
+				ss++;
+			if(IsAlpha(*ss) || *ss == '_') {
+				const char *b = ss;
+				ss++;
+				while(IsAlNum(*ss) || *ss == '_')
+					ss++;
+				String id(b, ss);
+				int q = param.Find(id);
+				if(q >= 0) {
+					if(q <= p.GetCount()) {
+						if(q < p.GetCount())
+							r.Cat(AsCString(p[q]));
+						s = ss;
+						continue;
+					}
+				}
+				r.Cat(String(s, ss));
+				s = ss;
+				continue;
+			}
+		}
+		r.Cat(*s++);
+	}
+	return r;
+}

uppdev/cpp2/main.cpp

@@ -19,11 +19,18 @@ void Test(const char *sourcefile, const char *currentfile)
 	Cpp cpp;
 	cpp.include_path = include_path;
 	FileIn in(sourcefile);
-	DDUMP(cpp.Preprocess(sourcefile, in, currentfile));
+	RDUMP(cpp.Preprocess(sourcefile, in, currentfile));
 	DDUMP(cpp.namespace_stack);
-	DDUMP(cpp.output);
+//	DDUMP(cpp.output);
 	DDUMP(cpp.usedmacro);
 	DLOG("=================================");
+
+	{
+		Cpp cpp;
+		cpp.include_path = include_path;
+		cpp.Preprocess(sourcefile, NilStream(), currentfile, &cpp.usedmacro);
+		DDUMP(cpp.macro);
+	}
 }
 
 void RecursePP(const char *path, const char *include_path, Index<String>& visited)
@@ -47,7 +54,7 @@ void TestC(const char *ln)
 	for(int q = 0; q < 2; q++) {
 		bool incomment = q;
 		String l = ln;
-		DDUMP(incomment);
+		DUMP(incomment);
 		LOG(l);
 		RemoveComments(l, incomment);
 		LOG(l);
@@ -79,13 +86,14 @@ CONSOLE_APP_MAIN
 #endif	
 	{
 		RTIMING("Pass1");
-		Test("C:\\u\\upp.src\\uppsrc\\Core\\Profile.h", "C:\\u\\upp.src\\uppsrc\\Core\\Format.cpp");
+		Test("C:\\u\\upp.src\\uppsrc\\Core\\Format.h", "C:\\u\\upp.src\\uppsrc\\Core\\Format.cpp");
 	}
-	if(0) {
+#ifndef _DEBUG
+	for(int i = 0; i < 100; i++) {
 		RTIMING("Pass2");
 		Test("C:\\u\\upp.src\\uppsrc\\Core\\Format.h", "C:\\u\\upp.src\\uppsrc\\Core\\Format.cpp");
 	}
-
+#endif
 #if 0
 	{
 		RTIMING("Pass1");

uppdev/cpp2/ppfile.cpp

@@ -32,33 +32,6 @@ void RemoveComments(String& l, bool& incomment)
 	}
 }
 
-String CppMacro::Define(const char *s)
-{
-	CParser p(s);
-	String id;
-	try {
-		if(!p.IsId())
-			return Null;
-		id = p.ReadId();
-		param.Clear();
-		variadic = false;
-		if(p.Char('(')) {
-			while(p.IsId()) {
-				param.Add(p.ReadId());
-				p.Char(',');
-			}
-			if(p.Char3('.', '.', '.'))
-				variadic = true;
-			p.Char(')');
-		}
-		body = p.GetPtr();
-	}
-	catch(CParser::Error) {
-		return Null;
-	}
-	return id;
-}
-
 void PPFile::CheckEndNamespace(Vector<int>& namespace_block, int level)
 {
 	if(namespace_block.GetCount() && namespace_block.Top() == level) {
@@ -191,15 +164,8 @@ void PPFile::Dump() const
 		                     PP_USING, "using namespace", PP_NAMESPACE, "namespace",
 		                     PP_NAMESPACE_END, "}", "")
 		   << ' ' << m.id;
-		if(m.type == PP_DEFINE) {
+		if(m.type == PP_DEFINE)
-			if(m.macro.param.GetCount() || m.macro.variadic) {
+			ll << m.macro;
-				ll << '(' << Join(m.macro.param.GetKeys(), ", ");
-				if(m.macro.variadic)
-					ll << "...";
-				ll << ')';
-			}
-			ll << ' ' << m.macro.body;
-		}
 		if(m.type == PP_NAMESPACE)
 			ll << " {";
 		LOG(ll);
@@ -255,6 +221,7 @@ FileTime GetFileTimeCached(const String& p)
 
 String GetIncludePath(const String& s, const String& filedir, const String& include_path)
 {
+	RTIMING("GetIncludePath");
 	String key;
 	key << s << "#" << filedir << "#" << include_path;
 	int q = sIncludePath.Find(key);