Skip to content
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

Simple control flow analysis #1287

Closed
wants to merge 9 commits into from
Closed

Simple control flow analysis #1287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3ec5eb1
initial rev of controlflow analysis
vladima Nov 8, 2014
d0da055
merge with master
vladima Nov 26, 2014
1d6bd0d
addressed CR feedback, exit early after reporting 'unreachable statem…
vladima Dec 1, 2014
80cc8bb
merge with master
vladima Dec 1, 2014
147959f
removed commented code
vladima Dec 1, 2014
20d0cd9
fix post finally state
vladima Dec 1, 2014
363a517
move check of else statement into conditional
vladima Dec 1, 2014
15e630c
change category of cf related notification to 'warning'
vladima Dec 2, 2014
68b135a
fix final state in if statement
vladima Dec 2, 2014
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
2 changes: 1 addition & 1 deletion Jakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ compileFile(tscFile, compilerSources, [builtLocalDirectory, copyright].concat(co

var servicesFile = path.join(builtLocalDirectory, "typescriptServices.js");
var servicesDefinitionsFile = path.join(builtLocalDirectory, "typescriptServices.d.ts");
compileFile(servicesFile, servicesSources, [builtLocalDirectory, copyright].concat(servicesSources), [copyright], /*useBuiltCompiler:*/ true, /*noOutFile:*/ false, /*generateDeclarations:*/ true);
compileFile(servicesFile, servicesSources, [builtLocalDirectory, copyright].concat(servicesSources), [copyright], /*useBuiltCompiler:*/ false, /*noOutFile:*/ false, /*generateDeclarations:*/ true);

// Local target to build the compiler and services
desc("Builds the full compiler and services");
Expand Down
5 changes: 3 additions & 2 deletions src/compiler/checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
/// <reference path="parser.ts"/>
/// <reference path="binder.ts"/>
/// <reference path="emitter.ts"/>
/// <reference path="controlflow.ts"/>
Copy link
Member

Choose a reason for hiding this comment

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

Consider controlFlow.ts, but I like this too.


module ts {
var nextSymbolId = 1;
Expand Down Expand Up @@ -6150,7 +6151,7 @@ module ts {

function checkFunctionExpressionBody(node: FunctionExpression) {
if (node.type) {
checkIfNonVoidFunctionHasReturnExpressionsOrSingleThrowStatment(node, getTypeFromTypeNode(node.type));
checkControlFlowOfFunction(node, getTypeFromTypeNode(node.type) !== voidType, error);
}
if (node.body.kind === SyntaxKind.FunctionBlock) {
checkSourceElement(node.body);
Expand Down Expand Up @@ -7294,7 +7295,7 @@ module ts {

checkSourceElement(node.body);
if (node.type && !isAccessor(node.kind)) {
checkIfNonVoidFunctionHasReturnExpressionsOrSingleThrowStatment(node, getTypeFromTypeNode(node.type));
checkControlFlowOfFunction(node, getTypeFromTypeNode(node.type) !== voidType, error);
}

// If there is no body and no explicit return type, then report an error.
Expand Down
Loading