omdev 0.0.0.dev326__py3-none-any.whl → 0.0.0.dev328__py3-none-any.whl

omdev/cc/cli.py

@@ -39,12 +39,17 @@ from ..cache import data as dcache
 from .cdeps import Cdep
 from .cdeps import load_cdeps
 from .cdeps import process_marshaled_cdep
+from .srclangs import SRC_LANGS_BY_EXT
+from .srclangs import SrcLangs
+
+
+##
 
 
 class Cli(ap.Cli):
     @ap.cmd(
         ap.arg('--cwd'),
-        ap.arg('--cc'),
+        ap.arg('--cmd'),
         ap.arg('src-file'),
         ap.arg('args', nargs=ap.REMAINDER),
     )
@@ -90,6 +95,13 @@ class Cli(ap.Cli):
                         check.state(os.path.isdir(inc_dir))
                         include_dirs.append(inc_dir)
 
+            elif src_magic.key == '@omlish-llm-author':
+                pass
+
+            elif src_magic.key == '@omlish-cext':
+                # FIXME: lol - usecase for non-cext bins?
+                pass
+
             else:
                 raise KeyError(src_magic.key)
 
@@ -97,8 +109,15 @@ class Cli(ap.Cli):
 
         src_file_name = os.path.basename(src_file)
 
+        sl = SrcLangs.CPP
+        if '.' in src_file:
+            ext = src_file.rpartition('.')[2]
+            sl = SRC_LANGS_BY_EXT.get(ext, sl)
+
+        #
+
         sh_parts: list[str] = [
-            self.args.cc or 'clang++',
+            self.args.cmd or sl.cmd,
         ]
 
         for inc_dir in include_dirs:
@@ -110,8 +129,10 @@ class Cli(ap.Cli):
         if ldflags := os.environ.get('LDFLAGS'):
             sh_parts.append(ldflags)  # Explicitly shell-unquoted
 
+        if sl.std is not None:
+            sh_parts.append(f'-std={sl.std}')
+
         sh_parts.extend([
-            '-std=c++20',
             shlex.quote(os.path.abspath(src_file)),
             '-o',
             shlex.quote(src_file_name),

omdev/cc/srclangs.py

@@ -0,0 +1,44 @@
+import typing as ta
+
+from omlish import collections as col
+from omlish import dataclasses as dc
+from omlish import lang
+
+
+##
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+class SrcLang:
+    name: str
+
+    ext: str
+    alt_exts: ta.Sequence[str] | None = None
+
+    cmd: str
+
+    std: str | None = None
+
+
+class SrcLangs(lang.Namespace):
+    CPP = SrcLang(
+        name='cpp',
+        ext='cc',
+        alt_exts=['cpp'],
+        cmd='clang++',
+        std='c++20',
+    )
+
+    C = SrcLang(
+        name='c',
+        ext='c',
+        cmd='clang',
+        std='c17',
+    )
+
+
+SRC_LANGS_BY_EXT: ta.Mapping[str, SrcLang] = col.make_map([
+    (ext, sl)
+    for _, sl in SrcLangs
+    for ext in [sl.ext, *(sl.alt_exts or [])]
+], strict=True)

{omdev-0.0.0.dev326.dist-info → omdev-0.0.0.dev328.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev326
+Version: 0.0.0.dev328
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev326
+Requires-Dist: omlish==0.0.0.dev328
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev326.dist-info → omdev-0.0.0.dev328.dist-info}/RECORD

@@ -36,7 +36,8 @@ omdev/cc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/cc/__main__.py,sha256=n7gxSRYZ1QZOUxQPCT0_n9Xl26zi2UIvCwyGW_m67nA,166
 omdev/cc/cdeps.py,sha256=33_XLbLZMptyJIkzas6ruSHsaNi95pRQj5BNQInG75o,1546
 omdev/cc/cdeps.toml,sha256=MqZ1OQHQ2JPvQpHRL32GpRgQWQRtzjPI2EWl4EqSm-I,1004
-omdev/cc/cli.py,sha256=h_eIA370FLJTzzSmPlk4WEcJZMuH_zeeokztG0FZMFI,4425
+omdev/cc/cli.py,sha256=qmBLyq7dz85Sv4xZ_YR2S4UehCGKrf7-ZIWL0RwnLIY,4918
+omdev/cc/srclangs.py,sha256=3u_APHgknuc-BPRQSDISwSzouluKsnLlBxodp-XCl_E,728
 omdev/cexts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/cexts/_boilerplate.cc,sha256=sbpXEgdFrkdzZXgaNWFFNN27fL9TZu6VrwvMY4-nnFM,1726
 omdev/cexts/build.py,sha256=F3z1-CjDlEM-Gzi5IunKUBO52qdH_pMsFylobTdGJnI,2654
@@ -295,9 +296,9 @@ omdev/tools/json/rendering.py,sha256=3HhdlKSetS6iK1tjF2aILzsl8Mb3D8wW92vYwGpRdVA
 omdev/tools/pawk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tools/pawk/__main__.py,sha256=VCqeRVnqT1RPEoIrqHFSu4PXVMg4YEgF4qCQm90-eRI,66
 omdev/tools/pawk/pawk.py,sha256=zsEkfQX0jF5bn712uqPAyBSdJt2dno1LH2oeSMNfXQI,11424
-omdev-0.0.0.dev326.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev326.dist-info/METADATA,sha256=FmWy3rprjDSjibWIe6umKnDU_NTbCKFxOOx68p8JC-k,1674
-omdev-0.0.0.dev326.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omdev-0.0.0.dev326.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev326.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev326.dist-info/RECORD,,
+omdev-0.0.0.dev328.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev328.dist-info/METADATA,sha256=RxvGx7H2RP1Jzdxu9licD0UP3I09pz-Bl7Efovlaj0s,1674
+omdev-0.0.0.dev328.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omdev-0.0.0.dev328.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev328.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev328.dist-info/RECORD,,