ref #3359: Updates to pass tests

lib/pipeline/matcher/AllElemMatchOp.js

@@ -1,6 +1,6 @@
 "use strict";
 
-MatchExpression = require('MatchExpression');
+MatchExpression = require('./MatchExpression');
 
 
 // Autogenerated by cport.py on 2013-09-17 14:37

lib/pipeline/matcher/AndMatchExpression.js

@@ -1,11 +1,12 @@
 "use strict";
 
-ListOfMatchExpressions = require('ListOfMatchExpressions');
+ListOfMatchExpression = require('./ListOfMatchExpression');
 
 // Autogenerated by cport.py on 2013-09-17 14:37
 var AndMatchExpression = module.exports = function (){
+	this._expressions = [];
 	this._matchType = 'AND';
-}, klass = AndMatchExpression, base =  ListOfMatchExpressions, proto = klass.prototype = Object.create(base.prototype, {constructor:{value:klass}});
+}, klass = AndMatchExpression, base =  ListOfMatchExpression, proto = klass.prototype = Object.create(base.prototype, {constructor:{value:klass}});
 
 
 

lib/pipeline/matcher/ArrayMatchingMatchExpression.js

@@ -1,9 +1,11 @@
 "use strict";
 
+var MatchExpression = require('./MatchExpression');
+
 // Autogenerated by cport.py on 2013-09-17 14:37
-var ArrayMatchingMatchExpression = module.exports = function (matchType){
+var ArrayMatchingMatchExpression = module.exports = function ArrayMatchingMatchExpression(matchType){
 	this._matchType = matchType;
-}, klass = ArrayMatchingMatchExpression, base =  Object  , proto = klass.prototype = Object.create(base.prototype, {constructor:{value:klass}});
+}, klass = ArrayMatchingMatchExpression, base =  MatchExpression, proto = klass.prototype = Object.create(base.prototype, {constructor:{value:klass}});
 
 // File: expression_array.h lines: 55-55
 proto._elementPath = undefined;

lib/pipeline/matcher/AtomicMatchExpression.js

@@ -1,6 +1,6 @@
 "use strict"
 
