From 8d8c68552785ebe56e4b051a45bd3b6899cb78e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jens=20M=C3=B6nig?= <jens@moenig.org>
Date: Tue, 8 Feb 2022 14:50:08 +0100
Subject: [PATCH] moved bitwise operators into standard extensions

---
 HISTORY.md            |  1 +
 libraries/bitwise.js  | 48 -------------------------------------
 libraries/bitwise.xml |  2 +-
 snap.html             |  2 +-
 src/extensions.js     | 55 +++++++++++++++++++++++++++++++++++++++++--
 5 files changed, 56 insertions(+), 52 deletions(-)
 delete mode 100644 libraries/bitwise.js

diff --git a/HISTORY.md b/HISTORY.md
index 1b0e459b..e51d32bb 100755
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -28,6 +28,7 @@
 * fixed the comment in "remove duplicates" in the list utilities library to reflect that the last match is kept
 * fixed "do in parallel" block in parallelization library
 * new bitwise operators library, thanks, Bernat!
+* moved bitwise operators into standard extensions
 
 ### 2022-02-07
 * lists: fixed JSON encoding for nested lists
diff --git a/libraries/bitwise.js b/libraries/bitwise.js
deleted file mode 100644
index da5ece5f..00000000
--- a/libraries/bitwise.js
+++ /dev/null
@@ -1,48 +0,0 @@
-SnapExtensions.primitives.set(
-    'bit_and(a, b)',
-    function (a, b) {
-        return a & b;
-    }
-);
-
-SnapExtensions.primitives.set(
-    'bit_or(a, b)',
-    function (a, b) {
-        return a | b;
-    }
-);
-
-SnapExtensions.primitives.set(
-    'bit_xor(a, b)',
-    function (a, b) {
-        return a ^ b;
-    }
-);
-
-SnapExtensions.primitives.set(
-    'bit_not(a)',
-    function (a) {
-        return ~ a;
-    }
-);
-
-SnapExtensions.primitives.set(
-    'bit_left_shift(a, b)',
-    function (a, b) {
-        return a << b;
-    }
-);
-
-SnapExtensions.primitives.set(
-    'bit_right_shift(a, b)',
-    function (a, b) {
-        return a >> b;
-    }
-);
-
-SnapExtensions.primitives.set(
-    'bit_unsigned_right_shift(a, b)',
-    function (a, b) {
-        return a >>> b;
-    }
-);
diff --git a/libraries/bitwise.xml b/libraries/bitwise.xml
index 324b1a57..31ec7097 100644
--- a/libraries/bitwise.xml
+++ b/libraries/bitwise.xml
@@ -1 +1 @@
-<blocks app="Snap! 7, https://snap.berkeley.edu" version="2"><block-definition s="¬ %&apos;a&apos;" type="reporter" category="operators"><header></header><code></code><translations></translations><inputs><input type="%n"></input></inputs><script><block s="doApplyExtension"><l>src_load(url)</l><list><l>libraries/bitwise.js</l></list></block><block s="doReport"><block s="reportApplyExtension"><l>bit_not(a)</l><list><block var="a"/></list></block></block></script></block-definition><block-definition s="%&apos;a&apos; ∧ %&apos;b&apos;" type="reporter" category="operators"><header></header><code></code><translations></translations><inputs><input type="%n"></input><input type="%n"></input></inputs><script><block s="doApplyExtension"><l>src_load(url)</l><list><l>libraries/bitwise.js</l></list></block><block s="doReport"><block s="reportApplyExtension"><l>bit_and(a, b)</l><list><block var="a"/><block var="b"/></list></block></block></script></block-definition><block-definition s="%&apos;a&apos; ∨ %&apos;b&apos;" type="reporter" category="operators"><header></header><code></code><translations></translations><inputs><input type="%n"></input><input type="%n"></input></inputs><script><block s="doApplyExtension"><l>src_load(url)</l><list><l>libraries/bitwise.js</l></list></block><block s="doReport"><block s="reportApplyExtension"><l>bit_or(a, b)</l><list><block var="a"/><block var="b"/></list></block></block></script></block-definition><block-definition s="%&apos;a&apos; ⊻ %&apos;b&apos;" type="reporter" category="operators"><header></header><code></code><translations></translations><inputs><input type="%n"></input><input type="%n"></input></inputs><script><block s="doApplyExtension"><l>src_load(url)</l><list><l>libraries/bitwise.js</l></list></block><block s="doReport"><block s="reportApplyExtension"><l>bit_xor(a, b)</l><list><block var="a"/><block var="b"/></list></block></block></script></block-definition><block-definition s="%&apos;a&apos; &lt;&lt; %&apos;b&apos;" type="reporter" category="operators"><header></header><code></code><translations></translations><inputs><input type="%n"></input><input type="%n"></input></inputs><script><block s="doApplyExtension"><l>src_load(url)</l><list><l>libraries/bitwise.js</l></list></block><block s="doReport"><block s="reportApplyExtension"><l>bit_left_shift(a, b)</l><list><block var="a"/><block var="b"/></list></block></block></script></block-definition><block-definition s="%&apos;a&apos; &gt;&gt; %&apos;b&apos;" type="reporter" category="operators"><header></header><code></code><translations></translations><inputs><input type="%n"></input><input type="%n"></input></inputs><script><block s="doApplyExtension"><l>src_load(url)</l><list><l>libraries/bitwise.js</l></list></block><block s="doReport"><block s="reportApplyExtension"><l>bit_right_shift(a, b)</l><list><block var="a"/><block var="b"/></list></block></block></script></block-definition><block-definition s="%&apos;a&apos; &gt;&gt;&gt; %&apos;b&apos;" type="reporter" category="operators"><header></header><code></code><translations></translations><inputs><input type="%n"></input><input type="%n"></input></inputs><script><block s="doApplyExtension"><l>src_load(url)</l><list><l>libraries/bitwise.js</l></list></block><block s="doReport"><block s="reportApplyExtension"><l>bit_unsigned_right_shift(a, b)</l><list><block var="a"/><block var="b"/></list></block></block></script></block-definition></blocks>
\ No newline at end of file
+<blocks app="Snap! 7, https://snap.berkeley.edu" version="2"><block-definition s="¬ %&apos;a&apos;" type="reporter" category="operators"><header></header><code></code><translations></translations><inputs><input type="%n"></input></inputs><script><block s="doReport"><block s="reportApplyExtension"><l>bit_not(a)</l><list><block var="a"/></list></block></block></script></block-definition><block-definition s="%&apos;a&apos; ∧ %&apos;b&apos;" type="reporter" category="operators"><header></header><code></code><translations></translations><inputs><input type="%n"></input><input type="%n"></input></inputs><script><block s="doReport"><block s="reportApplyExtension"><l>bit_and(a, b)</l><list><block var="a"/><block var="b"/></list></block></block></script></block-definition><block-definition s="%&apos;a&apos; ∨ %&apos;b&apos;" type="reporter" category="operators"><header></header><code></code><translations></translations><inputs><input type="%n"></input><input type="%n"></input></inputs><script><block s="doReport"><block s="reportApplyExtension"><l>bit_or(a, b)</l><list><block var="a"/><block var="b"/></list></block></block></script></block-definition><block-definition s="%&apos;a&apos; ⊻ %&apos;b&apos;" type="reporter" category="operators"><header></header><code></code><translations></translations><inputs><input type="%n"></input><input type="%n"></input></inputs><script><block s="doReport"><block s="reportApplyExtension"><l>bit_xor(a, b)</l><list><block var="a"/><block var="b"/></list></block></block></script></block-definition><block-definition s="%&apos;a&apos; &lt;&lt; %&apos;b&apos;" type="reporter" category="operators"><header></header><code></code><translations></translations><inputs><input type="%n"></input><input type="%n"></input></inputs><script><block s="doReport"><block s="reportApplyExtension"><l>bit_left_shift(a, b)</l><list><block var="a"/><block var="b"/></list></block></block></script></block-definition><block-definition s="%&apos;a&apos; &gt;&gt; %&apos;b&apos;" type="reporter" category="operators"><header></header><code></code><translations></translations><inputs><input type="%n"></input><input type="%n"></input></inputs><script><block s="doReport"><block s="reportApplyExtension"><l>bit_right_shift(a, b)</l><list><block var="a"/><block var="b"/></list></block></block></script></block-definition><block-definition s="%&apos;a&apos; &gt;&gt;&gt; %&apos;b&apos;" type="reporter" category="operators"><header></header><code></code><translations></translations><inputs><input type="%n"></input><input type="%n"></input></inputs><script><block s="doReport"><block s="reportApplyExtension"><l>bit_unsigned_right_shift(a, b)</l><list><block var="a"/><block var="b"/></list></block></block></script></block-definition></blocks>
\ No newline at end of file
diff --git a/snap.html b/snap.html
index 807c8f06..9a2c4226 100755
--- a/snap.html
+++ b/snap.html
@@ -28,7 +28,7 @@
         <script src="src/sketch.js?version=2021-11-03"></script>
         <script src="src/video.js?version=2019-06-27"></script>
         <script src="src/maps.js?version=2021-06-15"></script>
