Handling extremely long user-type names by specific bounding.

commit-id:be92039f
starkware-libs · Jun 25, 2024 · b14afa1 · b14afa1
1 parent 8ec2e0b
commit b14afa1
Show file tree

Hide file tree

Showing 6 changed files with 1,079 additions and 918 deletions.
diff --git a/crates/cairo-lang-semantic/src/types.rs b/crates/cairo-lang-semantic/src/types.rs
@@ -248,15 +248,26 @@ impl ConcreteTypeId {
     pub fn format(&self, db: &dyn SemanticGroup) -> String {
         // TODO(spapini): Format generics.
         let generic_type_format = self.generic_type(db).format(db.upcast());
-        let generic_args = self.generic_args(db);
-        if generic_args.is_empty() {
-            generic_type_format
+        let mut generic_args = self.generic_args(db).into_iter();
+        if let Some(first) = generic_args.next() {
+            // Soft limit for the number of chars in the formatted type.
+            const CHARS_BOUND: usize = 500;
+            let mut f = generic_type_format;
+            f.push_str("::<");
+            f.push_str(&first.format(db));
+            for arg in generic_args {
+                // If the formatted type is becoming too long, stop adding more arguments.
+                if f.len() > CHARS_BOUND {
+                    f.push_str(", ...");
+                    break;
+                }
+                f.push_str(", ");
+                f.push_str(&arg.format(db));
+            }
+            f.push('>');
+            f
         } else {
-            format!(
-                "{}::<{}>",
-                generic_type_format,
-                generic_args.iter().map(|arg| arg.format(db)).join(", ")
-            )
+            generic_type_format
         }
     }
 

diff --git a/crates/cairo-lang-sierra/src/parser.lalrpop b/crates/cairo-lang-sierra/src/parser.lalrpop
@@ -180,6 +180,7 @@ PathLabel: String = {
 GenericArgsString: String = {
     GenericArg => <>.to_string(),
     <head:GenericArgsString> "," <tail:GenericArg> => format!("{head}, {tail}"),
+    <head:GenericArgsString> "," "..." => format!("{head}, ..."),
 }
 
 // Label that can also include generic arguments.

diff --git a/crates/cairo-lang-starknet/cairo_level_tests/contracts/circuit_contract.cairo b/crates/cairo-lang-starknet/cairo_level_tests/contracts/circuit_contract.cairo
@@ -16,6 +16,22 @@ mod circuit_contract {
         let in1 = CircuitElement::<CircuitInput<0>> {};
         let in2 = CircuitElement::<CircuitInput<1>> {};
         let add = circuit_add(in1, in2);
+        let add = circuit_add(add, add);
+        let add = circuit_add(add, add);
+        let add = circuit_add(add, add);
+        let add = circuit_add(add, add);
+        let add = circuit_add(add, add);
+        let add = circuit_add(add, add);
+        let add = circuit_add(add, add);
+        let add = circuit_add(add, add);
+        let add = circuit_add(add, add);
+        let add = circuit_add(add, add);
+        let add = circuit_add(add, add);
+        let add = circuit_add(add, add);
+        let add = circuit_add(add, add);
+        let add = circuit_add(add, add);
+        let add = circuit_add(add, add);
+        let add = circuit_add(add, add);
         let inv = circuit_inverse(add);
 
         let modulus = TryInto::<_, CircuitModulus>::try_into([7, 0, 0, 0]).unwrap();