Skip to content

Commit 3a36a3a

Browse files
committed
rename
1 parent d40f94d commit 3a36a3a

6 files changed

+114
-90
lines changed

semgrep_output_v1.atd

+2-2
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ type core_timing
317317
rules: rule_id list;
318318
?rules_parse_time: float option; (* not used in spacegrep *)
319319

320-
max_ocaml_heap_words : int;
320+
max_memory_bytes : int;
321321
}
322322

323323
(* later: could refactor [target_time] and [rule_times] to be equal
@@ -645,7 +645,7 @@ type cli_timing <ocaml attr="deriving show"> = {
645645
targets: cli_target_times list;
646646
total_bytes: int;
647647

648-
?max_ocaml_heap_words : int option;
648+
?max_memory_bytes : int option;
649649
}
650650

651651
(* LATER: should just use rule_id *)

semgrep_output_v1.jsonschema

+3-3
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@
232232
},
233233
"core_timing": {
234234
"type": "object",
235-
"required": [ "targets", "rules", "max_ocaml_heap_words" ],
235+
"required": [ "targets", "rules", "max_memory_bytes" ],
236236
"properties": {
237237
"targets": {
238238
"type": "array",
@@ -243,7 +243,7 @@
243243
"items": { "$ref": "#/definitions/rule_id" }
244244
},
245245
"rules_parse_time": { "type": "number" },
246-
"max_ocaml_heap_words": { "type": "integer" }
246+
"max_memory_bytes": { "type": "integer" }
247247
}
248248
},
249249
"target_time": {
@@ -570,7 +570,7 @@
570570
"items": { "$ref": "#/definitions/cli_target_times" }
571571
},
572572
"total_bytes": { "type": "integer" },
573-
"max_ocaml_heap_words": { "type": "integer" }
573+
"max_memory_bytes": { "type": "integer" }
574574
}
575575
},
576576
"rule_id_dict": {

semgrep_output_v1.py

+7-7
Original file line numberDiff line numberDiff line change
@@ -2080,7 +2080,7 @@ class CoreTiming:
20802080

20812081
targets: List[TargetTime]
20822082
rules: List[RuleId]
2083-
max_ocaml_heap_words: int
2083+
max_memory_bytes: int
20842084
rules_parse_time: Optional[float] = None
20852085

20862086
@classmethod
@@ -2089,7 +2089,7 @@ def from_json(cls, x: Any) -> 'CoreTiming':
20892089
return cls(
20902090
targets=_atd_read_list(TargetTime.from_json)(x['targets']) if 'targets' in x else _atd_missing_json_field('CoreTiming', 'targets'),
20912091
rules=_atd_read_list(RuleId.from_json)(x['rules']) if 'rules' in x else _atd_missing_json_field('CoreTiming', 'rules'),
2092-
max_ocaml_heap_words=_atd_read_int(x['max_ocaml_heap_words']) if 'max_ocaml_heap_words' in x else _atd_missing_json_field('CoreTiming', 'max_ocaml_heap_words'),
2092+
max_memory_bytes=_atd_read_int(x['max_memory_bytes']) if 'max_memory_bytes' in x else _atd_missing_json_field('CoreTiming', 'max_memory_bytes'),
20932093
rules_parse_time=_atd_read_float(x['rules_parse_time']) if 'rules_parse_time' in x else None,
20942094
)
20952095
else:
@@ -2099,7 +2099,7 @@ def to_json(self) -> Any:
20992099
res: Dict[str, Any] = {}
21002100
res['targets'] = _atd_write_list((lambda x: x.to_json()))(self.targets)
21012101
res['rules'] = _atd_write_list((lambda x: x.to_json()))(self.rules)
2102-
res['max_ocaml_heap_words'] = _atd_write_int(self.max_ocaml_heap_words)
2102+
res['max_memory_bytes'] = _atd_write_int(self.max_memory_bytes)
21032103
if self.rules_parse_time is not None:
21042104
res['rules_parse_time'] = _atd_write_float(self.rules_parse_time)
21052105
return res
@@ -2652,7 +2652,7 @@ class CliTiming:
26522652
profiling_times: Dict[str, float]
26532653
targets: List[CliTargetTimes]
26542654
total_bytes: int
2655-
max_ocaml_heap_words: Optional[int] = None
2655+
max_memory_bytes: Optional[int] = None
26562656

26572657
@classmethod
26582658
def from_json(cls, x: Any) -> 'CliTiming':
@@ -2663,7 +2663,7 @@ def from_json(cls, x: Any) -> 'CliTiming':
26632663
profiling_times=_atd_read_assoc_object_into_dict(_atd_read_float)(x['profiling_times']) if 'profiling_times' in x else _atd_missing_json_field('CliTiming', 'profiling_times'),
26642664
targets=_atd_read_list(CliTargetTimes.from_json)(x['targets']) if 'targets' in x else _atd_missing_json_field('CliTiming', 'targets'),
26652665
total_bytes=_atd_read_int(x['total_bytes']) if 'total_bytes' in x else _atd_missing_json_field('CliTiming', 'total_bytes'),
2666-
max_ocaml_heap_words=_atd_read_int(x['max_ocaml_heap_words']) if 'max_ocaml_heap_words' in x else None,
2666+
max_memory_bytes=_atd_read_int(x['max_memory_bytes']) if 'max_memory_bytes' in x else None,
26672667
)
26682668
else:
26692669
_atd_bad_json('CliTiming', x)
@@ -2675,8 +2675,8 @@ def to_json(self) -> Any:
26752675
res['profiling_times'] = _atd_write_assoc_dict_to_object(_atd_write_float)(self.profiling_times)
26762676
res['targets'] = _atd_write_list((lambda x: x.to_json()))(self.targets)
26772677
res['total_bytes'] = _atd_write_int(self.total_bytes)
2678-
if self.max_ocaml_heap_words is not None:
2679-
res['max_ocaml_heap_words'] = _atd_write_int(self.max_ocaml_heap_words)
2678+
if self.max_memory_bytes is not None:
2679+
res['max_memory_bytes'] = _atd_write_int(self.max_memory_bytes)
26802680
return res
26812681

