summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex AUVOLAT <alex.auvolat@ens.fr>2014-01-10 18:45:19 +0100
committerAlex AUVOLAT <alex.auvolat@ens.fr>2014-01-10 18:45:19 +0100
commit2c7d3a47508e2323cd70d8f65324d8c3d01e51d0 (patch)
tree294b28c4ab8b10ff14af07a206b5cdb997a645a3
parentc4fca6ff8ffa7ad8e6129dd0f6fe1b72d58c950f (diff)
parenta95f51e847892fe0e358c519cc4bac42382fbbb7 (diff)
downloadLPC-Projet-2c7d3a47508e2323cd70d8f65324d8c3d01e51d0.tar.gz
LPC-Projet-2c7d3a47508e2323cd70d8f65324d8c3d01e51d0.zip
Merge branch 'master' into codegen-optHEADmaster
Conflicts: src/codegen.ml
-rw-r--r--src/codegen.ml3
-rw-r--r--src/typing.ml78
-rw-r--r--tests/exec/multi_virt.cpp46
-rw-r--r--tests/exec/multi_virt.out5
-rw-r--r--tests/typing/bad/diamond.cpp33
5 files changed, 126 insertions, 39 deletions
diff --git a/src/codegen.ml b/src/codegen.ml
index 2a8d1ae..62e4757 100644
--- a/src/codegen.ml
+++ b/src/codegen.ml
@@ -55,7 +55,7 @@ let env_get_free_reg e = (* prend un registre libre, le passe dans la
c_free_regs = more;
c_save_regs = r::e.c_save_regs }, r
-let globals_env = ref Smap.empty
+let globals_env = ref Smap.empty (* variables globales *)
(* Chaînes de caractères utilisées dans le programme *)
let strings = Hashtbl.create 12 (* string -> label *)
@@ -103,6 +103,7 @@ let rec stmt_does_call = function
- une liste de registres à sauvegarder dans tous les cas
- l'expression pour laquelle on veut générer du code
+
À l'issue d'un appel à gen_expr, il y a plusieurs possibilités, exprimées
par le type union expr_type décrit ci-dessus :
- le premier registre de la liste des registres disponnibles (noté r) contient
diff --git a/src/typing.ml b/src/typing.ml
index 7377d5c..4a47987 100644
--- a/src/typing.ml
+++ b/src/typing.ml
@@ -678,51 +678,53 @@ let compute_tclass env c =
| Some k -> Some (build_type_or_ref k)
| None -> None in
- (* If method is redefined from a virtual method of a parent class, it becomes virtual with same offset
- Else if method is virtual, it gets new offset !
- Else method is not virtual, everything is simple. *)
- let rec check_in_super (s:tcls_hier) =
- match List.fold_left (fun k s ->
- let r = check_in_super s in
- match k, r with
- | None, None -> None
- | None, Some k -> Some k
- | Some k, None -> None
- | Some k, Some r -> ty_error ("Ambiguous redefinition of " ^ proto.p_name))
- None s.h_supers
- with
- | Some k -> Some k
- | None ->
- List.fold_left (fun f (i, p) ->
- if (p.tp_name = proto.p_name && (List.map fst p.tp_args) = args_types && p.tp_virtual <> None)
- then begin
- ty_assert (p.tp_ret_type = ret_type) "Virtual method must be redefined with same return type.";
- Some (s, i)
- end else f) None s.h_vtable
- in let super = match check_in_super hier with
- | None -> if virt then
- (* allocate new spot in vtable of this object *)
- Some (hier, List.fold_left (fun n (x, _) -> max n (x+4)) 0 hier.h_vtable)
- else None
- | Some k -> Some k
- in
-
- (* Build proto *)
+ (* Build primitive proto *)
let tproto =
- { tp_virtual = super;
+ { tp_virtual = None;
tp_name = proto.p_name;
tp_unique_ident = proto.p_name ^ (tproto_unique_number()) ;
tp_class = Some(cls_name);
tp_ret_type = ret_type;
tp_args = args;
} in
- (* Add to vtable *)
- begin match super with
- | None -> ()
- | Some (c, i) ->
- c.h_vtable <- (i, tproto)::(List.remove_assoc i c.h_vtable)
- end;
- tproto) in
+
+ (* If method is redefined from a virtual method of a parent class,
+ it becomes virtual with same offset
+ If method is redefined from a virtual method of several parent classes,
+ update vtables for all these parent classes, use any as virtual
+ class for this class.
+ Else if method is virtual, it gets new offset !
+ Else method is not virtual, everything is simple. *)
+ let rec check_in_super (s:tcls_hier) =
+ let c_proto =
+ try
+ let (pos, proto) = List.find
+ (fun (_, p) -> p.tp_name = proto.p_name && (List.map fst p.tp_args) = args_types && p.tp_virtual <> None)
+ s.h_vtable in
+ ty_assert (proto.tp_ret_type = ret_type)
+ "Redefinition of virtual method must be done with same return type.";
+ let new_proto = { tproto with tp_virtual = Some(s, pos) } in
+ s.h_vtable <- (pos, new_proto)::(List.remove_assoc pos s.h_vtable);
+ Some (s, pos)
+ with | Not_found -> None
+ in
+
+ List.fold_left (fun k s ->
+ match check_in_super s with
+ | None -> k
+ | r -> r)
+ c_proto s.h_supers
+ in
+ match check_in_super hier with
+ | None -> if virt then
+ (* allocate new spot in vtable of this object *)
+ let pos = List.fold_left (fun n (x, _) -> max n (x+4)) 0 hier.h_vtable in
+ let proto = { tproto with tp_virtual = Some (hier, pos) } in
+ hier.h_vtable <- (pos, proto)::hier.h_vtable;
+ proto
+ else tproto
+ | some_super -> { tproto with tp_virtual = some_super }
+ ) in
(mem, mem_u), m::meth
) ((Smap.empty, used), []) c.c_members in
(* make sure class has default constructor *)
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