fn

CHANGELOG.md

@@ -4,6 +4,8 @@
 ## Breaking changes
 - 変数定義の`#` → `let`
 - 変数定義の`$` → `var`
+- 関数定義の`@` → `fn`
+- 無名関数`@() {}` → `() => {}`
 - 代入の`<-` → `=`
 - 比較の`=` → `==`
 - `&` → `&&`

src/parser/parser.peggy

@@ -102,7 +102,7 @@ NamespaceStatement
 
 Statement
 	= VarDef      // "let" NAME | "var" NAME
-	/ FnDef       // "@"
+	/ FnDef       // "fn"
 	/ Out         // "<:"
 	/ Return      // "return"
 	/ Attr        // "+"
@@ -122,7 +122,7 @@ Expr
 
 Expr2
 	= If          // "if"
-	/ Fn          // "@("
+	/ Fn          // "() =>"
 	/ Chain       // Expr3 "(" | Expr3 "[" | Expr3 "."
 	/ Expr3
 
@@ -501,10 +501,10 @@ Args
 // define function statement
 
 FnDef
-	= "@" s1:__* name:NAME s2:__* "(" _* args:Args? _* ")" ret:(_* ":" _* @Type)? _* "{" _* content:Statements? _* "}"
+	= "fn" _+ name:NAME s1:__* "(" _* args:Args? _* ")" _* ret:(_* "=>" _* @Type)? _* "{" _* content:Statements? _* "}"
 {
-	if (s1.length > 0 || s2.length > 0) {
-		error('Cannot use spaces before or after the function name.');
+	if (s1.length > 0) {
+		error('Cannot use spaces after the function name.');
 	}
 	return createNode('def', {
 		name: name,
@@ -516,7 +516,7 @@ FnDef
 
 // function expression
 
-Fn = "@(" _* args:Args? _* ")" ret:(_* ":" _* @Type)? _* "{" _* content:Statements? _* "}"
+Fn = "(" _* args:Args? _* ")" _* ret:(_* ":" _* @Type)? _* "=>" _* "{" _* content:Statements? _* "}"
 { return createNode('fn', { args: args || [], ret: ret }, content || []); }
 
 
@@ -554,7 +554,7 @@ Type
 	/ NamedType
 
 FnType
-	= "@(" _* args:ArgTypes? _* ")" _* "=>" _* result:Type
+	= "(" _* args:ArgTypes? _* ")" _* "=>" _* result:Type
 { return createNode('fn', { args: args || [], result }); }
 
 ArgTypes