Merge pull request #27 from ettic-team/wip

Fixed bug & code improvement

Author: HoLyVieR

classes/concatenation.js

@@ -1,6 +1,14 @@
 /// class Concatenation
 
 function Concatenation(value1, value2) {
+	if (value1 === null) {
+		throw new Error("value1 can't be null");
+	}
+
+	if (value2 === null) {
+		throw new Error("value1 can't be null");
+	}
+	
 	this.values = [];
 	this.values.push(value1);
 	this.values.push(value2);
@@ -22,4 +30,4 @@ Concatenation.prototype.equals = function (val) {
 	return val.values[0].equals(this.values[0]) && val.values[1].equals(this.values[1]);
 }
 
-module.exports = Concatenation;
+module.exports = Concatenation;

classes/constant.js

@@ -16,4 +16,4 @@ Constant.prototype.equals = function (val) {
 	return this.value === val.value;
 }
 
-module.exports = Constant;
+module.exports = Constant;

classes/function-argument.js

@@ -1,6 +1,18 @@
 /// class FunctionArgument
 
 function FunctionArgument(fnct, variableName, index) {
+	if (!fnct) {
+		throw new Error("Type of fnct must be string or object.");	
+	}
+
+	if (typeof variableName !== "string") {
+		throw new Error("Type of variableName must be string.");
+	}
+
+	if (typeof index !== "number") {
+		throw new Error("Type of index must be number.");
+	}
+	
 	this.name = variableName;
 	this.fnct = fnct;
 	this.index = index;

classes/function-invocation.js

@@ -29,4 +29,4 @@ FunctionInvocation.prototype.equals = function (val) {
 	return good;
 }
 
-module.exports = FunctionInvocation;
+module.exports = FunctionInvocation;

classes/global-function-call.js

@@ -1,6 +1,14 @@
 /// class GlobalFunctionCall
 
 function GlobalFunctionCall(name, args) {
+	if (typeof name !== "string") {
+		throw new Error("Type of name must be string.");
+	}
+
+	if (typeof args !== "object" || typeof args.length !== "number") {
+		throw new Error("Type of args must be array.");
+	}
+	
 	this.name = name;
 	this.arguments = args;
 }
@@ -41,4 +49,4 @@ GlobalFunctionCall.prototype.equals = function (val) {
 	return good;
 }
 
-module.exports = GlobalFunctionCall;
+module.exports = GlobalFunctionCall;

classes/local-function-call.js

@@ -1,6 +1,14 @@
 /// class LocalFunctionCall
 
 function LocalFunctionCall(reference, args) {
+	if (reference == null) {
+		throw new Exception("Reference is null.");
+	}
+
+	if (typeof args !== "object" || typeof args.length !== "number") {
+                throw new Error("Type of args must be array.");
+        }
+
 	this.arguments = args;
 	this.reference = reference;
 }
@@ -19,7 +27,7 @@ LocalFunctionCall.prototype.equals = function (val) {
 		return false;
 	}
 
-	if (!this.reference.equals(val.reference)) {
+	if (this.reference !== val.reference) {
 		return false;
 	} 
 
@@ -38,4 +46,4 @@ LocalFunctionCall.prototype.equals = function (val) {
 	return good;
 }
 
-module.exports = LocalFunctionCall;
+module.exports = LocalFunctionCall;

classes/member-expression.js

@@ -1,6 +1,10 @@
 /// class MemberExpression
 
 function MemberExpression(parts) {
+	if (typeof parts !== "object" || typeof parts.length !== "number") {
+                throw new Error("Type of parts must be array.");
+        }	
+	
 	this.parts = parts;
 }
 
@@ -33,4 +37,4 @@ MemberExpression.prototype.equals = function (val) {
 	return good;
 }
 
-module.exports = MemberExpression;
+module.exports = MemberExpression;

classes/object-function-call.js

@@ -3,6 +3,10 @@
 var MemberExpression   = require("./member-expression");
 
 function ObjectFunctionCall(members, args) {
+	if (typeof args !== "object" || typeof args.length !== "number") {
+                throw new Error("Type of args must be array.");
+        }	
+
 	this.members = new MemberExpression(members);
 	this.arguments = args;
 }

classes/reference.js

@@ -3,6 +3,10 @@
 var CONST_SEPARATOR_ID = "&&&";
 
 function Reference(name) {
+	if (typeof name !== "string") {
+		throw new Error("Type of name must be string.");
+	}
+
 	this.name = name;
 }
 
@@ -18,4 +22,4 @@ Reference.prototype.equals = function (val) {
 	return this.name === val.name;
 }
 
-module.exports = Reference;
+module.exports = Reference;