Added line preprocessor directive support.

ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/PreProcessorDirective.cs

@@ -47,6 +47,27 @@ namespace ICSharpCode.NRefactory.CSharp
 		Line = 12
 	}
 
+	public class LinePreprocssorDirective : PreProcessorDirective
+	{
+		public int LineNumber {
+			get;
+			set;
+		}
+
+		public string FileName {
+			get;
+			set;
+		}
+
+		public LinePreprocssorDirective(TextLocation startLocation, TextLocation endLocation) : base (PreProcessorDirectiveType.Line, startLocation, endLocation)
+		{
+		}
+
+		public LinePreprocssorDirective(string argument = null) : base (PreProcessorDirectiveType.Line, argument)
+		{
+		}
+	}
+
 	public class PragmaWarningPreprocssorDirective : PreProcessorDirective
 	{
 		public bool Disable {

ICSharpCode.NRefactory.CSharp/Parser/CSharpParser.cs

@@ -960,7 +960,7 @@ namespace ICSharpCode.NRefactory.CSharp
 					return;
 				foreach (var attr in attrs.Sections) {
 					var section = ConvertAttributeSection(attr);
-					if (section == null || section.AttributeTarget == "module" || section.AttributeTarget == "assembly")
+					if (section == null)
 						continue;
 					parent.AddChild (section, role);
 				}
@@ -3663,7 +3663,19 @@ namespace ICSharpCode.NRefactory.CSharp
 						pragma.AddWarnings(pragmaDirective.Codes);
 						newLeaf = pragma;
 						role = Roles.PreProcessorDirective;
-					} else {
+						goto end;
+					}
+
+					var lineDirective = special as SpecialsBag.LineProcessorDirective;
+					if (lineDirective != null) {
+						var pragma = new LinePreprocssorDirective(new TextLocation(lineDirective.Line, lineDirective.Col), new TextLocation(lineDirective.EndLine, lineDirective.EndCol));
+						pragma.LineNumber = lineDirective.LineNumber;
+						pragma.FileName = lineDirective.FileName;
+						newLeaf = pragma;
+						role = Roles.PreProcessorDirective;
+						goto end;
+					}
+
 					var directive = special as SpecialsBag.PreProcessorDirective;
 					if (directive != null) {
 						newLeaf = new PreProcessorDirective ((ICSharpCode.NRefactory.CSharp.PreProcessorDirectiveType)((int)directive.Cmd & 0xF), new TextLocation (directive.Line, directive.Col), new TextLocation (directive.EndLine, directive.EndCol)) {
@@ -3672,7 +3684,8 @@ namespace ICSharpCode.NRefactory.CSharp
 						};
 						role = Roles.PreProcessorDirective;
 					}
-					}
+					end:
+						;
 				}
 				if (newLeaf != null) {
 					InsertComment(ref insertionPoint, newLeaf, role, isDocumentationComment, conversionVisitor.Unit);

ICSharpCode.NRefactory.CSharp/Parser/mcs/cs-tokenizer.cs

@@ -2037,6 +2037,9 @@ namespace Mono.CSharp
 		bool PreProcessLine ()
 		{
 			Location loc = Location;
+			#if FULL_AST
+			var lineDirective = sbag.GetCurrentLineProcessorDirective();
+			#endif
 
 			int c;
 
@@ -2087,6 +2090,9 @@ namespace Mono.CSharp
 
 				return new_line != 0;
 			}
+			#if FULL_AST
+			lineDirective.LineNumber = new_line;
+			#endif
 
 			c = get_char ();
 			if (c == ' ') {
@@ -2113,6 +2119,9 @@ namespace Mono.CSharp
 			string new_file_name = null;
 			if (c == '"') {
 				new_file_name = TokenizeFileName (ref c);
+				#if FULL_AST
+				lineDirective.FileName = new_file_name;
+				#endif
 
 				// skip over white space
 				while (c == ' ' || c == '\t') {

ICSharpCode.NRefactory.CSharp/Parser/mcs/location.cs

@@ -493,6 +493,16 @@ if (checkpoints.Length <= CheckpointIndex) throw new Exception (String.Format ("
 			}
 		}
 
+		public class LineProcessorDirective : PreProcessorDirective
+		{
+			public int LineNumber { get; set; }
+			public string FileName { get; set; }
+
+			public LineProcessorDirective (int line, int col, int endLine, int endCol, Tokenizer.PreprocessorDirective cmd, string arg) : base (line, col, endLine, endCol, cmd, arg)
+			{
+			}
+		}
+
 		public class PreProcessorDirective : SpecialBase
 		{
 			public readonly int Line;
@@ -572,7 +582,17 @@ if (checkpoints.Length <= CheckpointIndex) throw new Exception (String.Format ("
 		{
 			if (inComment)
 				EndComment (startLine, startCol);
-			Specials.Add (cmd == Tokenizer.PreprocessorDirective.Pragma ? new PragmaPreProcessorDirective (startLine, startCol, endLine, endColumn, cmd, arg) : new PreProcessorDirective (startLine, startCol, endLine, endColumn, cmd, arg));
+			switch (cmd) {
+			case Tokenizer.PreprocessorDirective.Pragma:
+				Specials.Add (new PragmaPreProcessorDirective (startLine, startCol, endLine, endColumn, cmd, arg));
+				break;
+			case Tokenizer.PreprocessorDirective.Line:
+				Specials.Add (new LineProcessorDirective (startLine, startCol, endLine, endColumn, cmd, arg));
+				break;
+			default:
+				Specials.Add (new PreProcessorDirective (startLine, startCol, endLine, endColumn, cmd, arg));
+				break;
+			}
 		}
 
 		[Conditional ("FULL_AST")]
@@ -593,6 +613,11 @@ if (checkpoints.Length <= CheckpointIndex) throw new Exception (String.Format ("
 			pragmaDirective.Codes.Add (code);
 		}
 
+		public LineProcessorDirective GetCurrentLineProcessorDirective()
+		{
+			return Specials [Specials.Count - 1] as LineProcessorDirective;
+		}
+
 		public enum NewLine { Unix, Windows }
 
 		[Conditional ("FULL_AST")]

ICSharpCode.NRefactory.Tests/CSharp/AstStructureTests.cs

@@ -53,6 +53,8 @@ namespace ICSharpCode.NRefactory.CSharp
 			foreach (Type type in typeof(AstNode).Assembly.GetExportedTypes()) {
 				if (type == typeof(CSharpModifierToken)) // CSharpModifierToken is the exception (though I'm not too happy about that)
 					continue;
+				if (type == typeof(PreProcessorDirective)) // another exception - is it useful or not ?
+					continue;
 				if (type.IsSubclassOf(typeof(AstNode))) {
 					Assert.IsTrue(type.BaseType.IsAbstract, type.FullName);
 				}

ICSharpCode.NRefactory.Tests/CSharp/Parser/GeneralScope/PreprocessorDirectiveTests.cs

@@ -147,17 +147,22 @@ namespace ICSharpCode.NRefactory.CSharp.Parser.GeneralScope
 		{
 			string program = "#line 200 \"otherfile.cs\"\nclass Test {}";
 			CSharpParser parser = new CSharpParser();
-			SyntaxTree syntaxTree = parser.Parse(program);
+			SyntaxTree syntaxTree = parser.Parse(program, "/a.cs");
 			Assert.IsFalse(parser.HasErrors, string.Join(Environment.NewLine, parser.Errors.Select(e => e.Message)));
 			Assert.AreEqual(new Role[] {
 			                	Roles.PreProcessorDirective,
 			                	Roles.NewLine,
-			                	NamespaceDeclaration.MemberRole
+			                	SyntaxTree.MemberRole
 			}, syntaxTree.Children.Select(c => c.Role).ToArray());
 			Assert.AreEqual(new TextLocation(2, 1), syntaxTree.Members.Single().StartLocation);
+
+			var ppd = (LinePreprocssorDirective)syntaxTree.FirstChild;
+			Assert.AreEqual(PreProcessorDirectiveType.Line, ppd.Type);
+			Assert.AreEqual(200, ppd.LineNumber);
+			Assert.AreEqual("otherfile.cs", ppd.FileName);
 		}
 		
-		[Test, Ignore("ppd.Argument is missing")]
+		[Test]
 		public void Line()
 		{
 			string program = "#line 200\nclass Test {}";
@@ -170,9 +175,9 @@ namespace ICSharpCode.NRefactory.CSharp.Parser.GeneralScope
 			                	NamespaceDeclaration.MemberRole
 			}, syntaxTree.Children.Select(c => c.Role).ToArray());
 			Assert.AreEqual(new TextLocation(2, 1), syntaxTree.Members.Single().StartLocation);
-			var ppd = (PreProcessorDirective)syntaxTree.FirstChild;
+			var ppd = (LinePreprocssorDirective)syntaxTree.FirstChild;
 			Assert.AreEqual(PreProcessorDirectiveType.Line, ppd.Type);
-			Assert.AreEqual("200", ppd.Argument);
+			Assert.AreEqual(200, ppd.LineNumber);
 		}
 		
 		const string elifProgram = @"