[Getfem-commits] [getfem-commits] branch master updated: Bug fix on macro expansion

[Yves Renard]

This is an automated email from the git hooks/post-receive script.

renard pushed a commit to branch master
in repository getfem.

The following commit(s) were added to refs/heads/master by this push:
     new 6f475bc  Bug fix on macro expansion
6f475bc is described below

commit 6f475bcb7519bdbe57359291b06ba46f271948cd
Author: Yves Renard <address@hidden>
AuthorDate: Sun Mar 1 18:28:36 2020 +0100

    Bug fix on macro expansion
---
 src/getfem_generic_assembly_tree.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/getfem_generic_assembly_tree.cc 
b/src/getfem_generic_assembly_tree.cc
index 117c346..3d77d16 100644
--- a/src/getfem_generic_assembly_tree.cc
+++ b/src/getfem_generic_assembly_tree.cc
@@ -1356,7 +1356,7 @@ namespace getfem {
       GMM_ASSERT1(pnode->nbc1+1 < children.size(), "Internal error");
       pga_tree_node pchild = children[pnode->nbc1+1];
 
-      if (po || pt) {
+      if (po || pt || pnode->op_type != GA_NAME) {
         if (!(pchild->children.empty()) || pchild->node_type != GA_NODE_NAME)
           ga_throw_error(pchild->expr, pchild->pos, "Error in macro "
                          "expansion. Only variable name are allowed for macro "
@@ -1380,7 +1380,7 @@ namespace getfem {
         if (po == 1) pnode->name = "Grad_" + pnode->name;
         if (po == 2) pnode->name = "Hess_" + pnode->name;
         if (po == 3) pnode->name = "Div_" + pnode->name;
-      } else {   
+      } else {
         pga_tree_node pnode_old = pnode;
         pnode = nullptr;
         tree.copy_node(pchild, pnode_old->parent, pnode);