Index: External/Plugins/ASCompletion/Model/ASFileParser.cs
===================================================================
--- External/Plugins/ASCompletion/Model/ASFileParser.cs (revision 1773)
+++ External/Plugins/ASCompletion/Model/ASFileParser.cs (working copy)
@@ -55,6 +55,8 @@
static public Regex re_balancedBraces = new Regex("{[^{}]*(((?<Open>{)[^{}]*)+((?<Close-Open>})[^{}]*)+)*(?(Open)(?!))}", ro_cs);
static public Regex re_import = new Regex("^[\\s]*import[\\s]+(?<package>[\\w.]+)", ro_cm);
static private Regex re_spaces = new Regex("\\s+", RegexOptions.Compiled);
+ static private Regex re_param = new Regex( "[\\(,]\\s*((?<pName>(\\.\\.\\.)?[\\w\\$]+)\\s*(\\:\\s*(?<pType>[\\w\\$\\*\\.\\<\\>]+))?)", RegexOptions.Compiled );
+ static private Regex re_functType = new Regex( "\\s*\\:\\s*(?<fType>[\\w\\$\\.\\<\\>]+)", RegexOptions.Compiled );
static private Regex re_validTypeName = new Regex("^(\\s*of\\s*)?(?<type>[\\w.\\$]*)$", RegexOptions.Compiled);
static private Regex re_region = new Regex(@"^(#|{)[ ]?region[:\\s]*(?<name>[^\r\n]*)", RegexOptions.Compiled);
#endregion
@@ -1546,6 +1548,19 @@
lastComment = null;
}
}
+ else if( curMember.Type == "Function" && lastComment != null )
+ {
+ MemberModel fnModel = ParseDelegateDeclaration( lastComment );
+
+ if( fnModel != null )
+ {
+ curMember.Type = fnModel.Type;
+ curMember.Flags = fnModel.Flags;
+ curMember.Parameters = fnModel.Parameters;
+
+ lastComment = null;
+ }
+ }
}
else if (hadContext && (hadKeyword || inParams || inEnum || inTypedef))
{
@@ -1857,6 +1872,57 @@
int p = token.LastIndexOf(separator);
return (p >= 0) ? token.Substring(p+1) : token;
}
+
+ /// <summary>
+ /// Added by [i.o.] 11.03.2011
+ /// Delegate comment declaration parsing
+ /// </summary>
+ /// <param name="decl"></param>
+ /// <returns></returns>
+ private MemberModel ParseDelegateDeclaration( string decl )
+ {
+ // Testing for correct declaration
+ if( decl == null || decl.Length == 0 )
+ return null;
+
+ int idxBraceOp = decl.IndexOf( "(" );
+ int idxBraceCl = decl.IndexOf( ")" );
+
+ if( idxBraceOp < 0 || idxBraceCl < 0 )
+ return null;
+
+ Regex re_braceOp = new Regex( "\\(", RegexOptions.Compiled );
+ Regex re_braceCl = new Regex( "\\)", RegexOptions.Compiled );
+
+ if( re_braceOp.Matches( decl ).Count > 1 ||
+ re_braceCl.Matches( decl ).Count > 1 )
+ return null;
+
+ // Tests: OK
+
+ // Setting default values
+ MemberModel fm = new MemberModel( "unknown", "*", FlagType.Function, Visibility.Default );
+ fm.Parameters = new List<MemberModel>();
+
+ // Getting a type of function
+ Match m = re_functType.Match( decl.Substring( idxBraceCl ) );
+ if( m.Success )
+ fm.Type = m.Groups["fType"].Value;
+
+ // Getting params matches
+ String pBody = decl.Substring( idxBraceOp, 1 + idxBraceCl - idxBraceOp );
+ MatchCollection pMatches = re_param.Matches( pBody );
+ int i, l = pMatches.Count;
+ for( i=0; i<l; i++ )
+ {
+ fm.Parameters.Add( new MemberModel( pMatches[i].Groups["pName"].Value,
+ pMatches[i].Groups["pType"].Value,
+ FlagType.ParameterVar,
+ Visibility.Default ) );
+ }
+
+ return fm;
+ }
#endregion
}
}
