diff options
| author | Kathy Gray | 2014-03-27 14:20:51 +0000 |
|---|---|---|
| committer | Kathy Gray | 2014-03-27 14:20:51 +0000 |
| commit | 70d8fd00c326f928bf0300b006b2c3a79d09cd10 (patch) | |
| tree | f781fee882027302bd3368ddd33e13826769b310 /language | |
| parent | 9549b13972f5c3173bc7d11ea1b62b490f673166 (diff) | |
Check simple constraints (i.e. ones using only constants).
Changes syntax of tuple type from * to , so that nexps of the form 8 * 'n can be supported in the parser, which was apparently not true before.
Diffstat (limited to 'language')
| -rw-r--r-- | language/l2.ott | 2 | ||||
| -rw-r--r-- | language/l2_parse.ott | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/language/l2.ott b/language/l2.ott index a6918526..6faeb724 100644 --- a/language/l2.ott +++ b/language/l2.ott @@ -224,7 +224,7 @@ typ :: 'Typ_' ::= {{ com Function type (first-order only in user code) }} % TODO: build first-order restriction into AST or just into type rules? neither - see note % TODO: concrete syntax for effects in a function type? needed only for pp, not in user syntax. - | typ1 * .... * typn :: :: tup + | ( typ1 , .... , typn ) :: :: tup {{ com Tuple type }} % TODO union in the other kind grammars? or make a syntax of argument? or glom together the grammars and leave o the typechecker | id < typ_arg1 , .. , typ_argn > :: :: app diff --git a/language/l2_parse.ott b/language/l2_parse.ott index 3ef811bb..b2e9cfdf 100644 --- a/language/l2_parse.ott +++ b/language/l2_parse.ott @@ -177,7 +177,7 @@ atyp :: 'ATyp_' ::= | pure :: M :: pure {{ com sugar for empty effect set }} {{ icho [] }} | atyp1 -> atyp2 effect atyp3 :: :: fn {{ com Function type (first-order only in user code), last atyp is an effect }} - | atyp1 * .... * atypn :: :: tup + | ( atyp1 , .... , atypn ) :: :: tup {{ com Tuple type }} | id < atyp1 , .. , atypn > :: :: app {{ com type constructor application }} |