diff options
| author | Alex AUVOLAT <alex.auvolat@ens.fr> | 2014-01-07 14:57:52 +0100 |
|---|---|---|
| committer | Alex AUVOLAT <alex.auvolat@ens.fr> | 2014-01-07 14:57:52 +0100 |
| commit | ac9d321fe8cb789d4f3fda6e07ac96d6d3fa73b1 (patch) | |
| tree | 345d17161539844a7e12ce6a75c1bb753cc1829f | |
| parent | 8c9a4cd262754b3e24f545235a12839d6adf0bd9 (diff) | |
| parent | f6b4cc449e4531b61d20f9c5544db4a8bedb7d1c (diff) | |
| download | LPC-Projet-ac9d321fe8cb789d4f3fda6e07ac96d6d3fa73b1.tar.gz LPC-Projet-ac9d321fe8cb789d4f3fda6e07ac96d6d3fa73b1.zip | |
Merge branch 'master' into codegen-alex
| -rw-r--r-- | src/test.cpp | 1 | ||||
| -rw-r--r-- | src/typing.ml | 1 |
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 a62eb55..6a2d646 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 |