Merge continued

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

uppdev/CodeBase/CodeBase.cpp

@@ -0,0 +1,46 @@
+#include <Core/Core.h>
+
+void A() {
+	String x;
+	x.
+}
+
+struct Type { int j; };
+
+struct Foo {
+	struct Type3 { int h; };
+
+	void Bar() {
+		Type t;
+		t;
+	}
+
+	void BBB() {
+		Type t;
+		t
+	}
+
+	void Type() {
+
+	}
+};
+
+void Foo::Bar() {
+	Type t;
+	String x;
+	t
+}
+
+void Foo::Bar2()
+{
+	Type3 x;
+	x.h;
+	x.h;
+	x.h;
+}
+
+void Foo::Bar()
+{
+	Type x;
+	x;
+}