fix: remove anonymous function from struct methods

llafuente · Oct 23, 2024 · 3c262a9 · 3c262a9
1 parent 67b4952
commit 3c262a9
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/spec/language/functions.md b/spec/language/functions.md
@@ -21,27 +21,30 @@ deferStmt
 functionDecl
   : (functionDef | anonymousFunctionDef) functionBody
   ;
-/*
+
 functionModifiers
-  : '@pure'
-  | '@mock'
-  | '@debug'
+  : 'pure'
+  | 'override'
+  | 'overwrite'
+  | 'readonly'
   ;
-*/
+  // | '@mock'
+  // | '@debug'
+
 anonymousFunctionDef
-  : 'pure'? 'function' templateDefinition? '(' functionParameterList? ')' functionReturnTypeModifiers* typeDefinition?
+  : functionModifiers* 'function' templateDefinition? '(' functionParameterList? ')' functionReturnTypeModifiers* typeDefinition?
   ;
 
 functionDef
-  : 'pure'? 'function' identifier templateDefinition? '(' functionParameterList? ')' functionReturnTypeModifiers* typeDefinition?
+  : functionModifiers* 'function' identifier templateDefinition? '(' functionParameterList? ')' functionReturnTypeModifiers* typeDefinition?
   ;
 
 memoryFunctionDecl
   : memoryFunctionDef functionBody
   ;
 
 memoryFunctionDef
-  : ('new'|'delete'|'clone') '(' functionParameterList? ')'
+  : ('override' | 'overwrite')* ('new'|'delete'|'clone') '(' functionParameterList? ')'
   ;
 
 operatorFunctionDecl
@@ -224,7 +227,7 @@ function sum(i32 a, i32 b) i32 {
 1. A pure function shall have no access to package, file or global variables
 unless it's a constant or a semantic-error shall raise
 
-> A pure function shall no read or write any non-constant variable.
+> A pure function shall no read or write any non-constant variable outside function scope
 
 
 ## functions as Type
@@ -1181,4 +1184,4 @@ function add<$t>($t a, float b) $t {
 function add<$t is float>($t a, float b) $t {
   return a + b 
 }
-```
+```
diff --git a/spec/language/type-system.md b/spec/language/type-system.md
@@ -130,7 +130,7 @@ typeImplementsDecl
   ;
 
 structTypeDecl
-  : 'struct' (typeExtendsDecl | typeImplementsDecl)* '{' endOfStmt? structProperty* '}'
+  : 'struct' (typeExtendsDecl | typeImplementsDecl | 'noalign')* '{' endOfStmt? structProperty* '}'
   ;
 
 interfaceTypeDecl
@@ -175,16 +175,13 @@ structPropertyModifiers
   | 'readonly'
   ;
 
-functionModifiers
-  : 'readonly'
-  ;
-
 structPropertyDecl
   // TODO anonymousFunction
   : (structPropertyModifiers)* typeDefinition identifier ('=' (constant | arrayConstantInitializer | structConstantInitializer))?
   // TODO REVIEW aliasing operator?
   | propertyAlias
-  | (functionModifiers)* functionDecl
+  // Notice: do not support anonymous function
+  | functionDef functionBody
   | memoryFunctionDecl
   | operatorFunctionDecl
   | structGetterDecl