Merge branch 'master' of git.calculate.ru:calculate-lib

pym/cl_template.py

@@ -130,8 +130,9 @@ class _terms(_error, _shareTermsFunction):
                     if k == " and ":
                         flagOR = False
                         if listEqual == [] or False in listEqual:
-                            listEqual = []
-                            break
+#                            listEqual = []
+#                            break
+                            listEqual = [False]
                         else:
                             listEqual = [True]
                     # если or
@@ -144,8 +145,10 @@ class _terms(_error, _shareTermsFunction):
                             listEqual = [True]
                             flagOR = True
             else:
-                if flagOR:
-                    continue
+                #if flagOR:
+                #    continue
+                if flagOR and listEqual and all(listEqual):
+                    break
                 #проверка на допустимость названия переменной
                 flagFunction = False
                 if self._reDenyName.search(vals[0]):