fix parsing of && and ||

IS4Code · Nov 2, 2024 · 0b1673a · 0b1673a
1 parent d43d1c0
commit 0b1673a
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/plugins/src/modules/parser.h b/plugins/src/modules/parser.h
@@ -407,7 +407,6 @@ class expression_parser
 				}
 				case '(':
 				{
-					auto old = begin;
 					++begin;
 					auto inner = parse_outer_expression(amx, begin, end, ')');
 					++begin;
@@ -1116,7 +1115,13 @@ class expression_parser
 					{
 						break;
 					}
+					auto old = begin;
 					++begin;
+					if(begin != end && *begin == '&')
+					{
+						begin = old;
+						return result;
+					}
 					auto inner = parse_operand(amx, begin, end, endchar);
 					if(!inner)
 					{
@@ -1131,7 +1136,13 @@ class expression_parser
 					{
 						break;
 					}
+					auto old = begin;
 					++begin;
+					if(begin != end && *begin == '|')
+					{
+						begin = old;
+						return result;
+					}
 					auto inner = parse_operand(amx, begin, end, endchar);
 					if(!inner)
 					{
@@ -1196,7 +1207,6 @@ class expression_parser
 					{
 						break;
 					}
-					auto old = begin;
 					++begin;
 					if(begin == end || *begin != '&')
 					{
@@ -1213,7 +1223,6 @@ class expression_parser
 					{
 						break;
 					}
-					auto old = begin;
 					++begin;
 					if(begin == end || *begin != '|')
 					{