operator is a reverved C++ keyword: operato->operatorr

MathEval/node.cpp

@@ -46,7 +46,6 @@ node_create(char type,...)
      * Initialize constant value.
      */
     node->data.constant = va_arg(ap, double);
-
     break;
     
   case 'v':
@@ -70,8 +69,7 @@ node_create(char type,...)
     /*
      * Initialize operator type and operand.
      */
-	node->data.un_op.operato = (char) va_arg(ap, int);
-
+    node->data.un_op.operatorr = (char) va_arg(ap, int);
     node->data.un_op.child = va_arg(ap, Node *);
     break;
     
@@ -79,8 +77,7 @@ node_create(char type,...)
     /*
      * Initialize operator type and operands.
      */
-	node->data.un_op.operato = (char) va_arg(ap, int);
-
+    node->data.un_op.operatorr = (char) va_arg(ap, int);
     node->data.bin_op.left = va_arg(ap, Node *);
     node->data.bin_op.right = va_arg(ap, Node *);
     break;
@@ -148,10 +145,10 @@ node_copy(Node * node)
     return node_create('f', node->data.function.record, node_copy(node->data.function.child));
     
   case 'u':
-	return node_create('u', node->data.un_op.operato, node_copy(node->data.un_op.child));
+    return node_create('u', node->data.un_op.operatorr, node_copy(node->data.un_op.child));
     
   case 'b':
-	return node_create('b', node->data.bin_op.operato, node_copy(node->data.bin_op.left), node_copy(node->data.bin_op.right));
+    return node_create('b', node->data.bin_op.operatorr, node_copy(node->data.bin_op.left), node_copy(node->data.bin_op.right));
   }
   
   return NULL;
@@ -179,7 +176,8 @@ node_simplify(Node * node)
       
       node_destroy(node);
       return node_create('c', value);
-	} else
+    }
+    else
       return node;
     
   case 'u':
@@ -188,12 +186,13 @@ node_simplify(Node * node)
      * operator and replace operator node with constant node.
      */
     node->data.un_op.child = node_simplify(node->data.un_op.child);
-	if (node->data.un_op.operato == '-' && node->data.un_op.child->type == 'c') {
+    if (node->data.un_op.operatorr == '-' && node->data.un_op.child->type == 'c') {
       double          value = node_evaluate(node);
       
       node_destroy(node);
       return node_create('c', value);
-	} else
+    } 
+    else
       return node;
     
   case 'b':
@@ -216,91 +215,94 @@ node_simplify(Node * node)
     /*
      * Eliminate 0 as neutral addition operand.
      */
-	else if (node->data.bin_op.operato == '+')
+    else if (node->data.bin_op.operatorr == '+')
       if (node->data.bin_op.left->type == 'c' && node->data.bin_op.left->data.constant == 0) {
 	Node *right;
-
 	right = node->data.bin_op.right;
 	node->data.bin_op.right = NULL;
 	node_destroy(node);
 	return right;
-	    } else if (node->data.bin_op.right->type == 'c' && node->data.bin_op.right->data.constant == 0) {
+      } 
+      else if (node->data.bin_op.right->type == 'c' && node->data.bin_op.right->data.constant == 0) {
 	Node *left;
-
 	left = node->data.bin_op.left;
 	node->data.bin_op.left = NULL;
 	node_destroy(node);
 	return left;
-	    } else
+      }
+      else
 	return node;
     /*
      * Eliminate 0 as neutral subtraction right operand.
      */
-	else if (node->data.bin_op.operato == '-')
+    else if (node->data.bin_op.operatorr == '-')
       if (node->data.bin_op.right->type == 'c' && node->data.bin_op.right->data.constant == 0) {
 	Node *left;
-
 	left = node->data.bin_op.left;
 	node->data.bin_op.left = NULL;
 	node_destroy(node);
 	return left;
-	    } else
+      }
+      else
 	return node;
     /*
      * Eliminate 1 as neutral multiplication operand.
      */
-	else if (node->data.bin_op.operato == '*')
+    else if (node->data.bin_op.operatorr == '*')
       if (node->data.bin_op.left->type == 'c' && node->data.bin_op.left->data.constant == 1) {
 	Node *right;
-
 	right = node->data.bin_op.right;
 	node->data.bin_op.right = NULL;
 	node_destroy(node);
 	return right;
-	    } else if (node->data.bin_op.right->type == 'c' && node->data.bin_op.right->data.constant == 1) {
+      } 
+      else if (node->data.bin_op.right->type == 'c' && node->data.bin_op.right->data.constant == 1) {
 	Node *left;
-
 	left = node->data.bin_op.left;
 	node->data.bin_op.left = NULL;
 	node_destroy(node);
 	return left;
-	    } else
+      }
+      else
 	return node;
     /*
      * Eliminate 1 as neutral division right operand.
      */
-	else if (node->data.bin_op.operato == '/')
+    else if (node->data.bin_op.operatorr == '/')
       if (node->data.bin_op.right->type == 'c' && node->data.bin_op.right->data.constant == 1) {
 	Node *left;
-
 	left = node->data.bin_op.left;
 	node->data.bin_op.left = NULL;
 	node_destroy(node);
 	return left;
-	    } else
+      }
+      else
 	return node;
     /*
      * Eliminate 0 and 1 as both left and right exponentiation
      * operands.
      */
