29.04.2014 - Version 0.4.0_prealpha. PICodeParser, namespace PICodeInfo, new tool "pip_cmg" in dir "code_model_generator". New feature in PIIODevice - "createFromFullPath", all parameters of all I/O devices now works with PIObjects`s properties.

pievaluator.h

@@ -4,7 +4,7 @@
 /*
     PIP - Platform Independent Primitives
     Evaluator designed for stream computing
-    Copyright (C) 2013  Ivan Pelipenko peri4ko@gmail.com
+    Copyright (C) 2014  Ivan Pelipenko peri4ko@gmail.com
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -26,6 +26,8 @@
 #include "pistring.h"
 #include "pimath.h"
 
+typedef complexd (*FuncFunc)(void * , int, complexd * );
+
 namespace PIEvaluatorTypes {
 	static const int operationCount = 14;
 	
@@ -42,9 +44,10 @@ namespace PIEvaluatorTypes {
 						bfIm, bfRe, bfArg, bfLen, bfConj,
 						bfRad, bfDeg, bfJ0, bfJ1, bfJN,
 						bfY0, bfY1, bfYN, bfMin, bfMax,
-						bfClamp, bfStep, bfMix
+						bfClamp, bfStep, bfMix, bfDefined,
+						bfCustom = 0xFFFF
 	};
-					
+	
 	struct Instruction {
 		Instruction() {;}
 		Instruction(Operation oper, PIVector<int> opers, int out_ind, int func = -1) {
@@ -63,10 +66,12 @@ namespace PIEvaluatorTypes {
 		int var_num;
 	};
 	struct Function {
-		Function() {arguments = 0; type = bfUnknown;}
-		Function(const PIString & name, int args, BaseFunctions ftype) {identifier = name; arguments = args; type = ftype;}
+		Function() {arguments = 0; type = bfUnknown; handler = 0;}
+		Function(const PIString & name, int args, BaseFunctions ftype) {identifier = name; arguments = args; type = ftype; handler = 0;}
+		Function(const PIString & name, int args, FuncFunc h) {identifier = name; arguments = args; type = bfCustom; handler = h;}
 		PIString identifier;
 		BaseFunctions type;
+		FuncFunc handler;
 		int arguments;
 	};
 	struct Variable {
@@ -83,6 +88,7 @@ namespace PIEvaluatorTypes {
 	⋀	&
 	⋁	|
 */
+
 class PIP_EXPORT PIEvaluatorContent
 {
 	friend class PIEvaluator;
@@ -92,6 +98,7 @@ public:
 	
 	void addFunction(const PIString & name, int args = 1) {functions.push_back(PIEvaluatorTypes::Function(name, args, getBaseFunction(name)));}
 	void addVariable(const PIString & name, const complexd & val = 0.) {variables.push_back(PIEvaluatorTypes::Variable(name, val)); sortVariables();}
+	void addCustomFunction(const PIString & name, int args_count, FuncFunc func) {functions << PIEvaluatorTypes::Function(name, args_count, func);}
 	int functionsCount() const {return functions.size();}
 	int variablesCount() const {return variables.size();}
 	int customVariablesCount() const {return variables.size() - cv_count;}
@@ -119,16 +126,24 @@ private:
 	
 };
 
+
 class PIP_EXPORT PIEvaluator
 {
 public:
 	
 	//! Constructs an empty evaluator
-	PIEvaluator() {correct = false;}
+	PIEvaluator() {correct = false; data_ = 0;}
 	
 	~PIEvaluator() {;}
 	
 	
+	//! Returns custom data
+	void * data() {return data_;}
+	
+	//! Set custom data to "_data"
+	void setData(void * _data) {data_ = _data;}
+
+	
 	//! Check mathematical expression and parse it to list of instructions
 	bool check(const PIString & string);
 	
@@ -142,7 +157,10 @@ public:
 	void setVariable(int index, complexd value = 0.) {if (index >= 0 && index < content.variablesCount()) content.setVariableValue(index, value);}
 
 	void setCustomVariableValue(int index, complexd value = 0.) {content.variables[index + content.cv_count].value = value;}
-
+/*
+	//! Add function "name" with arguments count "args_count" and handler "func". Three arguments will be passed to handler: \a data(), "args_count" and array of input values.
+	void addFunction(const PIString & name, int args_count, FuncFunc func) {content.addCustomFunction(name, args_count, func);}
+*/
 	//! Evaluate last successfully checked with function \a check() expression and returns result
 	complexd evaluate();
 
@@ -200,6 +218,7 @@ private:
 	PIString currentString, lastError;
 	complexd out;
 	bool correct;
+	void * data_;
 };
 
 inline bool operator ==(PIEvaluatorTypes::Element e1, PIEvaluatorTypes::Element e2) {return (e1.type == e2.type && e1.num == e2.num);}