|
@@ -161,14 +161,14 @@ public class expressManager {
|
|
/// <param name="isAnd">如果输入的是多个条件,之间的关系是and还是or,true为and,false为or</param>
|
|
/// <param name="isAnd">如果输入的是多个条件,之间的关系是and还是or,true为and,false为or</param>
|
|
/// <returns>表达式树节点</returns>
|
|
/// <returns>表达式树节点</returns>
|
|
public treeNode Parse(String strExpress, boolean isAnd) throws Exception {
|
|
public treeNode Parse(String strExpress, boolean isAnd) throws Exception {
|
|
- ArrayList<String> tokens = getTokens(strExpress);
|
|
|
|
- ArrayList<String> Tokens = new ArrayList<>();
|
|
|
|
- if (!CollectionUtils.isEmpty(tokens)) {
|
|
|
|
- for (String token : tokens) {
|
|
|
|
- String s = token.replaceAll("^\"*|\"*$", "");
|
|
|
|
- Tokens.add(s);
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ ArrayList<String> Tokens = GetTokens(strExpress);
|
|
|
|
+// ArrayList<String> Tokens = new ArrayList<>();
|
|
|
|
+// if (!CollectionUtils.isEmpty(tokens)) {
|
|
|
|
+// for (String token : tokens) {
|
|
|
|
+// String s = token.replaceAll("^\"*|\"*$", "");
|
|
|
|
+// Tokens.add(s);
|
|
|
|
+// }
|
|
|
|
+// }
|
|
Stack<Symbol> symbolStack = new Stack<Symbol>();
|
|
Stack<Symbol> symbolStack = new Stack<Symbol>();
|
|
Stack<treeNode> valueStack = new Stack<treeNode>();
|
|
Stack<treeNode> valueStack = new Stack<treeNode>();
|
|
for (String strTem : Tokens) {
|
|
for (String strTem : Tokens) {
|