Revert "Jon remove function constructor"

mcollina · mcollina · commit 55a991e4ebd4 · 2014-08-30T09:36:46.000+02:00
diff --git a/lib/connection.js b/lib/connection.js
@@ -33,29 +33,29 @@ function Connection() {
   this.on("pipe", function(source) {
     that.stream = source;
   });
-
-  var self = this;
-
-  Object.keys(protocol.types).forEach(function(k) {
-    var v = protocol.types[k];
-    self[v] = function shim_generator(opts) {
-      var p = generate[v](opts);
-      if (p instanceof Error) { 
-        self.emit('error', p) 
-      } else { 
-        self.stream.write(p); 
-      } 
-    };
-  });
 };
-
 util.inherits(Connection, Writable);
 
 Connection.prototype.setPacketEncoding = function (encoding) {
   this._packetEncoding = encoding;
   return this;
 };
 
+for (var k in protocol.types) {
+  var v = protocol.types[k];
+
+  var fun = "" +
+  "   var p = this.generate." + v +"(opts); " +
+  "   if (p instanceof Error) { " +
+  "     this.emit('error', p) " +
+  "   } else { " +
+  "     this.stream.write(p); " +
+  "   } "
+  " } ";
+
+  Connection.prototype[v] = new Function("opts", fun);
+}
+
 Connection.prototype._newPacket = function() {
   this.packet = {};
   this.tmp = { pos: 1, mul: 1, length: 0};
@@ -138,64 +138,26 @@ Connection.prototype._readPayload = function() {
 };
 
 (function() {
+  var v = protocol.types[k];
+
+  var fun = "" +
+  "   'use strict'; \n" +
+  "   var buf = this.data.slice(this.index, this.index + this.packet.length); \n" +
+  "   var result = null; \n" +
+  "   this.index += this.packet.length; \n" +
+  "   switch(this.packet.cmd) { \n";
+
+  Object.keys(parse).forEach(function(key) {
+    fun = fun +
+    "   case '" + key + "': \n" +
+    "     result = parse." + key + "(buf, this.packet, this._packetEncoding); \n" +
+    "     break; \n ";
+  });
 
-  Connection.prototype._parsePayload = function() {
-    var buf = this.data.slice(this.index, this.index + this.packet.length);
-    var result = null;
-    this.index += this.packet.length;
-    var cmd = this.packet.cmd;
-    switch(cmd) {
-      case protocol.types[0]:
-        result = parse[cmd](buf, this.packet, this._packetEncoding);
-        break;
-      case protocol.types[1]:
-        result = parse[cmd](buf, this.packet, this._packetEncoding);
-        break;
-      case protocol.types[2]:
-        result = parse[cmd](buf, this.packet, this._packetEncoding);
-        break;
-      case protocol.types[3]:
-        result = parse[cmd](buf, this.packet, this._packetEncoding);
-        break;
-      case protocol.types[4]:
-        result = parse[cmd](buf, this.packet, this._packetEncoding);
-        break;
-      case protocol.types[5]:
-        result = parse[cmd](buf, this.packet, this._packetEncoding);
-        break;
-      case protocol.types[6]:
-        result = parse[cmd](buf, this.packet, this._packetEncoding);
-        break;
-      case protocol.types[7]:
-        result = parse[cmd](buf, this.packet, this._packetEncoding);
-        break;
-      case protocol.types[8]:
-        result = parse[cmd](buf, this.packet, this._packetEncoding);
-        break;
-      case protocol.types[9]:
-        result = parse[cmd](buf, this.packet, this._packetEncoding);
-        break;
-      case protocol.types[10]:
-        result = parse[cmd](buf, this.packet, this._packetEncoding);
-        break;
-      case protocol.types[11]:
-        result = parse[cmd](buf, this.packet, this._packetEncoding);
-        break;
-      case protocol.types[12]:
-        result = parse[cmd](buf, this.packet, this._packetEncoding);
-        break;
-      case protocol.types[13]:
-        result = parse[cmd](buf, this.packet, this._packetEncoding);
-        break;
-      case protocol.types[14]:
-        result = parse[cmd](buf, this.packet, this._packetEncoding);
-        break;
-      case protocol.types[15]:
-        result = parse[cmd](buf, this.packet, this._packetEncoding);
-        break;
-    }
-    return result;
-  }
+  fun += "} \n";
+  fun += "return result; \n";
+
+  Connection.prototype._parsePayload = new Function("parse", fun);
 })();
 
 Connection.prototype._write = function(data, encoding, done) {
