fixed div, comment, eval in woql

Author: kevinchekovfeeney

lib/woql.js

@@ -53,12 +53,14 @@ WOQL.typecast = function(vara, type, varb){	return new WOQLQuery().typecast(vara
 
 
 /* Mathematical Processing */
-WOQL.eval = function(arith, v){	return new WOQLQuery().eval(arith, v);}
+WOQL.eval = function(arith, v){	return new WOQLQuery().eval(arith, v);}	
 WOQL.plus = function(...args){	return new WOQLQuery().plus(...args);}
 WOQL.minus = function(...args){	return new WOQLQuery().minus(...args); }
 WOQL.times = function(...args){	return new WOQLQuery().times(...args); }
 WOQL.divide = function(...args){ return new WOQLQuery().divide(...args); }
 WOQL.exp = function(a, b){	return new WOQLQuery().exp(a, b); }
+WOQL.div = function(...args){	return new WOQLQuery().div(...args); }
+WOQL.comment = function(arg){	return new WOQLQuery().comment(arg); }
 
 
 //language extensions that can be chained after 'grounded' stuff (clauses with a specific subject) sub, isa, delete_triple, add_triple, delete_quad, add_quad, node
@@ -437,6 +439,19 @@ WOQLQuery.prototype.sub = function(a, b){
 	return this.last("sub", a);
 }
 
+WOQLQuery.prototype.comment = function(val){
+	if(val){
+		val = (val.json ? val.json() : val)
+		this.cursor['comment'] = val;
+	}
+	else {
+		this.cursor['comment'] = null;
+		this.cursor = this.cursor['comment'];
+	}
+	return this;
+}
+
+
 WOQLQuery.prototype.abstract = function(varname){
 	if(varname){
 		return this.quad(varname, "tcs:tag", "tcs:abstract", "db:schema");
@@ -464,31 +479,54 @@ WOQLQuery.prototype.trim = function(a, b){
 }
 
 WOQLQuery.prototype.eval = function(arith, v){
+	arith = arith.json ? arith.json() : arith;
 	this.cursor['eval'] = [arith, v];
 	return this.last('eval', v);
 }
 
 WOQLQuery.prototype.plus = function (...args) {
-	this.cursor.plus = args;
+	this.cursor.plus = []; 
+	for(var i = 0; i < args.length; i++){
+		this.cursor.plus.push(args[i].json ? args[i].json() : args[i]);
+	}
 	return this.last();
 };
 
 WOQLQuery.prototype.minus = function (...args) {
-	this.cursor.minus = args;
+	this.cursor.minus = [];
+	for(var i = 0; i < args.length; i++){
+		this.cursor.minus.push(args[i].json ? args[i].json() : args[i]);
+	}
 	return this.last();
 };
 
 WOQLQuery.prototype.times = function (...args) {
-	this.cursor.times = args;
+	this.cursor.times = [];
+	for(var i = 0; i < args.length; i++){
+		this.cursor.times.push(args[i].json ? args[i].json() : args[i]);
+	}
 	return this.last();
 };
 
 WOQLQuery.prototype.divide = function (...args) {
-	this.cursor.divide = args;
+	this.cursor.divide = [];
+	for(var i = 0; i < args.length; i++){
+		this.cursor.divide.push(args[i].json ? args[i].json() : args[i]);
+	}
+	return this.last();
+};
+
+WOQLQuery.prototype.div = function (...args) {
+	this.cursor.div = [];
+	for(var i = 0; i < args.length; i++){
+		this.cursor.div.push(args[i].json ? args[i].json() : args[i]);
+	}
 	return this.last();
 };
 
 WOQLQuery.prototype.exp = function (a, b) {
+	a = (a.json ? a.json() : a);
+	b = (b.json ? b.json() : b);
 	this.cursor.exp = [a, b];
 	return this.last();
 };
@@ -645,7 +683,7 @@ WOQLQuery.prototype.label = function(l, lang){
 	return this;
 }
 
-WOQLQuery.prototype.comment = function(c, lang){
+WOQLQuery.prototype.description = function(c, lang){
 	if(this.tripleBuilder) this.tripleBuilder.comment(c, lang);
 	return this;
 }
@@ -1243,7 +1281,7 @@ WOQLQuery.prototype.uncleanArguments = function(operator, args, indent, show_con
  */
 WOQLQuery.prototype.uncleanArgument = function(operator, val, index, allArgs){
 	//numeric values go out untouched... 
-	const numeric_operators = ["limit", "start", "eval", "plus", "minus", "times", "divide", "exp"];
+	const numeric_operators = ["limit", "start", "eval", "plus", "minus", "times", "divide", "exp", "div"];
 	if(operator == "isa"){
 		val = (index == 0 ? this.unclean(val, 'subject') : this.unclean(val, 'class'));
 	}