Skip to content

Convert Lua's python data structure from list to dict #161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
monty-linden merged 3 commits into from
Jul 20, 2026
Merged

Convert Lua's python data structure from list to dict #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c491cd
Convert Lua's python data structure from list to dict
tapple Jun 24, 2026
88456f0
fix merge conflict
tapple Jul 2, 2026
bd31b6e
fix merge conflicts
tapple Jul 13, 2026
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
18 changes: 9 additions & 9 deletions lsl_definitions/generators/keywords.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ def dump_slua_syntax(
pretty: bool = False,
Comment thread
tapple marked this conversation as resolved.
Comment thread
tapple marked this conversation as resolved.
Comment thread
tapple marked this conversation as resolved.
) -> bytes:
"""Generate SLua syntax XML for viewer"""
ll_module = next(m for m in slua_definitions.modules if m.name == "ll")
ll_module = slua_definitions.modules["ll"]
header_comment = b"""<!-- SLua (Server Lua) keywords file for Second Life Viewer.
This file is auto-generated by https://github.com/secondlife/lsl-definitions. -->"""
syntax = {
Expand All @@ -73,12 +73,12 @@ def dump_slua_syntax(
}

# types
for class_ in sorted(slua_definitions.base_classes, key=lambda x: x.name):
for class_ in sorted(slua_definitions.base_classes.values(), key=lambda x: x.name):
syntax["types"][class_.name] = class_.to_keywords_dict()
for alias in sorted(slua_definitions.type_aliases, key=lambda x: x.name):
for alias in sorted(slua_definitions.type_aliases.values(), key=lambda x: x.name):
if alias.export:
syntax["types"][alias.name] = alias.to_keywords_dict()
for class_ in sorted(slua_definitions.classes, key=lambda x: x.name):
for class_ in sorted(slua_definitions.classes.values(), key=lambda x: x.name):
syntax["types"][class_.name] = class_.to_keywords_dict()

# events
Expand All @@ -88,10 +88,10 @@ def dump_slua_syntax(
syntax["events"][event.name] = event.to_slua_dict(slua_definitions)

# functions
for func in sorted(slua_definitions.functions, key=lambda x: x.name):
for func in sorted(slua_definitions.functions.values(), key=lambda x: x.name):
if not func.local_only and not func.slua_removed:
syntax["functions"][func.name] = func.to_keywords_dict()
for module in sorted(slua_definitions.modules, key=lambda x: x.name):
for module in sorted(slua_definitions.modules.values(), key=lambda x: x.name):
if module.name not in {"ll", "llcompat"}:
syntax["functions"].update(module.to_keywords_functions_dict())
syntax["functions"].update(ll_module.to_keywords_functions_dict())
Expand All @@ -100,14 +100,14 @@ def dump_slua_syntax(
syntax["functions"][func.compute_slua_name()] = func.to_slua_dict(slua_definitions)

# constants
for const in slua_definitions.builtin_constants:
for const in slua_definitions.builtin_constants.values():
syntax["constants"][const.name] = const.to_keywords_dict()
for module in sorted(slua_definitions.modules, key=lambda x: x.name):
for module in sorted(slua_definitions.modules.values(), key=lambda x: x.name):
syntax["constants"].update(module.to_keywords_constants_dict())
for const in sorted(definitions.constants.values(), key=lambda x: x.name):
if not const.private and not const.slua_removed:
syntax["constants"][const.name] = const.to_slua_dict(slua_definitions)
for const in slua_definitions.global_constants:
for const in slua_definitions.global_constants.values():
if const.name not in syntax["constants"] and not const.private:
syntax["constants"][const.name] = const.to_keywords_dict()

Expand Down
58 changes: 28 additions & 30 deletions lsl_definitions/generators/slua.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
@register("slua_lsp_defs")
def gen_luau_lsp_defs(definitions: LSLDefinitions, slua_definitions: SLuaDefinitions) -> str:
"""Generate SLua definitions for Luau Language Server"""
ll_module = [m for m in slua_definitions.modules if m.name == "ll"][0]
llcompat_module = [m for m in slua_definitions.modules if m.name == "llcompat"][0]
ll_module = slua_definitions.modules["ll"]
llcompat_module = slua_definitions.modules["llcompat"]

defs = io.StringIO()
defs.write("""-- Second Life SLua (Server Lua) definitions file for luau-lsp.
Expand All @@ -37,12 +37,12 @@ def gen_luau_lsp_defs(definitions: LSLDefinitions, slua_definitions: SLuaDefinit

# 1. Luau builtins unneeded. Luau-lsp already know about these
# 2. SLua base classes. These only depend on Luau builtins
classes = slua_definitions.base_classes + slua_definitions.classes
classes = list(slua_definitions.base_classes.values()) + list(slua_definitions.classes.values())
classes.sort(key=lambda x: x.name)
for class_ in (class_ for class_ in classes if class_.name[0].islower()):
class_.write_luau_def(defs)
defs.write("\n")
for alias in slua_definitions.type_aliases:
for alias in slua_definitions.type_aliases.values():
defs.write(alias.to_luau_def())
defs.write("\n")
defs.write("\n")
Expand All @@ -51,13 +51,13 @@ def gen_luau_lsp_defs(definitions: LSLDefinitions, slua_definitions: SLuaDefinit
for class_ in (class_ for class_ in classes if class_.name[0].isupper()):
class_.write_luau_def(defs)
defs.write("\n")
for func in slua_definitions.functions:
for func in slua_definitions.functions.values():
if func.private or func.local_only:
continue
if not func.typechecker_flags.fully_defined:
defs.write("-- ")
func.write_luau_global_def(defs)
for module in sorted(slua_definitions.modules, key=lambda x: x.name):
for module in sorted(slua_definitions.modules.values(), key=lambda x: x.name):
if module.name in {"ll", "llcompat"}:
continue
if module.name == "string":
Expand All @@ -67,13 +67,13 @@ def gen_luau_lsp_defs(definitions: LSLDefinitions, slua_definitions: SLuaDefinit
module.write_luau_def(defs)
if module.name == "string":
defs.write("--]]\n")
for var in slua_definitions.global_variables:
for var in slua_definitions.global_variables.values():
defs.write("declare ")
defs.write(var.to_luau_def())
defs.write("\n")
ll_module.write_luau_def(defs)
llcompat_module.write_luau_def(defs)
for const in sorted(slua_definitions.global_constants, key=lambda x: x.name):
for const in sorted(slua_definitions.global_constants.values(), key=lambda x: x.name):
if const.private:
continue
defs.write("declare ")
Expand All @@ -88,8 +88,7 @@ def gen_selene_yml(definitions: LSLDefinitions, slua_definitions: SLuaDefinition
"""Generate SLua standard library for Selene linter
https://kampfkarren.github.io/selene/usage/std.html
"""
classes = {c.name: c for c in slua_definitions.base_classes + slua_definitions.classes}
type_aliases = {a.name: a for a in slua_definitions.type_aliases}
classes = {**slua_definitions.base_classes, **slua_definitions.classes}

file = io.StringIO()
file.write("""# Second Life SLua (Server Lua) standard library definition file for selene.
Expand Down Expand Up @@ -130,8 +129,8 @@ def selene_type(type_str: str, default="any") -> str | dict | None:
}
if type_str in type_map:
return type_map[type_str]
if type_str in type_aliases:
return type_aliases[type_str].selene_type
if type_str in slua_definitions.type_aliases:
return slua_definitions.type_aliases[type_str].selene_type
if (type_str.startswith("{") and type_str.endswith("}")) or type_str.startswith("list |"):
return "table"
if "|" in type_str:
Expand Down Expand Up @@ -186,11 +185,11 @@ def selene_function(func: SLuaFunction, method=False) -> dict:

def selene_class(class_: SLuaClassDeclaration) -> dict:
fields = {}
for method in class_.methods:
for method in class_.methods.values():
fields[method.name] = selene_function(method, method=True)
for func in class_.functions:
for func in class_.functions.values():
fields[func.name] = selene_function(func, method=False)
for prop in class_.properties:
for prop in class_.properties.values():
fields[prop.name] = selene_property(prop)
return fields

Expand All @@ -202,50 +201,49 @@ def selene_module(module: SLuaModule) -> dict:
{
f"{module.name}.{const.name}": selene_property(const)
# for func in sorted(self.functions, key=lambda x: x.name)
for const in module.constants
for const in module.constants.values()
if not const.private
}
)
globals.update(
{
f"{module.name}.{func.name}": selene_function(func)
# for func in sorted(self.functions, key=lambda x: x.name)
for func in module.functions
for func in module.functions.values()
if not func.private and not func.local_only
}
)
return globals

# Duplicate quaternion module as rotation. The callable aspect of quaternion
# prevents us from being able to de-duplicate this with structs.
modules = {m.name: m for m in slua_definitions.modules}
modules["rotation"] = SLuaModule(
slua_definitions.modules["rotation"] = SLuaModule(
name="rotation",
comment=modules["quaternion"].comment,
callable=modules["quaternion"].callable,
constants=modules["quaternion"].constants,
functions=modules["quaternion"].functions,
comment=slua_definitions.modules["quaternion"].comment,
callable=slua_definitions.modules["quaternion"].callable,
constants=slua_definitions.modules["quaternion"].constants,
functions=slua_definitions.modules["quaternion"].functions,
)

for const in slua_definitions.global_variables:
for const in slua_definitions.global_variables.values():
if not const.private and const.name != "rotation":
selene["globals"][const.name] = selene_property(const)
for const in sorted(slua_definitions.global_constants, key=lambda x: x.name):
for const in sorted(slua_definitions.global_constants.values(), key=lambda x: x.name):
if not const.private:
selene["globals"][const.name] = selene_property(const)
for func in sorted(slua_definitions.functions, key=lambda x: x.name):
for func in sorted(slua_definitions.functions.values(), key=lambda x: x.name):
if not func.private and not func.local_only:
selene["globals"][func.name] = selene_function(func)
for module in sorted(modules.values(), key=lambda x: x.name):
for module in sorted(slua_definitions.modules.values(), key=lambda x: x.name):
if module.name not in {"ll", "llcompat"}:
selene["globals"].update(selene_module(module))
selene["globals"].update(selene_module(modules["ll"]))
selene["globals"].update(selene_module(modules["llcompat"]))
selene["globals"].update(selene_module(slua_definitions.modules["ll"]))
selene["globals"].update(selene_module(slua_definitions.modules["llcompat"]))
for class_ in classes.values():
selene["structs"][class_.name] = selene_class(class_)

# Fix up LLEvents argument types
event_names = [m for m in slua_definitions.type_aliases if m.name == "LLEventName"][
event_names = [m for m in slua_definitions.type_aliases.values() if m.name == "LLEventName"][
0
].selene_type
for method_name in ["on", "once", "off", "handlers"]:
Expand Down
25 changes: 12 additions & 13 deletions lsl_definitions/generators/slua_lsp_docs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,11 @@ def add_module(self, module: SLuaModule) -> None:
learn_more_link=doc_url(module.name, None),
)
# for const in sorted(self.constants, key=lambda x: x.name)
for const in module.constants:
for const in module.constants.values():
if not const.private:
self.add_constant(const, module=module.name)
# for func in sorted(self.functions, key=lambda x: x.name)
for func in module.functions:
for func in module.functions.values():
if not func.private and not func.local_only:
self.add_function(func, module=module.name)

Expand All @@ -106,31 +106,30 @@ def gen_slua_lsp_docs(definitions: LSLDefinitions, slua_definitions: SLuaDefinit

# Duplicate quaternion module as rotation. The callable aspect of quaternion
# prevents us from being able to de-duplicate this with structs.
modules = {m.name: m for m in slua_definitions.modules}
modules["rotation"] = SLuaModule(
slua_definitions.modules["rotation"] = SLuaModule(
name="rotation",
comment=modules["quaternion"].comment,
callable=modules["quaternion"].callable,
constants=modules["quaternion"].constants,
functions=modules["quaternion"].functions,
comment=slua_definitions.modules["quaternion"].comment,
callable=slua_definitions.modules["quaternion"].callable,
constants=slua_definitions.modules["quaternion"].constants,
functions=slua_definitions.modules["quaternion"].functions,
)

# class docs are unused if generated
# for const in slua_definitions.globalVariables:
# if not const.private and const.name != "rotation":
# selene["globals"][const.name] = selene_property(const)
for func in slua_definitions.functions:
for func in slua_definitions.functions.values():
if not func.private and not func.local_only and not func.slua_removed:
builder.add_function(func)
for module in sorted(modules.values(), key=lambda x: x.name):
for module in sorted(slua_definitions.modules.values(), key=lambda x: x.name):
if module.name not in {"ll", "llcompat"}:
builder.add_module(module)
builder.add_module(modules["ll"])
builder.add_module(modules["llcompat"])
builder.add_module(slua_definitions.modules["ll"])
builder.add_module(slua_definitions.modules["llcompat"])
# builtin docs are unused if generated
# for const in slua_definitions.builtin_constants:
# builder.add_constant(const)
for const in sorted(slua_definitions.global_constants, key=lambda x: x.name):
for const in sorted(slua_definitions.global_constants.values(), key=lambda x: x.name):
if not const.private:
builder.add_constant(const)
# class docs are unused if generated
Expand Down
Loading
Loading