Parse and resolve ValueReferences

.github/workflows/rust.yml

@@ -21,8 +21,8 @@ jobs:
           command: check
           args: --all-features
 
-  test:
-    name: Test Suite
+  test-default:
+    name: Test Suite (default)
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -34,18 +34,62 @@ jobs:
       - uses: actions-rs/cargo@v1
         with:
           command: test
+
+  test-protobuf:
+    name: Test Suite (protobuf)
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          override: true
       - uses: actions-rs/cargo@v1
         with:
           command: test
           args: --features protobuf
+
+  test-psql:
+    name: Test Suite (psql)
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          override: true
       - uses: actions-rs/cargo@v1
         with:
           command: test
           args: --features psql
+
+  test-async-psql:
+    name: Test Suite (async-psql)
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          override: true
       - uses: actions-rs/cargo@v1
         with:
           command: test
           args: --features async-psql
+
+  test-all:
+    name: Test Suite (all)
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          override: true
       - uses: actions-rs/cargo@v1
         with:
           command: test
@@ -86,3 +130,67 @@ jobs:
         with:
           command: clippy
           args: --all-features -- -D warnings
+
+  etsi-standards:
+    name: ETSI
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          override: true
+      - run: wget https://forge.etsi.org/rep/ITS/asn1/cdd_ts102894_2/raw/151b191121d05c3b808f5dec14387339730db14f/ITS-Container.asn
+      - run: wget https://forge.etsi.org/rep/ITS/asn1/cam_en302637_2/raw/7ae4195d48dd468754a50f1a3bb0c2ce976ae15a/CAM-PDU-Descriptions.asn
+      - uses: actions-rs/cargo@v1
+        with:
+          command: run
+          args: -- tests ITS-Container.asn CAM-PDU-Descriptions.asn
+      - run: bash -c "echo '#[test] fn does_it_compile() { let _ = StationID(1); }' >> tests/its_container.rs"
+      - run: sed -i '1i mod its_container;' tests/cam_pdu_descriptions.rs
+      - run: sed -i 's/super::/crate::/g' tests/cam_pdu_descriptions.rs
+      - run: cat tests/cam_pdu_descriptions.rs
+      - run: bash -c "echo '#[test] fn does_it_compile() { let _ = GenerationDeltaTime(1); }' >> tests/cam_pdu_descriptions.rs"
+      - uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: --test its_container does_it_compile
+      - uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: --test cam_pdu_descriptions does_it_compile
+
+  coverage:
+    name: Test Coverage
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: nightly
+          override: true
+      - name: Run cargo-tarpaulin
+        uses: actions-rs/tarpaulin@v0.1
+        with:
+          version: '0.15.0'
+          args: '--out Xml --out Lcov --all-features -- --test-threads 1'
+
+      - name: Archive code coverage results
+        uses: actions/upload-artifact@v1
+        with:
+          name: code-coverage-report
+          path: cobertura.xml
+
+      - name: Upload to Coveralls
+        uses: coverallsapp/github-action@master
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          path-to-lcov: './lcov.info'
+
+  cargo-deny:
+    name: Check license and vulnerabilities
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: EmbarkStudios/cargo-deny-action@v1

Cargo.toml

@@ -48,11 +48,10 @@ asn1rs-model =  { version = "0.2.0", path = "asn1rs-model", optional = true }
 asn1rs-macros = { version = "0.2.0", path = "asn1rs-macros", optional = true }
 
 [dev-dependencies]
-syn = {version = "1.0.28", features = ["full"] }
+syn = {version = "1.0.28", features = ["full", "visit"] }
 quote = "1.0.3"
 proc-macro2 = "1.0.10"
 
-
 [features]
 default = ["macros", "model"]
 psql = ["asn1rs-model/psql", "postgres", "bytes"]
@@ -71,4 +70,4 @@ path = "benches/bitbuffer.rs"
 required-features = ["legacy_bit_buffer"]
 
 [package.metadata.docs.rs]
