zaphar/ucg
1
0
Fork 0
mirror of https://github.com/zaphar/ucg.git synced 2025-07-22 18:19:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

maint: The macro usage for shapes was confusing

Browse Source
This commit is contained in:
Jeremy Wall 2023-08-21 16:08:40 -04:00
parent bad460bf71
commit 8cc94eedef
2 changed files with 24 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock generated
View File

@ -532,6 +532,7 @@ dependencies = [
"dirs",
"regex",
"rustyline",
"serde",
"serde_json",
"serde_yaml",
"simple-error",

55
src/ast/mod.rs
View File

@ -236,42 +236,33 @@ pub struct ModuleShapeDef {
ret: Box<Shape>,
}
macro_rules! value_enum {
($doc:meta $i:tt, $t:ty, $l:ty, $($extra:tt)*) => {
#[$doc]
#[derive(PartialEq, Debug, Clone)]
pub enum $i {
// Simple Values
Empty(Position),
Boolean(PositionedItem<bool>),
Int(PositionedItem<i64>),
Float(PositionedItem<f64>),
Str(PositionedItem<String>),
Symbol(PositionedItem<String>),
// Complex Values
Tuple(PositionedItem<$t>),
List($l),
// Extra items
$( $extra )*
}
}
#[doc = "Value types represent the Values that UCG can have."]
#[derive(PartialEq, Debug, Clone)]
pub enum Value {
Empty(Position),
Boolean(PositionedItem<bool>),
Int(PositionedItem<i64>),
Float(PositionedItem<f64>),
Str(PositionedItem<String>),
Symbol(PositionedItem<String>),
Tuple(PositionedItem<FieldList>),
List(ListDef),
}
value_enum!(
doc="Value types represent the Values that UCG can have."
Value,
FieldList,
ListDef,
);
value_enum!(
doc="Shapes represent the types that UCG values or expressions can have."
Shape,
ShapeTuple,
PositionedItem<ShapeList>,
#[doc = "Shapes represent the types that UCG values or expressions can have."]
#[derive(PartialEq, Debug, Clone)]
pub enum Shape {
Empty(Position),
Boolean(PositionedItem<bool>),
Int(PositionedItem<i64>),
Float(PositionedItem<f64>),
Str(PositionedItem<String>),
Symbol(PositionedItem<String>),
Tuple(PositionedItem<ShapeTuple>),
List(PositionedItem<ShapeList>),
Func(FuncShapeDef),
Module(ModuleShapeDef),
);
}
impl Shape {
pub fn merge(&self, right: &Shape) -> Option<Self> {