-MatchExpression = require('MatchExpression');
+MatchExpression = require('./MatchExpression');
 
 // Autogenerated by cport.py on 2013-09-17 14:37
 var AtomicMatchExpression = module.exports = function AtomicMatchExpression(){

lib/pipeline/matcher/ElemMatchObjectMatchExpression.js

@@ -2,7 +2,7 @@
 var ArrayMatchingMatchExpression = require('./ArrayMatchingMatchExpression.js');
 
 // Autogenerated by cport.py on 2013-09-17 14:37
-var ElemMatchObjectMatchExpression = module.exports = function (ELEM_MATCH_OBJECT){
+var ElemMatchObjectMatchExpression = module.exports = function ElemMatchObjectMatchExpression(ELEM_MATCH_OBJECT){
 	base.call(this);
 }, klass = ElemMatchObjectMatchExpression, base = ArrayMatchingMatchExpression, proto = klass.prototype = Object.create(base.prototype, {constructor:{value:klass}});
 

lib/pipeline/matcher/ElemMatchValueMatchExpression.js

@@ -1,7 +1,7 @@
 "use strict";
 
 // Autogenerated by cport.py on 2013-09-17 14:37
-var ElemMatchValueMatchExpression = module.exports = function (){
+var ElemMatchValueMatchExpression = module.exports = function ElemMatchValueMatchExpression(){
 	this._matchType = 'ELEM_MATCH_VALUE';
 }, klass = ElemMatchValueMatchExpression, base =  Object  , proto = klass.prototype = Object.create(base.prototype, {constructor:{value:klass}});
 

lib/pipeline/matcher/EqualityMatchExpression.js

@@ -1,6 +1,6 @@
 "use strict";
 
-ComparisonMatchExpression = require('ComparisonMatchExpression');
+ComparisonMatchExpression = require('./ComparisonMatchExpression');
 
 // Autogenerated by cport.py on 2013-09-17 14:37
 var EqualityMatchExpression = module.exports = function EqualityMatchExpression(){

lib/pipeline/matcher/GTEMatchExpression.js

@@ -1,9 +1,9 @@
 "use strict";
 
-var ComparisonMatchExpression = require('ComparisonMatchExpression');
+var ComparisonMatchExpression = require('./ComparisonMatchExpression');
 
 // Autogenerated by cport.py on 2013-09-17 14:37
-var GTEMatchExpression = module.exports = function (){
+var GTEMatchExpression = module.exports = function GTEMatchExpression(){
 	this._matchType = 'GTE';
 }, klass = GTEMatchExpression, base =  ComparisonMatchExpression, proto = klass.prototype = Object.create(base.prototype, {constructor:{value:klass}});
 

lib/pipeline/matcher/GTMatchExpression.js

@@ -1,6 +1,6 @@
 "use strict";
 
-var ComparisonMatchExpression = require('ComparisonMatchExpression');
+var ComparisonMatchExpression = require('./ComparisonMatchExpression');
 
 // Autogenerated by cport.py on 2013-09-17 14:37
 var GTMatchExpression = module.exports = function GTMatchExpression(){

lib/pipeline/matcher/IndexKeyMatchableDocument.js

@@ -1,7 +1,7 @@
 "use strict";
 
 // Autogenerated by cport.py on 2013-09-17 14:37
-var IndexKeyMatchableDocument = module.exports = function (pattern, doc){
+var IndexKeyMatchableDocument = module.exports = function IndexKeyMatchableDocument(pattern, doc){
 	this._pattern = pattern;
 	this._doc = doc;
 }, klass = IndexKeyMatchableDocument, base =  Object  , proto = klass.prototype = Object.create(base.prototype, {constructor:{value:klass}});

lib/pipeline/matcher/LTEMatchExpression.js

@@ -1,6 +1,6 @@
 "use strict";
 
-var ComparisonMatchExpression = require('ComparisonMatchExpression');
+var ComparisonMatchExpression = require('./ComparisonMatchExpression');
 
 // Autogenerated by cport.py on 2013-09-17 14:37
 var LTEMatchExpression = module.exports = function LTEMatchExpression(){

lib/pipeline/matcher/LTMatchExpression.js

@@ -1,6 +1,6 @@
 "use strict";
 
-var ComparisonMatchExpression = require('ComparisonMatchExpression');
+var ComparisonMatchExpression = require('./ComparisonMatchExpression');
 
 // Autogenerated by cport.py on 2013-09-17 14:37
 var LTMatchExpression = module.exports = function LTMatchExpression(){

lib/pipeline/matcher/ListOfMatchExpression.js

@@ -1,10 +1,12 @@
 "use strict";
 
+var MatchExpression = require('./MatchExpression');
+
 // Autogenerated by cport.py on 2013-09-17 14:37
-var ListOfMatchExpression = module.exports = function (matchType){
+var ListOfMatchExpression = module.exports = function ListOfMatchExpression(matchType){
 	this._expressions = [];
 	this._matchType = matchType;
-}, klass = ListOfMatchExpression, base =  Object  , proto = klass.prototype = Object.create(base.prototype, {constructor:{value:klass}});
+}, klass = ListOfMatchExpression, base =  MatchExpression, proto = klass.prototype = Object.create(base.prototype, {constructor:{value:klass}});
 
 // File: expression_tree.h lines: 56-56
 proto._expressions = undefined;

lib/pipeline/matcher/NotMatchExpression.js

@@ -62,7 +62,7 @@ proto.getChild = function getChild( i ) { //  size_t i
  */
 proto.init = function init( exp ) { //  MatchExpression* exp 
 // File: expression_tree.h lines: 123-125
-	this._exp.reset( exp );
+	this._exp = exp;
 	return {'code':'OK'};
 };
 

lib/pipeline/matcher/OrMatchExpression.js

@@ -1,9 +1,10 @@
 "use strict";
 
-ListOfMatchExpression = require('ListOfMatchExpression');
+var ListOfMatchExpression = require('./ListOfMatchExpression');
 
 // Autogenerated by cport.py on 2013-09-17 14:37
 var OrMatchExpression = module.exports = function OrMatchExpression (){
+	this._expressions = [];
 	this._matchType = 'OR';
 }, klass = OrMatchExpression, base = ListOfMatchExpression, proto = klass.prototype = Object.create(base.prototype, {constructor:{value:klass}});
 

lib/pipeline/matcher/TypeMatchExpression.js

@@ -6,7 +6,7 @@ var ElementPath = require('./ElementPath');
 // Autogenerated by cport.py on 2013-09-17 14:37
 var TypeMatchExpression = module.exports = function TypeMatchExpression(){
 	this._matchType = 'TYPE_OPERATOR';
-}, klass = TypeMatchExpression, base =  Object  , proto = klass.prototype = Object.create(base.prototype, {constructor:{value:klass}});
+}, klass = TypeMatchExpression, base =  MatchExpression, proto = klass.prototype = Object.create(base.prototype, {constructor:{value:klass}});
 
 
 // File: expression_leaf.h lines: 338-338