Grammar improvements:

-Support control characters in a string (^M, #13 and combination)
-Support double pointer (^^) reference

Author: Laurensvanrun

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

@@ -64,6 +64,15 @@ package org.sonar.plugins.delphi.antlr;
 **/
 }
 
+@lexer::members {
+  private boolean isControlchar() {
+    // TODO 
+    //  - check if there are actually 2 chars ahead and not an EOF
+    //  - perhaps something else than a regex match here
+    return ((char)input.LA(1) + "" + (char)input.LA(2)).matches("\\w\\W");
+  }
+}
+
 //****************************
 //section start
 //****************************
@@ -480,15 +489,16 @@ factor                       : '@' factor
                              | designator
                              | typeId '(' expression ')'
                              ;
-stringFactor                 : ControlString (QuotedString ControlString)* (QuotedString)?
-                             | QuotedString (ControlString QuotedString)* (ControlString)?
+stringFactor                 : (ControlString | ControlChar) (QuotedString (ControlString | ControlChar))* (QuotedString)?
+                             | QuotedString ((ControlString | ControlChar) QuotedString)* (ControlString | ControlChar)?
                              ;
 setSection                   : '[' (expression ((',' | '..') expression)*)? ']'
                              ;
 
 designator                   : ('inherited')? ( (qualifiedIdent | typeId) )? (designatorItem)*
                              ;
 designatorItem               : '^'
+                             | '^^'
                              | ('.' | '@') ident              //CHANGED added '@'
                              | ('<' genericTypeIdent (',' genericTypeIdent)* '>')       //ADDED for proc<sth, sth>.foo;
                              | '[' expressionList ']'
@@ -940,14 +950,15 @@ TkRealNum               : Digitseq ( ((DOT Digitseq)? (('e'|'E') ('+'|'-')? Digi
                         ;
 TkHexNum                : '$' Hexdigitseq
                         ;
-QuotedString            : '\'' ('\'\'' | ~('\''))* '\''   //taken from PASCAL grammar
+ControlChar             : '^' ( {isControlchar()}?=> Alpha
+                            | {$type=POINTER2;}
+                            )
+                        | '#' Digitseq
+                        | '#' '$' Hexdigitseq
                         ;
-ControlString           : Controlchar (Controlchar)*
+QuotedString            : '\'' ('\'\'' | ~('\''))* '\''   //taken from PASCAL grammar
                         ;
-
-fragment
-Controlchar             : '#' Digitseq
-                        | '#' '$' Hexdigitseq
+ControlString           : ControlChar (ControlChar)*
                         ;
 fragment
 Alpha                   : 'a'..'z'