Fix variable delaration in litmus headers and re as nre

hernan-poncedeleon · hernan-poncedeleon · commit 76504e04fa38 · 2025-05-16T13:15:42.000+08:00
Signed-off-by: Hernan Ponce de Leon &lt;hernanl.leon@huawei.com&gt;
diff --git a/dartagnan/src/main/antlr4/LitmusC.g4 b/dartagnan/src/main/antlr4/LitmusC.g4
@@ -13,7 +13,7 @@ main
     ;
 
 variableDeclaratorList
-    :   LBrace (globalDeclarator Semi comment?)* RBrace (Semi)?
+    :   LBrace (globalDeclarator (Semi comment? globalDeclarator?)* Semi?)? RBrace Semi?
     ;
 
 globalDeclarator
@@ -193,6 +193,7 @@ nre locals [IntBinaryOp op, String mo, String name]
     |   C11AtomicStore            LPar address = re  Comma value = re  RPar                                                                 # nreC11Store
 
     |   Ast? varName Equals re                                                                                                              # nreAssignment
+    |   re                                                                                                                                  # reAsNre
     |   typeSpecifier varName (Equals re)?                                                                                                  # nreRegDeclaration
 
     |   SpinLock LPar address = re RPar                                                                                                     # nreSpinLock

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ main`
`13`	`13`	`;`
`14`	`14`
`15`	`15`	`variableDeclaratorList`
`16`		`- : LBrace (globalDeclarator Semi comment?)* RBrace (Semi)?`
	`16`	`+ : LBrace (globalDeclarator (Semi comment? globalDeclarator?)* Semi?)? RBrace Semi?`
`17`	`17`	`;`
`18`	`18`
`19`	`19`	`globalDeclarator`
`@@ -193,6 +193,7 @@ nre locals [IntBinaryOp op, String mo, String name]`
`193`	`193`	`\| C11AtomicStore LPar address = re Comma value = re RPar # nreC11Store`
`194`	`194`
`195`	`195`	`\| Ast? varName Equals re # nreAssignment`
	`196`	`+ \| re # reAsNre`
`196`	`197`	`\| typeSpecifier varName (Equals re)? # nreRegDeclaration`
`197`	`198`
`198`	`199`	`\| SpinLock LPar address = re RPar # nreSpinLock`