-
Notifications
You must be signed in to change notification settings - Fork 11
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Assume schema rust definition #316
Closed
Closed
Changes from 6 commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
9ad632f
adding rust schema
oflatt 90b0d2f
make rust version match
oflatt c4290e6
Merge branch 'oflatt-input-schema' into oflatt-input-schema-rust
oflatt 1573c4b
use Push instead of All
oflatt ba78ae1
Merge branch 'oflatt-input-schema' into oflatt-input-schema-rust
oflatt a5e2488
sync up with empty/unit
oflatt b079e7a
Merge branch 'oflatt-input-schema' into oflatt-input-schema-rust
oflatt 4ace7e9
update to match extend
oflatt 210c7b0
Merge branch 'oflatt-input-schema' into oflatt-input-schema-rust
oflatt 58853e5
update for pointer types
oflatt e40dcc3
Merge branch 'oflatt-input-schema' into oflatt-input-schema-rust
oflatt cf4e0fc
fix up type
oflatt 7a11141
remove boxes
oflatt File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
use schema::Program; | ||
|
||
pub mod schema; | ||
|
||
pub type Result = std::result::Result<(), egglog::Error>; | ||
|
||
pub fn run_test(build: &str, check: &str, progs: Vec<Program>) -> Result { | ||
let program = format!( | ||
"{}\n{build}\n{}\n{check}\n", | ||
[include_str!("schema.egg"),].join("\n"), | ||
include_str!("schedule.egg"), | ||
); | ||
|
||
println!("{}", program); | ||
|
||
egglog::EGraph::default() | ||
.parse_and_run_program(&program) | ||
.map(|lines| { | ||
for line in lines { | ||
println!("{}", line); | ||
} | ||
}) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
(run-schedule | ||
(repeat 6 | ||
(saturate always-run) | ||
(saturate error-checking) | ||
)) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,71 @@ | ||
//! This module mirrors `schema.egg`. | ||
//! No implementation or conversion should | ||
//! be implemented in this file. | ||
|
||
use std::rc::Rc; | ||
|
||
pub enum Type { | ||
IntT, | ||
BoolT, | ||
UnitT, | ||
/// Nested tuple types are not allowed. | ||
TupleT(Vec<Rc<Type>>), | ||
} | ||
|
||
pub enum BinaryOp { | ||
Add, | ||
Sub, | ||
Mul, | ||
LessThan, | ||
And, | ||
Or, | ||
Write, | ||
} | ||
|
||
pub enum UnaryOp { | ||
Not, | ||
Print, | ||
} | ||
|
||
pub enum Constant { | ||
Int(i64), | ||
Bool(bool), | ||
Unit, | ||
} | ||
|
||
pub enum Order { | ||
Parallel, | ||
Sequential, | ||
} | ||
|
||
pub type RcExpr = Rc<Expr>; | ||
|
||
pub enum Assumption { | ||
InLet(RcExpr), | ||
InLoop(RcExpr, RcExpr), | ||
} | ||
|
||
pub enum Expr { | ||
Const(Constant), | ||
Bop(BinaryOp, RcExpr, RcExpr), | ||
Uop(UnaryOp, RcExpr), | ||
Get(RcExpr, i64), | ||
Read(RcExpr, Type), | ||
Call(String, RcExpr), | ||
Empty(), | ||
Push(Order, RcExpr, RcExpr), | ||
Switch(RcExpr, Vec<RcExpr>), | ||
If(RcExpr, RcExpr, RcExpr), | ||
Let(RcExpr, RcExpr), | ||
DoWhile(RcExpr, RcExpr), | ||
Arg(Type), | ||
Assume(Assumption, RcExpr), | ||
Function(String, Type, Type, RcExpr), | ||
} | ||
|
||
pub struct Program { | ||
/// must be a function | ||
pub entry: Expr, | ||
/// a list of other functions | ||
pub functions: Vec<Expr>, | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If nested tuples aren't allowed, can we make them unrepresentable, as in:
This way we also get to avoid boxing the tuple elements.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good idea