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 #define processing

Browse Source
This commit is contained in:
Kevin Glynn 2010-07-15 14:18:17 -05:00
parent da70cd4b9a
commit 3eea1c7aaf
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
CSharpTranslator/antlr3/src/cs2j/CLR/cs2j.cs
View File

@ -40,7 +40,7 @@ namespace RusticiSoftware.Translator.CSharp
internal static ArrayList exAppRoot = new ArrayList();
internal static ArrayList exclude = new ArrayList();
internal static DirectoryHT appEnv = new DirectoryHT(null);
internal static ArrayList macroDefines = new ArrayList();
internal static List<string> macroDefines = new List<string>();
internal static XmlTextWriter enumXmlWriter;
internal static string xmldumpDir = Path.Combine(".", "tmpXMLs");
internal static int verbosity = 0;
@ -300,19 +300,14 @@ namespace RusticiSoftware.Translator.CSharp
Console.WriteLine("Parsing " + Path.GetFileName(fullName));
PreProcessor lex = new PreProcessor();
foreach (string d in macroDefines)
{
lex.AddDefine(d);
}
lex.AddDefine(macroDefines);
ICharStream input = new ANTLRFileStream(fullName);
lex.CharStream = input;
tokens = new CommonTokenStream(lex);
csParser p = new csParser(tokens);
object parser_rt;
CommonTree tree = null;
parser_rt = p.compilation_unit();
object parser_rt = p.compilation_unit();
// Sometimes ANTLR returns a CommonErrorNode if we can't parse the file
if (parser_rt is CommonErrorNode)
@ -321,7 +316,7 @@ namespace RusticiSoftware.Translator.CSharp
return null;
}
tree = (CommonTree)((RuleReturnScope)parser_rt).Tree;
CommonTree tree = (CommonTree)((RuleReturnScope)parser_rt).Tree;
// Check if we didn't get an AST
// This often happens if your grammar and tree grammar don't match
if (tree == null)