Skip to content

Commit c27dd35

Browse files
tappletapple
committed
make deprecated; true valid again
1 parent 0e8011e commit c27dd35

File tree

6 files changed

+70
-58
lines changed

6 files changed

+70
-58
lines changed

‎lsl_definitions.schema.json‎

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -32,23 +32,28 @@
3232
},
3333
"deprecated": {
3434
"markdownDescription": "This function or property has been deprecated.",
35-
"additionalProperties": false,
36-
"properties": {
37-
"reason": {
38-
"markdownDescription": "The reason for deprecation.",
39-
"type": "string"
40-
},
41-
"use": {
42-
"markdownDescription": "What to use instead.",
43-
"type": "string"
44-
},
45-
"selene-replace": {
46-
"markdownDescription": "Pattern replacements for selene.",
47-
"type": "array",
48-
"items": {"type": "string"}
35+
"oneOf": [
36+
{"type": "boolean" , "const": true},
37+
{
38+
"type": "object",
39+
"additionalProperties": false,
40+
"properties": {
41+
"reason": {
42+
"markdownDescription": "The reason for deprecation.",
43+
"type": "string"
44+
},
45+
"use": {
46+
"markdownDescription": "What to use instead.",
47+
"type": "string"
48+
},
49+
"selene-replace": {
50+
"markdownDescription": "Pattern replacements for selene.",
51+
"type": "array",
52+
"items": {"type": "string"}
53+
}
54+
}
4955
}
50-
},
51-
"type": "object"
56+
]
5257
}
5358
},
5459
"properties": {

‎lsl_definitions.yaml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3305,17 +3305,17 @@ constants:
33053305
type: integer
33063306
value: '0x100'
33073307
REMOTE_DATA_CHANNEL:
3308-
deprecated: {}
3308+
deprecated: true
33093309
tooltip: ''
33103310
type: integer
33113311
value: 1
33123312
REMOTE_DATA_REPLY:
3313-
deprecated: {}
3313+
deprecated: true
33143314
tooltip: ''
33153315
type: integer
33163316
value: 3
33173317
REMOTE_DATA_REQUEST:
3318-
deprecated: {}
3318+
deprecated: true
33193319
tooltip: ''
33203320
type: integer
33213321
value: 2
@@ -4745,7 +4745,7 @@ events:
47454745
- SData:
47464746
tooltip: ''
47474747
type: string
4748-
deprecated: {}
4748+
deprecated: true
47494749
tooltip: This event is deprecated.
47504750
run_time_permissions:
47514751
arguments:
@@ -5244,7 +5244,7 @@ functions:
52445244
- ExperienceID:
52455245
tooltip: ''
52465246
type: key
5247-
deprecated: {}
5247+
deprecated: true
52485248
energy: 10.0
52495249
func-id: 411
52505250
private: true
@@ -5256,7 +5256,7 @@ functions:
52565256
- AgentID:
52575257
tooltip: ''
52585258
type: key
5259-
deprecated: {}
5259+
deprecated: true
52605260
energy: 10.0
52615261
func-id: 385
52625262
private: true
@@ -5295,7 +5295,7 @@ functions:
52955295
- ChannelID:
52965296
tooltip: ''
52975297
type: key
5298-
deprecated: {}
5298+
deprecated: true
52995299
energy: 10.0
53005300
func-id: 257
53015301
return: void
@@ -5306,7 +5306,7 @@ functions:
53065306
- Offset:
53075307
tooltip: ''
53085308
type: vector
5309-
deprecated: {}
5309+
deprecated: true
53105310
energy: 10.0
53115311
func-id: 43
53125312
must-use: true
@@ -5354,7 +5354,7 @@ functions:
53545354
tooltip: ''
53555355
type: string
53565356
asset-semantics: true
5357-
deprecated: {}
5357+
deprecated: true
53585358
energy: 10.0
53595359
func-id: 161
53605360
return: void
@@ -6526,7 +6526,7 @@ functions:
65266526
- AgentID:
65276527
tooltip: ''
65286528
type: key
6529-
deprecated: {}
6529+
deprecated: true
65306530
energy: 10.0
65316531
func-id: 410
65326532
private: true
@@ -9479,7 +9479,7 @@ functions:
94799479
the value of the Header for HTTPRequestID.
94809480
llOpenRemoteDataChannel:
94819481
arguments: []
9482-
deprecated: {}
9482+
deprecated: true
94839483
energy: 10.0
94849484
func-id: 254
94859485
return: void
@@ -9703,7 +9703,7 @@ functions:
97039703
- Point:
97049704
tooltip: ''
97059705
type: vector
9706-
deprecated: {}
9706+
deprecated: true
97079707
energy: 10.0
97089708
func-id: 131
97099709
private: true
@@ -9877,15 +9877,15 @@ functions:
98779877
- iData:
98789878
tooltip: Integer data to send
98799879
type: integer
9880-
deprecated: {}
9880+
deprecated: true
98819881
energy: 10.0
98829882
func-id: 256
98839883
return: void
98849884
sleep: 3.0
98859885
tooltip: This function is deprecated.
98869886
llRemoteDataSetRegion:
98879887
arguments: []
9888-
deprecated: {}
9888+
deprecated: true
98899889
energy: 10.0
98909890
func-id: 263
98919891
return: void
@@ -9905,7 +9905,7 @@ functions:
99059905
- Unknown2:
99069906
tooltip: ''
99079907
type: integer
9908-
deprecated: {}
9908+
deprecated: true
99099909
energy: 10.0
99109910
func-id: 251
99119911
private: true
@@ -10633,7 +10633,7 @@ functions:
1063310633
- Text:
1063410634
tooltip: ''
1063510635
type: string
10636-
deprecated: {}
10636+
deprecated: true
1063710637
energy: 10.0
1063810638
func-id: 255
1063910639
return: key
@@ -10903,7 +10903,7 @@ functions:
1090310903
- ExperienceID:
1090410904
tooltip: ''
1090510905
type: key
10906-
deprecated: {}
10906+
deprecated: true
1090710907
energy: 10.0
1090810908
func-id: 386
1090910909
private: true
@@ -11949,7 +11949,7 @@ functions:
1194911949
a built-in animation, or the uuid of an animation.\n
1195011950
llStopPointAt:
1195111951
arguments: []
11952-
deprecated: {}
11952+
deprecated: true
1195311953
energy: 10.0
1195411954
func-id: 132
1195511955
private: true

‎lsl_definitions/lsl.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -527,8 +527,8 @@ def _handle_event(self, event_name: str, event_data: dict) -> LSLEvent:
527527
for arg in (event_data.get("arguments") or [])
528528
],
529529
private=event_data.get("private", False),
530-
deprecated=Deprecated.from_definition(event_data.get("deprecated", None)),
531-
slua_deprecated=Deprecated.from_definition(event_data.get("slua-deprecated", None)),
530+
deprecated=Deprecated.from_definition(event_data.get("deprecated", False)),
531+
slua_deprecated=Deprecated.from_definition(event_data.get("slua-deprecated", False)),
532532
slua_removed=event_data.get("slua-removed", False),
533533
detected_semantics=event_data.get("detected-semantics", False),
534534
)
@@ -558,8 +558,8 @@ def _handle_function(self, func_name: str, func_data: dict) -> LSLFunction:
558558
],
559559
private=func_data.get("private", False),
560560
god_mode=func_data.get("god-mode", False),
561-
deprecated=Deprecated.from_definition(func_data.get("deprecated", None)),
562-
slua_deprecated=Deprecated.from_definition(func_data.get("slua-deprecated", None)),
561+
deprecated=Deprecated.from_definition(func_data.get("deprecated", False)),
562+
slua_deprecated=Deprecated.from_definition(func_data.get("slua-deprecated", False)),
563563
slua_removed=func_data.get("slua-removed", False),
564564
func_id=func_data["func-id"],
565565
pure=func_data.get("pure", False),
@@ -647,7 +647,7 @@ def _handle_constant(self, const_name: str, const_data: dict) -> LSLConstant:
647647
value=str(const_data["value"]),
648648
tooltip=const_data.get("tooltip", ""),
649649
private=const_data.get("private", False),
650-
deprecated=Deprecated.from_definition(const_data.get("deprecated", None)),
650+
deprecated=Deprecated.from_definition(const_data.get("deprecated", False)),
651651
)
652652
if const.type not in {"float", "integer", "string", "vector", "rotation"}:
653653
raise ValueError(f"Invalid constant type {const.type}")

