Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
### Argon ###
*.gui

### Linux ###
*~

Expand Down
25 changes: 24 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion core/compiler/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ gds21 = "0.2"
arcstr = { version = "1", features = ["serde"] }
serde = { version = "1", features = ["derive", "rc"] }
serde_json = "1"
derive-where = "1"
derive-where = { version = "1", features = ["serde"] }
nalgebra = "0.34"
approx = "0.5"
rust_decimal = "1"
Expand Down
2 changes: 0 additions & 2 deletions core/compiler/examples/nested_inst.ar
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@ cell top() {
eq(right.x, 300.);
eq(right.y, 0.);
}
#scope1
if 1 > 2 { } else { }
let met3 = rect("met3", x0=left.bot.met1.x0, y0=20., x1=right.bot.met1.x1, y1=80.)!;
let duplicate_rect = left.bot.met3!;
}

4 changes: 2 additions & 2 deletions core/compiler/src/argon.y
Original file line number Diff line number Diff line change
Expand Up @@ -237,8 +237,8 @@ Expr -> Result<Expr<'input, ParseMetadata>, ()>
;

BlockExpr -> Result<Expr<'input, ParseMetadata>, ()>
: 'IF' Expr Scope 'ELSE' Scope { Ok(Expr::If(Box::new(IfExpr { scope_annotation: None, cond: $2?, then: Expr::Scope(Box::new($3?)), else_: Expr::Scope(Box::new($5?)), span: $span, metadata: (), }))) }
| ScopeAnnotation 'IF' Expr Scope 'ELSE' Scope { Ok(Expr::If(Box::new(IfExpr { scope_annotation: Some($1?), cond: $3?, then: Expr::Scope(Box::new($4?)), else_: Expr::Scope(Box::new($6?)), span: $span, metadata: (), }))) }
: 'IF' Expr Scope 'ELSE' Scope { Ok(Expr::If(Box::new(IfExpr { scope_annotation: None, cond: $2?, then: $3?, else_: $5?, span: $span, metadata: (), }))) }
| ScopeAnnotation 'IF' Expr Scope 'ELSE' Scope { Ok(Expr::If(Box::new(IfExpr { scope_annotation: Some($1?), cond: $3?, then: $4?, else_: $6?, span: $span, metadata: (), }))) }
| Scope { Ok(Expr::Scope(Box::new($1?))) }
;

Expand Down
Loading