26822682
@classmethod

semgrep_output_v1.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ export type CoreTiming = {
128128
targets: TargetTime[];
129129
rules: RuleId[];
130130
rules_parse_time?: number;
131-
max_ocaml_heap_words: Int;
131+
max_memory_bytes: Int;
132132
}
133133

134134
export type TargetTime = {
@@ -293,7 +293,7 @@ export type CliTiming = {
293293
profiling_times: [string, number][];
294294
targets: CliTargetTimes[];
295295
total_bytes: Int;
296-
max_ocaml_heap_words?: Int;
296+
max_memory_bytes?: Int;
297297
}
298298

299299
export type RuleIdDict = {
@@ -777,7 +777,7 @@ export function writeCoreTiming(x: CoreTiming, context: any = x): any {
777777
'targets': _atd_write_required_field('CoreTiming', 'targets', _atd_write_array(writeTargetTime), x.targets, x),
778778
'rules': _atd_write_required_field('CoreTiming', 'rules', _atd_write_array(writeRuleId), x.rules, x),
779779
'rules_parse_time': _atd_write_optional_field(_atd_write_float, x.rules_parse_time, x),
780-
'max_ocaml_heap_words': _atd_write_required_field('CoreTiming', 'max_ocaml_heap_words', _atd_write_int, x.max_ocaml_heap_words, x),
780+
'max_memory_bytes': _atd_write_required_field('CoreTiming', 'max_memory_bytes', _atd_write_int, x.max_memory_bytes, x),
781781
};
782782
}
783783

@@ -786,7 +786,7 @@ export function readCoreTiming(x: any, context: any = x): CoreTiming {
786786
targets: _atd_read_required_field('CoreTiming', 'targets', _atd_read_array(readTargetTime), x['targets'], x),
787787
rules: _atd_read_required_field('CoreTiming', 'rules', _atd_read_array(readRuleId), x['rules'], x),
788788
rules_parse_time: _atd_read_optional_field(_atd_read_float, x['rules_parse_time'], x),
789-
max_ocaml_heap_words: _atd_read_required_field('CoreTiming', 'max_ocaml_heap_words', _atd_read_int, x['max_ocaml_heap_words'], x),
789+
max_memory_bytes: _atd_read_required_field('CoreTiming', 'max_memory_bytes', _atd_read_int, x['max_memory_bytes'], x),
790790
};
791791
}
792792

@@ -1242,7 +1242,7 @@ export function writeCliTiming(x: CliTiming, context: any = x): any {
12421242
'profiling_times': _atd_write_required_field('CliTiming', 'profiling_times', _atd_write_assoc_array_to_object(_atd_write_float), x.profiling_times, x),
12431243
'targets': _atd_write_required_field('CliTiming', 'targets', _atd_write_array(writeCliTargetTimes), x.targets, x),
12441244
'total_bytes': _atd_write_required_field('CliTiming', 'total_bytes', _atd_write_int, x.total_bytes, x),
1245-
'max_ocaml_heap_words': _atd_write_optional_field(_atd_write_int, x.max_ocaml_heap_words, x),
1245+
'max_memory_bytes': _atd_write_optional_field(_atd_write_int, x.max_memory_bytes, x),
12461246
};
12471247
}
12481248

@@ -1253,7 +1253,7 @@ export function readCliTiming(x: any, context: any = x): CliTiming {
12531253
profiling_times: _atd_read_required_field('CliTiming', 'profiling_times', _atd_read_assoc_object_into_array(_atd_read_float), x['profiling_times'], x),
12541254
targets: _atd_read_required_field('CliTiming', 'targets', _atd_read_array(readCliTargetTimes), x['targets'], x),
12551255
total_bytes: _atd_read_required_field('CliTiming', 'total_bytes', _atd_read_int, x['total_bytes'], x),
1256-
max_ocaml_heap_words: _atd_read_optional_field(_atd_read_int, x['max_ocaml_heap_words'], x),
1256+
max_memory_bytes: _atd_read_optional_field(_atd_read_int, x['max_memory_bytes'], x),
12571257
};
12581258
}
12591259

0 commit comments

Comments
 (0)