Skip to content

Commit

Permalink
update v0.0.18 add case
Browse files Browse the repository at this point in the history
  • Loading branch information
@wycst
wycst committed Nov 16, 2024
1 parent a04dcd2 commit ea5c45b
Show file tree
Hide file tree
Showing 23 changed files with 1,006 additions and 230 deletions.
39 changes: 19 additions & 20 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<dependency>
<groupId>io.github.wycst</groupId>
<artifactId>wast</artifactId>
<version>0.0.17</version>
<version>0.0.18</version>
</dependency>
```

Expand All @@ -45,7 +45,7 @@
> 2 支持java中所有的操作运算符（加减乘除余，位运算，逻辑运算，字符串+）；<br>
> 3 支持**指数运算(java本身不支持)； <br>
> 4 支持函数以及自定义函数实现,函数可以任意嵌套； <br>
> 5 科学记数法支持，16进制，8进制等解析，支持大数运算（大数统一转为double类型）；<br>
> 5 科学记数法支持，16进制，8进制等解析，支持大数运算(BigDecimal)；<br>
> 6 支持简单的三目运算；<br>
> 7 代码轻量，使用安全，没有漏洞风险；<br>
> 8 支持超长文本表达式执行；<br>
Expand Down Expand Up @@ -162,12 +162,11 @@ System.out.println(map);

```
final JSONReader reader = JSONReader.from(new File(f));
reader.read(new JSONReader.ReaderCallback(JSONReader.ReadParseMode.ExternalImpl) {
reader.read(new JSONReaderHook() {
@Override
public void parseValue(String key, Object value, Object host, int elementIndex, String path) throws Exception {
super.parseValue(key, value, host, elementIndex, path);
if(path.equals("/features/[100000]/properties/STREET")) {
// 终止读取;
public void parseValue(String key, Object value, Object host, int elementIndex, String path, int type) throws Exception {
if(path.equals("/features/1/properties/STREET")) {
System.out.println(value);
abort();
}
}
Expand All @@ -179,11 +178,11 @@ System.out.println(map);
> 1、支持对大文本json的懒加载解析功能，即访问时解析，当需要读取一个大文本json中一个或多个属性值时非常有用。<br>
> 2、支持按需解析；<br>
> 3、支持上下文查找；<br>
> 4、支持在大文本json中提取部分内容作为解析上下文结果,使用JSONNode.from(source, path, lazy?) <br>
> 4、支持在大文本json中提取部分内容作为解析上下文结果,使用JSONNode.from(source, path) <br>
> 5、支持对节点的属性修改，删除等，节点的JSON反向序列化；<br>
> 6、支持直接提取功能(v0.0.2+支持)，参考JSONPath；
使用'/'作为路径的分隔符，数组下标使用[n]访问支持[*], [n+], [n-],[n]等复合下标访问，例如/store/book/[*]/author(注意不是/store/book[*]/author, 中括号[]可以省略)
使用'/'作为路径的分隔符，数组下标使用n访问支持*, n+, n-,n等复合下标访问，例如/store/book/*/author

```
String json = "{\"name\": \"li lei\", \”properties\": {\"age\": 23}}";
Expand Down Expand Up @@ -259,18 +258,18 @@ System.out.println(map);
}`
;
// 直接提取所有的author使用[*]
List authors = JSONNode.extract(json2, "/store/book/[*]/author");
// 直接提取所有的author使用*
List authors = JSONNode.extract(json2, "/store/book/*/author");
// 提取第2本书的作者author使用指定的下标[n]
String author = JSONNode.extract(json2, "/store/book/[1]/author").get(1);
（或者 JSONNode.from(json2, "/store/book/[1]/author").getStringValue();性能大体一致)
// 提取第2本书的作者author使用指定的下标n
String author = JSONNode.extract(json2, "/store/book/1/author").get(1);
（或者 JSONNode.from(json2, "/store/book/1/author").getStringValue();性能大体一致)
// 提取前2本书的作者使用下标[n-]（包含n）
List authors = JSONNode.extract(json2, "/store/book/[1-]/author").get(1);
// 提取前2本书的作者使用下标n-（包含n）
List authors = JSONNode.extract(json2, "/store/book/1-/author").get(1);
// 提取从第2本书开始后面所有的作者使用下标[n+]（包含n）
List authors = JSONNode.extract(json2, "/store/book/[1+]/author");
// 提取从第2本书开始后面所有的作者使用下标n+（包含n）
List authors = JSONNode.extract(json2, "/store/book/1+/author");
```
Expand Down Expand Up @@ -421,7 +420,7 @@ compileEnvironment.setVariableType(int.class, "arg.a", "arg.b", "b", "c");
// 输出编译的源代码
System.out.println(CompilerExpression.generateJavaCode(el, compileEnvironment));
CompilerExpression compiler = CompilerExpression.compile(el, compileEnvironment, CompilerExpression.Coder.Native);
CompilerExpression compiler = CompilerExpression.compile(el, compileEnvironment);
Map aa = new HashMap();
Expand All @@ -440,7 +439,7 @@ System.out.println("==== eval result " + compiler.evaluate(var));

### 4 函数和自定义函数使用

内置函数： max/min/sum/avg/abs/sqrt/lower/upper/size/ifNull <br>
内置函数： max/min/sum/avg/abs/sqrt/lower/upper/size/ifNull/toArray <br>
源码见： BuiltInFunction <br>
自定义函数可以是全局函数不需要类名作为命名空间，使用@max(@可省略)直接调用，全局函数可以通过两种方式注册：<br>

Expand Down
20 changes: 14 additions & 6 deletions src/main/java/io/github/wycst/wast/common/expression/ElOperator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
/**
* <p> 按java语法的操作符号优先级仅供参考，值越小优先级越高
* <p> 支持科学计数法e+n，16进制0x，8进制0n
* <p> 支持∈和∉
*
* <p>
* 符号 优先级
Expand All @@ -16,7 +17,6 @@
* && || 600
* ? : 700( ? 701, : 700) 三目运算符优先级放最低,其中:优先级高于?
* <p>
* 操作关键字： in , out , matches
*
* @Date 2024/8/24 22:35
* @Created by wangyc
Expand Down Expand Up @@ -45,17 +45,25 @@ public enum ElOperator {
NE("!=", 500, 56),
LOGICAL_AND("&&", 600, 61),
LOGICAL_OR("||", 600, 62),
IN("in", 600, 63),
OUT("out", 600, 64),
IN("∈", 600, 63),
OUT("∉", 600, 64),
COLON(":", 700, 70),
QUESTION("?", 701, 71);
QUESTION("?", 701, 71),

// todo 拓展类型
EXPAND("\uffff", 800, 80);

static final ElOperator[] INDEXS_OPERATORS = new ElOperator[128];

static {
ElOperator[] values = ElOperator.values();
for (ElOperator value : values) {
if(value.symbol.length() == 1) {
INDEXS_OPERATORS[value.symbol.charAt(0)] = value;
String symbol = value.symbol;
if (symbol.length() == 1) {
char c = symbol.charAt(0);
if (c < INDEXS_OPERATORS.length) {
INDEXS_OPERATORS[c] = value;
}
}
}
INDEXS_OPERATORS['='] = EQ;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/io/github/wycst/wast/common/expression/ExprEvaluator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -431,8 +431,8 @@ Object evaluateTernary(EvaluatorContext context, EvaluateEnvironment evaluateEnv
if (this.constant) {
return this.result;
}
Object result = null;
if (bool == null || bool == Boolean.FALSE) {
Object result;
if (bool == null || !bool) {
this.constant = isStatic && right.constant;
result = right.evaluate(context, evaluateEnvironment);
} else {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/github/wycst/wast/common/expression/ExprFunction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ public interface ExprFunction<I,O> {
* @param params
* @return
*/
public O call(I...params);
public O call(I... params);

}
10 changes: 8 additions & 2 deletions src/main/java/io/github/wycst/wast/common/expression/ExprParser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ public final List<String> getRootVariables() {
List<String> variables = new ArrayList<String>();
Set<Map.Entry<String, ElVariableInvoker>> entrySet = invokes.entrySet();
for (Map.Entry<String, ElVariableInvoker> entry : entrySet) {
if(entry.getValue().parent == null) {
if (entry.getValue().parent == null) {
variables.add(entry.getKey());
}
}
Expand Down Expand Up @@ -1611,7 +1611,13 @@ private void resetToken() {
*/
private ElOperator getOperator(char symbol) {
if (symbol >= ElOperator.INDEXS_OPERATORS.length) {
return null;
if (symbol == '∈') {
return this.operator = ElOperator.IN;
} else if (symbol == '∉') {
return this.operator = ElOperator.OUT;
} else {
return null;
}
}
ElOperator elOperator = ElOperator.INDEXS_OPERATORS[symbol];
if (elOperator != null) {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/io/github/wycst/wast/common/expression/compile/CompilerCodeUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -470,9 +470,9 @@ private static String generateNativeJavaSourceCode(String source, String express
assignmentArrayVariables.append("\t\t").append(typeNameInvoker.type.getCanonicalName()).append(" ").append(defineJavaIdentifier).append(" = ");
if(type.isPrimitive() && EnvUtils.JDK_7_BELOW) {
String primitiveMethodValue = PRIMITIVE_VALUE_METHODS.get(type).getValue();
assignmentArrayVariables.append(primitiveMethodValue).append("(").append("parameters[").append(index).append("]);\r\n");
assignmentArrayVariables.append(primitiveMethodValue).append("(").append("parameters[").append(invoker.getTailIndex()).append("]);\r\n");
} else {
assignmentArrayVariables.append("(").append(type.getCanonicalName()).append(") parameters[").append(index).append("];\r\n");
assignmentArrayVariables.append("(").append(type.getCanonicalName()).append(") parameters[").append(invoker.getTailIndex()).append("];\r\n");
}

if (defineIndexs.add(index)) {
Expand Down
10 changes: 10 additions & 0 deletions src/main/java/io/github/wycst/wast/common/expression/functions/BuiltInFunction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,16 @@
*/
public final class BuiltInFunction {

/**
* 支持将变量/常量参数转化为数组
*
* @param params
* @return
*/
public static Object[] toArray(Object... params) {
return params;
}

/**
* // 兼容1.5,1,6不使用流
* 最大值number && string && Comparable
Expand Down
Loading

0 comments on commit ea5c45b

Please sign in to comment.