Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 21 additions & 6 deletions ast/Serializer.go
Original file line number Diff line number Diff line change
Expand Up @@ -179,22 +179,37 @@ func (cat *Catalog) BuildKnowledgeBase() (*KnowledgeBase, error) {
switch amet.ValueType {
case TypeString:
length := make([]byte, 8)
buffer.Read(length)
_, err := buffer.Read(length)
if err != nil {
return nil, err
}
dLen := binary.LittleEndian.Uint64(length)
byteArr := make([]byte, dLen)
buffer.Read(byteArr)
_, err = buffer.Read(byteArr)
if err != nil {
return nil, err
}
newConst.Value = reflect.ValueOf(string(byteArr))
case TypeBoolean:
arr := make([]byte, 1)
buffer.Read(arr)
_, err := buffer.Read(arr)
if err != nil {
return nil, err
}
newConst.Value = reflect.ValueOf(arr[0] == 1)
case TypeInteger:
arr := make([]byte, 8)
buffer.Read(arr)
_, err := buffer.Read(arr)
if err != nil {
return nil, err
}
newConst.Value = reflect.ValueOf(int64(binary.LittleEndian.Uint64(arr)))
case TypeFloat:
arr := make([]byte, 8)
buffer.Read(arr)
_, err := buffer.Read(arr)
if err != nil {
return nil, err
}
bits := binary.LittleEndian.Uint64(arr)
float := math.Float64frombits(bits)
newConst.Value = reflect.ValueOf(float)
Expand Down Expand Up @@ -280,7 +295,7 @@ func (cat *Catalog) BuildKnowledgeBase() (*KnowledgeBase, error) {
}
importTable[amet.AstID] = n
default:
return nil, fmt.Errorf("unrecognized meta type")
return nil, fmt.Errorf("unrecognized meta type %d", meta.GetASTType())
}
}

Expand Down
4 changes: 2 additions & 2 deletions builder/RuleBuilder.go
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,8 @@ func (builder *RuleBuilder) BuildRuleFromResource(name, version string, resource

if errReporter.HasError() {
BuilderLog.Errorf("GRL syntax error. got %s", errReporter.Error())
for i, errr := range errReporter.Errors {
BuilderLog.Errorf("%d : %s", i, errr.Error())
for i, err := range errReporter.Errors {
BuilderLog.Errorf("%d : %s", i, err.Error())
}

return errReporter
Expand Down
2 changes: 1 addition & 1 deletion docs/cn/GRL_JSON_cn.md
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ resource := pkg.NewJSONResourceFromResource(underlying)
通过`ParseJSONRuleset`函数调用,可以解析包含JSON规则的字节数组并转换成GRL语法的规则集合。

```go
jsonData, err := ioutil.ReadFile("rules.json")
jsonData, err := io.ReadFile("rules.json")
if err != nil {
panic(err)
}
Expand Down
2 changes: 1 addition & 1 deletion docs/de/GRL_JSON_de.md
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ resource := pkg.NewJSONResourceFromResource(underlying)
It is also possible to parse a byte array containing JSON rules directly into a GRL syntax ruleset by calling the `ParseJSONRuleset` function.

```go
jsonData, err := ioutil.ReadFile("rules.json")
jsonData, err := io.ReadFile("rules.json")
if err != nil {
panic(err)
}
Expand Down
2 changes: 1 addition & 1 deletion docs/en/GRL_JSON_en.md
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ resource := pkg.NewJSONResourceFromResource(underlying)
It is also possible to parse a byte array containing JSON rules directly into a GRL syntax ruleset by calling the `ParseJSONRuleset` function.

```go
jsonData, err := ioutil.ReadFile("rules.json")
jsonData, err := io.ReadFile("rules.json")
if err != nil {
panic(err)
}
Expand Down
2 changes: 1 addition & 1 deletion docs/id/GRL_JSON_id.md
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ resource := pkg.NewJSONResourceFromResource(underlying)
It is also possible to parse a byte array containing JSON rules directly into a GRL syntax ruleset by calling the `ParseJSONRuleset` function.

```go
jsonData, err := ioutil.ReadFile("rules.json")
jsonData, err := io.ReadFile("rules.json")
if err != nil {
panic(err)
}
Expand Down
2 changes: 1 addition & 1 deletion docs/pl/GRL_JSON_pl.md
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ resource := pkg.NewJSONResourceFromResource(underlying)
Możliwe jest również parsowanie tablicy bajtów zawierającej reguły JSON bezpośrednio do zbioru reguł składni GRL przez wywołanie funkcji `ParseJSONRuleset`.

```go
jsonData, err := ioutil.ReadFile("rules.json")
jsonData, err := io.ReadFile("rules.json")
if err != nil {
panic(err)
}
Expand Down
115 changes: 0 additions & 115 deletions editor/EvaluationRoute.go

This file was deleted.

65 changes: 0 additions & 65 deletions editor/Server.go

This file was deleted.

106 changes: 0 additions & 106 deletions editor/StaticRoute.go

This file was deleted.

Loading
Loading