Remove bitwise operators

rattrayalex · rattrayalex · commit 078cd6654079 · 2017-04-28T21:44:14.000-07:00
diff --git a/src/parser/expression.js b/src/parser/expression.js
@@ -246,6 +246,11 @@ pp.parseExprOp = function(left, leftStartPos, leftStartLoc, minPrec, noIn) {
     }
   }
 
+  if (this.hasPlugin("lightscript") && this.isBitwiseOp()) {
+    this.unexpected(null, "Bitwise operators have been disabled in LightScript. " +
+      "Use the stdlib functions instead (eg; `bitwiseAnd(a, b)`).");
+  }
+
   const prec = this.state.type.binop;
   if (prec != null && (!noIn || !this.match(tt._in))) {
     if (prec > minPrec) {
diff --git a/src/plugins/lightscript.js b/src/plugins/lightscript.js
@@ -546,6 +546,15 @@ pp.tryParseNamedArrowDeclaration = function () {
   return node;
 };
 
+pp.isBitwiseOp = function () {
+  return (
+    this.match(tt.bitwiseOR) ||
+    this.match(tt.bitwiseAND) ||
+    this.match(tt.bitwiseXOR) ||
+    this.match(tt.bitShift)
+  );
+};
+
 
 export default function (instance) {
 
diff --git a/test/fixtures/core/uncategorised/156/options.lightscript.json b/test/fixtures/core/uncategorised/156/options.lightscript.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Bitwise operators have been disabled in LightScript. Use the stdlib functions instead (eg; `bitwiseAnd(a, b)`). (1:2)"
+}
diff --git a/test/fixtures/core/uncategorised/157/options.lightscript.json b/test/fixtures/core/uncategorised/157/options.lightscript.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Bitwise operators have been disabled in LightScript. Use the stdlib functions instead (eg; `bitwiseAnd(a, b)`). (1:2)"
+}
diff --git a/test/fixtures/core/uncategorised/158/options.lightscript.json b/test/fixtures/core/uncategorised/158/options.lightscript.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Bitwise operators have been disabled in LightScript. Use the stdlib functions instead (eg; `bitwiseAnd(a, b)`). (1:2)"
+}
diff --git a/test/fixtures/core/uncategorised/170/options.lightscript.json b/test/fixtures/core/uncategorised/170/options.lightscript.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Bitwise operators have been disabled in LightScript. Use the stdlib functions instead (eg; `bitwiseAnd(a, b)`). (1:2)"
+}
diff --git a/test/fixtures/core/uncategorised/171/options.lightscript.json b/test/fixtures/core/uncategorised/171/options.lightscript.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Bitwise operators have been disabled in LightScript. Use the stdlib functions instead (eg; `bitwiseAnd(a, b)`). (1:2)"
+}
diff --git a/test/fixtures/core/uncategorised/172/options.lightscript.json b/test/fixtures/core/uncategorised/172/options.lightscript.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Bitwise operators have been disabled in LightScript. Use the stdlib functions instead (eg; `bitwiseAnd(a, b)`). (1:2)"
+}
diff --git a/test/fixtures/core/uncategorised/184/options.lightscript.json b/test/fixtures/core/uncategorised/184/options.lightscript.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Bitwise operators have been disabled in LightScript. Use the stdlib functions instead (eg; `bitwiseAnd(a, b)`). (1:2)"
+}
diff --git a/test/fixtures/core/uncategorised/185/options.lightscript.json b/test/fixtures/core/uncategorised/185/options.lightscript.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Bitwise operators have been disabled in LightScript. Use the stdlib functions instead (eg; `bitwiseAnd(a, b)`). (1:2)"
+}
diff --git a/test/fixtures/core/uncategorised/186/options.lightscript.json b/test/fixtures/core/uncategorised/186/options.lightscript.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Bitwise operators have been disabled in LightScript. Use the stdlib functions instead (eg; `bitwiseAnd(a, b)`). (1:2)"
+}
diff --git a/test/fixtures/core/uncategorised/187/options.lightscript.json b/test/fixtures/core/uncategorised/187/options.lightscript.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Bitwise operators have been disabled in LightScript. Use the stdlib functions instead (eg; `bitwiseAnd(a, b)`). (1:2)"
+}
diff --git a/test/fixtures/core/uncategorised/188/options.lightscript.json b/test/fixtures/core/uncategorised/188/options.lightscript.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Bitwise operators have been disabled in LightScript. Use the stdlib functions instead (eg; `bitwiseAnd(a, b)`). (1:2)"
+}
diff --git a/test/fixtures/core/uncategorised/189/options.lightscript.json b/test/fixtures/core/uncategorised/189/options.lightscript.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Bitwise operators have been disabled in LightScript. Use the stdlib functions instead (eg; `bitwiseAnd(a, b)`). (1:2)"
+}
diff --git a/test/fixtures/core/uncategorised/190/options.lightscript.json b/test/fixtures/core/uncategorised/190/options.lightscript.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Bitwise operators have been disabled in LightScript. Use the stdlib functions instead (eg; `bitwiseAnd(a, b)`). (1:2)"
+}
diff --git a/test/fixtures/core/uncategorised/196/options.lightscript.json b/test/fixtures/core/uncategorised/196/options.lightscript.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Bitwise operators have been disabled in LightScript. Use the stdlib functions instead (eg; `bitwiseAnd(a, b)`). (1:7)"
+}
diff --git a/test/fixtures/esprima/expression-binary-bitwise/migrated_0000/options.lightscript.json b/test/fixtures/esprima/expression-binary-bitwise/migrated_0000/options.lightscript.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Bitwise operators have been disabled in LightScript. Use the stdlib functions instead (eg; `bitwiseAnd(a, b)`). (1:2)"
+}
diff --git a/test/fixtures/esprima/expression-binary-bitwise/migrated_0001/options.lightscript.json b/test/fixtures/esprima/expression-binary-bitwise/migrated_0001/options.lightscript.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Bitwise operators have been disabled in LightScript. Use the stdlib functions instead (eg; `bitwiseAnd(a, b)`). (1:2)"
+}
diff --git a/test/fixtures/esprima/expression-binary-bitwise/migrated_0002/options.lightscript.json b/test/fixtures/esprima/expression-binary-bitwise/migrated_0002/options.lightscript.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Bitwise operators have been disabled in LightScript. Use the stdlib functions instead (eg; `bitwiseAnd(a, b)`). (1:2)"
+}
diff --git a/test/fixtures/esprima/expression-binary-logical/migrated_0005/options.lightscript.json b/test/fixtures/esprima/expression-binary-logical/migrated_0005/options.lightscript.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Bitwise operators have been disabled in LightScript. Use the stdlib functions instead (eg; `bitwiseAnd(a, b)`). (1:7)"
+}
diff --git a/test/fixtures/esprima/expression-binary/migrated_0011/options.lightscript.json b/test/fixtures/esprima/expression-binary/migrated_0011/options.lightscript.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Bitwise operators have been disabled in LightScript. Use the stdlib functions instead (eg; `bitwiseAnd(a, b)`). (1:2)"
+}
diff --git a/test/fixtures/esprima/expression-binary/migrated_0012/options.lightscript.json b/test/fixtures/esprima/expression-binary/migrated_0012/options.lightscript.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Bitwise operators have been disabled in LightScript. Use the stdlib functions instead (eg; `bitwiseAnd(a, b)`). (1:2)"
+}
diff --git a/test/fixtures/esprima/expression-binary/migrated_0013/options.lightscript.json b/test/fixtures/esprima/expression-binary/migrated_0013/options.lightscript.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Bitwise operators have been disabled in LightScript. Use the stdlib functions instead (eg; `bitwiseAnd(a, b)`). (1:2)"
+}
diff --git a/test/fixtures/esprima/expression-binary/migrated_0014/options.lightscript.json b/test/fixtures/esprima/expression-binary/migrated_0014/options.lightscript.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Bitwise operators have been disabled in LightScript. Use the stdlib functions instead (eg; `bitwiseAnd(a, b)`). (1:2)"
+}
diff --git a/test/fixtures/esprima/expression-binary/migrated_0015/options.lightscript.json b/test/fixtures/esprima/expression-binary/migrated_0015/options.lightscript.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Bitwise operators have been disabled in LightScript. Use the stdlib functions instead (eg; `bitwiseAnd(a, b)`). (1:2)"
+}
diff --git a/test/fixtures/esprima/expression-binary/migrated_0016/options.lightscript.json b/test/fixtures/esprima/expression-binary/migrated_0016/options.lightscript.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Bitwise operators have been disabled in LightScript. Use the stdlib functions instead (eg; `bitwiseAnd(a, b)`). (1:2)"
+}
diff --git a/test/fixtures/esprima/expression-binary/migrated_0017/options.lightscript.json b/test/fixtures/esprima/expression-binary/migrated_0017/options.lightscript.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Bitwise operators have been disabled in LightScript. Use the stdlib functions instead (eg; `bitwiseAnd(a, b)`). (1:2)"
+}
diff --git a/test/fixtures/esprima/expression-bitwise-shift/migrated_0000/options.lightscript.json b/test/fixtures/esprima/expression-bitwise-shift/migrated_0000/options.lightscript.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Bitwise operators have been disabled in LightScript. Use the stdlib functions instead (eg; `bitwiseAnd(a, b)`). (1:2)"
+}
diff --git a/test/fixtures/esprima/expression-bitwise-shift/migrated_0001/options.lightscript.json b/test/fixtures/esprima/expression-bitwise-shift/migrated_0001/options.lightscript.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Bitwise operators have been disabled in LightScript. Use the stdlib functions instead (eg; `bitwiseAnd(a, b)`). (1:2)"
+}
diff --git a/test/fixtures/esprima/expression-bitwise-shift/migrated_0002/options.lightscript.json b/test/fixtures/esprima/expression-bitwise-shift/migrated_0002/options.lightscript.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Bitwise operators have been disabled in LightScript. Use the stdlib functions instead (eg; `bitwiseAnd(a, b)`). (1:2)"
+}
diff --git a/test/fixtures/esprima/expression-complex/migrated_0000/options.lightscript.json b/test/fixtures/esprima/expression-complex/migrated_0000/options.lightscript.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Bitwise operators have been disabled in LightScript. Use the stdlib functions instead (eg; `bitwiseAnd(a, b)`). (1:12)"
+}
diff --git a/test/fixtures/esprima/expression-grouping/migrated_0001/options.lightscript.json b/test/fixtures/esprima/expression-grouping/migrated_0001/options.lightscript.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Bitwise operators have been disabled in LightScript. Use the stdlib functions instead (eg; `bitwiseAnd(a, b)`). (1:6)"
+}
diff --git a/test/fixtures/flow/regression/issue-2083/options.lightscript.json b/test/fixtures/flow/regression/issue-2083/options.lightscript.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Bitwise operators have been disabled in LightScript. Use the stdlib functions instead (eg; `bitwiseAnd(a, b)`). (4:33)"
+}

Original file line number	Diff line number	Diff line change
`@@ -246,6 +246,11 @@ pp.parseExprOp = function(left, leftStartPos, leftStartLoc, minPrec, noIn) {`
`246`	`246`	`}`
`247`	`247`	`}`
`248`	`248`
	`249`	`+ if (this.hasPlugin("lightscript") && this.isBitwiseOp()) {`
	`250`	`+ this.unexpected(null, "Bitwise operators have been disabled in LightScript. " +`
	`251`	+ "Use the stdlib functions instead (eg; `bitwiseAnd(a, b)`).");
	`252`	`+ }`
	`253`	`+`
`249`	`254`	`const prec = this.state.type.binop;`
`250`	`255`	`if (prec != null && (!noIn \|\| !this.match(tt._in))) {`
`251`	`256`	`if (prec > minPrec) {`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	+ "throws": "Bitwise operators have been disabled in LightScript. Use the stdlib functions instead (eg; `bitwiseAnd(a, b)`). (1:2)"
	`3`	`+}`