[#556] Use round parentheses for type constructors

tony-lang · Mar 21, 2021 · 7a41e11 · 7a41e11
1 parent a100c78
commit 7a41e11
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 16 deletions.
diff --git a/common/util.ts b/common/util.ts
@@ -104,9 +104,9 @@ export const buildGenericType = (
  singleParameter = false,
 ) =>
  seq(
- '<',
+ '(',
  singleParameter ? field(name, rule) : commaSep1(field(name, rule)),
- '>',
+ ')',
  )
 
 export const buildTypeConstraint = <RuleName extends string>(

diff --git a/dtn/index.d.ts b/dtn/index.d.ts
@@ -215,9 +215,7 @@ export type UnnamedType =
  | ":"
  | "::"
  | ";"
- | "<"
  | "<:"
- | ">"
  | "?"
  | "@"
  | "["
@@ -277,9 +275,7 @@ export type SyntaxNode =
  | UnnamedNode<":">
  | UnnamedNode<"::">
  | UnnamedNode<";">
- | UnnamedNode<"<">
  | UnnamedNode<"<:">
- | UnnamedNode<">">
  | UnnamedNode<"?">
  | UnnamedNode<"@">
  | UnnamedNode<"[">

diff --git a/tony/corpus/terms.txt b/tony/corpus/terms.txt
@@ -701,10 +701,10 @@ else 1
 class
 ==================
 
-class Type<T>
+class Type(T)
  a :: T -> Number
  b :: T -> Number
-class Ord<T <: (Num; Eq; Ord)>
+class T <: (Num; Eq; Ord) => Ord(T)
  compare :: T -> T -> Number
 
 ---
@@ -753,7 +753,7 @@ class Ord<T <: (Num; Eq; Ord)>
 instance
 ==================
 
-instance Ord<Number>
+instance Ord(Number)
  compare := 1
 
 ---
@@ -1039,8 +1039,8 @@ type alias
 type Type := Type
 type Type := :tag Type
 type Type := :tag Type | :tag ()
-type Type<T, U <: Num> := T -> U
-type GreaterThan<T>(x :: T) := [y :: T | y > x]
+type U <: Num => Type(T, U) := T -> U
+type T <: Ord => GreaterThan(T, x :: T) := [y :: T | y > x]
 
 ---
 

diff --git a/tony/grammar.ts b/tony/grammar.ts
@@ -142,6 +142,7 @@ export = grammar({
  [$.tagged_value, $.tagged_pattern, $.tagged_type],
  [$.tagged_value, $.tagged_type],
  [$.tagged_pattern, $.tagged_type],
+ [$.type_variable_declaration, $.parametric_type],
  ],
 
  precedences: () => [],

diff --git a/tony/index.d.ts b/tony/index.d.ts
@@ -271,11 +271,9 @@ export type UnnamedType =
  | "::"
  | ":="
  | ";"
- | "<"
  | "<:"
  | "="
  | "=>"
- | ">"
  | "?"
  | "@"
  | "["
@@ -398,11 +396,9 @@ export type SyntaxNode =
  | UnnamedNode<"::">
  | UnnamedNode<":=">
  | UnnamedNode<";">
- | UnnamedNode<"<">
  | UnnamedNode<"<:">
  | UnnamedNode<"=">
  | UnnamedNode<"=>">
- | UnnamedNode<">">
  | UnnamedNode<"?">
  | UnnamedNode<"@">
  | UnnamedNode<"[">
@@ -430,8 +426,8 @@ export type SyntaxNode =
  | UnnamedNode<SyntaxType.Return>
  | UnnamedNode<"then">
  | UnnamedNode<"true">
- | TypeNode
  | UnnamedNode<SyntaxType.Type>
+ | TypeNode
  | TypeVariableDeclarationNameNode
  | UnnamedNode<SyntaxType.Typeof>
  | UnnamedNode<SyntaxType.When>