Improved lexer and parser for ^ in strings and pointers

Author: Laurensvanrun

src/main/antlr3/org/sonar/plugins/delphi/antlr/Delphi.g

@@ -489,8 +489,10 @@ factor                       : '@' factor
                              | designator
                              | typeId '(' expression ')'
                              ;
-stringFactor                 : (ControlString | ControlChar) (QuotedString (ControlString | ControlChar))* (QuotedString)?
-                             | QuotedString ((ControlString | ControlChar) QuotedString)* (ControlString | ControlChar)?
+stringFactor                 : (controlString) (QuotedString (controlString))* (QuotedString)?
+                             | QuotedString ((controlString) QuotedString)* (controlString)?
+                             ;
+controlString                : ControlChar (ControlChar)*
                              ;
 setSection                   : '[' (expression ((',' | '..') expression)*)? ']'
                              ;
@@ -958,8 +960,6 @@ ControlChar             : '^' ( {isControlchar()}?=> Alpha
                         ;
 QuotedString            : '\'' ('\'\'' | ~('\''))* '\''   //taken from PASCAL grammar
                         ;
-ControlString           : ControlChar (ControlChar)*
-                        ;
 fragment
 Alpha                   : 'a'..'z'
                         | 'A'..'Z'