From f63571c9a6b532f64b415de27bb0ee6cc358388d Mon Sep 17 00:00:00 2001 From: Alasdair Date: Thu, 11 Oct 2018 21:31:23 +0100 Subject: Change the function type in the AST Changes the representation of function types in the ast from Typ_fn : typ -> typ to Typ_fn : typ list -> typ to more accurately represent their use in the various backends, where we often compile functions to either their curried representations as in Lem and Isabelle, or just multiple argument functions in C. There's still some oddity because a single pattern in a function clause can bind against multiple arguments, and maybe we want to forbid this in the future. The syntax also hasn't changed (yet), so in theory this change shouldn't break anything (but it invariably will...). In the future we would ideally require that a function with N arguments has exactly N patterns in its declaration, one for each argument so f : (x, y) -> z f _ = ... would be disallowed (as _ matches both x and y), forcing f(_, _) = z this would simply quite a few things, Also we could have a different syntax for function argument lists and tuples, because it's rather hard to define a function that actually takes a tuple with the syntax how it is now. Some issues I noticed when doing this refactoring: Line 1926 of Coq translation. untuple_args_pat is maybe no longer needed? However there's still some funnyness where a pattern can be used to bind multiple function arguments so maybe it still is. Line 2306 of monomorphisation. I simplified the logic here. I think it's equivalent now, but I could be wrong. Line 4517 of rewrites. I'm not sure what make_cstr_mappings is doing here, but hopefully the simpler version is the same. --- language/sail.ott | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'language') diff --git a/language/sail.ott b/language/sail.ott index a1dc03f4..2edffcbe 100644 --- a/language/sail.ott +++ b/language/sail.ott @@ -238,7 +238,7 @@ typ :: 'Typ_' ::= {{ com defined type }} | kid :: :: var {{ com type variable }} - | typ1 -> typ2 effectkw effect :: :: fn + | ( typ1 , ... , typn ) -> typ2 effectkw effect :: :: fn {{ com Function (first-order only in user code) }} | typ1 <-> typ2 :: :: bidir {{ com Mapping }} -- cgit v1.2.3