-	else if (node->data.bin_op.operato == '^')
+    else if (node->data.bin_op.operatorr == '^')
       if (node->data.bin_op.left->type == 'c' && node->data.bin_op.left->data.constant == 0) {
 	node_destroy(node);
 	return node_create('c', 0.0);
-	    } else if (node->data.bin_op.left->type == 'c' && node->data.bin_op.left->data.constant == 1) {
+      } 
+      else if (node->data.bin_op.left->type == 'c' && node->data.bin_op.left->data.constant == 1) {
 	node_destroy(node);
 	return node_create('c', 1.0);
-	    } else if (node->data.bin_op.right->type == 'c' && node->data.bin_op.right->data.constant == 0) {
+      }
+      else if (node->data.bin_op.right->type == 'c' && node->data.bin_op.right->data.constant == 0) {
 	node_destroy(node);
 	return node_create('c', 1.0);
-	    } else if (node->data.bin_op.right->type == 'c' && node->data.bin_op.right->data.constant == 1) {
+      }
+      else if (node->data.bin_op.right->type == 'c' && node->data.bin_op.right->data.constant == 1) {
 	Node *left;
-
 	left = node->data.bin_op.left;
 	node->data.bin_op.left = NULL;
 	node_destroy(node);
 	return left;
-	    } else
+      }
+      else
 	return node;
     else
       return node;
@@ -336,7 +338,7 @@ node_evaluate(Node * node)
      * Unary operator node is evaluated according to operator
      * type.
      */
-	switch (node->data.un_op.operato) {
+    switch (node->data.un_op.operatorr) {
     case '-':
       return -node_evaluate(node->data.un_op.child);
     }
@@ -346,7 +348,7 @@ node_evaluate(Node * node)
      * Binary operator node is evaluated according to operator
      * type.
      */
-	switch (node->data.un_op.operato) {
+    switch (node->data.un_op.operatorr) {
     case '+':
       return node_evaluate(node->data.bin_op.left) + node_evaluate(node->data.bin_op.right);
       
@@ -494,7 +496,7 @@ node_derivative(Node * node, char *name, SymbolTable * symbol_table)
       return node_create('b', '/', node_create('b', '*', node_derivative(node->data.function.child, name, symbol_table), node_copy(node->data.function.child)), node_create('f', symbol_table_lookup(symbol_table, "Sqrt"), node_create('b', '^', node_copy(node->data.function.child), node_create('c', 2.0))));
     
   case 'u':
-	switch (node->data.un_op.operato) {
+    switch (node->data.un_op.operatorr) {
     case '-':
       /*
        * Apply (-f)'=-f' derivative rule.
@@ -503,7 +505,7 @@ node_derivative(Node * node, char *name, SymbolTable * symbol_table)
     }
     
   case 'b':
-	switch (node->data.bin_op.operato) {
+    switch (node->data.bin_op.operatorr) {
     case '+':
       /*
        * Apply (f+g)'=f'+g' derivative rule.
@@ -542,7 +544,6 @@ node_derivative(Node * node, char *name, SymbolTable * symbol_table)
        */
       else {
 	Node *log_node, *derivative;
-
 	log_node = node_create('b', '*', node_copy(node->data.bin_op.right), node_create('f', symbol_table_lookup(symbol_table, "Log"), node_copy(node->data.bin_op.left)));
 	derivative = node_create('b', '*', node_copy(node), node_derivative(log_node, name, symbol_table));
 	node_destroy(log_node);
@@ -628,7 +629,7 @@ node_write(Node * node, char *string)
   case 'u':
     sprintf(string, "%c", '(');
     string += strlen(string);
-	sprintf(string, "%c", node->data.un_op.operato);
+    sprintf(string, "%c", node->data.un_op.operatorr);
     string += strlen(string);
     node_write(node->data.un_op.child, string);
     string += strlen(string);
@@ -640,7 +641,7 @@ node_write(Node * node, char *string)
     string += strlen(string);
     node_write(node->data.bin_op.left, string);
     string += strlen(string);
-	sprintf(string, "%c", node->data.bin_op.operato);
+    sprintf(string, "%c", node->data.bin_op.operatorr);
     string += strlen(string);
     node_write(node->data.bin_op.right, string);
     string += strlen(string);

MathEval/node.h

@@ -41,13 +41,13 @@ typedef struct _Node {
     }               function;	/* Structure representing
 				 * function.  */
     struct {
-      char            operato;	/* Operator type ('-'
+      char            operatorr;/* Operator type ('-'
 				 * for unary minus).  */
       struct _Node   *child;	/* Operand node.  */
     }               un_op;	/* Structure representing unary
 				 * operator.  */
     struct {
-      char            operato;	/* Operator type ('+'
+      char            operatorr;/* Operator type ('+'
 				 * for adition, '-' for
 				 * subtraction, '*' for
 				 * multiplication, '/'

TODO

-$Id: TODO,v 1.44 2004-05-12 03:22:13 geuzaine Exp $
+$Id: TODO,v 1.45 2004-05-13 05:34:06 geuzaine Exp $
+
+add ternary operator and <,>,<=,>=,== tests in MathEval
+
+********************************************************************
 
 generalize Plugin(Triangulate) to vector and tensor points