Construct machine-sized typed clasical variables (#90)

* add method to construct machine-sized typed vars

* fix broken test

Author: jcjaskula-aws

oqpy/classical_types.py

@@ -20,6 +20,7 @@
 import functools
 import random
 import string
+import sys
 from typing import (
     TYPE_CHECKING,
     Any,
@@ -50,6 +51,11 @@
 
     from oqpy.program import Program
 
+    if sys.version_info < (3, 10):
+        EllipsisType = type(Ellipsis)
+    else:
+        from types import EllipsisType
+
 __all__ = [
     "pi",
     "ArrayVar",
@@ -242,13 +248,15 @@ class _SizedVar(_ClassicalVar):
     default_size: int | None = None
     size: int | None
 
-    def __class_getitem__(cls: Type[_SizedVarT], item: int) -> Callable[..., _SizedVarT]:
+    def __class_getitem__(cls: Type[_SizedVarT], item: int | None) -> Callable[..., _SizedVarT]:
         # Allows IntVar[64]() notation
         return functools.partial(cls, size=item)
 
-    def __init__(self, *args: Any, size: int | None = None, **kwargs: Any):
-        if size is None:
+    def __init__(self, *args: Any, size: int | None | EllipsisType = ..., **kwargs: Any):
+        if size is ...:
             self.size = self.default_size
+        elif size is None:
+            self.size = size
         else:
             if not isinstance(size, int) or size <= 0:
                 raise ValueError(

tests/test_directives.py

@@ -116,13 +116,14 @@ def test_version_string():
 def test_variable_declaration():
     b = BoolVar(True, "b")
     i = IntVar(-4, "i")
+    j = IntVar[None](4, "j")
     u = UintVar(5, "u")
     x = DurationVar(100e-9, "blah")
     y = FloatVar[50](3.3, "y")
     ang = AngleVar(name="ang")
     arr = BitVar[20](name="arr")
     c = BitVar(name="c")
-    vars = [b, i, u, x, y, ang, arr, c]
+    vars = [b, i, j, u, x, y, ang, arr, c]
 
     prog = Program(version=None)
     prog.declare(vars)
@@ -154,6 +155,7 @@ def test_variable_declaration():
         int[32] index = 2;
         bool b = true;
         int[32] i = -4;
+        int j = 4;
         uint[32] u = 5;
         duration blah = 100.0ns;
         float[50] y = 3.3;