fixes

Author: Alex D

src/emitterlua.ts

@@ -2902,7 +2902,6 @@ export class EmitterLua {
  this.processBinaryExpressionEqualOp(node, this.ops[node.operatorToken.kind], this.strOps[node.operatorToken.kind]);
  break;
  case ts.SyntaxKind.EqualsEqualsToken:
- case ts.SyntaxKind.AmpersandAmpersandToken:
  if (this.ignoreExtraLogic) {
  this.processBinaryExpressionSingleOp(node, this.ops[node.operatorToken.kind], this.strOps[node.operatorToken.kind]);
  } else {
@@ -2911,6 +2910,7 @@ export class EmitterLua {
 
  break;
  case ts.SyntaxKind.BarBarToken:
+ case ts.SyntaxKind.AmpersandAmpersandToken:
  if (this.ignoreExtraLogic) {
  this.processBinaryExpressionSingleOp(node, this.ops[node.operatorToken.kind], this.strOps[node.operatorToken.kind]);
  } else {
@@ -2922,8 +2922,18 @@ export class EmitterLua {
 
  this.functionContext.textCode.push("local op" + opIndex + " = ");
  this.processExpression(node.left);
- this.functionContext.textCode.push(" if __is_true(op" + opIndex + ") then return op" + opIndex + " else return ");
- this.processExpression(node.right);
+ this.functionContext.textCode.push(" if __is_true(op" + opIndex + ") then");
+ if (node.operatorToken.kind === ts.SyntaxKind.BarBarToken)
+ {
+ this.functionContext.textCode.push(" return op" + opIndex);
+ this.functionContext.textCode.push(" else return ");
+ this.processExpression(node.right);
+ } else {
+ this.functionContext.textCode.push(" return ");
+ this.processExpression(node.right);
+ this.functionContext.textCode.push(" else return op" + opIndex);
+ }
+
  this.functionContext.textCode.push(" end end)()");
  }
 

test/test.ts

@@ -1,12 +1,15 @@
-function _x() { 
- console.log(1); 
- return 1; 
- } 
-
- function _y() { 
- console.log(2); 
- return 2; 
- } 
- 
- console.log(_x() || _x() == 0 ? _x() : _y()); 
- console.log(!_x() && _x() != 0 ? _x() : _y());
+function padLeft(value: string, padding: number) 
+ function padLeft(value: string, padding: string) 
+ function padLeft(value: string, padding: any) { 
+ if (typeof padding === "number") { 
+ return String(padding) + value; 
+ } 
+ 
+ if (typeof padding === "string") { 
+ return padding + value; 
+ } 
+ 
+ throw new Error(`Expected string or number, got \'${padding}\'.`); 
+ } 
+ 
+ console.log(padLeft("Hello world", 4));