summaryrefslogtreecommitdiffstats
path: root/source/slang/slang-check-stmt.cpp
diff options
context:
space:
mode:
authorjsmall-nvidia <jsmall@nvidia.com>2020-05-22 14:21:37 -0400
committerGitHub <noreply@github.com>2020-05-22 11:21:37 -0700
commit076a4c06767cca12c5205d950e9cd37451f91488 (patch)
treedc3bcc376e18e5233f61b2cedfa3419717798a01 /source/slang/slang-check-stmt.cpp
parentdaf53bb2708982a2bcc6d6cc08fe88790ccf0bc2 (diff)
Tidy up around AST nodes (#1353)
* Fields from upper to lower case in slang-ast-decl.h * Lower camel field names in slang-ast-stmt.h * Fix fields in slang-ast-expr.h * slang-ast-type.h make fields lowerCamel. * slang-ast-base.h members functions lowerCamel. * Method names in slang-ast-type.h to lowerCamel. * GetCanonicalType -> getCanonicalType * Substitute -> substitute * Equals -> equals ToString -> toString * ParentDecl -> parentDecl Members -> members
Diffstat (limited to 'source/slang/slang-check-stmt.cpp')
-rw-r--r--source/slang/slang-check-stmt.cpp40
1 files changed, 20 insertions, 20 deletions
diff --git a/source/slang/slang-check-stmt.cpp b/source/slang/slang-check-stmt.cpp
index 58d301549..3de885a35 100644
--- a/source/slang/slang-check-stmt.cpp
+++ b/source/slang/slang-check-stmt.cpp
@@ -120,24 +120,24 @@ namespace Slang
{
WithOuterStmt subContext(this, stmt);
- stmt->Predicate = checkPredicateExpr(stmt->Predicate);
- subContext.checkStmt(stmt->Statement);
+ stmt->predicate = checkPredicateExpr(stmt->predicate);
+ subContext.checkStmt(stmt->statement);
}
void SemanticsStmtVisitor::visitForStmt(ForStmt *stmt)
{
WithOuterStmt subContext(this, stmt);
- checkStmt(stmt->InitialStatement);
- if (stmt->PredicateExpression)
+ checkStmt(stmt->initialStatement);
+ if (stmt->predicateExpression)
{
- stmt->PredicateExpression = checkPredicateExpr(stmt->PredicateExpression);
+ stmt->predicateExpression = checkPredicateExpr(stmt->predicateExpression);
}
- if (stmt->SideEffectExpression)
+ if (stmt->sideEffectExpression)
{
- stmt->SideEffectExpression = CheckExpr(stmt->SideEffectExpression);
+ stmt->sideEffectExpression = CheckExpr(stmt->sideEffectExpression);
}
- subContext.checkStmt(stmt->Statement);
+ subContext.checkStmt(stmt->statement);
}
RefPtr<Expr> SemanticsVisitor::checkExpressionAndExpectIntegerConstant(RefPtr<Expr> expr, RefPtr<IntVal>* outIntVal)
@@ -155,7 +155,7 @@ namespace Slang
stmt->varDecl->type.type = getSession()->getIntType();
addModifier(stmt->varDecl, new ConstModifier());
- stmt->varDecl->SetCheckState(DeclCheckState::Checked);
+ stmt->varDecl->setCheckState(DeclCheckState::Checked);
RefPtr<IntVal> rangeBeginVal;
RefPtr<IntVal> rangeEndVal;
@@ -225,9 +225,9 @@ namespace Slang
void SemanticsStmtVisitor::visitIfStmt(IfStmt *stmt)
{
- stmt->Predicate = checkPredicateExpr(stmt->Predicate);
- checkStmt(stmt->PositiveStatement);
- checkStmt(stmt->NegativeStatement);
+ stmt->predicate = checkPredicateExpr(stmt->predicate);
+ checkStmt(stmt->positiveStatement);
+ checkStmt(stmt->negativeStatement);
}
void SemanticsStmtVisitor::visitUnparsedStmt(UnparsedStmt*)
@@ -248,21 +248,21 @@ namespace Slang
void SemanticsStmtVisitor::visitReturnStmt(ReturnStmt *stmt)
{
auto function = getParentFunc();
- if (!stmt->Expression)
+ if (!stmt->expression)
{
- if (function && !function->ReturnType.Equals(getSession()->getVoidType()))
+ if (function && !function->returnType.Equals(getSession()->getVoidType()))
{
getSink()->diagnose(stmt, Diagnostics::returnNeedsExpression);
}
}
else
{
- stmt->Expression = CheckTerm(stmt->Expression);
- if (!stmt->Expression->type->Equals(getSession()->getErrorType()))
+ stmt->expression = CheckTerm(stmt->expression);
+ if (!stmt->expression->type->equals(getSession()->getErrorType()))
{
if (function)
{
- stmt->Expression = coerce(function->ReturnType.Ptr(), stmt->Expression);
+ stmt->expression = coerce(function->returnType.Ptr(), stmt->expression);
}
else
{
@@ -279,13 +279,13 @@ namespace Slang
void SemanticsStmtVisitor::visitWhileStmt(WhileStmt *stmt)
{
WithOuterStmt subContext(this, stmt);
- stmt->Predicate = checkPredicateExpr(stmt->Predicate);
- subContext.checkStmt(stmt->Statement);
+ stmt->predicate = checkPredicateExpr(stmt->predicate);
+ subContext.checkStmt(stmt->statement);
}
void SemanticsStmtVisitor::visitExpressionStmt(ExpressionStmt *stmt)
{
- stmt->Expression = CheckExpr(stmt->Expression);
+ stmt->expression = CheckExpr(stmt->expression);
}
}