summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex AUVOLAT <alex.auvolat@ens.fr>2014-01-07 14:58:01 +0100
committerAlex AUVOLAT <alex.auvolat@ens.fr>2014-01-07 14:58:01 +0100
commitbefa0878ac0f6bd3a21de420978a44606774ff1c (patch)
treee480cdd8023fe6142884b27c3c4fa854828f9641
parent5d01e0f25fd70a01184c575ae30b49eedf7fd92b (diff)
parentf6b4cc449e4531b61d20f9c5544db4a8bedb7d1c (diff)
downloadLPC-Projet-befa0878ac0f6bd3a21de420978a44606774ff1c.tar.gz
LPC-Projet-befa0878ac0f6bd3a21de420978a44606774ff1c.zip
Merge branch 'master' into codegen-alex-opt
-rw-r--r--src/test.cpp1
-rw-r--r--src/typing.ml1
2 files changed, 1 insertions, 1 deletions
diff --git a/src/test.cpp b/src/test.cpp
deleted file mode 100644
index 81373c8..0000000
--- a/src/test.cpp
+++ /dev/null
@@ -1 +0,0 @@
-int m() { return 1==2 && 3==4 || !(5>=6); }
diff --git a/src/typing.ml b/src/typing.ml
index 353c1ad..7a76b69 100644
--- a/src/typing.ml
+++ b/src/typing.ml
@@ -175,6 +175,7 @@ let rec subtype env a b = match a, b with
| T_Int, T_Int -> true
| T_Void, T_Void -> true
| Typenull, TPoint(_) -> true
+ | TPoint(TPoint(TClass(_))), TPoint(TPoint(_)) -> false
| TPoint(ka), TPoint(kb) -> subtype env ka kb
| TClass(i), TClass(j) ->
let c = get_c env i in