feat(compiler): emit dynamic scope information with emitted values

core/compiler/Cargo.toml

@@ -14,19 +14,19 @@ good_lp = { version = "1", features = [
 ], default-features = false }
 itertools = "0.14"
 ena = "0.14"
-enumify = { version = "0.2.1", registry = "substrate" }
+enumify = { version = "0.2", registry = "substrate" }
 gds21 = "0.2"
 arcstr = { version = "1", features = ["serde"] }
 serde = { version = "1", features = ["derive", "rc"] }
 serde_json = "1"
 derive-where = "1"
-nalgebra = "0.33.2"
+nalgebra = "0"
 approx = "0.5"
 rust_decimal = "1"
 rust_decimal_macros = "1"
-indexmap = "2.10.0"
+indexmap = { version = "2", features = ["serde"] }
 clap = { version = "4", features = ["derive"] }
-geometry = { version = "0.7.1", registry = "substrate" }
+geometry = { version = "0.7", registry = "substrate" }
 
 [build-dependencies]
 cfgrammar = "0.13"

core/compiler/examples/nested_inst.ar

@@ -1,6 +1,16 @@
 cell bot() {
     let met1 = rect(Layer::Met1, x0=0., y0=0., x1=100., y1=100.)!;
     let met2 = rect(Layer::Met1, x0=100., y0=0., x1=200., y1=100.)!;
+    let met3 = make_rect()!;
+    let met4 = emit_rect();
+}
+
+fn make_rect() -> Rect {
+    rect(Layer::Met2, x0=0., y0=0., x1=200., y1=100.)
+}
+
+fn emit_rect() -> Rect {
+    rect(Layer::Met2, x0=0., y0=0., x1=200., y1=100.)!
 }
 
 cell middle() {
@@ -18,5 +28,6 @@ cell top() {
   eq(right.x, 300.);
   eq(right.y, 0.);
   let met3 = rect(Layer::Met3, x0=left.bot.met1.x0, y0=20., x1=right.bot.met1.x1, y1=80.)!;
+  let duplicate_rect = left.bot.met3!;
 }
 

core/compiler/src/argon.y

@@ -1,5 +1,13 @@
-%start Decls
+%start Ast
 %%
+Ast -> Result<Ast<'input, ParseMetadata>, ()>:
+  Decls {
+    Ok(Ast {
+      decls: $1?,
+      span: $span,
+    })
+  };
+
 Decls -> Result<Vec<Decl<'input, ParseMetadata>>, ()>:
   Decls Decl {
     let mut __tmp = $1?;
@@ -105,6 +113,7 @@ CellDecl -> Result<CellDecl<'input, ParseMetadata>, ()>
       name: $2?,
       args: $4?,
       scope: $6?,
+      span: $span,
       metadata: (),
     })
   }
@@ -118,6 +127,7 @@ FnDecl -> Result<FnDecl<'input, ParseMetadata>, ()>
       args: $4?,
       scope: $8?,
       return_ty: $7?,
+      span: $span,
       metadata: (),
     })
   }
@@ -159,10 +169,10 @@ Scope -> Result<Scope<'input, ParseMetadata>, ()>
     if let Some(Statement::Expr { value, semicolon }) = __stmts.last().cloned() && !semicolon {
       __stmts.pop().unwrap();
       return Ok(Scope {
-          span: $span,
-          stmts: __stmts,
-          tail: Some(value),
-          metadata: (),
+        span: $span,
+        stmts: __stmts,
+        tail: Some(value),
+        metadata: (),
       })
     }
     Ok(Scope {

core/compiler/src/ast.rs

@@ -4,9 +4,10 @@ use cfgrammar::Span;
 use derive_where::derive_where;
 use itertools::Itertools;
 
-#[derive_where(Default, Debug, Clone)]
+#[derive_where(Debug, Clone)]
 pub struct Ast<'a, T: AstMetadata> {
     pub decls: Vec<Decl<'a, T>>,
+    pub span: Span,
 }
 
 #[derive_where(Debug, Clone)]
@@ -65,6 +66,7 @@ pub struct CellDecl<'a, T: AstMetadata> {
     pub name: Ident<'a, T>,
     pub args: Vec<ArgDecl<'a, T>>,
     pub scope: Scope<'a, T>,
+    pub span: Span,
     pub metadata: T::CellDecl,
 }
 
@@ -74,6 +76,7 @@ pub struct FnDecl<'a, T: AstMetadata> {
     pub args: Vec<ArgDecl<'a, T>>,
     pub return_ty: Ident<'a, T>,
     pub scope: Scope<'a, T>,
+    pub span: Span,
     pub metadata: T::FnDecl,
 }
 
@@ -486,6 +489,7 @@ pub trait AstTransformer<'a> {
             name,
             args,
             scope,
+            span: input.span,
             metadata,
         }
     }
@@ -504,6 +508,7 @@ pub trait AstTransformer<'a> {
             args,
             return_ty,
             scope,
+            span: input.span,
             metadata,
         }
     }