feat: replace numeric subtyping with explicit modes 🔢

Cargo.toml

@@ -32,7 +32,6 @@ ndc_macros = { path = "ndc_macros", version = "0.1.0" }
 ndc_stdlib = { path = "ndc_stdlib", version = "0.3.0" }
 num = "0.4.3"
 once_cell = "1.21.4"
-ordered-float = "5.3.0"
 proptest = "1.11"
 yansi = { version = "1.0.1", features = ["detect-tty", "detect-env"] }
 rand = "0.10.2"

benches/programs/bigint.ndc

@@ -1,4 +1,4 @@
-let result = 1;
+let result = 1n;
 for i in 2..=5000 {
     result *= i;
 }

benches/programs/closures.ndc

@@ -1,6 +1,6 @@
 let total = 0;
 for _ in 0..20 {
   let adders = [fn(x) => x + i for i in 0..10_000];
-  total = total + adders.map(fn(f) => f(0)).sum;
+  total = total + (adders.map(fn(f) => f(0)) as List<Int>).sum;
 };
 print(total);

benches/programs/perlin.ndc

@@ -5,7 +5,7 @@ fn fade(t) => t * t * t * (t * (t * 6 - 15) + 10);
 
 fn lerp(a, b, t) => a + t * (b - a);
 
-fn gradient(h, x, y) => (vectors[h % 8] * (x, y)).sum
+fn gradient(h, x, y) => ((vectors[h % 8] * (x, y)) as Tuple<Float, Float>).sum
 
 fn perlin(x, y, perm) {
   let xi, yi = int(x) & 255, int(y) & 255;
@@ -33,4 +33,4 @@ fn benchmark_perlin(grid_size) {
 }
 
 let noise = benchmark_perlin(100);
-print("Min:", noise.min, "Max:", noise.max, "Avg:", (noise.sum / noise.len));
+print("Min:", noise.min, "Max:", noise.max, "Avg:", ((noise as List<Float>).sum / noise.len));

ext/andy-cpp/syntaxes/andy-cpp.tmLanguage.json

@@ -58,7 +58,7 @@
         {
           "comment": "built-in type names used in annotations like `let x: Int` or `-> List<Int>`",
           "name": "support.type.andy-cpp",
-          "match": "\\b(Any|Never|Bool|Number|Float|Int|Rational|Complex|String|Option|Sequence|List|Iterator|MinHeap|MaxHeap|Deque|Tuple|Map)\\b"
+          "match": "\\b(Any|Never|Bool|Number|Float|Int|String|Option|Sequence|List|Iterator|MinHeap|MaxHeap|Deque|Tuple|Map)\\b"
         }
       ]
     },
@@ -200,18 +200,18 @@
           "name": "constant.numeric.complex.andy-cpp"
         },
         {
-          "comment": "Floats",
-          "match": "\\b([0-9][0-9_]*\\.[0-9][0-9_]*)\\b",
+          "comment": "Primitive Float and advanced Number float literals",
+          "match": "\\b([0-9][0-9_]*\\.[0-9][0-9_]*n?)\\b",
           "name": "constant.numeric.float.andy-cpp"
         },
         {
-          "comment": "Hexadecimal numbers",
-          "match": "\\b(0x[0-9A-Fa-f][0-9A-Fa-f_]*)\\b",
+          "comment": "Primitive Int and advanced Number hexadecimal literals",
+          "match": "\\b(0x[0-9A-Fa-f][0-9A-Fa-f_]*n?)\\b",
           "name": "constant.numeric.hex.andy-cpp"
         },
         {
-          "comment": "Ocatal n umbers",
-          "match": "\\b(0o[0-7][0-7]*)\\b",
+          "comment": "Primitive Int and advanced Number octal literals",
+          "match": "\\b(0o[0-7][0-7_]*n?)\\b",
           "name": "constant.numeric.octal.andy-cpp"
         },
         {
@@ -220,13 +220,13 @@
           "name": "constant.numeric.andy-cpp"
         },
         {
-          "comment": "Binary numbers",
-          "match": "\\b(0b[01][01_]*)\\b",
+          "comment": "Primitive Int and advanced Number binary literals",
+          "match": "\\b(0b[01][01_]*n?)\\b",
           "name": "constant.numeric.binary.andy-cpp"
         },
         {
-          "comment": "Integer numbers",
-          "match": "\\b([0-9][0-9_]*)\\b",
+          "comment": "Primitive Int and advanced Number decimal literals",
+          "match": "\\b([0-9][0-9_]*n?)\\b",
           "name": "constant.numeric.decimal.andy-cpp"
         },
         {
@@ -492,4 +492,4 @@
     }
   },
   "scopeName": "source.andy-cpp"
-}
+}

ext/tree-sitter-andy-cpp/grammar.js

@@ -467,14 +467,14 @@ module.exports = grammar({
     ),
 
     integer: _ => token(choice(
-      /0b[01][01_]*/,
-      /0o[0-7][0-7_]*/,
-      /0x[0-9A-Fa-f][0-9A-Fa-f_]*/,
+      /0b[01][01_]*n?/,
+      /0o[0-7][0-7_]*n?/,
+      /0x[0-9A-Fa-f][0-9A-Fa-f_]*n?/,
       /[0-9]+r[0-9A-Za-z][0-9A-Za-z_]*/, // arbitrary radix, e.g. 16rFF
-      /[0-9][0-9_]*/,
+      /[0-9][0-9_]*n?/,
     )),
 
-    float: _ => token(/[0-9][0-9_]*\.[0-9][0-9_]*/),
+    float: _ => token(/[0-9][0-9_]*\.[0-9][0-9_]*n?/),
 
     // Imaginary part of a complex literal: `3i`, `2.5j`
     complex: _ => token(/[0-9][0-9_]*(\.[0-9][0-9_]*)?[ij]/),

ext/tree-sitter-andy-cpp/src/grammar.json

@@ -2705,23 +2705,23 @@
         "members": [
           {
             "type": "PATTERN",
-            "value": "0b[01][01_]*"
+            "value": "0b[01][01_]*n?"
           },
           {
             "type": "PATTERN",
-            "value": "0o[0-7][0-7_]*"
+            "value": "0o[0-7][0-7_]*n?"
           },
           {
             "type": "PATTERN",
-            "value": "0x[0-9A-Fa-f][0-9A-Fa-f_]*"
+            "value": "0x[0-9A-Fa-f][0-9A-Fa-f_]*n?"
           },
           {
             "type": "PATTERN",
             "value": "[0-9]+r[0-9A-Za-z][0-9A-Za-z_]*"
           },
           {
             "type": "PATTERN",
-            "value": "[0-9][0-9_]*"
+            "value": "[0-9][0-9_]*n?"
           }
         ]
       }
@@ -2730,7 +2730,7 @@
       "type": "TOKEN",
       "content": {
         "type": "PATTERN",
-        "value": "[0-9][0-9_]*\\.[0-9][0-9_]*"
+        "value": "[0-9][0-9_]*\\.[0-9][0-9_]*n?"
       }
     },
     "complex": {