Merge branch '__rultor'

volodya-lombrozo · Jan 29, 2025 · 6bdbc16 · 6bdbc16 · 0pdd · Jan 29, 2025
2 parents e6ffebb + 888a1e8
commit 6bdbc16
Showing 1 changed file with 28 additions and 2 deletions.
diff --git a/src/main/resources/grammars/Java8ReducedParser.g4 b/src/main/resources/grammars/Java8ReducedParser.g4
@@ -269,7 +269,7 @@ normalInterfaceDeclaration
     ;
 
 normalClassDeclaration
-    : (inheritanceModifier SPACE)? ('strictfp' SPACE)?  'class' SPACE /* $jsmith-unique */ Identifier classBody
+    : (inheritanceModifier SPACE)? ('strictfp' SPACE)?  'class' SPACE /* $jsmith-unique */ /* $jsmith-var-decl */ Identifier classBody
     ;
 
 interfaceModifier
@@ -281,8 +281,34 @@ inheritanceModifier
     | 'abstract'
     ;
 
+/**
+* @todo #15:30min Classes are generated with only one constructor.
+* Currently, generating multiple constructors can cause a problem
+* where a constructor with the same signature is generated several times.
+* We need to make sure that only unique constructors with different numbers of parameters are generated.
+*/
+
 classBody /* $jsmith-scope */
-    : '{' classBodyDeclaration+ '}' NL
+    : '{' (constructorDeclaration)? classBodyDeclaration+'}' NL
+    ;
+
+constructorDeclaration
+    : NL constructorModifiers SPACE /* $jsmith-var-target */ Identifier SPACE '(' constructorParams ')' SPACE constructorBody
+    ;
+
+constructorParams
+    : (vardef (',' SPACE vardef)*)?
+    ;
+
+constructorBody
+    : methodBlock
+    ;
+
+
+constructorModifiers
+    : 'public'
+    | 'private'
+    | 'protected'
     ;
 
 interfaceBody