Skip to content

Change the interface to ICustomAstVisitor instead of ICustomAstVisitor2 for ScriptAnalysis #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 14, 2015
Merged

Change the interface to ICustomAstVisitor instead of ICustomAstVisitor2 for ScriptAnalysis #25

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 26 additions & 63 deletions Engine/Helper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,7 +637,7 @@ public int Compare(Tuple<int, int> t1, Tuple<int, int> t2)
/// <summary>
/// Class used to do variable analysis on the whole script
/// </summary>
public class ScriptAnalysis: ICustomAstVisitor2
public class ScriptAnalysis: ICustomAstVisitor
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you validate the changes by running all the rules + tests?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've run it on the applicable rules and it was okay. However, we do need to update a lot of other test cases. Going to do that in another pull request

{
private VariableAnalysis OuterAnalysis;

Expand Down Expand Up @@ -696,77 +696,40 @@ public object VisitScriptBlock(ScriptBlockAst scriptBlockAst)
}

/// <summary>
/// Do nothing
/// </summary>
/// <param name="baseCtorInvokeMemberExpressionAst"></param>
/// <returns></returns>
public object VisitBaseCtorInvokeMemberExpression(BaseCtorInvokeMemberExpressionAst baseCtorInvokeMemberExpressionAst)
{
return null;
}

/// <summary>
/// Do nothing
/// perform special visiting action if statement is a typedefinitionast
/// </summary>
/// <param name="configurationDefinitionAst"></param>
/// <param name="statementAst"></param>
/// <returns></returns>
public object VisitConfigurationDefinition(ConfigurationDefinitionAst configurationDefinitionAst)
private object VisitStatementHelper(StatementAst statementAst)
{
return null;
}
if (statementAst == null)
{
return null;
}

/// <summary>
/// Do nothing
/// </summary>
/// <param name="dynamicKeywordAst"></param>
/// <returns></returns>
public object VisitDynamicKeywordStatement(DynamicKeywordStatementAst dynamicKeywordAst)
{
return null;
}
TypeDefinitionAst typeAst = statementAst as TypeDefinitionAst;

/// <summary>
/// Set outer analysis before further visiting.
/// </summary>
/// <param name="functionMemberAst"></param>
/// <returns></returns>
public object VisitFunctionMember(FunctionMemberAst functionMemberAst)
{
var previousOuter = OuterAnalysis;
OuterAnalysis = Helper.Instance.InitializeVariableAnalysisHelper(functionMemberAst, OuterAnalysis);

if (functionMemberAst != null)
if (typeAst == null)
{
functionMemberAst.Body.Visit(this);
statementAst.Visit(this);
return null;
}

OuterAnalysis = previousOuter;
foreach (var member in typeAst.Members)
{
FunctionMemberAst functionMemberAst = member as FunctionMemberAst;

return null;
}
if (functionMemberAst != null)
{
var previousOuter = OuterAnalysis;
OuterAnalysis = Helper.Instance.InitializeVariableAnalysisHelper(functionMemberAst, OuterAnalysis);

/// <summary>
/// Do nothing
/// </summary>
/// <param name="propertyMemberAst"></param>
/// <returns></returns>
public object VisitPropertyMember(PropertyMemberAst propertyMemberAst)
{
return null;
}
if (functionMemberAst != null)
{
functionMemberAst.Body.Visit(this);
}

/// <summary>
/// Visit the functions defined in class
/// </summary>
/// <param name="typeDefinitionAst"></param>
/// <returns></returns>
public object VisitTypeDefinition(TypeDefinitionAst typeDefinitionAst)
{
if (typeDefinitionAst != null)
{
foreach (var member in typeDefinitionAst.Members)
{
member.Visit(this);
OuterAnalysis = previousOuter;
}
}

Expand Down Expand Up @@ -1182,7 +1145,7 @@ public object VisitNamedBlock(NamedBlockAst namedBlockAst)
{
foreach (var statement in namedBlockAst.Statements)
{
statement.Visit(this);
VisitStatementHelper(statement);
}
}

Expand Down Expand Up @@ -1265,7 +1228,7 @@ public object VisitStatementBlock(StatementBlockAst statementBlockAst)
{
foreach (var statement in statementBlockAst.Statements)
{
statement.Visit(this);
VisitStatementHelper(statement);
}
}

Expand Down