txt2asn.awk: Added conditions for ASN.1 pieces that were missing in the .asn (multipl...

[3GPP.git] / awk / txt2asn.awk

diff --git a/awk/txt2asn.awk b/awk/txt2asn.awk
index 1eb8414f61362acff287bc50a18dde2460da5746..e871003fe7402ce57c8f7b5b18dbbfca0ce321d8 100755 (executable)
--- a/awk/txt2asn.awk
+++ b/awk/txt2asn.awk
@@ -15,8 +15,14 @@ BEGIN {
     }
 }
 
     }
 }
 

-/^[0-9]+\./ {
+# Section headers
+# This will also catch bits of Short Message description but that won't cause issues
+# A way not to catch those could be to check that the numbers are in sequence
+
+/^[0-9]+(\.[0-9]+)*\t/ {

     in_IE = "no" ;
     in_IE = "no" ;

+#    print "Titre" ;
+#    print ;

 }
 
 /^-- ASN1START/ {
 }
 
 /^-- ASN1START/ {


@@ -34,6 +40,9 @@ BEGIN {
     next;
 }
 
     next;
 }
 

+# Recording empty line (to avoid multiple empty lines)
+# Printing separators in some cases
+

 /^[[:space:]]*$/ {
 
      if (next_line == "condition") {
 /^[[:space:]]*$/ {
 
      if (next_line == "condition") {


@@ -53,11 +62,15 @@ BEGIN {
 #    print ; 
 }
 
 #    print ; 
 }
 

-/^–[[:space:]]+ParentIE-WithEM$/ {
+# Stopping before ASN.1 examples (end of specification)
+/^-[[:space:]]+ParentIE-WithEM$/ {

     exit 0 ;
 }
 
     exit 0 ;
 }
 

-/^–[[:space:]]+[A-Za-z0-9-]+$/ {
+# Start of IE definitions
+# This cannot catch "Multiplicity and type constraints"
+# This also cannot catch NR-InterNodeDefinitions
+/^-[[:space:]]+[A-Za-z0-9-]+$/ {

     if (empty_line == "yes") {
        print ie_separator;
        print "-- IE: " $2;
     if (empty_line == "yes") {
        print ie_separator;
        print "-- IE: " $2;


@@ -69,10 +82,43 @@ BEGIN {
     next ;
 }
 
     next ;
 }
 

+/^NR-InterNodeDefinitions/ {
+    if (empty_line == "yes") {
+       print ie_separator;
+       print "-- IE: NR-InterNodeDefinitions";
+       print "" ;
+       # Perhaps it could work without this if the "next" at the end is removed
+       print ;
+       empty_line = "no" ;
+       conditions = "" ;
+    }
+    in_IE = "yes" ;
+    next ;
+}
+
+
+# Sometimes there is an "s" to constraint, sometimes not
+/^-[[:space:]]+Multiplicity and type constraints? definitions$/ {
+    if (empty_line == "yes") {
+       print ie_separator;
+       print "-- Multiplicity and type constraints definitions";
+       print "" ;
+       empty_line = "no" ;
+       conditions = "" ;
+    }
+    in_IE = "yes" ;
+    next ;
+}
+
+#/^-[[:space:]]+Multiplicity and type constraints definitions/ {
+#    in_IE = "yes" ;
+#    next ;
+#}
+

 /^Conditional Presence/ {
     add_line_after = "";
     separator = "" ;
 /^Conditional Presence/ {
     add_line_after = "";
     separator = "" ;

-
+    

     $0 = "Conditional presence" ;
     for(i=0;i<=140;i++) {
        separator = separator "-" ;
     $0 = "Conditional presence" ;
     for(i=0;i<=140;i++) {
        separator = separator "-" ;