From bdb3b9eb5e5947c49fc2cbe714f206dc50a74252 Mon Sep 17 00:00:00 2001
From: sjplimp <sjplimp@f3b2605a-c512-4ea7-a41b-209d697bcdaa>
Date: Fri, 27 May 2011 23:28:19 +0000
Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6232
 f3b2605a-c512-4ea7-a41b-209d697bcdaa

---
 src/variable.cpp | 29 +++++++++++++++++++++++------
 src/variable.h   |  1 +
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/variable.cpp b/src/variable.cpp
index ee2a95bee8..22286ee5d2 100644
--- a/src/variable.cpp
+++ b/src/variable.cpp
@@ -2146,10 +2146,10 @@ int Variable::math_function(char *word, char *contents, Tree **tree,
   char *arg1,*arg2,*arg3;
   char *ptr1,*ptr2;
 
-  ptr1 = strchr(contents,',');
+  ptr1 = find_next_comma(contents);
   if (ptr1) {
     *ptr1 = '\0';
-    ptr2 = strchr(ptr1+1,',');
+    ptr2 = find_next_comma(ptr1+1);
     if (ptr2) *ptr2 = '\0';
   } else ptr2 = NULL;
 
@@ -2448,10 +2448,10 @@ int Variable::group_function(char *word, char *contents, Tree **tree,
   char *arg1,*arg2,*arg3;
   char *ptr1,*ptr2;
 
-  ptr1 = strchr(contents,',');
+  ptr1 = find_next_comma(contents);
   if (ptr1) {
     *ptr1 = '\0';
-    ptr2 = strchr(ptr1+1,',');
+    ptr2 = find_next_comma(ptr1+1);
     if (ptr2) *ptr2 = '\0';
   } else ptr2 = NULL;
 
@@ -2705,10 +2705,10 @@ int Variable::special_function(char *word, char *contents, Tree **tree,
   char *arg1,*arg2,*arg3;
   char *ptr1,*ptr2;
 
-  ptr1 = strchr(contents,',');
+  ptr1 = find_next_comma(contents);
   if (ptr1) {
     *ptr1 = '\0';
-    ptr2 = strchr(ptr1+1,',');
+    ptr2 = find_next_comma(ptr1+1);
     if (ptr2) *ptr2 = '\0';
   } else ptr2 = NULL;
 
@@ -3098,6 +3098,23 @@ int Variable::inumeric(char *str)
   return atoi(str);
 }
 
+/* ----------------------------------------------------------------------
+   find next comma in str
+   skip commas inside one or more nested parenthesis
+   only return ptr to comma at level 0, else NULL if not found
+------------------------------------------------------------------------- */
+
+char *Variable::find_next_comma(char *str)
+{
+  int level = 0;
+  for (char *p = str; *p; ++p) {
+    if ('(' == *p) level++; 
+    else if (')' == *p) level--;
+    else if (',' == *p && !level) return p;
+  }
+  return NULL;
+}
+
 /* ----------------------------------------------------------------------
    debug routine for printing formula tree recursively
 ------------------------------------------------------------------------- */
diff --git a/src/variable.h b/src/variable.h
index 08552dff81..3d2c75e027 100644
--- a/src/variable.h
+++ b/src/variable.h
@@ -83,6 +83,7 @@ class Variable : protected Pointers {
   double constant(char *);
   double numeric(char *);
   int inumeric(char *);
+  char *find_next_comma(char *);
   void print_tree(Tree *, int);
 };