Correct map propagation when no right expression.

cdk · Jun 3, 2016 · f2b70f9 · f2b70f9
1 parent 11c5235
commit f2b70f9
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/tool/smarts/src/main/java/org/openscience/cdk/smiles/smarts/parser/SmartsQueryVisitor.java b/tool/smarts/src/main/java/org/openscience/cdk/smiles/smarts/parser/SmartsQueryVisitor.java
@@ -621,15 +621,14 @@ public Object visit(ASTChirality node, Object data) {
     }
 
     public Object visit(ASTLowAndExpression node, Object data) {
-        Object left = node.jjtGetChild(0).jjtAccept(this, data);
-        if (node.jjtGetNumChildren() == 1) {
-            return left;
+        IAtom expr = (IAtom) node.jjtGetChild(0).jjtAccept(this, data);
+        if (node.jjtGetNumChildren() > 1) {
+            IQueryAtom right = (IQueryAtom) node.jjtGetChild(1).jjtAccept(this, data);
+            expr = LogicalOperatorAtom.and((IQueryAtom) expr, right);
         }
-        IQueryAtom right = (IQueryAtom) node.jjtGetChild(1).jjtAccept(this, data);
-        IAtom res =  LogicalOperatorAtom.and((IQueryAtom) left, right);
         if (node.getMapIdx()>0)
-            res.setProperty(CDKConstants.ATOM_ATOM_MAPPING, node.getMapIdx());
-        return res;
+            expr.setProperty(CDKConstants.ATOM_ATOM_MAPPING, node.getMapIdx());
+        return expr;
     }
 
     public Object visit(ASTOrExpression node, Object data) {