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 createString(str)
-{
-  var length = 0;
-  var buffer = 0;
-  if (str)
-  {
-    length = str.length;
-    buffer = Runtime.stackAlloc(length * 2);
-    for (var i = 0, pointer = (buffer >> 1); i < length; i++, pointer++)
-      HEAP16[pointer] = str.charCodeAt(i);
-  }
-
-  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 convertGetter(call)
-{
-  return function()
-  {
-    return call(this._pointer);
-  };
-}
-
-function convertSetter(call)
-{
-  return function(value)
-  {
-    call(this._pointer, value);
-  }
-}
-
-function convertMethod(call)
-{
-  return function()
-  {
-    var params = Array.slice(arguments);
-    params.unshift(this._pointer);
-    return call.apply(this, params);
-  };
-}
 
 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 -1;
     }
-    return id;
-  },
-
-  getError: function(id)
-  {
-    if (typeof this._data[id] == "string")
-      return createString(this._data[id]);
-    else
-      return 0;
   },
 
   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),
 
-  RegExpFilter_typeMap: {},
-
-  createClass: function(superclass)
+  getMemoryLayout: function()
   {
-    var result = function(pointer)
-    {
-      this._pointer = pointer;
+    return {
+      'static_base':  STATIC_BASE,
+      'static_top':   STATICTOP,
+      'stack_base':   STACK_BASE,
+      'stack_top':    STACKTOP,
+      'stack_max':    STACK_MAX,
+      'dynamic_base': DYNAMIC_BASE,
+      'dynamic_top':  DYNAMICTOP,
+      'total_memory': TOTAL_MEMORY
     };
-    if (superclass)
-      result.prototype = Object.create(superclass.prototype);
-    result.prototype.delete = function()
-    {
-      Module._DeletePointer(this._pointer);
-    };
-    return result;
-  },
-
-  wrapCall: function(call)
-  {
-    return function()
-    {
-      var sp = Module.Runtime.stackSave();
-      try
-      {
-        return call.apply(this, arguments);
-      }
-      catch (e)
-      {
-        throw typeof e == "number" ? new Error(Module.AsciiToString(Module._GetException(e))) : e;
-      }
-      finally
-      {
-        Module.Runtime.stackRestore(sp);
-      }
-    };
-  },
-
-  stringArg: function(argPos, call)
-  {
-    return function()
-    {
-      var params = Array.slice(arguments);
-      params[argPos] = createString(params[argPos]);
-      try
-      {
-        return call.apply(this, params);
-      }
-      finally
-      {
-        Module._DestroyString(params[argPos]);
-      }
-    };
-  },
-
-  stringResult: function(call)
-  {
-    return function()
-    {
-      var params = Array.slice(arguments);
-      try
-      {
-        params.unshift(createString());
-        call.apply(this, params);
-        return getStringData(params[0]);
-      }
-      finally
-      {
-        Module._DestroyString(params[0]);
-      }
-    };
-  },
-
-  defineProperty: function(cls, name, getter, setter)
-  {
-    var descriptor =
-    {
-      enumerable: true,
-      get: Module.wrapCall(convertGetter(getter))
-    };
-    if (setter)
-      descriptor.set = Module.wrapCall(convertSetter(setter));
-    Object.defineProperty(cls.prototype, name, descriptor);
-  },
-
-  defineStringProperty: function(cls, name, getter, setter)
-  {
-    Module.defineProperty(cls, name, Module.stringResult(getter),
-        (setter ? Module.stringArg(1, setter) : null));
-  },
-
-  defineMethod: function(cls, name, method)
-  {
-    cls.prototype[name] = Module.wrapCall(convertMethod(method));
   }
 };
 var ENVIRONMENT_IS_WEB = false, ENVIRONMENT_IS_NODE = false,
     ENVIRONMENT_IS_WORKER = false, ENVIRONMENT_IS_SHELL = true;
 
 {{BODY}}
 
 Object.assign(exports, Module);