Merge branch 'master' into codegen-optHEADmaster

Conflicts:
	src/codegen.ml

3 files changed, 84 insertions, 0 deletions

diff --git a/tests/exec/multi_virt.cpp b/tests/exec/multi_virt.cpp
new file mode 100644
index 0000000..c0950b7
--- /dev/null
+++ b/tests/exec/multi_virt.cpp
@@ -0,0 +1,46 @@
+#include <iostream>
+
+class A { public : int a; virtual void fa();};
+class B { public : int b; virtual void fb(); virtual void h();};
+
+class C : public A, public B { public : int c; virtual void fc();};
+
+class D { public : int d; virtual void fd(); virtual void h();};
+class E : public C, public D { public : int e; virtual void fb(); virtual void fd(); virtual void h();};
+
+void B::fb() {std::cout << "B::fb";}
+void E::fb() {std::cout << "E::fb";}
+void A::fa() {std::cout << "A::fa";}
+void D::fd() {std::cout << "D::fd";}
+void E::fd() {std::cout << "E::fd";}
+void C::fc() {std::cout << "E::fc";}
+
+void E::h() {std::cout << "E::h";}
+void B::h() {std::cout << "B::h";}
+void D::h() {std::cout << "D::h";}
+
+
+int main() {
+  
+  E* cp = new E();
+  cp->h();
+  std::cout << "\n";
+  cp->fd();
+  std::cout << "\n";
+
+  D* dp = new E() ;
+  dp->h();
+  std::cout << "\n";
+  dp->fd();
+  std::cout << "\n";
+
+  A* ap = new C() ;
+  ap->fa();
+
+  std::cout << "\n";
+
+  return 0;
+}
+
+
+
diff --git a/tests/exec/multi_virt.out b/tests/exec/multi_virt.out
new file mode 100644
index 0000000..82c07a5
--- /dev/null
+++ b/tests/exec/multi_virt.out
@@ -0,0 +1,5 @@
+E::h
+E::fd
+E::h
+E::fd
+A::fa
diff --git a/tests/typing/bad/diamond.cpp b/tests/typing/bad/diamond.cpp
new file mode 100644
index 0000000..fe59ceb
--- /dev/null
+++ b/tests/typing/bad/diamond.cpp
@@ -0,0 +1,33 @@
+#include <iostream>
+
+
+class A { public :
+  int a;
+};
+
+class B : public A { public :
+  int b;
+};
+
+class C : public A { public :
+  int c;
+};
+
+class D : public B, public C { public :
+  int d;
+};
+
+
+
+void f(A* ap) {std::cout << ap->a << "\n";}
+
+int main () {
+
+  D* dp = new D();
+  dp->a = 42;
+  std::cout << dp-> a << "\n";
+
+  f(dp);
+
+  return 0;
+}
\ No newline at end of file