mirror of
https://github.com/zaphar/ucg.git
synced 2025-07-22 18:19:54 -04:00
Add list flag support.
If a field has a list of primitive values in it expand it to multiples of that flag for each value in the list.
This commit is contained in:
parent
41405b511b
commit
07413c9e8d
@ -24,5 +24,6 @@ let server_config = {
|
|||||||
tmpldir = "./templates",
|
tmpldir = "./templates",
|
||||||
prefix = {
|
prefix = {
|
||||||
foo = "bar"
|
foo = "bar"
|
||||||
}
|
},
|
||||||
|
l = ["foo", "bar"]
|
||||||
};
|
};
|
16
src/build.rs
16
src/build.rs
@ -126,6 +126,13 @@ impl Val {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn is_empty(&self) -> bool {
|
||||||
|
if let &Val::Empty = self {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
pub fn is_float(&self) -> bool {
|
pub fn is_float(&self) -> bool {
|
||||||
if let &Val::Float(_) = self {
|
if let &Val::Float(_) = self {
|
||||||
return true;
|
return true;
|
||||||
@ -148,7 +155,14 @@ impl Val {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn is_list(&self) -> bool {
|
pub fn is_list(&self) -> bool {
|
||||||
if let &Val::Tuple(_) = self {
|
if let &Val::List(_) = self {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn is_macro(&self) -> bool {
|
||||||
|
if let &Val::Macro(_) = self {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
|
@ -37,6 +37,27 @@ impl FlagConverter {
|
|||||||
return Ok(());
|
return Ok(());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn write_list_flag(&self, pfx: &str, name: &str, v: &Val, w: &mut Write) -> Result<()> {
|
||||||
|
if let &Val::List(ref def) = v {
|
||||||
|
// first of all we need to make sure that each &Val is only a primitive type.
|
||||||
|
for v in def.iter() {
|
||||||
|
let vref = v.as_ref();
|
||||||
|
if vref.is_list() || vref.is_tuple() || vref.is_macro() {
|
||||||
|
eprintln!(
|
||||||
|
"Skipping non primitive val in list for flag {}{}",
|
||||||
|
pfx, name
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
try!(self.write_flag_name(pfx, name, w));
|
||||||
|
try!(self.write(pfx, vref, w));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
panic!("Impossible call happened. Somebody messed up.")
|
||||||
|
}
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
|
||||||
fn write(&self, pfx: &str, v: &Val, w: &mut Write) -> Result<()> {
|
fn write(&self, pfx: &str, v: &Val, w: &mut Write) -> Result<()> {
|
||||||
match v {
|
match v {
|
||||||
&Val::Empty => {
|
&Val::Empty => {
|
||||||
@ -56,22 +77,21 @@ impl FlagConverter {
|
|||||||
// FIXME(jwall): Fill this in?
|
// FIXME(jwall): Fill this in?
|
||||||
eprintln!("Skipping List...");
|
eprintln!("Skipping List...");
|
||||||
}
|
}
|
||||||
&Val::Tuple(ref flds) => {
|
&Val::Tuple(ref flds) => for &(ref name, ref val) in flds.iter() {
|
||||||
for &(ref name, ref val) in flds.iter() {
|
if let &Val::Empty = val.as_ref() {
|
||||||
if let &Val::Empty = val.as_ref() {
|
try!(self.write_flag_name(pfx, &name.val, w));
|
||||||
try!(self.write_flag_name(pfx, &name.val, w));
|
continue;
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if val.is_tuple() {
|
|
||||||
let new_pfx = format!("{}{}.", pfx, name);
|
|
||||||
try!(self.write(&new_pfx, val, w));
|
|
||||||
} else {
|
|
||||||
try!(self.write_flag_name(pfx, &name.val, w));
|
|
||||||
// TODO(jwall): What if the value is a tuple?
|
|
||||||
try!(self.write(pfx, &val, w));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
if val.is_tuple() {
|
||||||
|
let new_pfx = format!("{}{}.", pfx, name);
|
||||||
|
try!(self.write(&new_pfx, val, w));
|
||||||
|
} else if val.is_list() {
|
||||||
|
try!(self.write_list_flag(pfx, &name.val, &val, w));
|
||||||
|
} else {
|
||||||
|
try!(self.write_flag_name(pfx, &name.val, w));
|
||||||
|
try!(self.write(pfx, &val, w));
|
||||||
|
}
|
||||||
|
},
|
||||||
&Val::Macro(ref _def) => {
|
&Val::Macro(ref _def) => {
|
||||||
// This is ignored
|
// This is ignored
|
||||||
eprintln!("Skipping macro...");
|
eprintln!("Skipping macro...");
|
||||||
|
Loading…
x
Reference in New Issue
Block a user