Skip to content
This repository was archived by the owner on Jun 1, 2022. It is now read-only.

Commit 7a41e11

Browse files
committed
[#556] Use round parentheses for type constructors
1 parent a100c78 commit 7a41e11

File tree

5 files changed

+9
-16
lines changed

5 files changed

+9
-16
lines changed

common/util.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,9 @@ export const buildGenericType = (
104104
singleParameter = false,
105105
) =>
106106
seq(
107-
'<',
107+
'(',
108108
singleParameter ? field(name, rule) : commaSep1(field(name, rule)),
109-
'>',
109+
')',
110110
)
111111

112112
export const buildTypeConstraint = <RuleName extends string>(

dtn/index.d.ts

-4
Original file line numberDiff line numberDiff line change
@@ -215,9 +215,7 @@ export type UnnamedType =
215215
| ":"
216216
| "::"
217217
| ";"
218-
| "<"
219218
| "<:"
220-
| ">"
221219
| "?"
222220
| "@"
223221
| "["
@@ -277,9 +275,7 @@ export type SyntaxNode =
277275
| UnnamedNode<":">
278276
| UnnamedNode<"::">
279277
| UnnamedNode<";">
280-
| UnnamedNode<"<">
281278
| UnnamedNode<"<:">
282-
| UnnamedNode<">">
283279
| UnnamedNode<"?">
284280
| UnnamedNode<"@">
285281
| UnnamedNode<"[">

tony/corpus/terms.txt

+5-5
Original file line numberDiff line numberDiff line change
@@ -701,10 +701,10 @@ else 1
701701
class
702702
==================
703703

704-
class Type<T>
704+
class Type(T)
705705
a :: T -> Number
706706
b :: T -> Number
707-
class Ord<T <: (Num; Eq; Ord)>
707+
class T <: (Num; Eq; Ord) => Ord(T)
708708
compare :: T -> T -> Number
709709

710710
---
@@ -753,7 +753,7 @@ class Ord<T <: (Num; Eq; Ord)>
753753
instance
754754
==================
755755

756-
instance Ord<Number>
756+
instance Ord(Number)
757757
compare := 1
758758

759759
---
@@ -1039,8 +1039,8 @@ type alias
10391039
type Type := Type
10401040
type Type := :tag Type
10411041
type Type := :tag Type | :tag ()
1042-
type Type<T, U <: Num> := T -> U
1043-
type GreaterThan<T>(x :: T) := [y :: T | y > x]
1042+
type U <: Num => Type(T, U) := T -> U
1043+
type T <: Ord => GreaterThan(T, x :: T) := [y :: T | y > x]
10441044

10451045
---
10461046

tony/grammar.ts

+1
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ export = grammar({
142142
[$.tagged_value, $.tagged_pattern, $.tagged_type],
143143
[$.tagged_value, $.tagged_type],
144144
[$.tagged_pattern, $.tagged_type],
145+
[$.type_variable_declaration, $.parametric_type],
145146
],
146147

147148
precedences: () => [],

tony/index.d.ts

+1-5
Original file line numberDiff line numberDiff line change
@@ -271,11 +271,9 @@ export type UnnamedType =
271271
| "::"
272272
| ":="
273273
| ";"
274-
| "<"
275274
| "<:"
276275
| "="
277276
| "=>"
278-
| ">"
279277
| "?"
280278
| "@"
281279
| "["
@@ -398,11 +396,9 @@ export type SyntaxNode =
398396
| UnnamedNode<"::">
399397
| UnnamedNode<":=">
400398
| UnnamedNode<";">
401-
| UnnamedNode<"<">
402399
| UnnamedNode<"<:">
403400
| UnnamedNode<"=">
404401
| UnnamedNode<"=>">
405-
| UnnamedNode<">">
406402
| UnnamedNode<"?">
407403
| UnnamedNode<"@">
408404
| UnnamedNode<"[">
@@ -430,8 +426,8 @@ export type SyntaxNode =
430426
| UnnamedNode<SyntaxType.Return>
431427
| UnnamedNode<"then">
432428
| UnnamedNode<"true">
433-
| TypeNode
434429
| UnnamedNode<SyntaxType.Type>
430+
| TypeNode
435431
| TypeVariableDeclarationNameNode
436432
| UnnamedNode<SyntaxType.Typeof>
437433
| UnnamedNode<SyntaxType.When>

0 commit comments

Comments
 (0)