summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorAlex AUVOLAT <alex.auvolat@ens.fr>2014-01-10 16:08:25 +0100
committerAlex AUVOLAT <alex.auvolat@ens.fr>2014-01-10 16:08:25 +0100
commitc4fca6ff8ffa7ad8e6129dd0f6fe1b72d58c950f (patch)
treeb6296c84b987eb18e4b4e9cba8e0371c6a3c1c26 /tests
parentce876db1ef52af3c0b1a89b18a08279a5aea3d9d (diff)
parentd0798a5e0d3828b491ed35b2f62edf6aef199e2b (diff)
downloadLPC-Projet-c4fca6ff8ffa7ad8e6129dd0f6fe1b72d58c950f.tar.gz
LPC-Projet-c4fca6ff8ffa7ad8e6129dd0f6fe1b72d58c950f.zip
Merge branch 'master' into codegen-opt
Diffstat (limited to 'tests')
-rw-r--r--tests/typing/bad/testfile-invalid-virtual-redef.cpp11
-rw-r--r--tests/typing/good/testfile-return-type-redef.cpp11
2 files changed, 22 insertions, 0 deletions
diff --git a/tests/typing/bad/testfile-invalid-virtual-redef.cpp b/tests/typing/bad/testfile-invalid-virtual-redef.cpp
new file mode 100644
index 0000000..263ec62
--- /dev/null
+++ b/tests/typing/bad/testfile-invalid-virtual-redef.cpp
@@ -0,0 +1,11 @@
+class A {
+ public:
+ virtual int f(int x);
+};
+
+class B : public A {
+ public:
+ virtual void f(int x);
+};
+
+int main() {}
diff --git a/tests/typing/good/testfile-return-type-redef.cpp b/tests/typing/good/testfile-return-type-redef.cpp
new file mode 100644
index 0000000..ff14d00
--- /dev/null
+++ b/tests/typing/good/testfile-return-type-redef.cpp
@@ -0,0 +1,11 @@
+class A {
+ public:
+ int f(int x);
+};
+
+class B : public A {
+ public:
+ void f(int x);
+};
+
+int main() {}