Skip to content

Commit 9ba4f67

Browse files
newm4nFerdinand Neman
andauthored
Make sure that ioutil replaced with io, removed editor package and some fix hereand there (#488)
Co-authored-by: Ferdinand Neman <[email protected]>
1 parent 5ab5780 commit 9ba4f67

File tree

69 files changed

+73
-59529
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+73
-59529
lines changed

ast/Serializer.go

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -179,22 +179,37 @@ func (cat *Catalog) BuildKnowledgeBase() (*KnowledgeBase, error) {
179179
switch amet.ValueType {
180180
case TypeString:
181181
length := make([]byte, 8)
182-
buffer.Read(length)
182+
_, err := buffer.Read(length)
183+
if err != nil {
184+
return nil, err
185+
}
183186
dLen := binary.LittleEndian.Uint64(length)
184187
byteArr := make([]byte, dLen)
185-
buffer.Read(byteArr)
188+
_, err = buffer.Read(byteArr)
189+
if err != nil {
190+
return nil, err
191+
}
186192
newConst.Value = reflect.ValueOf(string(byteArr))
187193
case TypeBoolean:
188194
arr := make([]byte, 1)
189-
buffer.Read(arr)
195+
_, err := buffer.Read(arr)
196+
if err != nil {
197+
return nil, err
198+
}
190199
newConst.Value = reflect.ValueOf(arr[0] == 1)
191200
case TypeInteger:
192201
arr := make([]byte, 8)
193-
buffer.Read(arr)
202+
_, err := buffer.Read(arr)
203+
if err != nil {
204+
return nil, err
205+
}
194206
newConst.Value = reflect.ValueOf(int64(binary.LittleEndian.Uint64(arr)))
195207
case TypeFloat:
196208
arr := make([]byte, 8)
197-
buffer.Read(arr)
209+
_, err := buffer.Read(arr)
210+
if err != nil {
211+
return nil, err
212+
}
198213
bits := binary.LittleEndian.Uint64(arr)
199214
float := math.Float64frombits(bits)
200215
newConst.Value = reflect.ValueOf(float)
@@ -280,7 +295,7 @@ func (cat *Catalog) BuildKnowledgeBase() (*KnowledgeBase, error) {
280295
}
281296
importTable[amet.AstID] = n
282297
default:
283-
return nil, fmt.Errorf("unrecognized meta type")
298+
return nil, fmt.Errorf("unrecognized meta type %d", meta.GetASTType())
284299
}
285300
}
286301

builder/RuleBuilder.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,8 @@ func (builder *RuleBuilder) BuildRuleFromResource(name, version string, resource
189189

190190
if errReporter.HasError() {
191191
BuilderLog.Errorf("GRL syntax error. got %s", errReporter.Error())
192-
for i, errr := range errReporter.Errors {
193-
BuilderLog.Errorf("%d : %s", i, errr.Error())
192+
for i, err := range errReporter.Errors {
193+
BuilderLog.Errorf("%d : %s", i, err.Error())
194194
}
195195

196196
return errReporter

docs/cn/GRL_JSON_cn.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ resource := pkg.NewJSONResourceFromResource(underlying)
217217
通过`ParseJSONRuleset`函数调用,可以解析包含JSON规则的字节数组并转换成GRL语法的规则集合。
218218

219219
```go
220-
jsonData, err := ioutil.ReadFile("rules.json")
220+
jsonData, err := io.ReadFile("rules.json")
221221
if err != nil {
222222
panic(err)
223223
}

docs/de/GRL_JSON_de.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ resource := pkg.NewJSONResourceFromResource(underlying)
245245
It is also possible to parse a byte array containing JSON rules directly into a GRL syntax ruleset by calling the `ParseJSONRuleset` function.
246246

247247
```go
248-
jsonData, err := ioutil.ReadFile("rules.json")
248+
jsonData, err := io.ReadFile("rules.json")
249249
if err != nil {
250250
panic(err)
251251
}

docs/en/GRL_JSON_en.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ resource := pkg.NewJSONResourceFromResource(underlying)
232232
It is also possible to parse a byte array containing JSON rules directly into a GRL syntax ruleset by calling the `ParseJSONRuleset` function.
233233

234234
```go
235-
jsonData, err := ioutil.ReadFile("rules.json")
235+
jsonData, err := io.ReadFile("rules.json")
236236
if err != nil {
237237
panic(err)
238238
}

docs/id/GRL_JSON_id.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ resource := pkg.NewJSONResourceFromResource(underlying)
245245
It is also possible to parse a byte array containing JSON rules directly into a GRL syntax ruleset by calling the `ParseJSONRuleset` function.
246246

247247
```go
248-
jsonData, err := ioutil.ReadFile("rules.json")
248+
jsonData, err := io.ReadFile("rules.json")
249249
if err != nil {
250250
panic(err)
251251
}

docs/pl/GRL_JSON_pl.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ resource := pkg.NewJSONResourceFromResource(underlying)
216216
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`.
217217

218218
```go
219-
jsonData, err := ioutil.ReadFile("rules.json")
219+
jsonData, err := io.ReadFile("rules.json")
220220
if err != nil {
221221
panic(err)
222222
}

editor/EvaluationRoute.go

Lines changed: 0 additions & 115 deletions
This file was deleted.

editor/Server.go

Lines changed: 0 additions & 65 deletions
This file was deleted.

editor/StaticRoute.go

Lines changed: 0 additions & 106 deletions
This file was deleted.

0 commit comments

Comments
 (0)