Issue 4125 - [emscripten] Convert filter classes to C++

compiled/shell.js

+"use strict";
+
 "Compiled from https://hg.adblockplus.org/adblockplus/ with Emscripten {{{EMSCRIPTEN_VERSION}}}";
 
-var sizeofString = 0;
 var FilterNotifier = require("filterNotifier").FilterNotifier;
-
-function copyString(str, buffer)
-{
-  var length = str.length;
-  for (var i = 0, pointer = (buffer >> 1); i < length; i++, pointer++)
-    HEAP16[pointer] = str.charCodeAt(i);
-  return length;
-}
-
-function createString(str)
-{
-  var length = 0;
-  var buffer = 0;
-  if (str)
-  {
-    buffer = Runtime.stackAlloc(str.length * 2);
-    length = copyString(str, buffer);
-  }
-
-  if (!sizeofString)
-    sizeofString = Module._GetSizeofString();
-  var result = Module.Runtime.stackAlloc(sizeofString);
-  Module._InitString(result, buffer, length);
-  return result;
-}
-
-function getStringData(str)
-{
-  var length = Module._GetStringLength(str);
-  var pointer = Module._GetStringData(str) >> 1;
-  return String.fromCharCode.apply(String, HEAP16.slice(pointer, pointer + length));
-}
-
-function createClass(superclass)
-{
-  var result = function(pointer)
-  {
-    this._pointer = pointer;
-  };
-  if (superclass)
-    result.prototype = Object.create(superclass.prototype);
-  result.prototype.delete = function()
-  {
-    Module._DeletePointer(this._pointer);
-  };
-  return result;
-}
 
 var regexps =
 {
   _data: Object.create(null),
   _counter: 0,
 
   create: function(source, matchCase)
   {
     var id = ++this._counter;
     try
     {
-      this._data[id] = new RegExp(getStringData(source), matchCase ? "" : "i");
+      this._data[id] = new RegExp(readString(source), matchCase ? "" : "i");
+      return id;
     }
     catch (e)
     {
-      this._data[id] = String(e);
-    }
-    return id;
-  },
-
-  getErrorLength: function(id)
-  {
-    if (typeof this._data[id] == "string")
-      return this._data[id].length;
-    else
       return -1;
-  },
-
-  getError: function(id, buffer)
-  {
-    if (typeof this._data[id] == "string")
-    {
-      copyString(this._data[id], buffer);
-      delete this._data[id];
     }
   },
 
   delete: function(id)
   {
     delete this._data[id];
   },
 
   test: function(id, str)
   {
-    return this._data[id].test(getStringData(str));
+    return this._data[id].test(readString(str));
   }
 };
 
 var Module =
 {
   preRun: [],
   postRun: [],
   print: console.log.bind(console),
   printErr: console.error.bind(console),
 
@@ skipping 10 matching lines @@
       'total_memory': TOTAL_MEMORY
     };
   }
 };
 var ENVIRONMENT_IS_WEB = false, ENVIRONMENT_IS_NODE = false,
     ENVIRONMENT_IS_WORKER = false, ENVIRONMENT_IS_SHELL = true;
 
 {{BODY}}
 
 Object.assign(exports, Module);