mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-03 21:23:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix parser to strip semicolons from module/import names; update tests

Browse Source
This commit is contained in:
copilot-swe-agent[bot]
2026-06-26 05:21:39 +00:00
committed by Kovid Goyal
parent 060c235224
commit c899873784
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kitty/shaders/slang.py
View File

@@ -56,9 +56,9 @@ def parse_slang_text(text: str, path: str = '') -> SlangFile:
else:
match words[0]:
case 'module':
module = words[1]
module = words[1].removesuffix(';')
case 'import':
imports.add(words[1])
imports.add(words[1].removesuffix(';'))
case _:
if words[0].startswith('[shader('): # ])
text = words[0].partition('(')[2].partition(')')[0].strip()

18
kitty_tests/slang.py
View File

@@ -37,12 +37,12 @@ float4 psMain() : SV_Target {
# Only line comments and block comments, no code
check('// just a comment\n/* block comment */', SlangFile('', '', frozenset(), frozenset(), ''))
# Module and import declarations (note: trailing semicolons are preserved by the parser)
# Module and import declarations
check('''
module mymodule;
import utils;
import helpers;
''', SlangFile('', '', frozenset({'utils;', 'helpers;'}), frozenset(), 'mymodule;'))
''', SlangFile('', '', frozenset({'utils', 'helpers'}), frozenset(), 'mymodule'))
# pixel stage maps to Stage.fragment
check('''
@@ -97,7 +97,7 @@ import common;
[shader("vertex")]
void vsMain() {}
''', SlangFile('', '', frozenset({'common;'}), frozenset({EntryPoint(Stage.vertex, 'vsMain')}), 'myshader;'))
''', SlangFile('', '', frozenset({'common'}), frozenset({EntryPoint(Stage.vertex, 'vsMain')}), 'myshader'))
def test_slang_ordering(self):
# Test topological_sort with a manually constructed linear chain: a <- b <- c
@@ -145,10 +145,14 @@ void vsMain() {}
graph2 = build_import_graph(tmpdir)
self.assertEqual(set(graph2.keys()), {'a', 'b', 'c'})
self.assertEqual(graph2['a'].imports, frozenset())
# The parser preserves trailing semicolons on import names
self.assertEqual(graph2['b'].imports, frozenset({'a;'}))
self.assertEqual(graph2['c'].imports, frozenset({'b;'}))
self.assertEqual(graph2['a'].module, 'a;')
self.assertEqual(graph2['b'].imports, frozenset({'a'}))
self.assertEqual(graph2['c'].imports, frozenset({'b'}))
self.assertEqual(graph2['a'].module, 'a')
# Topological sort of file-based graph respects import dependencies
order3 = topological_sort(graph2)
self.assertLess(order3.index('a'), order3.index('b'))
self.assertLess(order3.index('b'), order3.index('c'))
# Non-.slang files are ignored
with open(os.path.join(tmpdir, 'ignored.txt'), 'w') as f: