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

support variants to smooth java naming convention support

Browse Source
This commit is contained in:
Kevin Glynn 2011-09-06 10:05:40 +02:00
parent 8fef1242e9
commit 11402e0865
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CSharpTranslator/antlr3/src/CS2JTranslator/CS2JMain/CS2JMain.cs
View File

@ -127,7 +127,7 @@ namespace Twiglet.CS2J.Translator
.Add ("exappdir=", dirs => addDirectories(cfg.ExAppRoot, dirs)) .Add ("exappdir=", dirs => addDirectories(cfg.ExAppRoot, dirs))
.Add ("csdir=", dirs => addDirectories(csDir, dirs)) .Add ("csdir=", dirs => addDirectories(csDir, dirs))
.Add ("excsdir=", dirs => addDirectories(cfg.Exclude, dirs)) .Add ("excsdir=", dirs => addDirectories(cfg.Exclude, dirs))
.Add ("alttranslations=", asub => cfg.AltTranslations.Add(asub)) .Add ("alt-translations=", asub => cfg.AltTranslations.Add(asub))
.Add ("translator-keep-parens=", v => cfg.TranslatorKeepParens = Boolean.Parse(v)) .Add ("translator-keep-parens=", v => cfg.TranslatorKeepParens = Boolean.Parse(v))
.Add ("translator-timestamp-files=", v => cfg.TranslatorAddTimeStamp = Boolean.Parse(v)) .Add ("translator-timestamp-files=", v => cfg.TranslatorAddTimeStamp = Boolean.Parse(v))
.Add ("translator-blanket-throw=", v => cfg.TranslatorBlanketThrow = Boolean.Parse(v)) .Add ("translator-blanket-throw=", v => cfg.TranslatorBlanketThrow = Boolean.Parse(v))
@ -424,7 +424,15 @@ namespace Twiglet.CS2J.Translator
try { try {
TypeRepTemplate t = TypeRepTemplate.newInstance(txStream); TypeRepTemplate t = TypeRepTemplate.newInstance(txStream);
// Fullname has form: <path>/<key>.xml // Fullname has form: <path>/<key>.xml
AppEnv[t.TypeName+(t.TypeParams != null && t.TypeParams.Length > 0 ? "'" + t.TypeParams.Length.ToString() : "")] = t; string txKey = t.TypeName+(t.TypeParams != null && t.TypeParams.Length > 0 ? "'" + t.TypeParams.Length.ToString() : "");
if (!String.IsNullOrEmpty(t.Variant))
{
AppEnv.Add(txKey, t, t.Variant);
}
else
{
AppEnv.Add(txKey, t);
}
} catch (Exception e) { } catch (Exception e) {
Console.WriteLine ("WARNING -- Could not import " + fullName + " (" + e.Message + ")"); Console.WriteLine ("WARNING -- Could not import " + fullName + " (" + e.Message + ")");
} }