Fixed syntax and diagnostics location

git-svn-id: https://svn.inf.ethz.ch/svn/lecturers/a2/trunk@8648 8c9fc860-2736-0410-a75d-ab315db34111

source/FoxParser.Mod

@@ -90,7 +90,7 @@ CONST
 						['else' StatementSequence]
 						'end'
 					| 'with' Identifier ':' QualifiedIdentifier 'do' StatementSequence 
-						{'|' Identifier ':' QualifiedIdentifier 'do' StatementSequence}
+						{['|' Identifier ':'] QualifiedIdentifier 'do' StatementSequence}
 						[else StatementSequence]
 						 'end'
 					| 'case' Expression 'of' ['|'] Case {'|' Case} ['else' StatementSequence] 'end'
@@ -1088,7 +1088,7 @@ TYPE
                         ['else' StatementSequence]
                         'end'
                      | 'with' Identifier ':' QualifiedIdentifier 'do' StatementSequence 
-                         {'|' Identifier ':' QualifiedIdentifier 'do' StatementSequence}
+                         {'|' [Identifier ':'] QualifiedIdentifier 'do' StatementSequence}
                 				[else StatementSequence]
                          'end'
                      | 'case' Expression 'of' ['|'] Case {'|' Case} ['else' StatementSequence] 'end'
@@ -1187,7 +1187,7 @@ TYPE
 						withStatement.AddWithPart(withPart);
 						qualifiedIdentifier := QualifiedIdentifier();
 						IF Optional(Scanner.Colon) THEN (* compatibility with old format *)
-							Basic.Warning(diagnostics, scanner.source^, position, "deprecate form of with statement, remove the repeated variable");
+							Basic.Warning(diagnostics, scanner.source^, qualifiedIdentifier.position, "deprecated form of with statement, remove the repeated variable");
 							qualifiedIdentifier := QualifiedIdentifier();
 						END;
 						qualifiedType := SyntaxTree.NewQualifiedType(qualifiedIdentifier.position, currentScope, qualifiedIdentifier);