fix parsing of && and ||

IS4Code · IS4Code · commit 0b1673a794e9 · 2024-11-02T11:41:34.000+01:00
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 != '|')
 					{

Original file line number	Diff line number	Diff line change
`@@ -407,7 +407,6 @@ class expression_parser`
`407`	`407`	`}`
`408`	`408`	`case '(':`
`409`	`409`	`{`
`410`		`- auto old = begin;`
`411`	`410`	`++begin;`
`412`	`411`	`auto inner = parse_outer_expression(amx, begin, end, ')');`
`413`	`412`	`++begin;`
`@@ -1116,7 +1115,13 @@ class expression_parser`
`1116`	`1115`	`{`
`1117`	`1116`	`break;`
`1118`	`1117`	`}`
	`1118`	`+ auto old = begin;`
`1119`	`1119`	`++begin;`
	`1120`	`+ if(begin != end && *begin == '&')`
	`1121`	`+ {`
	`1122`	`+ begin = old;`
	`1123`	`+ return result;`
	`1124`	`+ }`
`1120`	`1125`	`auto inner = parse_operand(amx, begin, end, endchar);`
`1121`	`1126`	`if(!inner)`
`1122`	`1127`	`{`
`@@ -1131,7 +1136,13 @@ class expression_parser`
`1131`	`1136`	`{`
`1132`	`1137`	`break;`
`1133`	`1138`	`}`
	`1139`	`+ auto old = begin;`
`1134`	`1140`	`++begin;`
	`1141`	`+ if(begin != end && *begin == '\|')`
	`1142`	`+ {`
	`1143`	`+ begin = old;`
	`1144`	`+ return result;`
	`1145`	`+ }`
`1135`	`1146`	`auto inner = parse_operand(amx, begin, end, endchar);`
`1136`	`1147`	`if(!inner)`
`1137`	`1148`	`{`
`@@ -1196,7 +1207,6 @@ class expression_parser`
`1196`	`1207`	`{`
`1197`	`1208`	`break;`
`1198`	`1209`	`}`
`1199`		`- auto old = begin;`
`1200`	`1210`	`++begin;`
`1201`	`1211`	`if(begin == end \|\| *begin != '&')`
`1202`	`1212`	`{`
`@@ -1213,7 +1223,6 @@ class expression_parser`
`1213`	`1223`	`{`
`1214`	`1224`	`break;`
`1215`	`1225`	`}`
`1216`		`- auto old = begin;`
`1217`	`1226`	`++begin;`
`1218`	`1227`	`if(begin == end \|\| *begin != '\|')`
`1219`	`1228`	`{`