merge master

aemkei · Jun 4, 2016 · 26daabc · 26daabc
2 parents 4d7cfb0 + cfd429e
commit 26daabc
Show file tree

Hide file tree

Showing 2 changed files with 77 additions and 77 deletions.
diff --git a/jsfuck.js b/jsfuck.js
@@ -19,14 +19,14 @@
     'Number':   '(+[])',
     'String':   '([]+[])',
     'Boolean':  '(![])',
-    'Function': '[]["filter"]',
+    'Function': '[]["fill"]',
     'RegExp':   'Function("return/"+false+"/")()'
   };
 
   var MAPPING = {
     'a':   '(false+"")[1]',
     'b':   '([]["entries"]()+"")[2]',
-    'c':   '([]["filter"]+"")[3]',
+    'c':   '([]["fill"]+"")[3]',
     'd':   '(undefined+"")[2]',
     'e':   '(true+"")[3]',
     'f':   '(false+"")[0]',
@@ -38,7 +38,7 @@
     'l':   '(false+"")[2]',
     'm':   '(Number+"")[11]',
     'n':   '(undefined+"")[1]',
-    'o':   '(true+[]["filter"])[10]',
+    'o':   '(true+[]["fill"])[10]',
     'p':   '(+(211))["to"+String["name"]](31)[1]',
     'q':   '(+(212))["to"+String["name"]](31)[1]',
     'r':   '(true+"")[1]',
@@ -54,7 +54,7 @@
     'A':   '(+[]+Array)[10]',
     'B':   '(+[]+Boolean)[10]',
     'C':   'Function("return escape")()(("")["italics"]())[2]',
-    'D':   'Function("return escape")()([]["filter"])["slice"]("-1")',
+    'D':   'Function("return escape")()([]["fill"])["slice"]("-1")',
     'E':   '(RegExp+"")[12]',
     'F':   '(+[]+Function)[10]',
     'G':   '(false+Function("return Date")()())[30]',
@@ -78,16 +78,16 @@
     'Y':   USE_CHAR_CODE,
     'Z':   USE_CHAR_CODE,
 
-    ' ':   '(NaN+[]["filter"])[11]',
+    ' ':   '(NaN+[]["fill"])[11]',
     '!':   USE_CHAR_CODE,
     '"':   '("")["fontcolor"]()[12]',
     '#':   USE_CHAR_CODE,
     '$':   USE_CHAR_CODE,
-    '%':   'Function("return escape")()([]["filter"])[20]',
+    '%':   'Function("return escape")()([]["fill"])[21]',
     '&':   '("")["link"](0+")[10]',
     '\'':  USE_CHAR_CODE,
-    '(':   '(false+[]["filter"])[20]',
-    ')':   '(true+[]["filter"])[20]',
+    '(':   '(undefined+[]["fill"])[22]',
+    ')':   '([0]+false+[]["fill"])[20]',
     '*':   USE_CHAR_CODE,
     '+':   '(+(+!+[]+(!+[]+[])[!+[]+!+[]+!+[]]+[+!+[]]+[+[]]+[+[]])+[])[2]',
     ',':   '([]["slice"]["call"](false+"")+"")[1]',
@@ -107,9 +107,9 @@
     '^':   USE_CHAR_CODE,
     '_':   USE_CHAR_CODE,
     '`':   USE_CHAR_CODE,
-    '{':   '(NaN+[]["filter"])[21]',
+    '{':   '(true+[]["fill"])[20]',
     '|':   USE_CHAR_CODE,
-    '}':   '([]["filter"]+"")["slice"]("-1")',
+    '}':   '([]["fill"]+"")["slice"]("-1")',
     '~':   USE_CHAR_CODE
   };
 
@@ -264,7 +264,7 @@
             "([]+[])[" + encode("constructor") + "]" +
             "[" + encode("fromCharCode") + "]" +
             "(" + encode(c.charCodeAt(0) + "") + ")";
-   
+
           output.push(replacement);
           MAPPING[c] = replacement;
         }
@@ -279,12 +279,12 @@
 
     if (wrapWithEval){
       if (runInParentScope){
-        output = "[][" + encode("filter") + "]" +
+        output = "[][" + encode("fill") + "]" +
           "[" + encode("constructor") + "]" +
           "(" + encode("return eval") +  ")()" +
           "(" + output + ")";
       } else {
-        output = "[][" + encode("filter") + "]" +
+        output = "[][" + encode("fill") + "]" +
           "[" + encode("constructor") + "]" +
           "(" + output + ")()";
       }

diff --git a/output.txt b/output.txt
@@ -1,19 +1,19 @@
-` ` 147
-`!` 6309
-`"` 691
-`#` 6318
-`$` 6323
-`%` 3195
-`&` 2491
-`'` 6338
-`(` 146
-`)` 147
-`*` 6314
+` ` 109
+`!` 5057
+`"` 539
+`#` 5066
+`$` 5071
+`%` 2551
+`&` 1997
+`'` 5086
+`(` 117
+`)` 114
+`*` 5062
 `+` 70
-`,` 469
+`,` 393
 `-` 153
 `.` 72
-`/` 304
+`/` 266
 `0` 8
 `1` 10
 `2` 14
@@ -24,72 +24,72 @@
 `7` 39
 `8` 44
 `9` 49
-`:` 2282
-`;` 2501
-`<` 292
-`=` 687
-`>` 298
-`?` 2277
-`@` 6317
-`A` 725
-`B` 728
-`C` 3353
-`D` 3586
-`E` 2283
-`F` 846
-`G` 4763
-`H` 6353
+`:` 1864
+`;` 2007
+`<` 254
+`=` 535
+`>` 260
+`?` 1859
+`@` 5065
+`A` 573
+`B` 576
+`C` 2707
+`D` 2902
+`E` 1865
+`F` 656
+`G` 3851
+`H` 5101
 `I` 70
-`J` 6324
-`K` 6486
-`L` 6453
-`M` 4764
+`J` 5072
+`K` 5234
+`L` 5163
+`M` 3852
 `N` 16
-`O` 1654
-`P` 6322
-`Q` 6324
-`R` 2278
-`S` 730
-`T` 4766
-`U` 3522
-`V` 6348
-`W` 6353
-`X` 6358
-`Y` 6363
-`Z` 6329
+`O` 1346
+`P` 5070
+`Q` 5072
+`R` 1860
+`S` 578
+`T` 3854
+`U` 2834
+`V` 5096
+`W` 5101
+`X` 5106
+`Y` 5111
+`Z` 5077
 `[` 171
-`\` 6458
+`\` 5168
 `]` 189
-`^` 6339
-`_` 6327
-``` 6327
+`^` 5087
+`_` 5075
+``` 5075
 `a` 15
 `b` 177
-`c` 144
+`c` 106
 `d` 22
 `e` 25
 `f` 13
-`g` 740
-`h` 1714
+`g` 588
+`h` 1372
 `i` 27
 `j` 182
-`k` 1703
+`k` 1361
 `l` 19
-`m` 729
+`m` 577
 `n` 18
-`o` 143
-`p` 1725
-`q` 1729
+`o` 105
+`p` 1383
+`q` 1387
 `r` 16
 `s` 24
 `t` 14
 `u` 16
-`v` 1719
-`w` 1728
-`x` 1733
+`v` 1377
+`w` 1386
+`x` 1391
 `y` 84
-`z` 1758
-`{` 151
-`|` 6468
-`}` 536
-`~` 6349
+`z` 1416
+`{` 109
+`|` 5178
+`}` 460
+`~` 5097