FrogWithACoolHat/RustXMLParseTest
2
1
Fork 1
Code Issues 6 Pull requests 1 Projects Releases Packages Wiki Activity

Struct methods to &self, related changed to parse.

Browse source 
Cleaned up struct derives, comments, and variables in main.
This commit is contained in:
Kyle Kiteveles 2023-08-07 15:44:57 -04:00
parent 7baa168d8c
commit c15d1613b8
2 changed files with 46 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/main.rs
View file

@ -9,7 +9,6 @@ fn main() {
let mut objects_filenames: Vec<String> = Vec::new(); let mut objects_filenames: Vec<String> = Vec::new();
let mut messages_filenames: Vec<String> = Vec::new(); let mut messages_filenames: Vec<String> = Vec::new();
let mut file_names: Vec<String> = Vec::new(); let mut file_names: Vec<String> = Vec::new();
let mut text: Vec<String> = args[1..].to_vec();
let mut handles:Vec<JoinHandle<()>> = Vec::new(); let mut handles:Vec<JoinHandle<()>> = Vec::new();
let opt = roxmltree::ParsingOptions { let opt = roxmltree::ParsingOptions {
allow_dtd: true, allow_dtd: true,
@ -20,7 +19,6 @@ fn main() {
file_names.push(arg.to_string()); file_names.push(arg.to_string());
objects_filenames.push(file_names.last().unwrap().trim_end_matches(".xml").to_string() + "_objects.rs"); objects_filenames.push(file_names.last().unwrap().trim_end_matches(".xml").to_string() + "_objects.rs");
messages_filenames.push(file_names.last().unwrap().trim_end_matches(".xml").to_string() + "_messages.rs"); messages_filenames.push(file_names.last().unwrap().trim_end_matches(".xml").to_string() + "_messages.rs");
handles.push(thread::spawn(move || { handles.push(thread::spawn(move || {
println!("{:?}", arg); println!("{:?}", arg);
if arg.to_string().contains(".xml") { if arg.to_string().contains(".xml") {
@ -118,10 +116,10 @@ fn parse(doc: &Document) -> oop::Family {
if f.value() ==real_family.get_name() { if f.value() ==real_family.get_name() {
for genus in real_family.get_genera().as_mut_slice() { for genus in real_family.get_genera().as_mut_slice() {
if let Some(g) = child2.attribute_node("genus") { if let Some(g) = child2.attribute_node("genus") {
if g.value() == genus.clone().get_name() { if g.value() == genus.get_name() {
for species in genus.clone().get_species().as_mut_slice() { for species in genus.get_species().as_mut_slice() {
if let Some(s) = child2.attribute_node("species") { if let Some(s) = child2.attribute_node("species") {
if s.value() == species.clone().get_name() { if s.value() == species.get_name() {
species.push_object(oop::Object::new(child2.attribute_node("class").unwrap().value().to_string(), child2.attribute_node("abrv").unwrap().value().to_string(), child2.attribute_node("version").unwrap().value().to_string(), Vec::new())) species.push_object(oop::Object::new(child2.attribute_node("class").unwrap().value().to_string(), child2.attribute_node("abrv").unwrap().value().to_string(), child2.attribute_node("version").unwrap().value().to_string(), Vec::new()))
} }
} }
@ -155,11 +153,11 @@ fn parse(doc: &Document) -> oop::Family {
if s.value() ==real_family.get_name(){ if s.value() ==real_family.get_name(){
for genus in real_family.get_genera().as_mut_slice() { for genus in real_family.get_genera().as_mut_slice() {
if let Some(g) = child2.attribute_node("genus") { if let Some(g) = child2.attribute_node("genus") {
if g.value() == genus.clone().get_name() { if g.value() == genus.get_name() {
for species in genus.clone().get_species().as_mut_slice() { for species in genus.get_species().as_mut_slice() {
if let Some(s) = child2.attribute_node("species") { if let Some(s) = child2.attribute_node("species") {
if s.value() == species.clone().get_name() { if s.value() == species.get_name() {
for object in species.clone().get_objects().as_mut_slice() { for object in species.get_objects().as_mut_slice() {
object.push_object_member(oop::ObjectMember::new(child4.attribute_node("type").unwrap().value().to_string(), child4.attribute_node("name").unwrap().value().to_string(), child4.attribute_node("minversion").unwrap().value().to_string(), child4.attribute_node("maxversion").unwrap().value().to_string(), Vec::new())); object.push_object_member(oop::ObjectMember::new(child4.attribute_node("type").unwrap().value().to_string(), child4.attribute_node("name").unwrap().value().to_string(), child4.attribute_node("minversion").unwrap().value().to_string(), child4.attribute_node("maxversion").unwrap().value().to_string(), Vec::new()));
} }
} }
@ -196,19 +194,19 @@ fn parse(doc: &Document) -> oop::Family {
if f.value() ==real_family.get_name() { if f.value() ==real_family.get_name() {
for genus in real_family.get_genera().as_mut_slice() { for genus in real_family.get_genera().as_mut_slice() {
if let Some(g) = child2.attribute_node("genus") { if let Some(g) = child2.attribute_node("genus") {
if g.value() == genus.clone().get_name() { if g.value() == genus.get_name() {
for species in genus.clone().get_species().as_mut_slice() { for species in genus.get_species().as_mut_slice() {
if let Some(s) = child2.attribute_node("species") { if let Some(s) = child2.attribute_node("species") {
if s.value() == species.clone().get_name() { if s.value() == species.get_name() {
for object in species.clone().get_objects().as_mut_slice() { for object in species.get_objects().as_mut_slice() {
for member in object.clone().get_members().as_mut_slice() { for member in object.get_members().as_mut_slice() {
if let Some(m) = child3.attribute_node("name") { if let Some(m) = child3.attribute_node("name") {
if m.value() == member.clone().get_name() { if m.value() == member.get_name() {
if child4.has_attribute("defaultvalue") { if child4.has_attribute("defaultvalue") {
member.clone().get_enumerations().push(oop::MemberEnumeration::new(child4.attribute_node("name").unwrap().value().to_string(), child4.attribute_node("defaultvalue").unwrap().value().to_string())); member.get_enumerations().push(oop::MemberEnumeration::new(child4.attribute_node("name").unwrap().value().to_string(), child4.attribute_node("defaultvalue").unwrap().value().to_string()));
} }
else { else {
member.clone().get_enumerations().push(oop::MemberEnumeration::new(child4.attribute_node("name").unwrap().value().to_string(), String::new())); member.get_enumerations().push(oop::MemberEnumeration::new(child4.attribute_node("name").unwrap().value().to_string(), String::new()));
} }
} }
} }

44
src/oop.rs
View file

@ -25,16 +25,17 @@ impl Family {
return self.name.clone() return self.name.clone()
} }
pub fn set_name(&mut self, name: String){ /*pub fn set_name(&mut self, name: String){
if self.name.len() == 0 { if self.name.len() == 0 {
self.name = name self.name = name
} }
}*/
pub fn get_genera(&mut self) -> &mut Vec<Genus>{
return &mut self.genera
} }
pub fn get_genera(&self) -> Vec<Genus>{ #[allow(unused)]
return self.genera.clone()
}
pub fn get_messages(&self) -> Vec<Vec<String>>{ pub fn get_messages(&self) -> Vec<Vec<String>>{
return self.messages.clone() return self.messages.clone()
} }
@ -67,8 +68,8 @@ impl Genus {
return self.name.clone() return self.name.clone()
} }
pub fn get_species(&self) -> Vec<Species>{ pub fn get_species(&mut self) -> &mut Vec<Species>{
return self.species.clone() return &mut self.species
} }
pub fn push_species(&mut self, species: Species) { pub fn push_species(&mut self, species: Species) {
@ -92,12 +93,13 @@ impl Species {
return self.name.clone() return self.name.clone()
} }
#[allow(unused)]
pub fn get_default_value(&self) -> String{ pub fn get_default_value(&self) -> String{
return self.default_value.clone() return self.default_value.clone()
} }
pub fn get_objects(&self) -> Vec<Object>{ pub fn get_objects(&mut self) -> &mut Vec<Object>{
return self.objects.clone() return &mut self.objects
} }
pub fn push_object(&mut self, object: Object) { pub fn push_object(&mut self, object: Object) {
@ -118,20 +120,24 @@ impl Object {
Self { name, abrv, version, members } Self { name, abrv, version, members }
} }
#[allow(unused)]
pub fn get_name(&self) -> String{ pub fn get_name(&self) -> String{
return self.name.clone() return self.name.clone()
} }
#[allow(unused)]
pub fn get_abrv(&self) -> String{ pub fn get_abrv(&self) -> String{
return self.abrv.clone() return self.abrv.clone()
} }
#[allow(unused)]
pub fn get_version(&self) -> String{ pub fn get_version(&self) -> String{
return self.version.clone() return self.version.clone()
} }
pub fn get_members(&self) -> Vec<ObjectMember>{ #[allow(unused)]
return self.members.clone() pub fn get_members(&mut self) -> &mut Vec<ObjectMember>{
return &mut self.members
} }
pub fn push_object_member(&mut self, member: ObjectMember) { pub fn push_object_member(&mut self, member: ObjectMember) {
@ -157,22 +163,27 @@ impl ObjectMember {
return self.name.clone() return self.name.clone()
} }
#[allow(unused)]
pub fn get_member_type(&self) -> String{ pub fn get_member_type(&self) -> String{
return self.member_type.clone() return self.member_type.clone()
} }
#[allow(unused)]
pub fn get_minversion(&self) -> String{ pub fn get_minversion(&self) -> String{
return self.minversion.clone() return self.minversion.clone()
} }
#[allow(unused)]
pub fn get_maxversion(&self) -> String{ pub fn get_maxversion(&self) -> String{
return self.maxversion.clone() return self.maxversion.clone()
} }
pub fn get_enumerations(&self) -> Vec<MemberEnumeration>{ #[allow(unused)]
return self.enumerations.clone() pub fn get_enumerations(&mut self) -> &mut Vec<MemberEnumeration>{
return &mut self.enumerations
} }
#[allow(unused)]
pub fn push_member_enumeration(&mut self, enumeration: MemberEnumeration) { pub fn push_member_enumeration(&mut self, enumeration: MemberEnumeration) {
self.enumerations.push(enumeration); self.enumerations.push(enumeration);
} }
@ -189,10 +200,12 @@ impl MemberEnumeration {
Self { name, default_value } Self { name, default_value }
} }
#[allow(unused)]
pub fn get_name(&self) -> String{ pub fn get_name(&self) -> String{
return self.name.clone() return self.name.clone()
} }
#[allow(unused)]
pub fn get_default_value(&self) -> String{ pub fn get_default_value(&self) -> String{
return self.default_value.clone() return self.default_value.clone()
} }
@ -213,22 +226,27 @@ impl Messages {
Self { requests, responses, commands, statuses, streams, error: String::from("") } Self { requests, responses, commands, statuses, streams, error: String::from("") }
} }
#[allow(unused)]
pub fn get_requests(&self) -> Vec<String>{ pub fn get_requests(&self) -> Vec<String>{
return self.requests.clone() return self.requests.clone()
} }
#[allow(unused)]
pub fn get_responses(&self) -> Vec<String>{ pub fn get_responses(&self) -> Vec<String>{
return self.responses.clone() return self.responses.clone()
} }
#[allow(unused)]
pub fn get_commands(&self) -> Vec<String>{ pub fn get_commands(&self) -> Vec<String>{
return self.commands.clone() return self.commands.clone()
} }
#[allow(unused)]
pub fn get_statuses(&self) -> Vec<String>{ pub fn get_statuses(&self) -> Vec<String>{
return self.statuses.clone() return self.statuses.clone()
} }
#[allow(unused)]
pub fn get_streams(&self) -> Vec<String>{ pub fn get_streams(&self) -> Vec<String>{
return self.streams.clone() return self.streams.clone()
} }