aboutsummaryrefslogtreecommitdiffstats
path: root/src/parser.js
diff options
context:
space:
mode:
authorIgor Minar2011-08-14 01:26:56 -0700
committerIgor Minar2011-08-15 00:20:48 -0700
commit9d808239b3120b0120f164834ce3012f779c8939 (patch)
treeceea216c6797316f39e230a2e006047299033c00 /src/parser.js
parentef01362e441db50758dde41bcdcc20823b55a213 (diff)
downloadangular.js-9d808239b3120b0120f164834ce3012f779c8939.tar.bz2
style(*): wrap all assignments in if statements
we commonly assign stuff in if statments like this: if (variable = someFn()) { //do something with variable } This results in lint and IDE warnings (did you mean ==?). It is better to be explicit about our intention and wrap the assignement into parens: if ((variable = someFn())) { //do something with variable } Doing so suppresses warnings + is easier to understand the intention. I verified that the closure compiler strips the extra parens, so there is no byte overhead for this safety practice. We should use this style going forward...
Diffstat (limited to 'src/parser.js')
-rw-r--r--src/parser.js14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/parser.js b/src/parser.js
index dadab1fb..5129f2f7 100644
--- a/src/parser.js
+++ b/src/parser.js
@@ -421,7 +421,7 @@ function parser(text, json){
var left = logicalOR();
var right;
var token;
- if (token = expect('=')) {
+ if ((token = expect('='))) {
if (!left.assign) {
throwError("implies assignment but [" +
text.substring(0, token.index) + "] can not be assigned to", token);
@@ -468,7 +468,7 @@ function parser(text, json){
function relational(){
var left = additive();
var token;
- if (token = expect('<', '>', '<=', '>=')) {
+ if ((token = expect('<', '>', '<=', '>='))) {
left = binaryFn(left, token.fn, relational());
}
return left;
@@ -477,7 +477,7 @@ function parser(text, json){
function additive(){
var left = multiplicative();
var token;
- while(token = expect('+','-')) {
+ while ((token = expect('+','-'))) {
left = binaryFn(left, token.fn, multiplicative());
}
return left;
@@ -486,7 +486,7 @@ function parser(text, json){
function multiplicative(){
var left = unary();
var token;
- while(token = expect('*','/','%')) {
+ while ((token = expect('*','/','%'))) {
left = binaryFn(left, token.fn, unary());
}
return left;
@@ -496,9 +496,9 @@ function parser(text, json){
var token;
if (expect('+')) {
return primary();
- } else if (token = expect('-')) {
+ } else if ((token = expect('-'))) {
return binaryFn(ZERO, token.fn, unary());
- } else if (token = expect('!')) {
+ } else if ((token = expect('!'))) {
return unaryFn(token.fn, unary());
} else {
return primary();
@@ -539,7 +539,7 @@ function parser(text, json){
}
}
var next;
- while (next = expect('(', '[', '.')) {
+ while ((next = expect('(', '[', '.'))) {
if (next.text === '(') {
primary = functionCall(primary);
} else if (next.text === '[') {