backup/cs2j
1
0
Fork 0
mirror of https://github.com/twiglet/cs2j.git synced 2025-01-18 13:15:17 +01:00
Code Issues Projects Releases Activity

simplify SubstituteInType, just try all strings that match [\w|\.]+

Browse Source
This commit is contained in:
Kevin Glynn 2011-03-02 19:29:07 +01:00
parent eb6b494fb8
commit e8b59d4fdb
1 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
CSharpTranslator/antlr3/src/CS2JTranslator/CS2JTemplate/TranslationTemplate.cs
View File

@ -35,15 +35,45 @@ namespace Twiglet.CS2J.Translator.TypeRep
} }
return ret; return ret;
} }
private class TypeVarMapper
{
private Dictionary<string,TypeRepTemplate> myArgMap;
public TypeVarMapper(Dictionary<string,TypeRepTemplate> inArgMap)
{
myArgMap = inArgMap;
}
public string ReplaceFromMap(Match m)
{
if (myArgMap.ContainsKey(m.Value))
{
return myArgMap[m.Value].mkSafeTypeName();
}
return m.Value;
}
}
public static string SubstituteInType(String type, Dictionary<string,TypeRepTemplate> argMap) public static string SubstituteInType(String type, Dictionary<string,TypeRepTemplate> argMap)
{
if (String.IsNullOrEmpty(type))
return type;
TypeVarMapper mapper = new TypeVarMapper(argMap);
return Regex.Replace(type, @"([\w|\.]+)*", new MatchEvaluator(mapper.ReplaceFromMap));
}
private static string OldSubstituteInType(String type, Dictionary<string,TypeRepTemplate> argMap)
{ {
if (String.IsNullOrEmpty(type)) if (String.IsNullOrEmpty(type))
return type; return type;
string ret = type; string ret = type;
// type is either "string" or "string<type,type,...>" // type is either "string" or "string*[type,type,...]*" or string[]
Match match = Regex.Match(type, @"^([\w|\.]+)(?:\s*\[\s*([\w|\.]+)(?:\s*,\s*([\w|\.]+))*\s*\])?$"); // Match match = Regex.Match(type, @"^([\w|\.]+)(?:\s*\*\[\s*([\w|\.]+)(?:\s*,\s*([\w|\.]+))*\s*\]\*)?$");
Match match = Regex.Match(type, @"([\w|\.]+)*");
if (match.Success) if (match.Success)
{ {
CaptureCollection captures = match.Captures; CaptureCollection captures = match.Captures;