‎lsl_definitions/slua.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -660,7 +660,7 @@ def _validate_function(
660660
],
661661
returnType=data.get("returnType", "()"),
662662
comment=data.get("comment", ""),
663-
deprecated=Deprecated.from_definition(data.get("deprecated", None)),
663+
deprecated=Deprecated.from_definition(data.get("deprecated", False)),
664664
private=data.get("private", False),
665665
must_use=data.get("must-use", False),
666666
)

‎lsl_definitions/utils.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,11 @@ class Deprecated:
1616
use: str | None = None
1717
selene_replace: list[str] | None = None
1818

19-
def from_definition(definition: dict | None) -> "Deprecated | None":
20-
if definition is None:
19+
def from_definition(definition: dict | bool) -> "Deprecated | None":
20+
if definition is False:
2121
return None
22+
if definition is True:
23+
return Deprecated()
2224
return Deprecated(
2325
reason=definition.get("reason", None),
2426
use=definition.get("use", None),

‎slua_definitions.schema.json‎

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,28 @@
2323
},
2424
"deprecated": {
2525
"markdownDescription": "This function or property has been deprecated.",
26-
"additionalProperties": false,
27-
"properties": {
28-
"reason": {
29-
"markdownDescription": "The reason for deprecation.",
30-
"type": "string"
31-
},
32-
"use": {
33-
"markdownDescription": "What to use instead.",
34-
"type": "string"
35-
},
36-
"selene-replace": {
37-
"markdownDescription": "Pattern replacements for selene.",
38-
"type": "array",
39-
"items": {"type": "string"}
26+
"oneOf": [
27+
{"type": "boolean" , "const": true},
28+
{
29+
"type": "object",
30+
"additionalProperties": false,
31+
"properties": {
32+
"reason": {
33+
"markdownDescription": "The reason for deprecation.",
34+
"type": "string"
35+
},
36+
"use": {
37+
"markdownDescription": "What to use instead.",
38+
"type": "string"
39+
},
40+
"selene-replace": {
41+
"markdownDescription": "Pattern replacements for selene.",
42+
"type": "array",
43+
"items": {"type": "string"}
44+
}
45+
}
4046
}
41-
},
42-
"type": "object"
47+
]
4348
},
4449
"property": {
4550
"markdownDescription": "A property or constant.",

0 commit comments

Comments
 (0)