-all-features = true
+all-features = true

README.md

@@ -46,13 +46,25 @@ The crate can be used as standalone CLI binary or used as library through its AP
 | `IA5String`         | ✔️ yes  | ✔️ yes  | ✔️ yes¹   | ✔️ yes¹   | ✔️ yes¹  | ❌ ub              | 
 | ...`SIZE(A..B)`     | ✔️ yes  | ✔️ yes  | 🆗 ignored  | 🆗 ignored  | 🆗 ignored | ❌ ub              | 
 | ...`SIZE(A..B,...)` | ✔️ yes  | ✔️ yes  | 🆗 ignored  | 🆗 ignored  | 🆗 ignored | ❌ ub              |   
+| `NumericString`     | ✔️ yes  | ✔️ yes  | ✔️ yes¹   | ✔️ yes¹   | ✔️ yes¹  | ❌ ub              | 
+| ...`SIZE(A..B)`     | ✔️ yes  | ✔️ yes  | 🆗 ignored  | 🆗 ignored  | 🆗 ignored | ❌ ub              | 
+| ...`SIZE(A..B,...)` | ✔️ yes  | ✔️ yes  | 🆗 ignored  | 🆗 ignored  | 🆗 ignored | ❌ ub              |   
+| `PrintableString`   | ✔️ yes  | ✔️ yes  | ✔️ yes¹   | ✔️ yes¹   | ✔️ yes¹  | ❌ ub              | 
+| ...`SIZE(A..B)`     | ✔️ yes  | ✔️ yes  | 🆗 ignored  | 🆗 ignored  | 🆗 ignored | ❌ ub              | 
+| ...`SIZE(A..B,...)` | ✔️ yes  | ✔️ yes  | 🆗 ignored  | 🆗 ignored  | 🆗 ignored | ❌ ub              |   
+| `VisibleString`     | ✔️ yes  | ✔️ yes  | ✔️ yes¹   | ✔️ yes¹   | ✔️ yes¹  | ❌ ub              | 
+| ...`SIZE(A..B)`     | ✔️ yes  | ✔️ yes  | 🆗 ignored  | 🆗 ignored  | 🆗 ignored | ❌ ub              | 
+| ...`SIZE(A..B,...)` | ✔️ yes  | ✔️ yes  | 🆗 ignored  | 🆗 ignored  | 🆗 ignored | ❌ ub              |   
 | `INTEGER`           | ✔️ yes  | ✔️ yes  | ✔️ yes      | ✔️ yes      | ✔️ yes     | ✔️ yes             |
 | ...`A..B`           | ✔️ yes  | ✔️ yes  | ✔️ yes²   | ✔️ yes²   | ✔️ yes²  | ✔️ yes             |
 | ...`A..B,...`       | ✔️ yes  | ✔️ yes  | ✔️ yes²   | ✔️ yes²   | ✔️ yes²  | ⚠️ ignored         |
 | `BOOLEAN`           | ✔️ yes  | ✔️ yes  | ✔️ yes      | ✔️ yes      | ✔️ yes     | ✔️ yes             |
 | `OPTIONAL`          | ✔️ yes  | ✔️ yes  | ✔️ yes      | ✔️ yes      | ✔️ yes     | ✔️ yes             |
 | `IMPORTS..FROM..;`  | ✔️ yes  |         |             |             |            |                    |
 | `ObjectIdentifiers` | ✔️ yes  |         |             |             |            |                    |
+| Value References    | ✔️ yes  |         |             |             |            |                    |
+| ... in Range        | ✔️ yes  |         |             |             |            |                    |
+| ... in Size         | ✔️ yes  |         |             |             |            |                    |
 
 
  - ✔️ yes: according to specification
@@ -72,10 +84,12 @@ The crate can be used as standalone CLI binary or used as library through its AP
 - The legacy UPER Reader/Writer does not support all features (pre v0.2.0)
 
 #### Supported standards
