@ -40,10 +40,10 @@ namespace ICSharpCode.NRefactory.CSharp
class ConversionVisitor : StructuralVisitor class ConversionVisitor : StructuralVisitor
{ {
CompilationUnit unit = new CompilationUnit ( ) ; SyntaxTree unit = new SyntaxTree ( ) ;
internal bool convertTypeSystemMode ; internal bool convertTypeSystemMode ;
public CompilationUnit Unit { public SyntaxTree Unit {
get { get {
return unit ; return unit ;
} }
@ -335,12 +335,16 @@ namespace ICSharpCode.NRefactory.CSharp
if ( loc ! = null & & pos < loc . Count ) if ( loc ! = null & & pos < loc . Count )
result . AddChild ( new CSharpTokenNode ( Convert ( loc [ pos + + ] ) ) , Roles . Colon ) ; result . AddChild ( new CSharpTokenNode ( Convert ( loc [ pos + + ] ) ) , Roles . Colon ) ;
} }
int attributeCount = 0 ;
foreach ( var attr in GetAttributes ( optAttributes ) ) { foreach ( var attr in GetAttributes ( optAttributes ) ) {
result . AddChild ( attr , Roles . Attribute ) ; result . AddChild ( attr , Roles . Attribute ) ;
attributeCount + + ;
} }
// Left and right bracket + commas between the attributes
int locCount = 2 + attributeCount - 1 ;
// optional comma
// optional comma
if ( loc ! = null & & pos < loc . Count - 1 & & ! loc [ pos ] . Equals ( loc [ pos + 1 ] ) ) if ( loc ! = null & & pos < loc . Count - 1 & & loc . Count = = locCount + 1 )
result . AddChild ( new CSharpTokenNode ( Convert ( loc [ pos + + ] ) ) , Roles . Comma ) ; result . AddChild ( new CSharpTokenNode ( Convert ( loc [ pos + + ] ) ) , Roles . Comma ) ;
if ( loc ! = null & & pos < loc . Count ) if ( loc ! = null & & pos < loc . Count )
result . AddChild ( new CSharpTokenNode ( Convert ( loc [ pos + + ] ) ) , Roles . RBracket ) ; result . AddChild ( new CSharpTokenNode ( Convert ( loc [ pos + + ] ) ) , Roles . RBracket ) ;
@ -668,7 +672,7 @@ namespace ICSharpCode.NRefactory.CSharp
if ( namespaceStack . Count > 0 ) { if ( namespaceStack . Count > 0 ) {
namespaceStack . Peek ( ) . AddChild ( child , NamespaceDeclaration . MemberRole ) ; namespaceStack . Peek ( ) . AddChild ( child , NamespaceDeclaration . MemberRole ) ;
} else { } else {
unit . AddChild ( child , CompilationUnit . MemberRole ) ; unit . AddChild ( child , SyntaxTree . MemberRole ) ;
} }
} }
@ -2387,7 +2391,9 @@ namespace ICSharpCode.NRefactory.CSharp
if ( binaryExpression . Left ! = null ) if ( binaryExpression . Left ! = null )
result . AddChild ( ( Expression ) binaryExpression . Left . Accept ( this ) , BinaryOperatorExpression . LeftRole ) ; result . AddChild ( ( Expression ) binaryExpression . Left . Accept ( this ) , BinaryOperatorExpression . LeftRole ) ;
result . AddChild ( new CSharpTokenNode ( Convert ( binaryExpression . Location ) ) , BinaryOperatorExpression . GetOperatorRole ( result . Operator ) ) ; var location = LocationsBag . GetLocations ( binaryExpression ) ;
if ( location ! = null )
result . AddChild ( new CSharpTokenNode ( Convert ( location [ 0 ] ) ) , BinaryOperatorExpression . GetOperatorRole ( result . Operator ) ) ;
if ( binaryExpression . Right ! = null ) if ( binaryExpression . Right ! = null )
result . AddChild ( ( Expression ) binaryExpression . Right . Accept ( this ) , BinaryOperatorExpression . RightRole ) ; result . AddChild ( ( Expression ) binaryExpression . Right . Accept ( this ) , BinaryOperatorExpression . RightRole ) ;
return result ; return result ;
@ -2399,7 +2405,9 @@ namespace ICSharpCode.NRefactory.CSharp
result . Operator = BinaryOperatorType . NullCoalescing ; result . Operator = BinaryOperatorType . NullCoalescing ;
if ( nullCoalescingOperator . LeftExpression ! = null ) if ( nullCoalescingOperator . LeftExpression ! = null )
result . AddChild ( ( Expression ) nullCoalescingOperator . LeftExpression . Accept ( this ) , BinaryOperatorExpression . LeftRole ) ; result . AddChild ( ( Expression ) nullCoalescingOperator . LeftExpression . Accept ( this ) , BinaryOperatorExpression . LeftRole ) ;
result . AddChild ( new CSharpTokenNode ( Convert ( nullCoalescingOperator . Location ) ) , BinaryOperatorExpression . NullCoalescingRole ) ; var location = LocationsBag . GetLocations ( nullCoalescingOperator ) ;
if ( location ! = null )
result . AddChild ( new CSharpTokenNode ( Convert ( location [ 0 ] ) ) , BinaryOperatorExpression . NullCoalescingRole ) ;
if ( nullCoalescingOperator . RightExpression ! = null ) if ( nullCoalescingOperator . RightExpression ! = null )
result . AddChild ( ( Expression ) nullCoalescingOperator . RightExpression . Accept ( this ) , BinaryOperatorExpression . RightRole ) ; result . AddChild ( ( Expression ) nullCoalescingOperator . RightExpression . Accept ( this ) , BinaryOperatorExpression . RightRole ) ;
return result ; return result ;
@ -2794,8 +2802,8 @@ namespace ICSharpCode.NRefactory.CSharp
} }
if ( commaLoc ! = null & & curComma < commaLoc . Count ) if ( commaLoc ! = null & & curComma < commaLoc . Count )
init . AddChild ( new CSharpTokenNode ( Convert ( commaLoc [ curComma + + ] ) ) , Roles . Comma ) ; init . AddChild ( new CSharpTokenNode ( Convert ( commaLoc [ curComma + + ] ) ) , Roles . Comma ) ;
} }
if ( initLoc ! = null ) { if ( initLoc ! = null ) {
if ( initLoc . Count = = 3 ) // optional comma
if ( initLoc . Count = = 3 ) // optional comma
init . AddChild ( new CSharpTokenNode ( Convert ( initLoc [ 1 ] ) ) , Roles . Comma ) ; init . AddChild ( new CSharpTokenNode ( Convert ( initLoc [ 1 ] ) ) , Roles . Comma ) ;
@ -2879,9 +2887,11 @@ namespace ICSharpCode.NRefactory.CSharp
initializer . AddChild ( new CSharpTokenNode ( Convert ( commaLocations [ i ] ) ) , Roles . Comma ) ; initializer . AddChild ( new CSharpTokenNode ( Convert ( commaLocations [ i ] ) ) , Roles . Comma ) ;
} }
} }
if ( initLocation ! = null ) {
if ( initLocation ! = null ) if ( initLocation . Count = = 2 ) // optional comma
initializer . AddChild ( new CSharpTokenNode ( Convert ( initLocation [ 0 ] ) ) , Roles . Comma ) ;
initializer . AddChild ( new CSharpTokenNode ( Convert ( initLocation [ initLocation . Count - 1 ] ) ) , Roles . RBrace ) ; initializer . AddChild ( new CSharpTokenNode ( Convert ( initLocation [ initLocation . Count - 1 ] ) ) , Roles . RBrace ) ;
}
result . AddChild ( initializer , ArrayCreateExpression . InitializerRole ) ; result . AddChild ( initializer , ArrayCreateExpression . InitializerRole ) ;
} }
@ -3073,7 +3083,9 @@ namespace ICSharpCode.NRefactory.CSharp
result . Operator = AssignmentOperatorType . Assign ; result . Operator = AssignmentOperatorType . Assign ;
if ( simpleAssign . Target ! = null ) if ( simpleAssign . Target ! = null )
result . AddChild ( ( Expression ) simpleAssign . Target . Accept ( this ) , AssignmentExpression . LeftRole ) ; result . AddChild ( ( Expression ) simpleAssign . Target . Accept ( this ) , AssignmentExpression . LeftRole ) ;
result . AddChild ( new CSharpTokenNode ( Convert ( simpleAssign . Location ) ) , AssignmentExpression . AssignRole ) ; var location = LocationsBag . GetLocations ( simpleAssign ) ;
if ( location ! = null )
result . AddChild ( new CSharpTokenNode ( Convert ( location [ 0 ] ) ) , AssignmentExpression . AssignRole ) ;
if ( simpleAssign . Source ! = null ) { if ( simpleAssign . Source ! = null ) {
result . AddChild ( ( Expression ) simpleAssign . Source . Accept ( this ) , AssignmentExpression . RightRole ) ; result . AddChild ( ( Expression ) simpleAssign . Source . Accept ( this ) , AssignmentExpression . RightRole ) ;
} }
@ -3118,7 +3130,9 @@ namespace ICSharpCode.NRefactory.CSharp
if ( compoundAssign . Target ! = null ) if ( compoundAssign . Target ! = null )
result . AddChild ( ( Expression ) compoundAssign . Target . Accept ( this ) , AssignmentExpression . LeftRole ) ; result . AddChild ( ( Expression ) compoundAssign . Target . Accept ( this ) , AssignmentExpression . LeftRole ) ;
result . AddChild ( new CSharpTokenNode ( Convert ( compoundAssign . Location ) ) , AssignmentExpression . GetOperatorRole ( result . Operator ) ) ; var location = LocationsBag . GetLocations ( compoundAssign ) ;
if ( location ! = null )
result . AddChild ( new CSharpTokenNode ( Convert ( location [ 0 ] ) ) , AssignmentExpression . GetOperatorRole ( result . Operator ) ) ;
if ( compoundAssign . Source ! = null ) if ( compoundAssign . Source ! = null )
result . AddChild ( ( Expression ) compoundAssign . Source . Accept ( this ) , AssignmentExpression . RightRole ) ; result . AddChild ( ( Expression ) compoundAssign . Source . Accept ( this ) , AssignmentExpression . RightRole ) ;
return result ; return result ;
@ -3204,7 +3218,7 @@ namespace ICSharpCode.NRefactory.CSharp
if ( location ! = null ) { if ( location ! = null ) {
if ( location . Count = = 2 ) // optional comma
if ( location . Count = = 2 ) // optional comma
result . AddChild ( new CSharpTokenNode ( Convert ( location [ 1 ] ) ) , Roles . Comma ) ; result . AddChild ( new CSharpTokenNode ( Convert ( location [ 0 ] ) ) , Roles . Comma ) ;
result . AddChild ( new CSharpTokenNode ( Convert ( location [ location . Count - 1 ] ) ) , Roles . RBrace ) ; result . AddChild ( new CSharpTokenNode ( Convert ( location [ location . Count - 1 ] ) ) , Roles . RBrace ) ;
} }
return result ; return result ;
@ -3213,25 +3227,36 @@ namespace ICSharpCode.NRefactory.CSharp
#endregion
#endregion
#region LINQ expressions
#region LINQ expressions
QueryOrderClause currentQueryOrderClause ;
public override object Visit ( Mono . CSharp . Linq . QueryExpression queryExpression ) public override object Visit ( Mono . CSharp . Linq . QueryExpression queryExpression )
{ {
var result = new QueryExpression ( ) ; var oldQueryOrderClause = currentQueryOrderClause ;
try {
var currentClause = queryExpression . next ; currentQueryOrderClause = null ;
var result = new QueryExpression ( ) ;
while ( currentClause ! = null ) {
QueryClause clause = ( QueryClause ) currentClause . Accept ( this ) ; var currentClause = queryExpression . next ;
if ( clause is QueryContinuationClause ) {
// insert preceding query at beginning of QueryContinuationClause
while ( currentClause ! = null ) {
clause . InsertChildAfter ( null , result , QueryContinuationClause . PrecedingQueryRole ) ; QueryClause clause = ( QueryClause ) currentClause . Accept ( this ) ;
// create a new QueryExpression for the remaining query
if ( clause is QueryContinuationClause ) {
result = new QueryExpression ( ) ; // insert preceding query at beginning of QueryContinuationClause
clause . InsertChildAfter ( null , result , QueryContinuationClause . PrecedingQueryRole ) ;
// create a new QueryExpression for the remaining query
result = new QueryExpression ( ) ;
}
if ( clause ! = null ) {
result . AddChild ( clause , QueryExpression . ClauseRole ) ;
}
currentClause = currentClause . next ;
} }
result . AddChild ( clause , QueryExpression . ClauseRole ) ;
currentClause = currentClause . next ; return result ;
}
finally {
currentQueryOrderClause = oldQueryOrderClause ;
} }
return result ;
} }
public override object Visit ( Mono . CSharp . Linq . QueryStartClause queryStart ) public override object Visit ( Mono . CSharp . Linq . QueryStartClause queryStart )
@ -3397,7 +3422,7 @@ namespace ICSharpCode.NRefactory.CSharp
public override object Visit ( Mono . CSharp . Linq . OrderByAscending orderByAscending ) public override object Visit ( Mono . CSharp . Linq . OrderByAscending orderByAscending )
{ {
var result = new QueryOrderClause ( ) ; currentQueryOrderClause = new QueryOrderClause ( ) ;
var ordering = new QueryOrdering ( ) ; var ordering = new QueryOrdering ( ) ;
if ( orderByAscending . Expr ! = null ) if ( orderByAscending . Expr ! = null )
@ -3407,13 +3432,13 @@ namespace ICSharpCode.NRefactory.CSharp
ordering . Direction = QueryOrderingDirection . Ascending ; ordering . Direction = QueryOrderingDirection . Ascending ;
ordering . AddChild ( new CSharpTokenNode ( Convert ( location [ 0 ] ) ) , QueryOrdering . AscendingKeywordRole ) ; ordering . AddChild ( new CSharpTokenNode ( Convert ( location [ 0 ] ) ) , QueryOrdering . AscendingKeywordRole ) ;
} }
result . AddChild ( ordering , QueryOrderClause . OrderingRole ) ; currentQueryOrderClause . AddChild ( ordering , QueryOrderClause . OrderingRole ) ;
return result ; return currentQueryOrderClause ;
} }
public override object Visit ( Mono . CSharp . Linq . OrderByDescending orderByDescending ) public override object Visit ( Mono . CSharp . Linq . OrderByDescending orderByDescending )
{ {
var result = new QueryOrderClause ( ) ; currentQueryOrderClause = new QueryOrderClause ( ) ;
var ordering = new QueryOrdering ( ) ; var ordering = new QueryOrdering ( ) ;
if ( orderByDescending . Expr ! = null ) if ( orderByDescending . Expr ! = null )
@ -3423,14 +3448,12 @@ namespace ICSharpCode.NRefactory.CSharp
ordering . Direction = QueryOrderingDirection . Descending ; ordering . Direction = QueryOrderingDirection . Descending ;
ordering . AddChild ( new CSharpTokenNode ( Convert ( location [ 0 ] ) ) , QueryOrdering . DescendingKeywordRole ) ; ordering . AddChild ( new CSharpTokenNode ( Convert ( location [ 0 ] ) ) , QueryOrdering . DescendingKeywordRole ) ;
} }
result . AddChild ( ordering , QueryOrderClause . OrderingRole ) ; currentQueryOrderClause . AddChild ( ordering , QueryOrderClause . OrderingRole ) ;
return result ; return currentQueryOrderClause ;
} }
public override object Visit ( Mono . CSharp . Linq . ThenByAscending thenByAscending ) public override object Visit ( Mono . CSharp . Linq . ThenByAscending thenByAscending )
{ {
var result = new QueryOrderClause ( ) ;
var ordering = new QueryOrdering ( ) ; var ordering = new QueryOrdering ( ) ;
if ( thenByAscending . Expr ! = null ) if ( thenByAscending . Expr ! = null )
ordering . AddChild ( ( Expression ) thenByAscending . Expr . Accept ( this ) , Roles . Expression ) ; ordering . AddChild ( ( Expression ) thenByAscending . Expr . Accept ( this ) , Roles . Expression ) ;
@ -3439,14 +3462,12 @@ namespace ICSharpCode.NRefactory.CSharp
ordering . Direction = QueryOrderingDirection . Ascending ; ordering . Direction = QueryOrderingDirection . Ascending ;
ordering . AddChild ( new CSharpTokenNode ( Convert ( location [ 0 ] ) ) , QueryOrdering . AscendingKeywordRole ) ; ordering . AddChild ( new CSharpTokenNode ( Convert ( location [ 0 ] ) ) , QueryOrdering . AscendingKeywordRole ) ;
} }
result . AddChild ( ordering , QueryOrderClause . OrderingRole ) ; currentQueryOrderClause . AddChild ( ordering , QueryOrderClause . OrderingRole ) ;
return result ; return null ;
} }
public override object Visit ( Mono . CSharp . Linq . ThenByDescending thenByDescending ) public override object Visit ( Mono . CSharp . Linq . ThenByDescending thenByDescending )
{ {
var result = new QueryOrderClause ( ) ;
var ordering = new QueryOrdering ( ) ; var ordering = new QueryOrdering ( ) ;
if ( thenByDescending . Expr ! = null ) if ( thenByDescending . Expr ! = null )
ordering . AddChild ( ( Expression ) thenByDescending . Expr . Accept ( this ) , Roles . Expression ) ; ordering . AddChild ( ( Expression ) thenByDescending . Expr . Accept ( this ) , Roles . Expression ) ;
@ -3455,8 +3476,8 @@ namespace ICSharpCode.NRefactory.CSharp
ordering . Direction = QueryOrderingDirection . Descending ; ordering . Direction = QueryOrderingDirection . Descending ;
ordering . AddChild ( new CSharpTokenNode ( Convert ( location [ 0 ] ) ) , QueryOrdering . DescendingKeywordRole ) ; ordering . AddChild ( new CSharpTokenNode ( Convert ( location [ 0 ] ) ) , QueryOrdering . DescendingKeywordRole ) ;
} }
result . AddChild ( ordering , QueryOrderClause . OrderingRole ) ; currentQueryOrderClause . AddChild ( ordering , QueryOrderClause . OrderingRole ) ;
return result ; return null ;
} }
public override object Visit ( Await awaitExpr ) public override object Visit ( Await awaitExpr )
@ -3701,28 +3722,34 @@ namespace ICSharpCode.NRefactory.CSharp
get { return errorReportPrinter . Errors ; } get { return errorReportPrinter . Errors ; }
} }
public CompilationUnit Parse ( ITextSource textSource , string fileName , int lineModifier = 0 ) /// <summary>
/// Parses a C# code file.
/// </summary>
/// <param name="program">The source code to parse.</param>
/// <param name="fileName">The file name. Used to identify the file (e.g. when building a type system).
/// This can be an arbitrary identifier, NRefactory never tries to access the file on disk.</param>
/// <returns>Returns the syntax tree.</returns>
public SyntaxTree Parse ( string program , string fileName = "" )
{ {
return Parse ( textSource . CreateReader ( ) , fileName , lineModifier ) ; return Parse ( new StringTextSource ( program ) , fileName ) ;
} }
public CompilationUnit Parse ( TextReader reader , string fileName , int lineModifier = 0 ) /// <summary>
/// Parses a C# code file.
/// </summary>
/// <param name="reader">The text reader containing the source code to parse.</param>
/// <param name="fileName">The file name. Used to identify the file (e.g. when building a type system).
/// This can be an arbitrary identifier, NRefactory never tries to access the file on disk.</param>
/// <returns>Returns the syntax tree.</returns>
public SyntaxTree Parse ( TextReader reader , string fileName = "" )
{ {
// TODO: can we optimize this to avoid the text->stream->text roundtrip?
return Parse ( new StringTextSource ( reader . ReadToEnd ( ) ) , fileName ) ;
using ( MemoryStream stream = new MemoryStream ( ) ) {
StreamWriter w = new StreamWriter ( stream , Encoding . UTF8 ) ;
char [ ] buffer = new char [ 2 0 4 8 ] ;
int read ;
while ( ( read = reader . ReadBlock ( buffer , 0 , buffer . Length ) ) > 0 )
w . Write ( buffer , 0 , read ) ;
w . Flush ( ) ; // we can't close the StreamWriter because that would also close the MemoryStream
stream . Position = 0 ;
return Parse ( stream , fileName , lineModifier ) ;
}
} }
public CompilationUnit Parse ( CompilerCompilationUnit top , string fileName , int lineModifier = 0 ) /// <summary>
/// Converts a Mono.CSharp syntax tree into an NRefactory syntax tree.
/// </summary>
public SyntaxTree Parse ( CompilerCompilationUnit top , string fileName )
{ {
if ( top = = null ) { if ( top = = null ) {
return null ; return null ;
@ -3738,7 +3765,7 @@ namespace ICSharpCode.NRefactory.CSharp
} }
conversionVisitor . Unit . FileName = fileName ; conversionVisitor . Unit . FileName = fileName ;
conversionVisitor . Unit . ConditionalSymbols = top . Conditionals . ToArray ( ) ; conversionVisitor . Unit . ConditionalSymbols = top . Conditionals . Concat ( compilerSettings . ConditionalSymbols ) . ToArray ( ) ;
return conversionVisitor . Unit ; return conversionVisitor . Unit ;
} }
@ -3751,55 +3778,104 @@ namespace ICSharpCode.NRefactory.CSharp
} }
} }
/// <summary>
/// Callback that gets called with the Mono.CSharp syntax tree whenever some code is parsed.
/// </summary>
public Action < CompilerCompilationUnit > CompilationUnitCallback { public Action < CompilerCompilationUnit > CompilationUnitCallback {
get ; get ;
set ; set ;
} }
/// <summary>
/// Specifies whether to run the parser in a special mode for generating the type system.
/// If this property is true, the syntax tree will only contain nodes relevant for the
/// <see cref="SyntaxTree.ToTypeSystem()"/> call and might be missing other nodes (e.g. method bodies).
/// The default is false.
/// </summary>
public bool GenerateTypeSystemMode { public bool GenerateTypeSystemMode {
get ; get ;
set ; set ;
} }
public CompilationUnit Parse ( string program , string fileName ) TextLocation initialLocation = new TextLocation ( 1 , 1 ) ;
{
return Parse ( new StringReader ( program ) , fileName ) ; /// <summary>
/// Specifies the text location where parsing starts.
/// This property can be used when parsing a part of a file to make the locations of the AstNodes
/// refer to the position in the whole file.
/// The default is (1,1).
/// </summary>
public TextLocation InitialLocation {
get { return initialLocation ; }
set { initialLocation = value ; }
} }
internal static object parseLock = new object ( ) ; internal static object parseLock = new object ( ) ;
public CompilationUnit Parse ( Stream stream , string fileName , int lineModifier = 0 ) /// <summary>
/// Parses a C# code file.
/// </summary>
/// <param name="stream">The stream containing the source code to parse.</param>
/// <param name="fileName">The file name. Used to identify the file (e.g. when building a type system).
/// This can be an arbitrary identifier, NRefactory never tries to access the file on disk.</param>
/// <returns>Returns the syntax tree.</returns>
public SyntaxTree Parse ( Stream stream , string fileName = "" )
{
return Parse ( new StreamReader ( stream ) , fileName ) ;
}
/// <summary>
/// Parses a C# code file.
/// </summary>
/// <param name="program">The source code to parse.</param>
/// <param name="fileName">The file name. Used to identify the file (e.g. when building a type system).
/// This can be an arbitrary identifier, NRefactory never tries to access the file on disk.</param>
/// </param>
/// <returns>Returns the syntax tree.</returns>
public SyntaxTree Parse ( ITextSource program , string fileName = "" )
{
return Parse ( program , fileName , initialLocation . Line , initialLocation . Column ) ;
}
SyntaxTree Parse ( ITextSource program , string fileName , int initialLine , int initialColumn )
{ {
lock ( parseLock ) { lock ( parseLock ) {
errorReportPrinter = new ErrorReportPrinter ( "" ) ; errorReportPrinter = new ErrorReportPrinter ( "" ) ;
var ctx = new CompilerContext ( compilerSettings . ToMono ( ) , errorReportPrinter ) ; var ctx = new CompilerContext ( compilerSettings . ToMono ( ) , errorReportPrinter ) ;
ctx . Settings . TabSize = 1 ; ctx . Settings . TabSize = 1 ;
var reader = new SeekableStreamReader ( stream , Encoding . UTF8 ) ; var reader = new SeekableStreamReader ( program ) ;
var file = new SourceFile ( fileName , fileName , 0 ) ; var file = new SourceFile ( fileName , fileName , 0 ) ;
Location . Initialize ( new List < SourceFile > ( new [ ] { file } ) ) ; Location . Initialize ( new List < SourceFile > ( new [ ] { file } ) ) ;
var module = new ModuleContainer ( ctx ) ; var module = new ModuleContainer ( ctx ) ;
var parser = Driver . Parse ( reader , file , module , lineModifier ) ; var session = new ParserSession ( ) ;
session . LocationsBag = new LocationsBag ( ) ;
var report = new Report ( ctx , errorReportPrinter ) ;
var parser = Driver . Parse ( reader , file , module , session , report , initialLine - 1 , initialColumn - 1 ) ;
var top = new CompilerCompilationUnit ( ) { var top = new CompilerCompilationUnit ( ) {
ModuleCompiled = module , ModuleCompiled = module ,
LocationsBag = parser . LocationsBag , LocationsBag = session . LocationsBag ,
SpecialsBag = parser . Lexer . sbag , SpecialsBag = parser . Lexer . sbag ,
Conditionals = parser . Lexer . SourceFile . Conditionals Conditionals = parser . Lexer . SourceFile . Conditionals
} ; } ;
var unit = Parse ( top , fileName , lineModifier ) ; var unit = Parse ( top , fileName ) ;
unit . Errors . AddRange ( errorReportPrinter . Errors ) ; unit . Errors . AddRange ( errorReportPrinter . Errors ) ;
CompilerCallableEntryPoint . Reset ( ) ; CompilerCallableEntryPoint . Reset ( ) ;
return unit ; return unit ;
} }
} }
public IEnumerable < EntityDeclaration > ParseTypeMembers ( TextReader reader , int lineModifier = 0 ) public IEnumerable < EntityDeclaration > ParseTypeMembers ( string code )
{
return ParseTypeMembers ( code , initialLocation . Line , initialLocation . Column ) ;
}
IEnumerable < EntityDeclaration > ParseTypeMembers ( string code , int initialLine , int initialColumn )
{ {
string code = "unsafe partial class MyClass { " + Environment . NewLine + reader . ReadToEnd ( ) + "}" ; const string prefix = "unsafe partial class MyClass { ";
var cu = Parse ( new StringReader ( code ) , "parsed.cs" , lineModifier - 1 ) ; var syntaxTree = Parse ( new StringTextSource ( prefix + code + "}" ) , "parsed.cs" , initialLine , initialColumn - prefix . Length ) ;
if ( cu = = null ) if ( syntaxTree = = null )
return Enumerable . Empty < EntityDeclaration > ( ) ; return Enumerable . Empty < EntityDeclaration > ( ) ;
var td = cu . Children . FirstOrDefault ( ) as TypeDeclaration ; var td = syntaxTree . FirstChild as TypeDeclaration ;
if ( td ! = null ) { if ( td ! = null ) {
var members = td . Members . ToArray ( ) ; var members = td . Members . ToArray ( ) ;
// detach members from parent
// detach members from parent
@ -3810,10 +3886,16 @@ namespace ICSharpCode.NRefactory.CSharp
return Enumerable . Empty < EntityDeclaration > ( ) ; return Enumerable . Empty < EntityDeclaration > ( ) ;
} }
public IEnumerable < Statement > ParseStatements ( TextReader reader , int lineModifier = 0 ) public IEnumerable < Statement > ParseStatements ( string code )
{
return ParseStatements ( code , initialLocation . Line , initialLocation . Column ) ;
}
IEnumerable < Statement > ParseStatements ( string code , int initialLine , int initialColumn )
{ {
string code = "void M() { " + Environment . NewLine + reader . ReadToEnd ( ) + "}" ; // the dummy method is async so that 'await' expressions are parsed as expected
var members = ParseTypeMembers ( new StringReader ( code ) , lineModifier - 1 ) ; const string prefix = "async void M() { " ;
var members = ParseTypeMembers ( prefix + code + "}" , initialLine , initialColumn - prefix . Length ) ;
var method = members . FirstOrDefault ( ) as MethodDeclaration ; var method = members . FirstOrDefault ( ) as MethodDeclaration ;
if ( method ! = null & & method . Body ! = null ) { if ( method ! = null & & method . Body ! = null ) {
var statements = method . Body . Statements . ToArray ( ) ; var statements = method . Body . Statements . ToArray ( ) ;
@ -3825,10 +3907,9 @@ namespace ICSharpCode.NRefactory.CSharp
return Enumerable . Empty < Statement > ( ) ; return Enumerable . Empty < Statement > ( ) ;
} }
public AstType ParseTypeReference ( TextReader reader ) public AstType ParseTypeReference ( string code )
{ {
string code = reader . ReadToEnd ( ) + " a;" ; var members = ParseTypeMembers ( code + " a;" ) ;
var members = ParseTypeMembers ( new StringReader ( code ) ) ;
var field = members . FirstOrDefault ( ) as FieldDeclaration ; var field = members . FirstOrDefault ( ) as FieldDeclaration ;
if ( field ! = null ) { if ( field ! = null ) {
AstType type = field . ReturnType ; AstType type = field . ReturnType ;
@ -3838,9 +3919,11 @@ namespace ICSharpCode.NRefactory.CSharp
return AstType . Null ; return AstType . Null ;
} }
public Expression ParseExpression ( TextReader reader ) public Expression ParseExpression ( string code )
{ {
var es = ParseStatements ( new StringReader ( "tmp = " + Environment . NewLine + reader . ReadToEnd ( ) + ";" ) , - 1 ) . FirstOrDefault ( ) as ExpressionStatement ; const string prefix = "tmp = " ;
var statements = ParseStatements ( prefix + code + ";" , initialLocation . Line , initialLocation . Column - prefix . Length ) ;
var es = statements . FirstOrDefault ( ) as ExpressionStatement ;
if ( es ! = null ) { if ( es ! = null ) {
AssignmentExpression ae = es . Expression as AssignmentExpression ; AssignmentExpression ae = es . Expression as AssignmentExpression ;
if ( ae ! = null ) { if ( ae ! = null ) {
@ -3852,14 +3935,16 @@ namespace ICSharpCode.NRefactory.CSharp
return Expression . Null ; return Expression . Null ;
} }
/ *
/// <summary>
/// <summary>
/// Parses a file snippet; guessing what the code snippet represents (compilation unit , type members, block, type reference, expression).
/// Parses a file snippet; guessing what the code snippet represents (whole file , type members, block, type reference, expression).
/// </summary>
/// </summary>
public AstNode ParseSnippet ( TextReader reader ) public AstNode ParseSnippet ( string code )
{ {
// TODO: add support for parsing a part of a file
// TODO: add support for parsing a part of a file
throw new NotImplementedException ( ) ; throw new NotImplementedException ( ) ;
} }
* /
public DocumentationReference ParseDocumentationReference ( string cref ) public DocumentationReference ParseDocumentationReference ( string cref )
{ {
@ -3874,15 +3959,18 @@ namespace ICSharpCode.NRefactory.CSharp
errorReportPrinter = new ErrorReportPrinter ( "" ) ; errorReportPrinter = new ErrorReportPrinter ( "" ) ;
var ctx = new CompilerContext ( compilerSettings . ToMono ( ) , errorReportPrinter ) ; var ctx = new CompilerContext ( compilerSettings . ToMono ( ) , errorReportPrinter ) ;
ctx . Settings . TabSize = 1 ; ctx . Settings . TabSize = 1 ;
var stream = new MemoryStream ( Encoding . Unicode . GetBytes ( cref ) ) ; var reader = new SeekableStreamReader ( new StringTextSource ( cref ) ) ;
var reader = new SeekableStreamReader ( stream , Encoding . Unicode ) ;
var file = new SourceFile ( "" , "" , 0 ) ; var file = new SourceFile ( "" , "" , 0 ) ;
Location . Initialize ( new List < SourceFile > ( new [ ] { file } ) ) ; Location . Initialize ( new List < SourceFile > ( new [ ] { file } ) ) ;
var module = new ModuleContainer ( ctx ) ; var module = new ModuleContainer ( ctx ) ;
module . DocumentationBuilder = new DocumentationBuilder ( ) ; module . DocumentationBuilder = new DocumentationBuilder ( module ) ;
var source_file = new CompilationSourceFile ( module ) ; var source_file = new CompilationSourceFile ( module ) ;
var report = new Report ( ctx , errorReportPrinter ) ; var report = new Report ( ctx , errorReportPrinter ) ;
var parser = new Mono . CSharp . CSharpParser ( reader , source_file , report ) ; ParserSession session = new ParserSession ( ) ;
session . LocationsBag = new LocationsBag ( ) ;
var parser = new Mono . CSharp . CSharpParser ( reader , source_file , report , session ) ;
parser . Lexer . Line + = initialLocation . Line - 1 ;
parser . Lexer . Column + = initialLocation . Column - 1 ;
parser . Lexer . putback_char = Tokenizer . DocumentationXref ; parser . Lexer . putback_char = Tokenizer . DocumentationXref ;
parser . Lexer . parsing_generic_declaration_doc = true ; parser . Lexer . parsing_generic_declaration_doc = true ;
parser . parse ( ) ; parser . parse ( ) ;
@ -3891,7 +3979,7 @@ namespace ICSharpCode.NRefactory.CSharp
// mc.GetSignatureForError (), cref);
// mc.GetSignatureForError (), cref);
} }
ConversionVisitor conversionVisitor = new ConversionVisitor ( false , parser . LocationsBag ) ; ConversionVisitor conversionVisitor = new ConversionVisitor ( false , session . LocationsBag ) ;
DocumentationReference docRef = conversionVisitor . ConvertXmlDoc ( module . DocumentationBuilder ) ; DocumentationReference docRef = conversionVisitor . ConvertXmlDoc ( module . DocumentationBuilder ) ;
CompilerCallableEntryPoint . Reset ( ) ; CompilerCallableEntryPoint . Reset ( ) ;
return docRef ; return docRef ;
Daniel Grunwald
13 years ago