fix: resolve conflict

Author: crossskyLi

README.md

@@ -1,5 +1,4 @@
-本项目作为本人对于ES6/JavaScript学习的记录。
+本项目作为本人对于JavaScript学习的记录。
 =
-主要编写的内容在于 js/index.js 文件中,作为平时编写代码的记录,
-平时对ES6部分语法不熟悉也是会经常到这里回顾。
+作为平时编写代码的记录,回顾知识和新知识学习的一片自由田。
 

operational_character/index.js

@@ -0,0 +1,104 @@
+(() => {
+  let result = null;
+  let obj = {}
+  let num = 0;
+  /**
+   * 按位取反 ~ 
+   */
+  num = 1;
+  result = ~num; // -2
+
+  num = '1'
+  result = ~num;// -2 隐性转换
+
+  num = 0;
+  result = ~num;  // 0 => -1
+
+  num = null;
+  result = ~num; // null => 0 => -1 隐性转换
+
+  num = '10101';
+  result = ~num; // 10101 => -10102  -10102 隐性转换
+
+  /**
+   * 左移位 << 
+   */
+  num = 110100;
+  result = num << 1; // 220200
+
+  num = 0;
+  result = num << 1;// 0
+
+  num = -1;
+  result = num << 1; // -2
+
+  num = -1;
+  result = num << 1; // -2
+
+  num = null;
+  result = num << 1; // 0
+
+  // 0 和 1 互相取反,涉及隐性转换
+  num = 0;
+  result = +!num; // 1
+
+  num = 1;
+  result = +!num;
+
+  /**
+   * 按位与 &
+   */
+  num = 1;
+  result = num & 1; // 1
+
+  num = 0;
+  result = num & 1; // 0
+
+  num = 3;
+  result = num & 1; // 1
+
+  num = 10;
+  result = num & 1; // 0
+
+  num = 3;
+  result = num & 0; // 0
+
+  // 取余操作
+  num = 11;
+  result = num %= 3 // 2 
+
+  // in 和delete
+  // num in this; // false
+  // this.num = num;
+  // num in this; // false
+
+  // delete this.num; // true
+})()
+
+/* 找出不大于N的最大的2的幂数 */
+let n = 111;
+function findN(n) {
+  n |= n >> 1;
+  n |= n >> 2;
+  n |= n >> 4;
+  n |= n >> 8;
+  n |= n >> 16;
+  n |= n >> 32;
+  n |= n >> 64;
+  return (n + 1) >> 1
+}
+/* 使用位运算实现 Math.pow */
+function pow(num, n) {
+  let sum = 1;
+  let temp = num;
+  while (n != 0) {
+    if (n & 1 === 1) {
+      sum *= temp
+    }
+    temp *= temp;
+    n = n >> 1;
+  }
+  return sum;
+}
+
+export default {}

operational_character/operational_character.js

@@ -1,14 +1,17 @@
 
 
 /* 函数式编程 functional paradigm */
-import functional from '../functional_paradigm/index'
-import { bindPloyfill } from '../bind_applay_call/bind.js'
+// import functional from '../functional_paradigm/index'
+// import { bindPloyfill } from '../bind_applay_call/bind.js'
 
 
 /* memory monitor */
 import monitor from '../memoryMonitor/index'
 
 import { reqVideoPictureInPicture } from '../video/index.js'
+// import monitor from '../memoryMonitor/index'
+
+import operational from '../operational_character/index'