Fix type parsing of iterators in range-loops

nokia · Jul 9, 2024 · d48a371 · d48a371
1 parent 89a0fda
commit d48a371
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 2 deletions.
diff --git a/ttcn3/syntax/nodes.go b/ttcn3/syntax/nodes.go
@@ -425,6 +425,7 @@ type (
 		Tok    Token
 		LParen Token
 		VarTok Token
+		Type   TypeSpec
 		Var    *Ident
 		InTok  Token
 		Range  Expr

diff --git a/ttcn3/syntax/nodes_gen.go b/ttcn3/syntax/nodes_gen.go
diff --git a/ttcn3/syntax/parser.go b/ttcn3/syntax/parser.go
@@ -2408,7 +2408,7 @@ func (p *parser) parseStmt() Stmt {
 	case LBRACK:
 		return p.parseAltGuard()
 	case FOR:
-		if p.peek(4).Kind() == IN || p.peek(5).Kind() == IN {
+		if p.peek(4).Kind() == IN || p.peek(5).Kind() == IN || p.peek(6).Kind() == IN {
 			return p.parseForRangeLoop()
 		}
 		return p.parseForLoop()
@@ -2485,6 +2485,9 @@ func (p *parser) parseForRangeLoop() *ForRangeStmt {
 	x.LParen = p.expect(LPAREN)
 	if p.tok == VAR {
 		x.VarTok = p.consume()
+		if p.peek(2).Kind() != IN {
+			x.Type = p.parseTypeSpec()
+		}
 		x.Var = p.parseName()
 	} else {
 		x.Var = p.parseIdent()

diff --git a/ttcn3/syntax/parser_test.go b/ttcn3/syntax/parser_test.go
@@ -277,6 +277,7 @@ func TestStmts(t *testing.T) {
 		{pass, `for (i:=x; i<23; i:=i+1) {}`},
 		{pass, `for (x in {1,2,3}) {}`},
 		{pass, `for (var x in a) {}`},
+		{pass, `for (var integer x in a) {}`},
 		{pass, `while (23) {}`},
 		{pass, `do {} while (23);`},
 		{pass, `if (1) {}`},