oprava chyby v teste 015, pridane 3 testy na kontrolu using, hlavne n…

…a stavy kde instacie maju rovnake meno ako metody a pretazovanie metod

_stud_tests.sh

@@ -267,6 +267,17 @@ echo -n $? > ${LOG_PATH}test031D.!!!
 $INTERPRETER $TASK.$EXTENSION --input=${LOCAL_IN_PATH}test032.in --output=${LOCAL_OUT_PATH2}test032.out 2> ${LOG_PATH}test032.err
 echo -n $? > ${LOG_PATH}test032.!!!
 
+# test33: one using on more fethods: test033.out; Expected return code: 0
+$INTERPRETER $TASK.$EXTENSION --input=${LOCAL_IN_PATH}test033.in --output=${LOCAL_OUT_PATH2}test033.out --details=C 2> ${LOG_PATH}test033.err
+echo -n $? > ${LOG_PATH}test033.!!!
+
+# test34: instance name and method name cannot be the same: test034.out; Expected return code: 21
+$INTERPRETER $TASK.$EXTENSION --input=${LOCAL_IN_PATH}test034.in --output=${LOCAL_OUT_PATH2}test034.out 2> ${LOG_PATH}test034.err
+echo -n $? > ${LOG_PATH}test034.!!!
+
+# test35: instance name and method name cannot be the same when in base classes: test035.out; Expected return code: 21
+$INTERPRETER $TASK.$EXTENSION --input=${LOCAL_IN_PATH}test035.in --output=${LOCAL_OUT_PATH2}test035.out 2> ${LOG_PATH}test035.err
+echo -n $? > ${LOG_PATH}test035.!!!
 
 #Print results
 RED='\033[0;31m'

ref-out/test033.!!!

@@ -0,0 +1 @@
+0

ref-out/test033.out

@@ -0,0 +1,32 @@
+<?xml version="1.0" ?>
+<class kind="concrete" name="C">
+    <inheritance>
+        <from name="B" privacy="public"/>
+        <from name="A" privacy="public"/>
+    </inheritance>
+    <public>
+        <methods>
+            <method name="f" scope="instance" type="int">
+                <from name="B"/>
+                <arguments>
+                    <argument name="a" type="int"/>
+                </arguments>
+            </method>
+            <method name="f1" scope="instance" type="int">
+                <from name="B"/>
+                <arguments/>
+            </method>
+            <method name="f2" scope="instance" type="int">
+                <from name="A"/>
+                <arguments/>
+            </method>
+            <method name="f" scope="instance" type="int">
+                <from name="B"/>
+                <arguments>
+                    <argument name="a" type="int"/>
+                    <argument name="b" type="int"/>
+                </arguments>
+            </method>
+        </methods>
+    </public>
+</class>

ref-out/test034.!!!

@@ -0,0 +1 @@
+4

ref-out/test035.!!!

@@ -0,0 +1 @@
+21

test015.in

@@ -8,5 +8,5 @@ public:
     int function(int x, int y);
 };
 class D : protected B, C {
-  using C::function(int x, int y);
+  using C::function;
 };

test033.in

@@ -0,0 +1,18 @@
+class A{
+    public:
+    int f(int a, int b);
+    int f(int a);
+    int f2(void);
+};
+
+class B{
+    public:
+        int f(int a, int b);
+        int f(int a);
+        int f1(void);
+};
+
+class C: public A, public B{
+    public:
+        using B::f;
+};

test034.in

@@ -0,0 +1,4 @@
+class A{
+    int f;
+    int f(int x);
+};

test035.in

@@ -0,0 +1,12 @@
+class A{
+public:
+    int f(int x);
+};
+
+class B{
+public:
+    int f;
+};
+
+class C: A, B{
+};