- -  [ETSI TS 102 894-2 / ITS-Container](https://www.etsi.org/deliver/etsi_ts/102800_102899/10289402/01.02.01_60/ts_10289402v010201p.pdf): \
-    ```itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg1(1) ts(102894) cdd(2) version(1)```
- -  [ETSI EN 302 637-2 / ITS-CAM](https://www.etsi.org/deliver/etsi_en/302600_302699/30263702/01.03.01_30/en_30263702v010301v.pdf): \
-    ```itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg1(1) en(302637) cam(2) version(1)```
+ -  [📜️ ETSI TS 102 894-2 (PDF)](https://www.etsi.org/deliver/etsi_ts/102800_102899/10289402/01.02.01_60/ts_10289402v010201p.pdf)
+    / [🧰 ITS-Container (GIT)](https://forge.etsi.org/rep/ITS/asn1/cdd_ts102894_2/blob/151b191121d05c3b808f5dec14387339730db14f/ITS-Container.asn): \
+    ```itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg1(1) ts(102894) cdd(2) version(2)```
+ -  [📜️ ETSI EN 302 637-2 (PDF)](https://www.etsi.org/deliver/etsi_en/302600_302699/30263702/01.03.01_30/en_30263702v010301v.pdf)
+    / [🧰 CAM-PDU-Description (GIT)](https://forge.etsi.org/rep/ITS/asn1/cam_en302637_2/blob/7ae4195d48dd468754a50f1a3bb0c2ce976ae15a/CAM-PDU-Descriptions.asn): \
+    ```itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg1(1) en(302637) cam(2) version(2)```
 
 ### CLI usage
 

asn1rs-macros/Cargo.toml

@@ -22,4 +22,4 @@ debug-proc-macro = []
 [dependencies]
 asn1rs-model =  { version = "0.2.0", path = "../asn1rs-model" }
 syn = {version = "1.0.17", features = ["full"] }
-quote = "1.0.3"
+quote = "1.0.3"

asn1rs-macros/src/lib.rs

@@ -1,11 +1,6 @@
 extern crate proc_macro;
 
 use asn1rs_model::ast;
-
-use asn1rs_model::gen::rust::RustCodeGenerator as RustGenerator;
-use asn1rs_model::gen::Generator;
-use asn1rs_model::model::Model;
-use asn1rs_model::parser::Tokenizer;
 use proc_macro::TokenStream;
 use syn::parse_macro_input;
 use syn::DeriveInput;
@@ -16,27 +11,7 @@ mod derive_protobuf_eq;
 #[proc_macro]
 pub fn asn_to_rust(item: TokenStream) -> TokenStream {
     let input = parse_macro_input!(item as LitStr).value();
-    let tokens = Tokenizer::default().parse(&input);
-    let model = Model::try_from(tokens).unwrap();
-
-    let mut generator = RustGenerator::default();
-    generator.add_model(model.to_rust());
-
-    let output = generator
-        .to_string()
-        .unwrap()
-        .into_iter()
-        .map(|(_file, content)| content)
-        .collect::<Vec<_>>()
-        .join("\n");
-
-    if cfg!(feature = "debug-proc-macro") {
-        println!("-------- output start");
-        println!("{}", output);
-        println!("-------- output end");
-    }
-
-    output.parse().unwrap()
+    asn1rs_model::ast::asn_to_rust(&input).parse().unwrap()
 }
 
 #[proc_macro_attribute]

asn1rs-model/src/ast/attribute.rs

@@ -85,13 +85,16 @@ impl<C: Context> Parse for AsnAttribute<C> {
 }
 
 fn parse_type<'a>(input: &'a ParseBuffer<'a>) -> syn::Result<Type> {
-    let ident = input
-        .step(|c| c.ident().ok_or_else(|| c.error("Expected ASN-Type")))?
-        .to_string()
-        .to_lowercase();
+    let ident = parse_ident(input, "Expected ASN-Type")?.to_lowercase();
     parse_type_pre_stepped(&ident, input)
 }
 
+fn parse_ident<T: Display>(content: &ParseBuffer, err: T) -> syn::Result<String> {
+    Ok(content
+        .step(|c| c.ident().ok_or_else(|| c.error(err)))?
+        .to_string())
+}
+
 fn parse_type_pre_stepped<'a>(
     lowercase_ident: &str,
     input: &'a ParseBuffer<'a>,
@@ -150,16 +153,24 @@ fn parse_type_pre_stepped<'a>(
         "sequence_of" | "set_of" => {
             let content;
             parenthesized!(content in input);
-            let size = if content.peek2(Token![.])
-                || (content.peek(Token![-]) && content.peek3(Token![.]))
-            {
-                let size = Size::parse(&content)?;
+
+            let ident = parse_ident(&content, "Expected size or ASN-Type")?.to_lowercase();
+
+            let (size, ident) = if "size".eq(&ident) {
+                let size_content;
+                parenthesized!(size_content in content);
+
+                let size = Size::parse(&size_content)?;
                 let _ = content.parse::<token::Comma>()?;
-                size
+                let ident = parse_ident(&content, "Expected ASN-Type")?.to_lowercase();
+
+                (size, ident)
             } else {
-                Size::Any
+                (Size::Any, ident)
             };
-            let inner = parse_type(&content)?;
+
+            let inner = parse_type_pre_stepped(&ident, &content)?;
+
             if lowercase_ident == "sequence_of" {
                 Ok(Type::SequenceOf(Box::new(inner), size))
             } else {
@@ -180,7 +191,18 @@ fn parse_opt_size_or_any(input: ParseStream) -> syn::Result<Size> {
         if content.is_empty() {
             Ok(Size::Any)
         } else {
-            Size::parse(&content)
+            let ident = parse_ident(&content, "Expected size or ASN-Type")?.to_lowercase();
+
+            if "size".eq(&ident) {
+                let size_content;
+                parenthesized!(size_content in content);
+                Size::parse(&size_content)
+            } else {
+                Err(input.error(format!(
+                    "Invalid identifier, expected none or size but got: {}",
+                    ident
+                )))
+            }
         }
     }
 }
@@ -297,9 +319,6 @@ impl Deref for DefinitionHeader {
 }
 impl PrimaryContext for DefinitionHeader {
     fn parse(input: &ParseBuffer<'_>) -> syn::Result<Self> {
-        input
-            .step(|c| c.ident().ok_or_else(|| c.error("Expected type identifier")))
-            .map(|ident| ident.to_string())
-            .map(DefinitionHeader)
+        parse_ident(input, "Expected type identifier for DefinitionHeader").map(DefinitionHeader)
     }
 }

asn1rs-model/src/ast/inline.rs

@@ -0,0 +1,31 @@
+use crate::gen::rust::RustCodeGenerator as RustGenerator;
+use crate::gen::Generator;
+use crate::model::Model;
+use crate::parser::Tokenizer;
+
+pub fn asn_to_rust(input: &str) -> String {
+    let tokens = Tokenizer::default().parse(&input);
+    let model = Model::try_from(tokens)
+        .expect("Failed to parse tokens")
+        .try_resolve()
+        .expect("Failed to resolve value references");
+
+    let mut generator = RustGenerator::default();
+    generator.add_model(model.to_rust());
+
+    let output = generator
+        .to_string()
+        .unwrap()
+        .into_iter()
+        .map(|(_file, content)| content)
+        .collect::<Vec<_>>()
+        .join("\n");
+
+    if cfg!(feature = "debug-proc-macro") {
+        println!("-------- output start");
+        println!("{}", output);
+        println!("-------- output end");
+    }
+
+    output
+}