-        <script src="src/extensions.js?version=2022-02-07"></script>
+        <script src="src/extensions.js?version=2022-02-08"></script>
         <script src="src/xml.js?version=2021-07-05"></script>
         <script src="src/store.js?version=2022-01-02"></script>
         <script src="src/locale.js?version=2022-01-31"></script>
diff --git a/src/extensions.js b/src/extensions.js
index f0c7f262..8c675c72 100644
--- a/src/extensions.js
+++ b/src/extensions.js
@@ -31,9 +31,9 @@
 IDE_Morph, CamSnapshotDialogMorph, SoundRecorderDialogMorph, isSnapObject, nop,
 Color, Process, contains*/
 
-/*jshint esversion: 11*/
+/*jshint esversion: 11, bitwise: false*/
 
-modules.extensions = '2022-February-07';
+modules.extensions = '2022-February-08';
 
 // Global stuff
 
@@ -259,6 +259,57 @@ SnapExtensions.primitives.set(
     }
 );
 
+// bitwise operations
+
+SnapExtensions.primitives.set(
+    'bit_and(a, b)',
+    function (a, b) {
+        return a & b;
+    }
+);
+
+SnapExtensions.primitives.set(
+    'bit_or(a, b)',
+    function (a, b) {
+        return a | b;
+    }
+);
+
+SnapExtensions.primitives.set(
+    'bit_xor(a, b)',
+    function (a, b) {
+        return a ^ b;
+    }
+);
+
+SnapExtensions.primitives.set(
+    'bit_not(a)',
+    function (a) {
+        return ~ a;
+    }
+);
+
+SnapExtensions.primitives.set(
+    'bit_left_shift(a, b)',
+    function (a, b) {
+        return a << b;
+    }
+);
+
+SnapExtensions.primitives.set(
+    'bit_right_shift(a, b)',
+    function (a, b) {
+        return a >> b;
+    }
+);
+
+SnapExtensions.primitives.set(
+    'bit_unsigned_right_shift(a, b)',
+    function (a, b) {
+        return a >>> b;
+    }
+);
+
 // data sciene & frequency distribution analysis (dta_):
 
 SnapExtensions.primitives.set(