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

fix: Backend generate() res TokenStream to String #19

Merged
merged 2 commits into from
May 2, 2024
Merged

fix: Backend generate() res TokenStream to String #19

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ab3014
fix: Backend generate() res TokenStream to String
v0-e Apr 30, 2024
216616e
fix: Rasn Backend generate_tld() res mapped
v0-e May 2, 2024
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
4 changes: 1 addition & 3 deletions rasn-compiler/src/generator/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@

use std::{error::Error, fmt::Debug};

use proc_macro2::TokenStream;

use crate::intermediate::ToplevelDefinition;

use self::error::GeneratorError;
Expand All @@ -29,7 +27,7 @@ pub trait Backend: Sized + Default {
/// generates bindings for a single ASN.1 item
/// ### Params
/// - `tld` [TopLevelDeclaration] for which the bindings should be generated
fn generate(&self, tld: ToplevelDefinition) -> Result<TokenStream, GeneratorError>;
fn generate(&self, tld: ToplevelDefinition) -> Result<String, GeneratorError>;

/// Formats the bindings using the language- or framework-specific linters.
/// For example, the Rust backend uses rustfmt for formatting bindings.
Expand Down
53 changes: 52 additions & 1 deletion rasn-compiler/src/generator/rasn/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,57 @@ macro_rules! assignment {
}

impl Rasn {
pub(crate) fn generate_tld(
&self,
tld: ToplevelDefinition,
) -> Result<TokenStream, GeneratorError> {
match tld {
ToplevelDefinition::Type(t) => {
if t.parameterization.is_some() {
return Ok(TokenStream::new());
}
match t.ty {
ASN1Type::Null => self.generate_null(t),
ASN1Type::Boolean(_) => self.generate_boolean(t),
ASN1Type::Integer(_) => self.generate_integer(t),
ASN1Type::Enumerated(_) => self.generate_enumerated(t),
ASN1Type::BitString(_) => self.generate_bit_string(t),
ASN1Type::CharacterString(_) => self.generate_character_string(t),
ASN1Type::Sequence(_) | ASN1Type::Set(_) => self.generate_sequence_or_set(t),
ASN1Type::SequenceOf(_) | ASN1Type::SetOf(_) => {
self.generate_sequence_or_set_of(t)
}
ASN1Type::ElsewhereDeclaredType(_) => self.generate_typealias(t),
ASN1Type::Choice(_) => self.generate_choice(t),
ASN1Type::OctetString(_) => self.generate_octet_string(t),
ASN1Type::Time(_) => unimplemented!("rasn does not support TIME types yet!"),
ASN1Type::Real(_) => Err(GeneratorError {
kind: GeneratorErrorType::NotYetInplemented,
details: "Real types are currently unsupported!".into(),
top_level_declaration: None,
}),
ASN1Type::ObjectIdentifier(_) => self.generate_oid(t),
ASN1Type::InformationObjectFieldReference(_)
| ASN1Type::EmbeddedPdv
| ASN1Type::External => self.generate_any(t),
ASN1Type::GeneralizedTime(_) => self.generate_generalized_time(t),
ASN1Type::UTCTime(_) => self.generate_utc_time(t),
ASN1Type::ChoiceSelectionType(_) => Err(GeneratorError {
kind: GeneratorErrorType::Asn1TypeMismatch,
details: "Choice selection type should have been resolved at this point!"
.into(),
top_level_declaration: None,
}),
}
}
ToplevelDefinition::Value(v) => self.generate_value(v),
ToplevelDefinition::Information(i) => match i.value {
ASN1Information::ObjectSet(_) => self.generate_information_object_set(i),
_ => Ok(TokenStream::new()),
},
}
}

pub(crate) fn generate_typealias(
&self,
tld: ToplevelTypeDefinition,
Expand Down Expand Up @@ -830,7 +881,7 @@ impl Rasn {
let anonymous_item = match seq_or_set_of.element_type.as_ref() {
ASN1Type::ElsewhereDeclaredType(_) => None,
n => Some(
self.generate(ToplevelDefinition::Type(ToplevelTypeDefinition {
self.generate_tld(ToplevelDefinition::Type(ToplevelTypeDefinition {
parameterization: None,
comments: format!(
" Anonymous {} OF member ",
Expand Down
55 changes: 6 additions & 49 deletions rasn-compiler/src/generator/rasn/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ impl Backend for Rasn {
quote!(use super:: #module::{ #(#used_imports),* };)
});
let (pdus, warnings): (Vec<TokenStream>, Vec<Box<dyn Error>>) =
tlds.into_iter()
.fold((vec![], vec![]), |mut acc, tld| match self.generate(tld) {
tlds.into_iter().fold((vec![], vec![]), |mut acc, tld| {
match self.generate_tld(tld) {
Ok(s) => {
acc.0.push(s);
acc
Expand All @@ -102,7 +102,8 @@ impl Backend for Rasn {
acc.1.push(Box::new(e));
acc
}
});
}
});
Ok(GeneratedModule {
generated: Some(quote! {
#[allow(non_camel_case_types, non_snake_case, non_upper_case_globals, unused)]
Expand Down Expand Up @@ -169,51 +170,7 @@ impl Backend for Rasn {
}
}

fn generate(&self, tld: ToplevelDefinition) -> Result<TokenStream, GeneratorError> {
match tld {
ToplevelDefinition::Type(t) => {
if t.parameterization.is_some() {
return Ok(TokenStream::new());
}
match t.ty {
ASN1Type::Null => self.generate_null(t),
ASN1Type::Boolean(_) => self.generate_boolean(t),
ASN1Type::Integer(_) => self.generate_integer(t),
ASN1Type::Enumerated(_) => self.generate_enumerated(t),
ASN1Type::BitString(_) => self.generate_bit_string(t),
ASN1Type::CharacterString(_) => self.generate_character_string(t),
ASN1Type::Sequence(_) | ASN1Type::Set(_) => self.generate_sequence_or_set(t),
ASN1Type::SequenceOf(_) | ASN1Type::SetOf(_) => {
self.generate_sequence_or_set_of(t)
}
ASN1Type::ElsewhereDeclaredType(_) => self.generate_typealias(t),
ASN1Type::Choice(_) => self.generate_choice(t),
ASN1Type::OctetString(_) => self.generate_octet_string(t),
ASN1Type::Time(_) => unimplemented!("rasn does not support TIME types yet!"),
ASN1Type::Real(_) => Err(GeneratorError {
kind: GeneratorErrorType::NotYetInplemented,
details: "Real types are currently unsupported!".into(),
top_level_declaration: None,
}),
ASN1Type::ObjectIdentifier(_) => self.generate_oid(t),
ASN1Type::InformationObjectFieldReference(_)
| ASN1Type::EmbeddedPdv
| ASN1Type::External => self.generate_any(t),
ASN1Type::GeneralizedTime(_) => self.generate_generalized_time(t),
ASN1Type::UTCTime(_) => self.generate_utc_time(t),
ASN1Type::ChoiceSelectionType(_) => Err(GeneratorError {
kind: GeneratorErrorType::Asn1TypeMismatch,
details: "Choice selection type should have been resolved at this point!"
.into(),
top_level_declaration: None,
}),
}
}
ToplevelDefinition::Value(v) => self.generate_value(v),
ToplevelDefinition::Information(i) => match i.value {
ASN1Information::ObjectSet(_) => self.generate_information_object_set(i),
_ => Ok(TokenStream::new()),
},
}
fn generate(&self, tld: ToplevelDefinition) -> Result<String, GeneratorError> {
self.generate_tld(tld).and_then(|s| Ok(s.to_string()))
6d7a marked this conversation as resolved.
Show resolved Hide resolved
}
}
4 changes: 2 additions & 2 deletions rasn-compiler/src/generator/rasn/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -791,7 +791,7 @@ impl Rasn {
.iter()
.filter(|m| self.needs_unnesting(&m.ty))
.map(|m| {
self.generate(ToplevelDefinition::Type(ToplevelTypeDefinition {
self.generate_tld(ToplevelDefinition::Type(ToplevelTypeDefinition {
parameterization: None,
comments: " Inner type ".into(),
name: self.inner_name(&m.name, parent_name).to_string(),
Expand Down Expand Up @@ -836,7 +836,7 @@ impl Rasn {
)
})
.map(|m| {
self.generate(ToplevelDefinition::Type(ToplevelTypeDefinition {
self.generate_tld(ToplevelDefinition::Type(ToplevelTypeDefinition {
parameterization: None,
comments: " Inner type ".into(),
name: self.inner_name(&m.name, parent_name).to_string(),
Expand Down
4 changes: 2 additions & 2 deletions rasn-compiler/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
//! fn generate(
//! &self,
//! tld: ToplevelDefinition
//! ) -> Result<TokenStream, GeneratorError> {
//! Ok(TokenStream::new())
//! ) -> Result<String, GeneratorError> {
//! Ok(String::new())
//! }
//!
//! fn config(&self) -> &Self::Config {
Expand Down
Loading