Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Tweak bril-rs library #96

Merged
merged 6 commits into from
Dec 13, 2020
Merged

Tweak bril-rs library #96

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
78d8592
Flatten `Option<Vec<T>>`
nwtnni Dec 12, 2020
466490b
Use raw identifiers for type fields
nwtnni Dec 12, 2020
e115c98
Gate values and types behind `float` feature
nwtnni Dec 12, 2020
6110829
Derive some additional traits
nwtnni Dec 12, 2020
31ff895
Revert "Use raw identifiers for type fields"
nwtnni Dec 13, 2020
8f165e3
Remove `Copy` trait
nwtnni Dec 13, 2020
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
40 changes: 22 additions & 18 deletions bril-rs/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@ pub struct Program {
#[derive(Serialize, Deserialize, Debug, Clone)]
pub struct Function {
pub name: String,
#[serde(skip_serializing_if = "Option::is_none")]
pub args: Option<Vec<Argument>>,
#[serde(default, skip_serializing_if = "Vec::is_empty")]
pub args: Vec<Argument>,
#[serde(rename = "type")]
#[serde(skip_serializing_if = "Option::is_none")]
pub return_type: Option<Type>,
#[serde(default, skip_serializing_if = "Vec::is_empty")]
pub instrs: Vec<Code>,
}

Expand Down Expand Up @@ -46,30 +47,31 @@ pub enum Instruction {
dest: String,
#[serde(rename = "type")]
op_type: Type,
#[serde(skip_serializing_if = "Option::is_none")]
args: Option<Vec<String>>,
#[serde(skip_serializing_if = "Option::is_none")]
funcs: Option<Vec<String>>,
#[serde(skip_serializing_if = "Option::is_none")]
labels: Option<Vec<String>>,
#[serde(default, skip_serializing_if = "Vec::is_empty")]
args: Vec<String>,
#[serde(default, skip_serializing_if = "Vec::is_empty")]
funcs: Vec<String>,
#[serde(default, skip_serializing_if = "Vec::is_empty")]
labels: Vec<String>,
},
Effect {
op: EffectOps,
#[serde(skip_serializing_if = "Option::is_none")]
args: Option<Vec<String>>,
#[serde(skip_serializing_if = "Option::is_none")]
funcs: Option<Vec<String>>,
#[serde(skip_serializing_if = "Option::is_none")]
labels: Option<Vec<String>>,
#[serde(default, skip_serializing_if = "Vec::is_empty")]
args: Vec<String>,
#[serde(default, skip_serializing_if = "Vec::is_empty")]
funcs: Vec<String>,
#[serde(default, skip_serializing_if = "Vec::is_empty")]
labels: Vec<String>,
},
}
#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]

#[derive(Serialize, Deserialize, Debug, Copy, Clone, PartialEq, Eq, Hash)]
pub enum ConstOps {
#[serde(rename = "const")]
Const,
}

#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
#[derive(Serialize, Deserialize, Debug, Copy, Clone, PartialEq, Eq, Hash)]
#[serde(rename_all = "lowercase")]
pub enum EffectOps {
#[serde(rename = "jmp")]
Expand All @@ -93,7 +95,7 @@ pub enum EffectOps {
Guard,
}

#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
#[derive(Serialize, Deserialize, Debug, Copy, Clone, PartialEq, Eq, Hash)]
#[serde(rename_all = "lowercase")]
pub enum ValueOps {
Add,
Expand Down Expand Up @@ -138,11 +140,12 @@ pub enum ValueOps {
PtrAdd,
}

#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, Hash)]
#[serde(rename_all = "lowercase")]
pub enum Type {
Int,
Bool,
#[cfg(feature = "float")]
Float,
#[cfg(feature = "memory")]
#[serde(rename = "ptr")]
Expand All @@ -154,6 +157,7 @@ pub enum Type {
pub enum Literal {
Int(i64),
Bool(bool),
#[cfg(feature = "float")]
Float(f64),
}

Expand Down